decidim-core 0.19.1 → 0.23.0

data/app/views/decidim/messaging/conversations/_show.html.erb

@@ -1,21 +1,40 @@
-<main class="wrapper">
+<% if participants.count == 1 %>
+  <% conversation_label = t(".chat_with") + " #{participants.first.name} (@#{participants.first.nickname})" %>
+<% else %>
+  <% conversation_label = t(".title", usernames: username_list(participants)) %>
+<% end %>
+
+<div class="wrapper">
   <div class="row">
-    <div class="columns">
-      <div class="title-action">
-        <h1 class="heading1 title-action__title">
-          <%= link_to decidim.conversations_path, class: "card--list__data__icon card--list__data__icon--back" do %>
-            <%= icon "chevron-left" %>
+    <div class="columns medium-9 medium-centered tabs-panel is-active" id="conversations" role="tabpanel" aria-label="<%= conversation_label %>">
+      <div class="conversation">
+
+        <div class="conversation-header flex--cc absolutes">
+          <div class="left center mr-s">
+            <%= link_to decidim.conversations_path, class: "card--list__data__icon card--list__data__icon--back" do %>
+              <%= icon "chevron-left", role: "img", aria_label: t(".back") %>
+            <% end %>
+          </div>
+          <%= link_to decidim.conversations_path do %>
+            <% if participants.count == 1 %>
+              <%= image_tag participants.first.avatar_url, alt: t("decidim.author.avatar") %>
+            <% else %>
+              <%= image_tag current_user.avatar.default_multiuser_url, alt: t("decidim.author.avatar") %>
+            <% end %>
           <% end %>
 
-          <%= t(".title", usernames: username_list(participants)) %>
-        </h1>
-      </div>
-    </div>
-  </div>
+          <div class="ml-s">
+            <% if participants.count == 1 %>
+              <%= t(".chat_with") %> <strong><%= participants.first.name %></strong><br><span class="muted">@<%= participants.first.nickname %></span>
+            <% else %>
+              <%= t(".title", usernames: username_list(participants)) %>
+            <% end %>
+          </div>
+        </div>
 
-  <div class="row">
-    <div id="conversation" class="columns large-8">
-      <%= yield %>
+        <%= yield %>
+
+      </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/messaging/conversations/_start.html.erb

@@ -1,10 +1,16 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <div class="add-message">
   <h5 class="section-heading">
     <%= t(".title") %>
   </h5>
 
   <%= form_for form, url: decidim.conversations_path, remote: true do |f| %>
-    <%= f.hidden_field :recipient_id %>
+    <%= form_required_explanation %>
+
+    <% @form.recipient.each do |recipient| %>
+      <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
+    <% end %>
     <%= f.text_area :body, label: false, rows: 4, required: true %>
 
     <%= f.submit t(".send") %>

data/app/views/decidim/messaging/conversations/create.js.erb

@@ -1,2 +1,2 @@
-$("#messages").append("<%= j(render "message", message: conversation.messages.first).html_safe %>");
+$("#messages").append("<%= j(render "messages", sender: conversation.messages.first.sender, messages: [conversation.messages.first]).html_safe %>");
 $(".add-message").replaceWith("<%= j(render "reply", form: form, conversation: conversation).html_safe %>");

data/app/views/decidim/messaging/conversations/error.js.erb

@@ -0,0 +1,10 @@
+var $messageError = $("#messageErrorModal");
+if ($messageError.length > 0) {
+  $messageError.foundation("_destroy").remove();
+}
+
+$("#messages").append("<%= j(render "error_modal", error: error, messages: messages).html_safe %>");
+$messageError = $("#messageErrorModal");
+
+var messageErrorReveal = new Foundation.Reveal($messageError);
+messageErrorReveal.open();

data/app/views/decidim/messaging/conversations/index.html.erb

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t("conversations", scope: "layouts.decidim.user_menu")) %>
+
+<div class="wrapper">
   <div class="row">
     <div class="columns">
       <div class="title-action">
