decidim-core 0.7.4 → 0.8.0

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

@@ -0,0 +1,9 @@
+<p><%= t(".greeting", recipient: @recipient) %></p>
+
+<p><%= t(".intro", sender: @sender) %></p>
+
+<p>
+  <%= link_to decidim.conversation_url(@conversation, host: @host), decidim.conversation_url(@conversation, host: @host) %>
+</p>
+
+<p><%= t(".outro") %></p>

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

@@ -0,0 +1,9 @@
+<p><%= t(".greeting", recipient: @recipient) %></p>
+
+<p><%= t(".intro", sender: @sender) %></p>
+
+<p>
+  <%= link_to decidim.conversation_url(@conversation, host: @host), decidim.conversation_url(@conversation, host: @host) %>
+</p>
+
+<p><%= t(".outro") %></p>

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

@@ -0,0 +1,20 @@
+<article class="message">
+  <div class="message__header">
+    <div class="author-data">
+      <div class="author author--inline">
+        <span class="author__avatar">
+          <%= image_tag message.sender.avatar.url %>
+        </span>
+        <span class="author__name">
+          <%= message.sender.name %>
+        </span>
+        <time datetime="<%= message.created_at.utc %>">
+          <%= simple_date(message.created_at) %>
+        </time>
+      </div>
+    </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") %>
+  <% 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

