decidim-core 0.15.2 → 0.16.0

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

@@ -9,7 +9,7 @@
       <%= cell "decidim/profile_sidebar", user_group %>
     </div>
     <div class="columns medium-9">
-      <%= cell "decidim/user_group_pending_requests_list", user_group, context: { current_user: current_user } %>
+      <%= cell "decidim/user_group_pending_requests_list", user_group %>
       <section class="section">
         <p><%= t(".current_members_without_admins") %></p>
         <%= cell "decidim/members", user_group, role: "member", from_admin: true %>

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

@@ -1,23 +1,24 @@
 <div class="user-group-fields">
   <div class="field">
-    <%= f.text_field :name %>
+    <%= f.text_field :name, help_text: t(".name_help") %>
   </div>
   <div class="field">
-    <%= f.text_field :nickname %>
+    <%= f.text_field :nickname, help_text: t(".nickname_help") %>
   </div>
   <div class="field">
-    <%= f.text_field :email %>
+    <%= f.text_field :email, help_text: t(".email_help") %>
   </div>
-    <div class="field">
-    <%= f.text_field :document_number %>
+  <div class="field">
+    <%= f.upload :avatar %>
   </div>
   <div class="field">
-    <%= f.text_field :phone %>
+    <%= f.text_area :about, rows: 5 %>
   </div>
+  <strong><%= t(".fill_in_for_verification") %></strong>
   <div class="field">
-    <%= f.upload :avatar %>
+    <%= f.text_field :document_number, help_text: t(".document_number_help") %>
   </div>
   <div class="field">
-    <%= f.text_area :about, rows: 5 %>
+    <%= f.text_field :phone, help_text: t(".phone_help") %>
   </div>
 </div>

data/app/views/decidim/groups/new.html.erb

@@ -3,6 +3,9 @@
   <div class="row collapse">
     <div class="columns large-8 large-centered text-center page-title">
       <h1><%= t(".new_user_group") %></h1>
+      <p>
+        <%= t(".subtitle") %>
+      </p>
     </div>
   </div>
 

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

@@ -2,6 +2,12 @@
 
 <p><%= t(".intro", sender: @sender) %></p>
 
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+
 <p>
   <%= link_to decidim.conversation_url(@conversation, host: @host), decidim.conversation_url(@conversation, host: @host) %>
 </p>

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

@@ -2,6 +2,12 @@
 
 <p><%= t(".intro", sender: @sender) %></p>
 
+<blockquote>
+  <p>
+    <em><%= @message %></em>
+  </p>
+</blockquote>
+
 <p>
   <%= link_to decidim.conversation_url(@conversation, host: @host), decidim.conversation_url(@conversation, host: @host) %>
 </p>

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

@@ -0,0 +1,14 @@
+<article class="message">
+  <div class="message__header">
+    <div class="card__author author-data author-data--small">
+      <%= cell "decidim/author", present(message.sender), context: { extra_classes: ["author-data--small"] } %>
+
+      <time datetime="<%= message.created_at.utc %>">
+        <%= message.friendly_created_at %>
+      </time>
+    </div>
+  </div>
+  <div class="message__content">
+    <%= simple_format(message.body) %>
+  </div>
+</article>

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

@@ -0,0 +1,11 @@
+<div class="add-message">
+  <h5 class="section-heading">
+    <%= t(".title") %>
+  </h5>
+
+  <%= form_for form, url: decidim.conversation_path(conversation.id), method: :put, remote: true do |f| %>
+    <%= f.text_area :body, label: false, rows: 4, required: true %>
+
+    <%= f.submit t(".send"), data: { disable: true } %>
+  <% end %>
+</div>

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

@@ -0,0 +1,21 @@
+<main 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" %>
+          <% end %>
+
+          <%= t(".title", usernames: username_list(participants)) %>
+        </h1>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div id="conversation" class="columns large-8">
+      <%= yield %>
+    </div>
+  </div>
+</main>

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

@@ -0,0 +1,12 @@
+<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 %>
+    <%= f.text_area :body, label: false, rows: 4, required: true %>
+
+    <%= f.submit t(".send") %>
+  <% end %>
+</div>

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

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

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

@@ -1 +1,51 @@
-<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/conversations" } %>
+<main class="wrapper">
+  <div class="row">
+    <div class="columns">
+      <div class="title-action">
+        <h1 class="heading1 title-action__title">
+          <%= t(".title") %>
+        </h1>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="columns large-8">
+      <% 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>
+
+                <% if conversation.unread_count(current_user) > 0 %>
+                  <span class="card--list__counter">
+                    <span><%= conversation.unread_count(current_user) %></span>
+                  </span>
+                <% end %>
+              </div>
+              <div class="card--list__data">
+                <span class="card--list__data__icon">
+                  <%= icon "chevron-right" %>
+                </span>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</main>

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

@@ -1 +1,5 @@
-<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/new_conversation", form: @form } %>
+<%= render layout: "show", locals: { participants: [@form.recipient] } do %>
+  <div id="messages"></div>
+
+  <%= render "start", form: @form %>
+<% end %>

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

@@ -1 +1,9 @@
-<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/conversation", conversation: conversation } %>
+<%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
+  <div id="messages">
+    <% conversation.messages.each do |message| %>
+      <%= render "message", message: message %>
+    <% end %>
+  </div>
+
+  <%= render "reply", form: @form, conversation: conversation %>
+<% end %>

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

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

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

@@ -2,8 +2,18 @@
 
 <p><%= @event_instance.email_intro %></p>
 
