Skip to content

Commit 434072e

Browse files
entantoencuantoentantoencuanto
committed
Update overridden partials to 0.30 version
1 parent 893254f commit 434072e

5 files changed

Lines changed: 81 additions & 73 deletions

File tree

‎decidim-ldap/app/views/decidim/devise/sessions/_default.html.erb‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
11
<% add_decidim_page_title(t("devise.sessions.new.log_in")) %>
22

3-
<%= render layout: "layouts/decidim/shared/layout_center" do %>
3+
<%= render(layout: "layouts/decidim/shared/layout_center") do %>
44

55
<div class="flex justify-center">
66
<h1 class="title-decorator my-12"><%= t("devise.sessions.new.log_in") %></h1>
77
</div>
88

9-
<div class="login__info font-semibold">
10-
<% if current_organization.sign_up_enabled? %>
11-
<p>
12-
<%= t("decidim.devise.sessions.new.are_you_new?") %>
13-
<%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
14-
</p>
15-
<% elsif current_organization.sign_in_enabled? %>
16-
<p>
17-
<%= t("decidim.devise.sessions.new.sign_up_disabled") %>
18-
</p>
19-
<% else %>
20-
<p>
21-
<%= t("decidim.devise.sessions.new.sign_in_disabled") %>
22-
</p>
23-
<% end %>
24-
</div>
25-
26-
<span class="login__info-separator"></span>
27-
289
<% cache current_organization do %>
29-
<%= render "decidim/devise/shared/omniauth_buttons" %>
10+
<%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
3011
<% end %>
3112

3213
<% if current_organization.sign_in_enabled? %>
@@ -36,22 +17,36 @@
3617

3718
<%= render partial: "decidim/account/password_fields", locals: { form: f } %>
3819

39-
<% if devise_mapping.rememberable? %>
40-
<%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
20+
</div>
21+
<div class="login__modal-remember">
22+
<% if devise_mapping.rememberable? %>
23+
<%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
24+
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user), class: "sign-up-link" %>
25+
<% end %>
26+
</div>
27+
28+
<div class="login__info mb-10 flex justify-center font-semibold">
29+
<% if current_organization.sign_up_enabled? %>
30+
<p>
31+
<%= t("decidim.devise.sessions.new.are_you_new?") %>
32+
<%= link_to t("decidim.devise.sessions.new.register"), new_user_registration_path %>
33+
</p>
34+
<% elsif current_organization.sign_in_enabled? %>
35+
<p>
36+
<%= t("decidim.devise.sessions.new.sign_up_disabled") %>
37+
</p>
38+
<% else %>
39+
<p>
40+
<%= t("decidim.devise.sessions.new.sign_in_disabled") %>
41+
</p>
4142
<% end %>
4243
</div>
4344

4445
<div class="form__wrapper-block">
4546
<button type="submit" class="button button__lg button__secondary">
4647
<%= t("devise.sessions.new.log_in") %>
47-
<%= icon "arrow-right-line", class: "fill-current" %>
4848
</button>
4949
</div>
50-
51-
<div class="login__links">
52-
<%= render "decidim/devise/shared/links" %>
53-
</div>
5450
<% end %>
55-
5651
<% end %>
5752
<% end %>

‎decidim-ldap/app/views/decidim/devise/sessions/_ldap.html.erb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<% add_decidim_page_title(t("devise.sessions.new.log_in")) %>
22

3-
<%= render layout: "layouts/decidim/shared/layout_center" do %>
3+
<%= render(layout: "layouts/decidim/shared/layout_center") do %>
44

55
<div class="flex justify-center">
66
<h1 class="title-decorator my-12"><%= t("devise.sessions.new.log_in") %></h1>
@@ -24,7 +24,6 @@
2424
<div class="form__wrapper-block">
2525
<button type="submit" class="button button__lg button__secondary">
2626
<%= t("devise.sessions.new.log_in") %>
27-
<%= icon "arrow-right-line", class: "fill-current" %>
2827
</button>
2928
</div>
3029
<% end %>

‎decidim-ldap/app/views/decidim/shared/_login_modal_default.html.erb‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,52 @@
99
%>
1010

1111
<%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
12-
<div data-dialog-container>
13-
<%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
14-
<h3 id="dialog-title-loginModal" class="h3"><%= t("decidim.shared.login_modal.please_log_in") %></h3>
12+
<div>
13+
<div class="flex flex-row">
14+
<%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
15+
<h3 id="dialog-title-loginModal" class="h3 ml-1"><%= t("decidim.shared.login_modal.please_log_in") %></h3>
16+
17+
</div>
18+
1519
<div>
1620
<% if current_organization.sign_in_enabled? %>
1721
<% cache current_organization do %>
1822
<%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
1923
<% end %>
20-
2124
<div class="form__wrapper">
2225
<%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
2326

2427
<%= render partial: "decidim/account/password_fields", locals: { form: f } %>
25-
</div>
2628

