RubyGems - decidim-core - Versions diffs - 0.20.0 → 0.23.1.rc1 - Mend

decidim-core 0.20.0 → 0.23.1.rc1

Potentially problematic release.

This version of decidim-core might be problematic. Click here for more details.

Files changed (836) hide show

data/app/views/decidim/amendments/_edit_form_fields.html.erb CHANGED

@@ -1,22 +1,16 @@
 <%= form.fields_for :emendation_params, form.object.emendation_params do |emendation_form| %>
+  <%= form_required_explanation %>
   <% amendable.attributes.each do |key, value| %>
     <% key = key.to_sym %>
     <% if amendable.amendable_fields.include?(key) %>
-      <% if [:title, :body].include?(key) %>
-        <div class="field hashtags__container">
-          <%= emendation_form.form_field_for key,
-                                             class: "js-hashtags",
-                                             hashtaggable: true,
-                                             label: amendments_form_fields_label(key),
-                                             value: amendments_form_fields_value(original, key) %>
-        </div>
-      <% end %>
+      <div class="field hashtags__container">
+        <%= amendments_form_field_for(key, emendation_form, original) %>
+      </div>
-      <% if form.object.errors[key].present? %>
-        <% form.object.errors.full_messages_for(key).each do |message| %>
-          <small class="form-error is-visible"><%= message %></small>
-        <% end %>
+      <% form.object.errors.full_messages_for(key).each do |message| %>
+        <small class="form-error is-visible"><%= message %></small>
       <% end %>
     <% end %>

data/app/views/decidim/amendments/_similar_emendation.html.erb CHANGED

@@ -1,5 +1,5 @@
-<main class="column">
-  <article class="card card--proposal">
+<div class="column">
+  <div class="card card--proposal">
     <div class="card__content">
       <div class="card__header">
         <%= link_to Decidim::ResourceLocatorPresenter.new(emendation).path, target: "_blank" do %>
@@ -20,5 +20,5 @@
       <%= cell "decidim/tags", emendation, context: { extra_classes: ["tags--proposal"] } %>
     </div>
-  </article>
-</main>
+  </div>
+</div>

data/app/views/decidim/amendments/compare_draft.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
@@ -18,4 +18,4 @@
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

data/app/views/decidim/amendments/edit_draft.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
@@ -28,4 +28,4 @@
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

data/app/views/decidim/amendments/new.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside ) %>
@@ -28,4 +28,4 @@
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

data/app/views/decidim/amendments/preview_draft.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <%= cell("decidim/amendable/wizard_step_form", amendable, view: :wizard_aside) %>
@@ -13,7 +13,7 @@
           </div>
           <div class="row column">
-            <%= simple_format present(emendation).body(links: true, strip_tags: true) %>
+            <%= render_emendation_body(emendation) %>
           </div>
           <br><%= render partial: "attachments", locals: { attached_to: emendation } %>
@@ -29,4 +29,4 @@
     <div class="columns large-3"></div>
   </div>
-</main>
+</div>

data/app/views/decidim/amendments/review.html.erb CHANGED

@@ -1,9 +1,9 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="columns">
       <div class="m-bottom">
         <%= link_to :back do %>
-          <%= icon "chevron-left", class: "icon--small" %>
+          <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
           <%= t(".back") %>
         <% end %>
       </div>
@@ -38,4 +38,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/application/_collection.html.erb CHANGED

@@ -1,9 +1,9 @@
 <% unless attachment_collection.unused? %>
   <div class="docs__container">
-    <h6 data-toggle="docs-collection-<%= attachment_collection.id %>"><%= icon "caret-right", class: "icon--small" %>&nbsp
+    <span data-toggle="docs-collection-<%= attachment_collection.id %>"><%= icon "caret-right", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;
       <strong><%= translated_attribute(attachment_collection.name) %></strong>
       <small>(<%= attachment_collection.attachments.count %> <%= t(".documents", count: attachment_collection.attachments.count) %>)</small>
-    </h6>
+    </span>
     <div id="docs-collection-<%= attachment_collection.id %>" class="docs__content hide" data-toggler=".hide">
       <p><%= translated_attribute(attachment_collection.description) %></p>
       <div class="card card--list">

data/app/views/decidim/application/_document.html.erb CHANGED

@@ -2,9 +2,9 @@
   <div class="card--list__text">
     <div>
       <a href="<%= document.url %>" class="card__link">
-        <h6 class="card--list__heading heading6">
+        <h4 class="card--list__heading heading6">
           <%= attachment_title(document) %> <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-        </h6>
+        </h4>
         <% if document.description.present? %>
             <span class="text-small"><%= translated_attribute(document.description) %></span>
         <% end %>
@@ -12,8 +12,8 @@
     </div>
   </div>
   <div class="card--list__data">