-<p>
-  <%= link_to @event_instance.resource_url, @event_instance.resource_url %>
-</p>
+<% if @event_instance.try(:resource_text).present? %>
+  <blockquote>
+    <p>
+      <%= @event_instance.resource_text.html_safe %>
+    </p>
+  </blockquote>
+<% end %>
+
+<% if @event_instance.resource_path.present? && @event_instance.resource_title.present? %>
+  <p>
+    <%= link_to @event_instance.resource_url, @event_instance.resource_url %>
+  </p>
+<% end %>
 
 <p><%= @event_instance.email_outro %></p>

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

@@ -1 +1,5 @@
-<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/notifications" } %>
+<main class="wrapper">
+  <div class="row column">
+    <%= cell "decidim/notifications", current_user %>
+  </div>
+</main>

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

@@ -1,5 +1,22 @@
 <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>
+    <div class="switch tiny switch-with-label notifications_from_own_activity">
+      <label>
+        <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".own_activity") %></span>
+      </label>
+    </div>
+    <div class="switch tiny switch-with-label notifications_from_followed">
+      <label>
+        <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".everything_followed") %></span>
+      </label>
+    </div>
+
+    <p><strong><%= t(".send_notifications_by_email") %></strong></p>
     <div class="switch tiny switch-with-label email_on_notification">
       <label>
         <%= f.check_box :email_on_notification, label: false, class: "switch-input" %>
@@ -7,6 +24,8 @@
         <span class="switch-label"><%= t(".email_on_notification") %></span>
       </label>
     </div>
+
+    <p><strong><%= t(".newsletters") %></strong></p>
     <div class="switch tiny switch-with-label newsletter_notifications">
       <label>
         <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>

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

@@ -0,0 +1,21 @@
+<div class="wrapper">
+  <div class="row column">
+    <div class="text-center">
+      <h1 class="heading1 page-title">
+        <%= title %>
+      </h1>
+    </div>
+
+    <main>
+      <%= cell "decidim/tos_page", :announcement %>
+
+      <div class="columns small-12">
+        <div class="card">
+          <div class="card__content"><%= decidim_sanitize translated_attribute page.content %></div>
+        </div>
+      </div>
+
+      <%= cell "decidim/tos_page", :sticky_form %>
+    </main>
+  </div>
+</div>

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

@@ -0,0 +1,45 @@
+<div class="wrapper">
+  <div class="row column">
+    <div class="text-center">
+      <h1 class="heading1 page-title">
+        <%= title %>
+      </h1>
+      <p class="intro--text subheading1">
+        <%= description %>
+      </p>
+    </div>
+
+    <main class="main-container tabbed-container">
+      <%= cell "decidim/tos_page", :announcement %>
+
+      <div class="row collapse main-container--side-panel">
+        <div class="columns medium-4 large-3">
+          <div class="side-panel">
+            <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 %>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+
+        <div class="columns medium-8 large-9">
+          <div class="main-container__content">
+            <div class="tabs-content vertical">
+              <div class="static__content">
+                <h2 class="section-heading">
+                  <%= translated_attribute page.title %>
+                </h2>
+                <%= decidim_sanitize translated_attribute page.content %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <%= cell "decidim/tos_page", :sticky_form %>
+    </main>
+  </div>
+</div>

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

@@ -1,5 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
-
 <%
 edit_link(
   decidim_admin.static_pages_path,
@@ -8,35 +6,76 @@ edit_link(
 )
 %>
 
-<main class="wrapper">
+<div class="wrapper">
   <div class="row column">
-    <h1 class="heading1 page-title"><%= t ".title" %></h1>
+    <div class="text-center">
+      <h1 class="heading1 page-title">
+        <%= t "decidim.pages.index.title" %>
+      </h1>
+      <p class="intro--text subheading1">
+        <%= t(".subheading", name: current_organization.name) %>
+      </p>
+    </div>
   </div>
-  <div class="row">
-    <div class="columns large-8">
-      <div class="card card--list">
-        <% @pages.each do |page| %>
-          <div class="card--list__item">
-            <div class="card--list__text">
-              <div>
-                <%= link_to page_path(page), class: "card__link" do %>
-                  <h6 class="card--list__heading heading6">
-                    <%= translated_attribute page.title %>
-                  </h6>
-                  <span class="text-small">
-                    <%= truncate strip_tags(translated_attribute(page.content)), length: 100 %>
-                  </span>
-                <% end %>
+
+  <% if @topics.any? %>
+    <div class="row">
+      <h3 class="section-heading"><%= t ".topics" %></h3>
+      <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__content">
+                    <h4 class="card__title">
+                      <%= link_to translated_attribute(topic.title), page_path(topic.pages.first), class: "card__link" %>
+                    </h4>
+                    <p><%= translated_attribute topic.description %></p>
+                    <ul>
+                      <% topic.pages.each do |page| %>
+                        <li><%= link_to translated_attribute(page.title), page_path(page) %></li>
+                      <% end %>
+                    </ul>
+                  </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" %>
+                    </div>
+                  </div>
+                </article>
               </div>
-            </div>
-            <div class="card--list__data">
-              <%= link_to page_path(page), class: "card--list__data__icon" do %>
-                <%= icon "chevron-right" %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
+            <% end %>
+          <% end %>
+        </div>
       </div>
     </div>
-  </div>
-</main>
+  <% end %>
+
+  <% if @orphan_pages.any? %>
+    <div class="row">
+      <h3 class="section-heading"><%= t ".standalone_pages" %></h3>
+      <div class="row collapse">
+        <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__content">
+                  <h4 class="card__title">
+                    <%= link_to translated_attribute(page.title), page_path(page), class: "card__link" %>
+                  </h4>
+                  <%== 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" %>
+                  </div>
+                </div>
+              </div>
+            </article>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>