@@ -10,42 +12,45 @@
   </div>
   <div class="row">
     <div class="columns large-8">
+      <div class="row columns">
+        <%= render partial: "new_conversation_button" %>
+      </div>
+
       <% if @conversations.empty? %>
         <div class="callout secondary">
           <p><%= t(".no_conversations") %></p>
         </div>
       <% else %>
-        <div class="card card--list conversations">
-          <% @conversations.each do |conversation| %>
-            <%= link_to decidim.conversation_path(conversation), class: "card--list__item" do %>
-              <div class="card--list__titled-text">
-                <h6 class="card--list__heading heading6">
-                  <%= username_list(conversation.interlocutors(current_user)) %>
-                </h6>
-
-                <span class="card--list__annotation">
-                  <%= conversation.last_message.friendly_created_at %>
-                </span>
-
-                <span class="text-small">
-                  <%= truncate conversation.last_message.body, length: 150 %>
-                </span>
+        <div class="tabs-panel is-active conversations" id="conversations" role="tabpanel" aria-label="<%= t(".title") %>">
+          <%= render partial: "conversation", collection: @conversations %>
+        </div>
+      <% end %>
+    </div>
 
-                <% if conversation.unread_count(current_user) > 0 %>
-                  <span class="card--list__counter">
-                    <span><%= conversation.unread_count(current_user) %></span>
-                  </span>
+    <% if user_groups.present? %>
+      <div class="columns large-4 conversation-groups">
+        <div class="row columns title-action">
+          <h4 class="heading4">
+            <%= t(".groups") %>
+          </h4>
+        </div>
+        <div class="tabs-panel is-active">
+          <div class="card card--list user-groups">
+            <% user_groups.each do |group| %>
+              <div class="card--list__item">
+                <%= link_to decidim.profile_conversations_path(nickname: group.nickname), class: "card--list__author" do %>
+                  <%= cell("decidim/user_profile", group).unlinked_user_data.html_safe %>
+                  <% if group.unread_messages_count_for(current_user).positive? %>
+                    <span class="card--list__counter">
+                      <span><%= group.unread_messages_count_for(current_user) %></span>
+                    </span>
+                  <% end %>
                 <% end %>
               </div>
-              <div class="card--list__data">
-                <span class="card--list__data__icon">
-                  <%= icon "chevron-right" %>
-                </span>
-              </div>
             <% end %>
-          <% end %>
+          </div>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
-</main>
+</div>

data/app/views/decidim/messaging/conversations/new.html.erb

@@ -1,4 +1,4 @@
-<%= render layout: "show", locals: { participants: [@form.recipient] } do %>
+<%= render layout: "show", locals: { participants: @form.recipient.to_a } do %>
   <div id="messages"></div>
 
   <%= render "start", form: @form %>

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -1,9 +1,13 @@
 <%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
-  <div id="messages">
-    <% conversation.messages.each do |message| %>
-      <%= render "message", message: message %>
+  <div id="messages" class="scroll-to-last-message">
+    <% user_grouped_messages.each do |sender, messages| %>
+        <%= render "messages", sender: sender, messages: messages %>
     <% end %>
   </div>
 
-  <%= render "reply", form: @form, conversation: conversation %>
+  <% if conversation.accept_user?(current_user) %>
+    <%= render "reply", form: @form, conversation: conversation %>
+  <% else %>
+    <em><%= t ".not_allowed" %></em>
+  <% end %>
 <% end %>

data/app/views/decidim/messaging/conversations/update.js.erb

@@ -1,2 +1,2 @@
-$("#messages").append("<%= j(render "message", message: message).html_safe %>");
+$("#messages").append("<%= j(render "messages", sender: message.sender, messages: [message]).html_safe %>");
 $(".new_message textarea#message_body").val("");

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_sanitize @body %>
+<%= decidim_sanitize cell.to_s %>
 
 <% content_for :note do %>
   <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