-    <%= link_to document.url, target: "_blank", rel: "noopener", class: "card--list__data__icon" do %>
-        <%= icon "cloud-download" %>
+    <%= link_to document.url, target: "_blank", rel: "noopener", class: "card--list__data__icon", title: t(".download") do %>
+        <%= icon "cloud-download", role: "img", aria_label: t(".download") %>
     <% end %>
   </div>
 </div>

data/app/views/decidim/application/_documents.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% if documents.any? %>
   <div class="section documents">
-    <h4 class="section-heading"><%= t(".related_documents") %></h4>
+    <h3 class="section-heading"><%= t(".related_documents") %></h3>
     <% if (documents_without_collection = documents.reject(&:attachment_collection_id?)).any? %>
       <div class="card card--list">
         <%= render partial: "document", collection: documents_without_collection %>

data/app/views/decidim/application/_photos.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% if photos.any? %>
   <div class="section images">
-    <h4 class="section-heading"><%= t(".related_photos") %></h4>
+    <h3 class="section-heading"><%= t(".related_photos") %></h3>
     <div class="gallery row">
       <% photos.in_groups_of(3, false).each do |group| %>
         <% group.each_with_index do |photo, index| %>

data/app/views/decidim/authorization_modals/_content.html.erb CHANGED

@@ -17,8 +17,8 @@
   <% authorizations.statuses.each do |status| %>
     <% next if status.ok? || authorizations.global_code && status.code != base_code %>
     <p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
-    <% if status.data[:extra_explanation] %>
-      <p><%= t status.data[:extra_explanation][:key], **status.data[:extra_explanation][:params] %></p>
+    <% [status.data[:extra_explanation]].flatten.compact.each do |extra_explanation| %>
+      <p><%= t extra_explanation[:key], **extra_explanation[:params] %></p>
     <% end %>
     <% if status.data[:fields] %>
       <ul>

data/app/views/decidim/authorization_modals/show.html.erb CHANGED

@@ -1,4 +1,4 @@
-<button class="close-button" data-close aria-label="Close modal" type="button">
+<button class="close-button" data-close aria-label="<%= t ".close_modal" %>" type="button">
   <span aria-hidden="true">&times;</span>
 </button>

data/app/views/decidim/data_portability/show.html.erb CHANGED

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("my_data", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("my_data", scope: "layouts.decidim.user_profile") } %>
 <div class="row data-portability">
   <strong><%= t(".download_data") %></strong>
   <p><%= t(".download_data_description", user_email: current_user.email).html_safe %></p>

data/app/views/decidim/devise/confirmations/new.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("devise.confirmations.new.resend_confirmation_instructions")) %>
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -12,7 +12,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, namespace: "confirmation", as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <%= devise_error_messages! %>
             <div class="field">
@@ -30,4 +30,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/devise/invitations/edit.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -10,11 +10,13 @@
   <div class="row">
     <div class="columns large-6 medium-10 medium-centered">
-      <%= decidim_form_for resource, as: resource_name, url: invitation_path(resource_name, invite_redirect: params[:invite_redirect]), html: { method: :put, class: "register-form new_user" } do |f| %>
+      <%= decidim_form_for resource, namespace: "invitation", as: resource_name, url: invitation_path(resource_name, invite_redirect: params[:invite_redirect]), html: { method: :put, class: "register-form new_user" } do |f| %>
         <div class="card">
           <div class="card__content">
             <legend><%= t("sign_up_as.legend", scope: "decidim.devise.registrations.new") %></legend>
+            <%= form_required_explanation %>
             <%= f.hidden_field :invitation_token %>
             <div class="user-nickname">
@@ -25,11 +27,11 @@
             <% if f.object.class.require_password_on_accepting %>
               <div class="field">
-                <%= f.password_field :password, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
+                <p><%= f.password_field :password, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
               </div>
               <div class="field">
-                <%= f.password_field :password_confirmation, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
+                <p><%= f.password_field :password_confirmation, required: "required", minlength: ::Devise.password_length.min, maxlength: ::Devise.password_length.max %></p>
               </div>
             <% end %>
           </div>
@@ -37,13 +39,10 @@
         <div class="card" id="card__tos">
           <div class="card__content">
-            <legend>
-              <%= t("tos_title", scope: "decidim.devise.registrations.new") %>
-            </legend>
-            <p class="tos-text">
-              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
-            </p>
+            <fieldset>
+              <legend><%= t("tos_title", scope: "decidim.devise.registrations.new") %></legend>
+              <p class="tos-text"><%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %></p>
+            </fieldset>
             <div class="field">
               <% link = link_to t("terms", scope: "decidim.devise.registrations.new"), page_path("terms-and-conditions"), target: "_blank" %>
@@ -55,8 +54,9 @@
         <div class="card" id="card__newsletter">
           <div class="card__content">