27-
<div class="login__modal-links">
28-
<%= link_to t("decidim.shared.login_modal.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
29-
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
3029
</div>
30+
<div class="login__modal-remember">
31+
<%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
32+
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
33+
</div>
34+
<div class="login__info flex justify-center font-semibold">
35+
<p>
36+
<%= t("decidim.devise.sessions.new.are_you_new?") %>
37+
<%= link_to t("decidim.shared.login_modal.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
38+
</p>
39+
</div>
40+
3141
<% else %>
3242
<%= cell("decidim/announcement", t("sign_in_disabled", scope: "decidim.devise.sessions.new"), callout_class: "warning" ) %>
3343

3444
<% cache current_organization do %>
3545
<%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
3646
<% end %>
3747
<% end %>
48+
<% if current_organization.sign_in_enabled? %>
49+
<div data-dialog-actions>
50+
<div class="form__wrapper-block w-full mb-4">
51+
<button type="submit" class="button button__lg button__secondary">
52+
<%= t("devise.sessions.new.log_in") %>
53+
</button>
54+
</div>
55+
</div>
56+
<% end %>
3857
</div>
3958
</div>
40-
41-
<% if current_organization.sign_in_enabled? %>
42-
<div data-dialog-actions>
43-
<button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="loginModal">
44-
<%= t("cancel", scope: "decidim.admin.actions") %>
45-
</button>
46-
<button type="submit" class="button button__lg button__secondary">
47-
<%= t("devise.sessions.new.log_in") %>
48-
<%= icon "arrow-right-line", class: "fill-current" %>
49-
</button>
50-
</div>
51-
<% end %>
5259
<% end %>
5360
<% end %>

‎decidim-ldap/app/views/decidim/shared/_login_modal_ldap.html.erb‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,46 @@
99
%>
1010

1111
<%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
12-
<div data-dialog-container>
13-
<%= icon "login-box-line", class: "w-6 h-6 text-gray fill-current" %>
14-
<h3 id="dialog-title-loginModal" class="h3"><%= t("decidim.shared.login_modal.please_log_in") %></h3>
12+
<div>
13+
<div class="flex flex-row">
14+
<%= icon "user-line", class: "w-6 h-6 text-gray fill-current" %>
15+
<h3 id="dialog-title-loginModal" class="h3 ml-1"><%= t("decidim.shared.login_modal.please_log_in") %></h3>
16+
</div>
17+
1518
<div>
1619
<% if current_organization.sign_in_enabled? %>
1720
<div class="form__wrapper">
1821
<%= f.email_field :email, autocomplete: "email", placeholder: t("placeholder_email", scope: "decidim.devise.shared") %>
1922

2023
<%= render partial: "decidim/account/password_fields", locals: { form: f } %>
24+
25+
</div>
26+
<div class="login__modal-remember">
27+
<%= f.check_box :remember_me, label_options: { class: "form__wrapper-checkbox-label" } %>
28+
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
29+
</div>
30+
<div class="login__info flex justify-center font-semibold">
31+
<p>
32+
<%= t("decidim.devise.sessions.new.are_you_new?") %>
33+
<%= link_to t("decidim.shared.login_modal.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
34+
</p>
2135
</div>
2236

2337
<%= hidden_field_tag :organization_id, current_organization.id %>
24-
25-
<div class="login__modal-links">
26-
<%= link_to t("decidim.shared.login_modal.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
27-
<%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
28-
</div>
2938
<% else %>
3039
<%= cell("decidim/announcement", t("sign_in_disabled", scope: "decidim.devise.sessions.new"), callout_class: "warning" ) %>
40+
41+
<% end %>
42+
<% if current_organization.sign_in_enabled? %>
43+
<div data-dialog-actions>
44+
<div class="form__wrapper-block w-full mb-4">
45+
<button type="submit" class="button button__lg button__secondary">
46+
<%= t("devise.sessions.new.log_in") %>
47+
</button>
48+
</div>
49+
</div>
3150
<% end %>
3251
</div>
3352
</div>
34-
35-
<% if current_organization.sign_in_enabled? %>
36-
<div data-dialog-actions>
37-
<button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="loginModal">
38-
<%= t("cancel", scope: "decidim.admin.actions") %>
39-
</button>
40-
<button type="submit" class="button button__lg button__secondary">
41-
<%= t("devise.sessions.new.log_in") %>
42-
<%= icon "arrow-right-line", class: "fill-current" %>
43-
</button>
44-
</div>
45-
<% end %>
4653
<% end %>
4754
<% end %>

‎decidim-ldap/spec/lib/overrides_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
{
99
package: "decidim-core",
1010
files: {
11-
"/app/views/decidim/devise/sessions/new.html.erb" => "a8fe60cd10c1636822c252d5488a979d",
12-
"/app/views/decidim/shared/_login_modal.html.erb" => "0d615603bb45f7b209032578dda9fc72"
11+
"/app/views/decidim/devise/sessions/new.html.erb" => "da0d18178c8dcead2774956e989527c5",
12+
"/app/views/decidim/shared/_login_modal.html.erb" => "98bd2832be207d7abcd48d2a0ba40bd0"
1313
}
1414
}
1515
]

0 commit comments

Comments
 (0)