@@ -0,0 +1,2 @@
+$("#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

@@ -0,0 +1,51 @@
+<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">
+                  <%= simple_date(conversation.last_message.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

@@ -0,0 +1,5 @@
+<%= 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

@@ -0,0 +1,9 @@
+<%= 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

@@ -0,0 +1 @@
+$("#messages").append("<%= j(render "message", message: message).html_safe %>");

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

@@ -1,4 +1,4 @@
-<%= sanitize @body %>
+<%= decidim_sanitize @body %>
 
 <% content_for :note do %>
   <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>

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

@@ -1,7 +1,7 @@
 <div class="card--list__item">
   <div class="card--list__text">
     <%= link_to notification.event_class_instance.resource_path do %>
-      <%= resource_icon notification.resource, class: "icon--chat card--list__icon" %>
+      <%= resource_icon notification.resource, class: "icon--conversation card--list__icon" %>
     <% end %>
     <div>
       <h5 class="card--list__heading">

data/app/views/decidim/shared/_action_authorization_modal.html.erb

@@ -6,7 +6,17 @@
               type="button">
         <span aria-hidden="true">&times;</span>
       </button>
-      <% if status.code == :incomplete %>
+      <% if status.code == :pending %>
+        <div class="reveal__header pending-authorization">
+          <h3 class="reveal__title"><%= t('.pending.title') %></h3>
+        </div>
+        <p><%= t ".pending.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+        <div class="row">
+          <div class="columns medium-8 medium-offset-2">
+            <%= link_to t('.pending.resume', authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path(action), class: "button expanded" %>
+          </div>
+        </div>
+      <% elsif status.code == :incomplete %>
         <div class="reveal__header incomplete-authorization">
           <h3 class="reveal__title"><%= t('.incomplete.title') %></h3>
         </div>

data/app/views/decidim/shared/_announcement.html.erb

@@ -1,5 +1,5 @@
 <div class="row column">
   <div class="callout secondary announcement">
-    <%= sanitize translated_attribute announcement %>
+    <%= decidim_sanitize translated_attribute announcement %>
   </div>
 </div>

data/app/views/decidim/shared/_version_author.html.erb

@@ -0,0 +1,18 @@
+<div class="author-data__main">
+  <div class="author author--inline">
+    <% if author.respond_to?(:avatar_url) %>
+      <span class="author__avatar author__avatar--small">
+        <%= image_tag author.avatar_url %>
+      </span>
+    <% end %>
+    <span class="author__name">
+      <% if author.try(:deleted?) %>
+        <span class="label label--small label--basic">
+          <%= t('.deleted') %>
+        </span>
+      <% else %>
+        <%= author.try(:name) || author %>
+      <% end %>
+    </span>
+  </div>
+</div>

data/app/views/layouts/decidim/_wrapper.html.erb

@@ -39,6 +39,9 @@
                 <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
                   <%= icon "bell" %>
                 <% end %>
+                <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}" do %>
+                  <%= icon "envelope-closed" %>
+                <% end %>
                 <ul class="dropdown menu" data-dropdown-menu>
                   <li class="is-dropdown-submenu-parent show-for-medium">
                     <%= link_to current_user.name, decidim.account_path %>

data/app/views/layouts/decidim/user_profile.html.erb

@@ -11,15 +11,7 @@
           <div class="columns medium-4 large-3">
             <div class="side-panel">
               <ul class="tabs vertical side-panel__tabs" id="user-settings-tabs">
-                <%= user_profile_tab t("account", scope: "layouts.decidim.user_profile"), account_path, aria_link_type: :exact %>
-                <%= user_profile_tab t("notifications_settings", scope: "layouts.decidim.user_profile"), notifications_settings_path %>
-                <% if available_authorization_handlers.any? %>
-                  <%= user_profile_tab t("authorizations", scope: "layouts.decidim.user_profile"), authorizations_path %>
-                <% end %>
-                <% if user_groups.any? %>
-                  <%= user_profile_tab t("user_groups", scope: "layouts.decidim.user_profile"), own_user_groups_path %>
-                <% end %>
-                <%= user_profile_tab t("delete_my_account", scope: "layouts.decidim.user_profile"), delete_account_path, aria_link_type: :exact %>
+                <%= user_menu.render %>
               </ul>
             </div>
           </div>

data/app/views/pages/decidim_page.html.erb

@@ -10,7 +10,7 @@
   <div class="row">
     <div class="columns large-8">
       <div class="static__content">
-        <%= sanitize translated_attribute page.content %>
+        <%= decidim_sanitize translated_attribute page.content %>
       </div>
     </div>
   </div>

data/app/views/pages/home.html.erb

@@ -1,5 +1,3 @@
-<% provide(:meta_title, current_organization.name) %>
-
 <%= render partial: 'pages/home/hero' %>
 
 <% if !translated_attribute(current_organization.description).blank? %>

data/app/views/pages/home/_footer_sub_hero.html.erb

@@ -3,9 +3,11 @@
     <div class="columns small-centered large-10">
       <h2 class="heading3"><%= t(".footer_sub_hero_headline", organization: current_organization.name) %></h2>
       <h5 class="heading4"><%== t(".footer_sub_hero_body") %></h5>
-      <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
-        <%= t(".register") %>
-        <%= icon "chevron-right", aria_hidden: true %>
+      <% unless current_user %>
+        <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
+          <%= t(".register") %>
+          <%= icon "chevron-right", aria_hidden: true %>
+        <% end %>
       <% end %>
     </div>
   </div>

data/app/views/pages/home/_hero.html.erb

@@ -6,7 +6,7 @@
           <% if translated_attribute(current_organization.welcome_text).blank? %>
             <%= t('.welcome', organization: current_organization.name) %>
           <% else %>
-            <%= sanitize translated_attribute current_organization.welcome_text %>
+            <%= decidim_sanitize translated_attribute current_organization.welcome_text %>
           <% end %>
         </h1>
       </div>

data/app/views/pages/home/_highlighted_processes.html.erb

@@ -1,37 +1,7 @@
-<section class="wrapper-home">
-  <div class="row">
-    <h3 class="section-heading"><%= t(".active_processes") %></h3>
-    <div class="row collapse">
-      <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
-                  large-up-4 card-grid">
-        <% highlighted_participatory_processes.each do |process| %>
-          <div class="column">
-            <article class="card card--process card--mini">
-              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <div class="card__image-top"
-                     style="background-image:url(<%= process.hero_image.url %>)"></div>
-              <% end %>
-              <div class="card__content">
-                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute process.title %></h4>
-                <% end %>
-                <% if process.active_step %>
-                  <span class="card--process__small">
-                    <%= t(".active_step") %>
-                    <strong><%= translated_attribute process.active_step.title %></strong>
-                  </span>
-                <% end %>
-              </div>
-            </article>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="columns small-centered small-12
-                smallmedium-8 medium-6 large-4">
-      <%= link_to t(".see_all_processes"), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
-    </div>
-  </div>
-</section>
+<% highlighted_elements = render_hook(:highlighted_elements) %>
+
+<% if !highlighted_elements.blank? %>
+  <section class="wrapper-home">
+    <%= highlighted_elements %>
+  </section>
+<% end %>

data/app/views/pages/home/_sub_hero.html.erb

@@ -1,10 +1,12 @@
   <section class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
-        <h2 class="heading3"><%= sanitize translated_attribute current_organization.description %></h2>
-        <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
-          <%= t(".register") %>
-          <%= icon "chevron-right", aria_hidden: true %>
+        <h2 class="heading3"><%= decidim_sanitize translated_attribute current_organization.description %></h2>
+        <% unless current_user %>
+          <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
+            <%= t(".register") %>
+            <%= icon "chevron-right", aria_hidden: true %>
+          <% end %>
         <% end %>
       </div>
     </div>

data/config/locales/ca.yml

@@ -60,11 +60,14 @@ ca:
       photos:
         related_photos: Fotos relacionades
     authorization_handlers:
-      decidim/dummy_authorization_handler:
+      dummy_authorization_handler:
+        explanation: Verifica't introduint un número de document que finalitzi amb "X"
         fields:
           document_number: Número de document
-          postal_code: Codi Postal
-        name: exemple d'autorització
+          postal_code: Codi postal
+        name: Autorització d'exemple
+      dummy_authorization_workflow:
+        name: Flux de treball d'autorització d'exemple
       errors:
         duplicate_authorization: Un usuari ja està autoritzat amb les mateixes dades.
       foo_authorization:
@@ -72,20 +75,8 @@ ca:
           bar: Bar
           foo: Foo
         name: Autorització foo
-    authorizations:
-      create:
-        error: S'ha produït un error en crear l'autorització.
-        success: Has estat autoritzat/da correctament.
-      first_login:
-        actions:
-          decidim/dummy_authorization_handler: Verificar contra l'exemple d'autorització
-        title: Verificar la teva identitat
-        verify_with_these_options: 'Aquestes són les opcions disponibles per verificar la teva identitat:'
-      new:
-        authorize: Enviar
-        authorize_with: Verificar-me amb %{authorizer}
-      skip_verification: Pots saltar-te aquest pas per ara i %{link}
-      start_exploring: començar a explorar
+      granted_at: Atorgada el %{timestamp}
+      started_at: Iniciat el %{timestamp}
     core:
       actions:
         unauthorized: No tens permís per realitzar aquesta acció
@@ -181,6 +172,34 @@ ca:
     menu:
       home: Inici
       more_information: Més informació
+    messaging:
+      conversation_mailer:
+        new_conversation:
+          greeting: Hola, %{recipient}!
+          intro: "%{sender} ha iniciat una nova conversa amb tu. Fes clic aquí per veure-la:"
+          outro: Gaudeix de decidim!
+          subject: "%{sender} ha iniciat una conversa amb tu"
+        new_message:
+          greeting: Hola, %{recipient}!
+          intro: "%{sender} ha enviat nous missatges a la teva conversa. Fes clic aquí per veure'ls:"
+          outro: Gaudeix de decidim!
+          subject: Tens nous missatges de %{sender}
+      conversations:
+        create:
+          error: No s'ha iniciat la conversa. Torna-ho a provar més tard
+        index:
+          no_conversations: Encara no tens converses
+          title: Converses
+        reply:
+          send: Enviar
+          title: Respon
+        show:
+          title: Conversa amb %{usernames}
+        start:
+          send: Enviar
+          title: Comença una conversa
+        update:
+          error: Missatge no enviat. Torna-ho a provar més tard
     newsletter_mailer:
       newsletter:
         note: Has rebut aquest missatge perquè estàs subscrit a butlletins de notícies a %{organization_name}. Pots canviar la configuració a la teva <a href="%{link}">pàgina de notificacions</a>.
@@ -226,6 +245,10 @@ ca:
           authorize: Autoritzar amb "%{authorization}"
           explanation: Per dur a terme aquesta acció, ha de disposar de l'autorització "%{authorization}".
           title: Es requereix autorització
+        pending:
+          explanation: Per realitzar aquesta acció, has d'estar autoritzat/da amb "%{authorization}", però la teva autorització encara està en curs
+          resume: Comprova el progrés de l'autorització "%{authorization}"
+          title: L'autorització encara està en progrés
         unauthorized:
           explanation: No es pot realitzar aquesta acció ja que alguna de les seves dades d'autorització no coincideixen amb les requerides.
           invalid: "%{field} no és vàlid."
@@ -257,6 +280,8 @@ ca:
         close_window: Tanca la finestra
         share: Compartir
         share_link: Comparteix l'enllaç
+      version_author:
+        deleted: Usuari eliminat
   devise:
     invitations:
       edit:
@@ -358,10 +383,6 @@ ca:
       hero:
         participate: Participa
         welcome: Benvingut a %{organization}!
-      highlighted_processes:
-        active_processes: Processos actius
-        active_step: Fase activa
-        see_all_processes: Veure tots els processos
       statistics:
         answers_count: Respostes
         comments_count: Comentaris
@@ -398,6 +419,13 @@ ca:
     wechat_footer: Obri el WeChat, feu clic al botó "Discover" i després feu clic al menú "Escanejar codi QR".
     weibo: Sina Weibo
     xing: Xing
+  time:
+    formats:
+      day_of_month: "%b %d"
+      day_of_week: "%a"
+      day_of_year: "%d/%m/%y"
+      decidim_short: "%d/%m/%Y %H:%M"
+      time_of_day: "%H:%M"
   views:
     pagination:
       first: "&laquo; Primera"