decidim-core 0.8.4 → 0.9.0

data/app/services/decidim/notification_generator_for_recipient.rb

@@ -29,8 +29,15 @@ module Decidim
       return unless event_class
       return unless resource
       return unless recipient
+      return unless notification.event_class_instance.notifiable?
 
-      Notification.create!(
+      notification.save!
+    end
+
+    private
+
+    def notification
+      @notification ||= Notification.new(
         user: recipient,
         event_class: event_class,
         resource: resource,
@@ -39,8 +46,6 @@ module Decidim
       )
     end
 
-    private
-
     attr_reader :event, :event_class, :resource, :recipient_id, :extra
 
     def recipient

data/app/uploaders/decidim/avatar_uploader.rb

@@ -8,11 +8,11 @@ module Decidim
     process :validate_dimensions
 
     version :big do
-      process resize_and_pad: [500, 500]
+      process resize_to_fit: [80, 80]
     end
 
     version :thumb do
-      process resize_and_pad: [100, 100]
+      process resize_to_fit: [40, 40]
     end
 
     def default_url(*)

data/app/views/decidim/account/delete.html.erb

@@ -8,7 +8,7 @@
       <div>
         <label>
           <span class="user-form__label"><%= t('activemodel.attributes.account.delete_reason') %></span>
-          <%= f.text_area :delete_reason, rows: 2 %>
+          <%= f.text_area :delete_reason, rows: 2, label: false %>
         </label>
       </div>
       <input type="submit" class="button open-modal-button" value="<%= t('.confirm.title') %>" />

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

@@ -1,12 +1,15 @@
 <div class="row">
-  <%= decidim_form_for(@account, url: account_path, method: :put, class: "user-form") do |f| %>
+  <%= decidim_form_for(@account, url: account_path, method: :put, class: "user-form", autocomplete: "nope") do |f| %>
     <div class="columns large-4">
       <%= f.upload :avatar %>
     </div>
 
     <div class="columns large-8 end">
       <%= f.text_field :name %>
+      <%= f.text_field :nickname %>
       <%= f.email_field :email %>
+      <%= f.url_field :personal_url %>
+      <%= f.text_area :about, rows: 5 %>
 
       <% if @account.errors[:password].any? || @account.errors[:password_confirmation].any? %>
         <%= render partial: "password_fields", locals: { form: f } %>

data/app/views/decidim/devise/invitations/edit.html.erb

@@ -13,6 +13,8 @@
           <%= 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| %>
             <%= f.hidden_field :invitation_token %>
 
+            <%= f.text_field :nickname, help_text: t("devise.invitations.edit.nickname_help") %>
+
             <% if f.object.class.require_password_on_accepting %>
               <%= f.password_field :password %></p>
 

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

@@ -16,7 +16,13 @@
           <%= decidim_form_for(@form, as: resource_name, url: omniauth_registrations_path(resource_name), html: { class: "register-form new_user" }) do |f| %>
             <div class="user-person">
               <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help"), label: t(".username_help") %>
+                <%= f.text_field :name, help_text: t(".username_help") %>
+              </div>
+            </div>
+
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :nickname, help_text: t(".nickname_help") %>
               </div>
             </div>
 

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

@@ -33,6 +33,12 @@
               </div>
             </div>
 
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :nickname, help_text: t(".nickname_help") %>
+              </div>
+            </div>
+
             <div class="field">
               <%= f.email_field :email %>
             </div>
@@ -65,7 +71,7 @@
 
             <fieldset>
               <div class="field">
-                <%= f.check_box :newsletter_notifications, label: t(".newsletter_notifications") %>
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: true %>
               </div>
 
               <div class="field">

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

@@ -1,17 +1,11 @@
 <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 class="card__author author-data author-data--small">
+      <%= render "decidim/shared/author_reference", author: present(message.sender) %>
+
+      <time datetime="<%= message.created_at.utc %>">
+        <%= message.friendly_created_at %>
+      </time>
     </div>
   </div>
   <div class="message__content">

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

@@ -6,6 +6,6 @@
   <%= 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") %>
+    <%= f.submit t(".send"), data: { disable: true } %>
   <% end %>
 </div>

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

@@ -24,7 +24,7 @@
                 </h6>
 
                 <span class="card--list__annotation">
-                  <%= simple_date(conversation.last_message.created_at) %>
+                  <%= conversation.last_message.friendly_created_at %>
                 </span>
 
                 <span class="text-small">

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

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

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

@@ -3,3 +3,14 @@
 <% content_for :note do %>
   <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
 <% end %>
+
+<% content_for :unsubscribe do %>
+  <%== t ".unsubscribe", link: decidim.unsubscribe_newsletters_url(host: @organization.host, u: @encrypted_token ) %>
+<% end %>
+
+<% content_for :see_on_website do %>
+  <center style="display: none">
+    <%== CGI.unescapeHTML truncate(@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

@@ -0,0 +1,11 @@
+<%= decidim_sanitize @body %>
+
+<% content_for :note do %>
+  <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
+<% end %>
+
+<% if @user.present? %>
+  <% content_for :unsubscribe do %>
+    <%== t "unsubscribe", scope: "decidim.newsletter_mailer.newsletter", link: decidim.unsubscribe_newsletters_url(host: @organization.host, u: @encrypted_token) %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,4 @@
+<div class="row">
+  <h4><%== t ".unsubscribe" %></h4>
+  <p><%== t ".check_subscription", link: decidim.notifications_settings_path %></p>
+</div>

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--conversation card--list__icon" %>
+      <%= resource_icon notification.resource, class: "icon--chat card--list__icon" %>
     <% end %>
     <div>
       <h5 class="card--list__heading">

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

@@ -0,0 +1,64 @@
+<% add_decidim_page_title(user.nickname) %>
+
+<main class="wrapper">
+  <% present(user) do |profile_user| %>
+    <div class="user-header row collapse">
+      <div class="columns">
+        <div class="user-header__main">
+          <div class="user-header__avatar">
+            <%= image_tag profile_user.avatar_url(:big) %>
+          </div>
+
+          <h1 class="heading1 user-header__heading">
+            <strong><%= profile_user.name %></strong>
+            <div class="user-nickname">
+              <%= profile_user.nickname %>
+              <% if !current_user || (current_user && current_user != user) %>
+                <span class="user-contact_link">
+                  <%= link_to_current_or_new_conversation_with(user) %>
+                </span>
+              <% end %>
+            </div>
+
+            <% if current_user && current_user != user %>
+              <%= render partial: "decidim/shared/follow_button", locals: { followable: user } %>
+            <% end %>
+          </h1>
+
+        </div>
+      </div>
+    </div>
+
+    <% if profile_user.about.present? %>
+      <div class="row">
+        <strong><%= t(".about_me") %></strong>
+        <p><%= profile_user.about %></p>
+      </div>
+    <% end %>
+
+    <% if profile_user.personal_url.present? %>
+      <div class="row">
+        <strong><%= t(".personal_url") %></strong>
+        <p><%= link_to profile_user.personal_url, profile_user.personal_url %></p>
+      </div>
+    <% end %>
+
+    <% if profile_user.officialized? %>
+      <div class="row">
+        <div class="mediumlarge-6 large-6">
+          <div class="card">
+            <div class="badge-card__content">
+              <span>
+                <%= icon "verified-badge" %>
+              </span>
+
+              <span>
+                <%= translated_attribute(profile_user.officialized_as).presence || t("decidim.profiles.default_officialization_text") %>
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</main>

data/app/views/decidim/scopes/_scopes_picker_input.html.erb

@@ -0,0 +1,6 @@
+<div id="<%=picker_options[:id]%>" class="data-picker <%=picker_options[:class]%>" data-picker-name="<%=picker_options[:name]%>">
+  <div class="picker-values"><% scopes.each do |scope, params| %>
+    <div><a href="<%=params[:url]%>" data-picker-value="<%=scope.id%>"><%=params[:text]%></a></div>
+  <% end %></div>
+  <div class="picker-prompt"><a href="<%=prompt_params[:url]%>"><%=prompt_params[:text]%></a></div>
+</div>

data/app/views/decidim/scopes/picker.html.erb

@@ -0,0 +1,36 @@
+  <div class="scope-picker picker-header">
+    <h2 id="data_picker-title"><%= title %></h2>
+    <ul>
+      <% unless root %>
+        <li><a href="<%= scopes_picker_path(**context)%>"><%= t("decidim.scopes.global") %></a></li>
+      <% end %>
+      <% parent_scopes.each do |scope| %>
+        <li><a href="<%= scopes_picker_path(current: scope.id, **context)%>"><%= translated_attribute(scope.name) %></a></li>
+      <% end %>
+    </ul>
+  </div>
+
+  <div class="scope-picker picker-content">
+    <div class="picker-scrollable-content">
+      <% if scopes.any? %>
+        <ul>
+          <% scopes.each do |scope| %>
+            <li><a href="<%= scopes_picker_path(current: scope.id, **context)%>"><%= translated_attribute(scope.name) %></a></li>
+          <% end %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="scope-picker picker-footer">
+    <div class="buttons button--double">
+      <% if current || !required %>
+        <a class="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
+      <% else %>
+        <a class="button muted">
+      <% end %>
+          <%= t("decidim.scopes.picker.choose") %>
+        </a>
+      <a class="button clear" data-close aria-label="<%= t("decidim.scopes.picker.cancel") %>"><%= t("decidim.scopes.picker.cancel") %></a>
+    </div>
+  </div>

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

@@ -6,59 +6,33 @@
               type="button">
         <span aria-hidden="true">&times;</span>
       </button>
-      <% 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>
-        <p><%= t ".incomplete.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
-        <ul>
-          <% status.data[:fields].each do |field| %>
-            <li><strong><%= t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers") %></strong></li>
-          <% end %>
-        </ul>
-        <div class="row">
-          <div class="columns medium-8 medium-offset-2">
-            <%= link_to t('.incomplete.reauthorize'), authorize_action_path(action), class: "button expanded" %>
-          </div>
-        </div>
-        <div class="text-center">
-          <button class="link" data-close><%=t ".incomplete.cancel" %></button>
-        </div>
-      <% elsif status.code == :missing %>
-        <div class="reveal__header missing-authorization">
-          <h3 class="reveal__title"><%= t('.missing.title') %></h3>
-        </div>
-        <p><%= t ".missing.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('.missing.authorize', authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path(action), class: "button expanded" %>
-          </div>
-        </div>
-      <% elsif status.code == :invalid %>
-        <div class="reveal__header invalid-authorization">
-          <h3 class="reveal__title"><%= t('.unauthorized.title') %></h3>
-        </div>
-        <p><%= t ".unauthorized.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
-        <ul>
-          <% status.data[:fields].each do |field, value| %>
-            <li><strong><%= t(".unauthorized.invalid", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers")) %></strong></li>
+      <div class="reveal__header <%= status.code %>-authorization">
+        <h3 class="reveal__title"><%= t ".#{status.code}.title" %></h3>
+      </div>
+      <p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+      <% if status.data[:extra_explanation] %>
+      <p><%= t status.data[:extra_explanation][:key], **status.data[:extra_explanation][:params] %></p>
+      <% end %>
+      <% if status.data[:fields] %>
+      <ul>
+        <% status.data[:fields].each do |field, value| %>
+          <li><strong><%= t ".#{status.code}.invalid_field", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers"), value: value ? "(#{value})" : "" %></strong></li>
+        <% end %>
+      </ul>
+      <% end %>
+      <div class="row">
+        <div class="columns medium-8 medium-offset-2">
+          <% if status.data[:action].present? %>
+            <%= link_to t(".#{status.code}.#{status.data[:action]}", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path(action), class: "button expanded" %>
+          <% else %>
+            <button class="button expanded" data-close><%= t ".#{status.code}.ok" %></button>
           <% end %>
-        </ul>
-        <div class="row">
-          <div class="columns medium-8 medium-offset-2">
-            <button class="button expanded" data-close><%=t ".unauthorized.ok" %></button>
-          </div>
         </div>
+      </div>
+      <% if status.data[:cancel] %>
+      <div class="text-center">
+        <button class="link" data-close><%= t ".#{status.code}.cancel" %></button>
+      </div>
       <% end %>
     </div>
   <% end %>

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

@@ -0,0 +1,21 @@
+<span class="author__avatar author__avatar--small">
+  <%= image_tag author.avatar_url %>
+</span>
+
+<% if author.deleted? %>
+  <span class="label label--small label--basic">
+    <%= t('.deleted') %>
+  </span>
+<% else %>
+  <span class="author__name"><%= author.name %></span>
+
+  <% if author.badge.present? %>
+    <span class="author__badge">
+      <%= icon author.badge %>
+    </span>
+  <% end %>
+
+  <% if author.nickname.present? %>
+    <span class="author__nickname"><%= author.nickname %></span>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<div class="author-data__main">
+  <div class="author author--inline">
+    <% if author.profile_path.present? %>
+      <%= link_to author.profile_path do %>
+        <%= render "decidim/shared/author", author: author %>
+      <% end %>
+    <% else %>
+      <%= render "decidim/shared/author", author: author %>
+    <% end %>
+    </a>
+  </div>
+</div>