decidim-core 0.21.0 → 0.22.0

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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">
@@ -24,10 +24,12 @@
   <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 +58,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 +72,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 +91,5 @@
     </div>
   </div>
 </div>
-</main>
+</div>
 <%= render "decidim/devise/shared/newsletter_modal" %>

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

@@ -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">
@@ -28,22 +28,20 @@
         <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 +53,4 @@
       </div>
     <% end %>
   </div>
-</main>
+</div>

data/app/views/decidim/devise/shared/_newsletter_modal.html.erb

@@ -1,6 +1,6 @@
 <div class="reveal" id="sign-up-newsletter-modal" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".title") %></h3>
+    <h2 class="reveal__title"><%= t(".title") %></h2>
     <button class="close-button" data-close aria-label="<%= t(".buttons.close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
@@ -13,11 +13,11 @@
 
   <div class="row">
     <div class="column flex-center">
-      <button type="buton" class="check-newsletter clear button secondary expanded" data-check=false>
+      <button type="button" class="check-newsletter clear button secondary expanded" data-check=false>
         <%= t(".buttons.uncheck") %>
       </button>
 
-      <button type="buton" class="check-newsletter button expanded" data-check=true>
+      <button type="button" class="check-newsletter button expanded" data-check=true>
         <%= t(".buttons.check") %>
       </button>
     </div>

data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb

@@ -7,7 +7,9 @@
             <span class="button--social__icon">
               <%= oauth_icon provider %>
             </span>
-            <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
+            <span class="button--social__text">
+              <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
+            </span>
           <% end %>
         </div>
       <% end %>

data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb

@@ -7,9 +7,12 @@
       <div class="text-center">
         <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
           <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)} button--social--mini", method: :post do %>
-            <span class="button--social__icon">
+            <span class="button--social__icon" aria-hidden="true">
               <%= oauth_icon provider %>
             </span>
+            <span class="show-for-sr">
+              <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
+            </span>
           <% end %>
         <% end %>
       </div>

data/app/views/decidim/devise/unlocks/new.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("devise.unlocks.new.resend_unlock_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: unlock_path(resource_name), html: { method: :post, class: "register-form new_user" }) do |f| %>
+            <%= decidim_form_for(resource, namespace: "unlock", as: resource_name, url: unlock_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/doorkeeper/authorizations/new.html.erb

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row collapse">
     <div class="row">
       <div class="columns large-8 medium-centered">
@@ -55,4 +55,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/endorsements/_identity.html.erb

@@ -0,0 +1,9 @@
+<li class="<%= selected ? "selected" : "" %>" data-method="<%= http_method.to_s.upcase %>" data-create_url="<%= create_url %>" data-destroy_url="<%= destroy_url %>">
+  <div class="author-data author-data--small">
+    <div class="author-data__main">
+      <%== cell("decidim/author", identity, skip_profile_link: true).profile %>
+    </div>
+  </div>
+
+  <%= icon("circle-check", class: "icon--big #{selected ? '' : 'invisible'}") %>
+</li>

data/app/views/decidim/endorsements/identities.html.erb

@@ -0,0 +1,12 @@
+<div class="reveal__header reveal__header--nomargin reveal__bg p-s">
+  <h6 class="heading6 m-none"><%= t ".select_identity" %></h6>
+</div>
+<ul class="reveal__list">
+<%= render_endorsement_identity(resource, current_user) %>
+<% @user_verified_groups.each do |user_group| %>
+  <%= render_endorsement_identity(resource, current_user, user_group) %>
+<% end %>
+</ul>
+<div class="reveal__footer reveal__bg text-right p-s">
+  <button class="button button--nomargin button--sc" type="button" data-close><%= t(".done") %></button>
+</div>

data/app/views/decidim/endorsements/update_buttons_and_counters.js.erb

@@ -0,0 +1,20 @@
+<% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.empty? %>
+update_main_page_button();
+<% end %>
+update_identities_rows();
+
+function update_main_page_button() {
+  var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
+  morphdom($endorsementButton[0], '<%= j(endorsement_buttons_cell(resource).render_user_identity_endorse_button).strip.html_safe %>');
+}
+function update_identities_rows() {
+  <% fully_endorsed= fully_endorsed?(resource, current_user) %>
+  var $endorsementsRowCount = $('#resource-<%= resource.id %>-endorsements-count');
+  morphdom($endorsementsRowCount[0], '<%= j(endorsement_buttons_cell(resource).render_endorsements_count).strip.html_safe %>');
+  var $endorsementsRowButton = $($('#select-identity-button')[0]);
+  <% if fully_endorsed %>
+    $endorsementsRowButton.addClass('active')
+  <% else %>
+    $endorsementsRowButton.removeClass('active')
+  <% end %>
+}

data/app/views/decidim/errors/internal_server_error.html.erb

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="large-8 large-centered">
     <div class="static__message">
@@ -7,4 +7,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/errors/not_found.html.erb

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="large-8 large-centered">
       <div class="static__message">
@@ -10,4 +10,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/gamification/badges/index.html.erb

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row column mb-m">
     <h1><%= t ".title" %></h1>
     <p>
@@ -8,7 +8,7 @@
   <% @badges.each do |badge| %>
     <div class="row column mb-m">
       <div class="column medium-2">
-        <article class="card card--badge absolutes">
+        <div class="card card--badge absolutes">
           <div class="card__content">
             <div class="card__header">
               <div class="badge-container">
@@ -19,7 +19,7 @@
               <strong><%= badge.translated_name %></strong>
             </div>
           </div>
-        </article>
+        </div>
       </div>
       <div class="column medium-10">
         <h6>
@@ -39,4 +39,4 @@
       </div>
     </div>
   <% end %>
-</main>
+</div>