-            <legend><%= t("newsletter_title", scope: "decidim.devise.registrations.new") %></legend>
             <fieldset>
+              <legend><%= t("newsletter_title", scope: "decidim.devise.registrations.new") %></legend>
               <div class="field">
                 <%= label_tag :"#{resource_name}[newsletter_notifications]" do %>
                   <%= check_box_tag :"#{resource_name}[newsletter_notifications]" %>
@@ -79,4 +79,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/devise/omniauth_registrations/new.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -13,7 +13,9 @@
     <div class="columns large-6 medium-10 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(@form, as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+            <%= form_required_explanation %>
             <div class="user-person">
               <div class="field">
                 <%= f.text_field :name, help_text: t(".username_help") %>
@@ -43,4 +45,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/devise/passwords/edit.html.erb CHANGED

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -10,7 +10,9 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :put, class: "register-form new_user" }) do |f| %>
+            <%= form_required_explanation %>
             <%= f.hidden_field :reset_password_token %>
             <div class="field">
@@ -32,4 +34,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/devise/passwords/new.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("devise.passwords.new.forgot_your_password")) %>
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -12,7 +12,7 @@
     <div class="columns medium-7 large-5 medium-centered">
       <div class="card">
         <div class="card__content">
-          <%= decidim_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
+          <%= decidim_form_for(resource, namespace: "password", as: resource_name, url: password_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
             <div class="field">
               <%= f.email_field :email, autofocus: true %>
             </div>
@@ -28,4 +28,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/devise/registrations/edit.html.erb CHANGED

@@ -1,7 +1,8 @@
 <h2><%= t("devise.registrations.edit.title", resource: resource_class.model_name.human) %></h2>
-<%= decidim_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+<%= decidim_form_for(resource, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
+  <%= form_required_explanation %>
   <%= invisible_captcha %>
   <div class="field">

data/app/views/decidim/devise/registrations/new.html.erb CHANGED

@@ -4,7 +4,7 @@
   <%= render "decidim/devise/shared/links" %>
 <% end %>
-<main class="wrapper">
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -19,15 +19,19 @@
     </div>
   </div>
-  <%= render "decidim/devise/shared/omniauth_buttons" %>
+  <% cache current_organization do %>
+    <%= render "decidim/devise/shared/omniauth_buttons" %>
+  <% end %>
   <div class="row">
     <div class="columns large-6 medium-10 medium-centered">
-      <%= decidim_form_for(@form, as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
         <%= invisible_captcha %>
         <div class="card">
           <div class="card__content">
+            <%= form_required_explanation %>
             <div class="user-person">
               <div class="field">
                 <%= f.text_field :name, help_text: t(".username_help") %>
@@ -56,7 +60,7 @@
         <div class="card" id="card__tos">
           <div class="card__content">
-            <legend><%= t(".tos_title") %></legend>
+            <h3><%= t(".tos_title") %></h3>
             <p class="tos-text">
               <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
@@ -70,13 +74,10 @@
         <div class="card" id="card__newsletter">
           <div class="card__content">
-            <legend><%= t(".newsletter_title") %></legend>
-            <fieldset>
+            <h3><%= t(".newsletter_title") %></h3>
               <div class="field">
                 <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
               </div>
-            </fieldset>
           </div>
         </div>
@@ -92,5 +93,5 @@
     </div>
   </div>
 </div>
-</main>
+</div>
 <%= render "decidim/devise/shared/newsletter_modal" %>

data/app/views/decidim/devise/sessions/new.html.erb CHANGED

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("devise.sessions.new.sign_in")) %>
-<main class="wrapper">
+<div class="wrapper">
   <div class="row collapse">
     <div class="row collapse">
       <div class="columns large-8 large-centered text-center page-title">
@@ -21,29 +21,29 @@
         <% end %>
       </div>
     </div>
-    <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% end %>
     <% if current_organization.sign_in_enabled? %>
       <div class="row">
         <div class="columns large-6 medium-centered">
           <div class="card">
             <div class="card__content">
-              <%= decidim_form_for(resource, as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
+              <%= decidim_form_for(resource, namespace: "session", as: resource_name, url: session_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
                 <div>
                   <div class="field">
-                    <%= f.email_field :email, autofocus: true %>
+                    <%= f.email_field :email %>
                   </div>
                   <div class="field">
                     <%= f.password_field :password, autocomplete: "off" %>
                   </div>
                 </div>
-                <fieldset>
                   <% if devise_mapping.rememberable? %>
                     <div class="field">
                       <%= f.check_box :remember_me %>
                     </div>
                   <% end %>
-                </fieldset>
                 <div class="actions">
                   <%= f.submit t("devise.sessions.new.sign_in"), class: "button expanded" %>
                 </div>
@@ -55,4 +55,4 @@
       </div>
     <% end %>
   </div>
-</main>
+</div>