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/devise/shared/_newsletter_modal.html.erb CHANGED

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

@@ -1,17 +1,17 @@
-<% if Devise.mappings[:user].omniauthable? && any_social_provider_enabled? %>
+<% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
   <div class="row">
     <div class="columns large-4 mediumlarge-6 medium-8 medium-centered">
-      <%- Decidim::User.omniauth_providers.each do |provider| %>
-        <% if social_provider_enabled? provider %>
-          <div class="social-register">
-            <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}", method: :post do %>
-              <span class="button--social__icon">
-                <%= oauth_icon provider %>
-              </span>
+      <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
+        <div class="social-register">
+          <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: "button button--social button--#{normalize_provider_name(provider)}", method: :post do %>
+            <span class="button--social__icon">
+              <%= oauth_icon provider %>
+            </span>
+            <span class="button--social__text">
               <%= t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) %>
-            <% end %>
-          </div>
-        <% end %>
+            </span>
+          <% end %>
+        </div>
       <% end %>
       <%- if current_organization.sign_in_enabled? %>
         <span class="register__separator">

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

@@ -1,17 +1,18 @@
-<% if Devise.mappings[:user].omniauthable? && any_social_provider_enabled? %>
+<% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
   <div class="row">
     <div class="columns medium-8 medium-centered">
       <span class="register__separator">
         <span class="register__separator__text"><%= t("or", scope: "decidim.devise.shared.omniauth_buttons") %></span>
       </span>
       <div class="text-center">
-        <%- Decidim::User.omniauth_providers.each do |provider| %>
-          <% if social_provider_enabled? 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">
-                <%= oauth_icon provider %>
-              </span>
-            <% end %>
+        <%- 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" 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 CHANGED

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

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

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

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

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

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

@@ -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/export_mailer/data_portability_export.html.erb CHANGED

@@ -1,2 +1,2 @@
-<%= t(".click_button", date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
-<%= link_to t(".download"), download_file_data_portability_url(host: @organization.host, token: @token), class: "button expanded hollow button--sc" %>
+<%= t(".click_button", password: @password, date: l(Decidim.data_portability_expiry_time.from_now, format: :decidim_short) ).html_safe %><br>
+<%= link_to t(".download"), download_file_data_portability_url(host: @organization.host, filename: @filename), class: "button expanded hollow button--sc" %>

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

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

data/app/views/decidim/group_admins/index.html.erb CHANGED

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t(".manage_admins")) %>
+<div class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
       <h5><%= t(".manage_admins") %></h5>
@@ -9,10 +11,10 @@
       <%= cell "decidim/profile_sidebar", user_group %>
     </div>
     <div class="columns medium-9">
-      <section class="section">
+      <div class="section">
         <p><%= t(".current_admins") %></p>
         <%= cell "decidim/members", user_group, role: "admin", from_admin: true %>
-      </section>
+      </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/group_invites/index.html.erb CHANGED

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t(".invite_user")) %>
+<div class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
       <h5><%= t(".invite_user") %></h5>
@@ -10,6 +12,7 @@
     </div>
     <div class="columns medium-9">
       <%= decidim_form_for(@form, url: group_invites_path(@user_group.nickname)) do |f| %>
+        <%= form_required_explanation %>
         <div class="card">
           <div class="card__content">
             <div class="field">
@@ -24,4 +27,4 @@
       <% end %>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/group_members/index.html.erb CHANGED

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t(".manage_members")) %>
+<div class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
       <h5><%= t(".manage_members") %></h5>
@@ -10,10 +12,10 @@
     </div>
     <div class="columns medium-9">
       <%= cell "decidim/user_group_pending_requests_list", user_group %>
-      <section class="section">
+      <div class="section">
         <p><%= t(".current_members_without_admins") %></p>
         <%= cell "decidim/members", user_group, role: "member", from_admin: true %>
-      </section>
+      </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/groups/_form.html.erb CHANGED

@@ -1,3 +1,5 @@
+<%= form_required_explanation %>
 <div class="user-group-fields">
   <div class="field">
     <%= f.text_field :name, help_text: t(".name_help") %>

data/app/views/decidim/groups/edit.html.erb CHANGED

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t(".edit_user_group")) %>
+<div class="wrapper">
 <div class="row collapse">
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
@@ -23,4 +25,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/groups/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">
@@ -26,4 +26,4 @@
     </div>
   </div>
 </div>
-</main>
+</div>