@@ -10,7 +10,7 @@
 
 <% content_for :see_on_website do %>
   <center style="display: none">
-    <%== CGI.unescapeHTML truncate(@body, max_length: 50) %>
+    <%== CGI.unescapeHTML truncate(cell.body, max_length: 50) %>
   </center>
   <%== t ".see_on_website", link: decidim.newsletter_url(host: @organization.host, id: @newsletter) %>
 <% end %>

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

@@ -1,4 +1,11 @@
-<%= decidim_sanitize @body %>
+<% @cell = cell(
+  "decidim/newsletter_templates/basic_only_text",
+  newsletter.template,
+  organization: @organization,
+  newsletter: newsletter,
+  recipient_user: @user
+) %>
+<%= decidim_sanitize @cell.to_s %>
 
 <% content_for :note do %>
   <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>

data/app/views/decidim/notification_mailer/event_received.html.erb

@@ -2,10 +2,10 @@
 
 <p><%= @event_instance.email_intro %></p>
 
-<% if @event_instance.try(:resource_text).present? %>
+<% if @event_instance.try(:safe_resource_text).present? %>
   <blockquote>
     <p>
-      <%= @event_instance.resource_text.html_safe %>
+      <%= @event_instance.safe_resource_text %>
     </p>
   </blockquote>
 <% end %>

data/app/views/decidim/notifications/index.html.erb

@@ -1,5 +1,7 @@
-<main class="wrapper">
+<% add_decidim_page_title(t("notifications", scope: "layouts.decidim.user_menu")) %>
+
+<div class="wrapper">
   <div class="row column">
     <%= cell "decidim/notifications", current_user %>
   </div>
-</main>
+</div>

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

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row">
   <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
     <p><strong><%= t(".receive_notifications_about") %></strong></p>
@@ -33,6 +36,16 @@
         <span class="switch-label"><%= t(".newsletter_notifications") %></span>
       </label>
     </div>
-    <%= f.submit t(".update_notifications_settings"), disable_with: true %>
+
+    <p><strong><%= t(".direct_messages") %></strong></p>
+    <div class="switch tiny switch-with-label allow_public_contact">
+      <label>
+        <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".allow_public_contact") %></span>
+      </label>
+    </div>
+
+    <%= f.submit t(".update_notifications_settings") %>
   <% end %>
 </div>