data/app/views/decidim/last_activities/index.html.erb CHANGED

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".last_activity")) %>
 <div class="wrapper">
   <div class="row">
     <h1 class="section-heading"><%= t(".last_activity") %></h1>

data/app/views/decidim/messaging/conversation_mailer/comanagers_new_conversation.html.erb ADDED

@@ -0,0 +1,17 @@
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
+<p><%= t(".admin_in_group", group: @sender.name) %></p>
+<p><%= t(".intro", group: @sender.name, manager: @third_party.name) %></p>
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+<p>
+  <%= link_to decidim.profile_conversation_url(nickname: @sender.nickname, id: @conversation.id, host: @host), decidim.profile_conversation_url(nickname: @sender.nickname, id: @conversation.id, host: @host) %>
+</p>
+<p><%= t(".outro") %></p>

data/app/views/decidim/messaging/conversation_mailer/comanagers_new_message.html.erb ADDED

@@ -0,0 +1,17 @@
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
+<p><%= t(".admin_in_group", group: @sender.name) %></p>
+<p><%= t(".intro", group: @sender.name, manager: @third_party.name) %></p>
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+<p>
+  <%= link_to decidim.profile_conversation_url(nickname: @sender.nickname, id: @conversation.id, host: @host), decidim.profile_conversation_url(nickname: @sender.nickname, id: @conversation.id, host: @host) %>
+</p>
+<p><%= t(".outro") %></p>

data/app/views/decidim/messaging/conversation_mailer/new_conversation.html.erb CHANGED

@@ -1,6 +1,6 @@
-<p><%= t(".greeting", recipient: @recipient) %></p>
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
-<p><%= t(".intro", sender: @sender) %></p>
+<p><%= t(".intro", sender: @sender.name) %></p>
 <blockquote>
   <p>

data/app/views/decidim/messaging/conversation_mailer/new_group_conversation.html.erb ADDED

@@ -0,0 +1,17 @@
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
+<p><%= t(".admin_in_group", group: @third_party.name) %></p>
+<p><%= t(".intro", sender: @sender.name, group: @third_party.name) %></p>
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+<p>
+  <%= link_to decidim.profile_conversation_url(nickname: @third_party.nickname, id: @conversation.id, host: @host), decidim.profile_conversation_url(nickname: @third_party.nickname, id: @conversation.id, host: @host) %>
+</p>
+<p><%= t(".outro") %></p>

data/app/views/decidim/messaging/conversation_mailer/new_group_message.html.erb ADDED

@@ -0,0 +1,17 @@
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
+<p><%= t(".admin_in_group", group: @third_party.name) %></p>
+<p><%= t(".intro", sender: @sender.name, group: @third_party.name) %></p>
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+<p>
+  <%= link_to decidim.profile_conversation_url(nickname: @third_party.nickname, id: @conversation.id, host: @host), decidim.profile_conversation_url(nickname: @third_party.nickname, id: @conversation.id, host: @host) %>
+</p>
+<p><%= t(".outro") %></p>

data/app/views/decidim/messaging/conversation_mailer/new_message.html.erb CHANGED

@@ -1,6 +1,6 @@
-<p><%= t(".greeting", recipient: @recipient) %></p>
+<p><%= t(".greeting", recipient: @recipient.name) %></p>
-<p><%= t(".intro", sender: @sender) %></p>
+<p><%= t(".intro", sender: @sender.name) %></p>
 <blockquote>
   <p>

data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb ADDED

@@ -0,0 +1,24 @@
+<div class="expanded">
+  <div class="wrapper wrapper--inner">
+    <div class="row">
+      <div class="large-12">
+        <h2 id="modalTitle"> <%= t(".modal_title") %> </h2>
+      </div>
+    </div>
+    <div class="row">
+      <div class="row columns mentions__container">
+        <label for="add_conversation_users"><%= t(".add_max_users") %></label>
+        <input id="add_conversation_users" type="text"
+            class="js-multiple-mentions mentions__container"
+            placeholder="<%= t(".add_users_placeholder") %>"
+            data-noresults="<%= t(".no_results") %>"
+            data-tribute="yes"
+            contenteditable="true"
+            data-direct-messages-disabled="<%= t("decidim.messaging.conversations.add_conversation_users.participant_with_disabled_message_reception") %>">
+      </div>
+      <div class="columns large-12">
+        <div class="js-multiple-mentions-recipients"></div>
+      </div>
+    </div>
+  </div>
+</div>