data/app/views/decidim/own_user_groups/index.html.erb

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("user_groups", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("user_groups", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row column">
   <section class="section">
     <div class="card card--list">
@@ -23,4 +26,5 @@
         </div>
       <% end %>
     </div>
+  </section>
 </div>

data/app/views/decidim/pages/_standalone.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <div class="row column">
-    <div class="text-center">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= title %>
       </h1>

data/app/views/decidim/pages/_tabbed.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <div class="row column">
-    <div class="text-center">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= title %>
       </h1>
@@ -9,7 +9,7 @@
       </p>
     </div>
 
-    <main class="main-container tabbed-container">
+    <div class="main-container tabbed-container">
       <%= cell "decidim/tos_page", :announcement %>
 
       <div class="row collapse main-container--side-panel">
@@ -18,7 +18,7 @@
             <ul class="tabs vertical side-panel__tabs">
               <% pages.each do |sibling| %>
                 <li class="tabs-title <%= page == sibling ? "is-active" : nil %>">
-                  <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), 'aria-selected': page == sibling %>
+                  <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>
                 </li>
               <% end %>
             </ul>
@@ -29,7 +29,7 @@
           <div class="main-container__content">
             <div class="tabs-content vertical">
               <div class="static__content">
-                <h2 class="section-heading">
+                <h2>
                   <%= translated_attribute page.title %>
                 </h2>
                 <%= decidim_sanitize translated_attribute page.content %>
@@ -40,6 +40,6 @@
       </div>
 
       <%= cell "decidim/tos_page", :sticky_form %>
-    </main>
+    </div>
   </div>
 </div>

data/app/views/decidim/pages/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("decidim.pages.index.title")) %>
 <%
 edit_link(
   decidim_admin.static_pages_path,
@@ -7,8 +8,8 @@ edit_link(
 %>
 
 <div class="wrapper">
-  <div class="row column">
-    <div class="text-center">
+  <div class="row">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= t "decidim.pages.index.title" %>
       </h1>
@@ -20,17 +21,17 @@ edit_link(
 
   <% if @topics.any? %>
     <div class="row">
-      <h3 class="section-heading"><%= t ".topics" %></h3>
+      <h2 class="section-heading"><%= t ".topics" %></h2>
       <div class="row collapse">
         <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
           <% @topics.each do |topic| %>
             <% if topic.pages.any? %>
               <div class="column">
-                <article class="card card--process card--mini">
+                <div class="card card--process card--mini">
                   <div class="card__content">
-                    <h4 class="card__title">
+                    <h3 class="card__title">
                       <%= link_to translated_attribute(topic.title), page_path(topic.pages.first), class: "card__link" %>
-                    </h4>
+                    </h3>
                     <p><%= translated_attribute topic.description %></p>
                     <ul>
                       <% topic.pages.each do |page| %>
@@ -40,10 +41,14 @@ edit_link(
                   </div>
                   <div class="card__footer">
                     <div class="card__support">
-                      <%= link_to t(".read_more"), page_path(topic.pages.first), class: "card__button button secondary button--sc small light" %>
+                      <%= link_to page_path(topic.pages.first),
+                                  class: "card__button button button--sc small" do %>
+                        <%= t(".read_more") %>
+                        <span class="show-for-sr"><%= translated_attribute(topic.title) %></span>
+                      <% end %>
                     </div>
                   </div>
-                </article>
+                </div>
               </div>
             <% end %>
           <% end %>
@@ -59,20 +64,24 @@ edit_link(
         <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
           <% @orphan_pages.each do |page| %>
             <div class="column">
-              <article class="card card--process card--mini">
+              <div class="card card--process card--mini">
                 <div class="card__content">
-                  <h4 class="card__title">
+                  <span class="card__title">
                     <%= link_to translated_attribute(page.title), page_path(page), class: "card__link" %>
-                  </h4>
+                  </span>
                   <%== strip_tags html_truncate(translated_attribute(page.content), length: 140, separator: "...") %>
                 </div>
                 <div class="card__footer">
                   <div class="card__support">
-                    <%= link_to t(".read_more"), page_path(page), class: "card__button button secondary button--sc small light" %>
+                    <%= link_to page_path(page),
+                                class: "card__button button button--sc small" do %>
+                      <%= t(".read_more") %>
+                      <span class="show-for-sr"><%= translated_attribute(page.title) %></span>
+                    <% end %>
                   </div>
                 </div>
               </div>
-            </article>
+            </div>
           <% end %>
         </div>
       </div>

data/app/views/decidim/profiles/_user_follow.erb

@@ -1,6 +1,6 @@
 <% present(user) do |profile_user| %>
   <div class="column">
-    <article class="card card--member">
+    <div class="card card--member">
       <div class="card__content">
         <div class="card__header collapse">
           <div class="author-data author-data--big">
@@ -23,10 +23,10 @@
           </div>
         </div>
         <div class="card__text card--picture-offset">
-          <p><%= html_truncate profile_user.about.to_s, length: 80 %></p>
+          <p><%= html_truncate decidim_html_escape(profile_user.about.to_s), length: 80 %></p>
           <%= render partial: "decidim/shared/follow_button.html", locals: { followable: user } %>
         </div>
       </div>
-    </article>
+    </div>
   </div>
 <% end %>