decidim-core 0.20.0 → 0.23.1.rc1

data/app/cells/decidim/activity/show.erb

@@ -1,24 +1,27 @@
-<article class="card card--widget">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <div class="card__link text-center">
-        <%= resource_icon resource, class: "icon--large" %>
-        <span class="text-medium mt-xs"><%= created_at %></span>
-      </div>
-    </li>
-    <li class="card-data__item card-data__item--expand">
-      <div>
-        <%= author %>
+<div class="card card--activity">
+  <div class="card__content">
+    <div class="card__text">
+      <div class="text-medium">
         <% if title.present? %>
-          <span class="text-small"><%= title %></span>
-        <% end %>
-        <%= link_to resource_link_path, class: "card__link" do %>
-          <h5 class="card__title mb-none">
-            <%= html_truncate resource_link_text, length: 100 %>
-          </h5>
+          <%= title %>
         <% end %>
-        <%= description %>
       </div>
-    </li>
-  </ul>
-</article>
+    </div>
+    <div class="card__author inline-block">
+      <%= author_data = author %>
+    </div><div class="card__activity-date inline-block <%= "before-content" if author_data.present? %>">
+      <span class="text-medium mt-xs"><%= created_at %></span>
+    </div>
+    <div class="card__header mb-none">
+      <%= link_to resource_link_path, class: "card__link" do %>
+        <span class="card__title mb-none">
+          <% @sanitized_resource_link_text = html_truncate decidim_sanitize(resource_link_text, strip_tags: true), length: 80 %>
+          <%= @sanitized_resource_link_text %>
+        </span>
+      <% end %>
+      <% if description.present? && @sanitized_resource_link_text.present? %>
+        <%= html_truncate decidim_sanitize(description, strip_tags: true), length: 80 %>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/activity_cell.rb

@@ -76,6 +76,8 @@ module Decidim
     def user
       return resource.normalized_author if resource.respond_to?(:normalized_author)
       return resource.author if resource.respond_to?(:author)
+      # As Proposals have Coauthorable concern instead of Authorable
+      return resource.identities.first if resource.respond_to?(:identities)
 
       model.user_lazy if resource.respond_to?(:user)
     end

data/app/cells/decidim/address_cell.rb

@@ -13,7 +13,7 @@ module Decidim
     private
 
     def resource_icon
-      icon "meetings", class: "icon--big"
+      icon "meetings", class: "icon--big", role: "img", "aria-hidden": true
     end
   end
 end

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -31,12 +31,8 @@ module Decidim
         end
       end
 
-      def decidim
-        Decidim::Core::Engine.routes.url_helpers
-      end
-
       def button_classes
-        "amend_button_card_cell button secondary hollow expanded button--icon button--sc"
+        "amend_button_card_cell button hollow expanded button--icon button--sc"
       end
     end
   end

data/app/cells/decidim/amendable/promote_button_card_cell.rb

@@ -44,7 +44,7 @@ module Decidim
       end
 
       def button_classes
-        "amend_button_card_cell button secondary hollow expanded button--icon button--sc"
+        "amend_button_card_cell button expanded button--icon button--sc"
       end
     end
   end

data/app/cells/decidim/announcement/show.erb

@@ -1,7 +1,7 @@
 <div class="row column">
   <%= content_tag :div, class: "callout announcement mb-sm #{callout_class} cell-announcement" do %>
     <% if announcement.class == Hash && announcement.key?(:title) %>
-      <h5><%= decidim_sanitize translated_attribute announcement[:title] %></h5>
+      <span><%= decidim_sanitize translated_attribute announcement[:title] %></span>
 
       <p><%= decidim_sanitize translated_attribute announcement[:body] %></p>
     <% else %>

data/app/cells/decidim/author/comments.erb

@@ -1,6 +1,6 @@
 <% if commentable? %>
   <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments.count) do %>
-    <%= icon "comment-square", class: "icon--small", aria_label: t("decidim.author.comments", count: from_context.comments.count), role: "img" %>
+    <%= icon "comment-square", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= from_context.comments.count %> <%= t("decidim.author.comments", count: from_context.comments.count) %>
   <% end %>
 <% end %>

data/app/cells/decidim/author/endorsements.erb

@@ -0,0 +1,6 @@
+<% if endorsable? %>
+  <%= link_to "#{resource_locator(from_context).path}#list-of-endorsements", title: t("decidim.author.endorsements",count: from_context.endorsements_count) do %>
+    <%= icon "bullhorn", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= from_context.endorsements_count %> <%= t("decidim.author.endorsements", count: from_context.endorsements_count) %>
+  <% end %>
+<% end %>

data/app/cells/decidim/author/flag.erb

@@ -1,5 +1,8 @@
-<% if flagable? %>
-  <button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
-    <%= icon "flag", aria_label: t("report", scope: "decidim.proposals.proposals.show"), class: "icon--small" %>
+<% if flaggable? %>
+  <button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+    <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
+    <span class="show-for-sr">
+      <%= t("report", scope: "decidim.proposals.proposals.show") %>
+    </span>
   </button>
 <% end %>

data/app/cells/decidim/author/profile_inline.erb

@@ -1,5 +1,5 @@
 <span class="author__avatar">
-  <%= image_tag model.avatar_url %>
+  <%= image_tag model.avatar_url, alt: t("decidim.author.avatar") %>
 </span>
 
 <% if model.deleted? %>
@@ -17,9 +17,8 @@
     data-keep-on-hover="true"
     data-allow-html="true"
     data-template-classes="light expanded"
-    tabindex="1"
     data-tip-text='<%= h render(:profile_minicard) %>'>
-    <%= model.name %>
+    <%= author_name %>
   </span>
 
   <% if model.badge.present? %>
@@ -29,7 +28,7 @@
   <% end %>
 <% else %>
   <span class="author__name">
-    <%= model.name %>
+    <%= author_name %>
   </span>
 
   <% if model.badge.present? %>

data/app/cells/decidim/author/show.erb

@@ -9,6 +9,8 @@
 
       <%= render :comments %>
 
+      <%= render :endorsements %>
+
       <%= render :flag %>
 
       <%= render :withdraw %>

data/app/cells/decidim/author/withdraw.erb

@@ -1,6 +1,6 @@
 <% if withdrawable? %>
-  <%= action_authorized_link_to :withdraw, withdraw_path, method: :put, class: "title-action__action button small hollow", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show"), data: { confirm: t("withdraw_confirmation", scope: "decidim.proposals.proposals.show") }  do %>
+  <%= action_authorized_link_to :withdraw, withdraw_path, method: :put, class: "title-action__action button small hollow", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show"), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show") } do %>
     <%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %>
-    <%= icon "x" %>
+    <%= icon "x", role: "img", "aria-hidden": true %>
   <% end %>
 <% end %>

data/app/cells/decidim/author_cell.rb

@@ -18,6 +18,10 @@ module Decidim
 
     delegate :current_user, to: :controller, prefix: false
 
+    def author_name
+      options[:author_name_text] || model.name
+    end
+
     def show
       render
     end
@@ -55,28 +59,24 @@ module Decidim
     end
 
     def creation_date?
-      return true if posts_controller?
       return unless from_context
-      return unless proposals_controller? || collaborative_drafts_controller?
-      return unless show_action?
+      return unless show_action? && (from_context.respond_to?(:published_at) || from_context.respond_to?(:created_at))
 
       true
     end
 
     def creation_date
-      date_at = if proposals_controller?
-                  from_context.published_at
-                else
-                  from_context.created_at
-                end
+      date_at = from_context.try(:published_at) || from_context.try(:created_at)
 
       l date_at, format: :decidim_short
     end
 
     def commentable?
-      return unless posts_controller?
+      from_context && from_context.class.include?(Decidim::Comments::Commentable)
+    end
 
-      true
+    def endorsable?
+      from_context && from_context.class.include?(Decidim::Endorsable)
     end
 
     def author_classes
@@ -85,13 +85,12 @@ module Decidim
 
     def actionable?
       return false if options[:has_actions] == false
-      return true if user_author? && posts_controller?
 
-      true if withdrawable? || flagable?
+      withdrawable? || flaggable?
     end
 
     def user_author?
-      true if "Decidim::UserPresenter".include? model.class.to_s
+      "Decidim::UserPresenter".include?(model.class.to_s)
     end
 
     def profile_path?

data/app/cells/decidim/badge/show.erb

@@ -1,14 +1,14 @@
 <div class="column">
-  <article class="card card--badge absolutes badge-<%= badge.name %>">
+  <div class="card card--badge absolutes badge-<%= badge.name %>">
     <div class="right badge-tip">
-      <div data-tooltip data-position="top" title="<%= tooltip %>" aria-describedby="<%= badge.name %>-tooltip" data-yeti-box="<%= badge.name %>-tooltip" data-toggle="<%= badge.name %>-tooltip" data-resize="<%= badge.name %>-tooltip" class="has-tip" data-t="<%= badge.name %>-t">
-        <%= icon "info" %>
+      <div data-tooltip data-position="top" title="<%= tooltip %>" data-yeti-box="<%= badge.name %>-tooltip" data-toggle="<%= badge.name %>-tooltip" data-resize="<%= badge.name %>-tooltip" class="has-tip" data-t="<%= badge.name %>-t">
+        <%= icon "info", role: "img", "aria-hidden": true %>
       </div>
     </div>
     <div class="card__content">
       <div class="card__header" style="opacity: <%= opacity %>;">
         <div class="badge-container">
-          <%= image_tag badge.image, class: "badge__logo" %>
+          <%= image_tag badge.image, class: "badge__logo", alt: "#{badge_name} badge_image" %>
         </div>
       </div>
       <div class="card__text text-center">
@@ -21,7 +21,7 @@
     <div class="card__footer card__footer--transparent">
         <div class="p-xs">
           <div class="flex--sbc">
-            <strong class="text-uppercase muted">
+            <strong class="muted">
               <%= level_title %>
             </strong>
             <div class="badge-level">
@@ -32,5 +32,5 @@
           </div>
         </div>
     </div>
-  </article>
+  </div>
 </div>

data/app/cells/decidim/badge/small.erb

@@ -1,5 +1,6 @@
 <%=
   image_tag badge.image,
     class: "badge__logo--small external-icon",
-    title: "#{badge_name} (#{level_title}): #{description}"
+    title: "#{badge_name} (#{level_title}): #{description}",
+    alt: "#{badge_name} badge_image"
 %>

data/app/cells/decidim/card/show.erb

@@ -1,11 +1,11 @@
 <div class="column">
-  <article class="card">
+  <div class="card">
     <div class="card__content">
       <% if title.present? %>
         <div class="card__header">
-          <h5 class="card__title">
+          <span class="card__title">
             <%= title %>
-          </h5>
+          </span>
         </div>
       <% end %>
 
@@ -15,5 +15,5 @@
         </p>
       <% end %>
     </div>
-  </article>
+  </div>
 </div>

data/app/cells/decidim/card_cell.rb

@@ -20,13 +20,11 @@ module Decidim
     end
 
     def resource_cell
-      if model.respond_to?(:resource_manifest) && model.resource_manifest.card.present?
-        @resource_cell ||= model.resource_manifest.card
-      elsif ["Decidim::Proposals::OfficialAuthorPresenter", "Decidim::Debates::OfficialAuthorPresenter"].include? model.class.to_s
-        @resource_cell ||= "decidim/author"
-      elsif ["Decidim::User", "Decidim::UserGroup"].include? model.model_name.name
-        @resource_cell ||= "decidim/author"
-      end
+      @resource_cell ||= if resource_card
+                           resource_card
+                         elsif official_author? || user_or_user_group?
+                           "decidim/author"
+                         end
     end
 
     def title
@@ -36,5 +34,21 @@ module Decidim
     def body
       model.try(:body) || model.try(:about) || ""
     end
+
+    def resource_manifest
+      model.try(:resource_manifest) || Decidim.find_resource_manifest(model.class)
+    end
+
+    def resource_card
+      resource_manifest&.card.presence
+    end
+
+    def official_author?
+      ["Decidim::Proposals::OfficialAuthorPresenter", "Decidim::Debates::OfficialAuthorPresenter"].include? model.class.to_s
+    end
+
+    def user_or_user_group?
+      ["Decidim::User", "Decidim::UserGroup"].include? model.model_name.name
+    end
   end
 end

data/app/cells/decidim/card_m/comments_counter.erb

@@ -1,3 +1,3 @@
-<%= icon("comment-square", class: "icon--small") %>
+<%= icon("comment-square", class: "icon--small", aria_label: "#{t("decidim.comments.comments_count")}:", role: "img") %>
 <%= " " %>
 <%= comments_count %>

data/app/cells/decidim/card_m/header.erb

@@ -1,15 +1,15 @@
 <div class="card__header">
   <% if has_link_to_resource? %>
     <%= link_to resource_path, class: "card__link" do %>
-      <h5 class="card__title">
+      <div class="card__title">
         <%= title %>
-      </h5>
+      </div>
     <% end %>
   <% else %>
     <div class="card__link">
-      <h5 class="card__title">
+      <div class="card__title">
         <%= title %>
-      </h5>
+      </div>
     </div>
   <% end %>
 

data/app/cells/decidim/card_m/image.erb

@@ -1,5 +1,5 @@
 <% if resource_image_path.present? %>
   <%= link_to resource_path do %>
-    <%= image_tag resource_image_path, class: "card__image" %>
+    <%= image_tag resource_image_path, class: "card__image", alt: title %>
   <% end %>
 <% end %>

data/app/cells/decidim/card_m/show.erb

@@ -1,10 +1,10 @@
 <div class="column" id="<%= dom_id(model) %>">
-  <article class="card <%= card_classes %>">
+  <div class="card <%= card_classes %>">
     <%= render :label if has_label? %>
     <%= render :top if render_top? %>
     <%= render :image if has_image? %>
     <div class="card__content">
-      <%= render :header %>
+      <%= render :header if has_header? %>
 
       <div class="card__text">
         <div class="card__text--paragraph">
@@ -19,5 +19,5 @@
     <%= render :data %>
     <%= render :status %>
     <%= render :footer %>
-  </article>
+  </div>
 </div>

data/app/cells/decidim/card_m_cell.rb

@@ -19,13 +19,17 @@ module Decidim
     private
 
     def resource_path
-      resource_locator(model).path
+      resource_locator(model).path(filter_link_params)
     end
 
     def resource_image_path
       nil
     end
 
+    def has_header?
+      true
+    end
+
     def has_image?
       false
     end
@@ -104,9 +108,7 @@ module Decidim
     end
 
     def comments_count
-      return model.comments.not_hidden.count if model.comments.respond_to? :not_hidden
-
-      model.comments.count
+      model.comments_count
     end
 
     def statuses
@@ -117,7 +119,8 @@ module Decidim
     end
 
     def creation_date_status
-      l(model.created_at.to_date, format: :decidim_short)
+      explanation = content_tag(:strong, t("activemodel.attributes.common.created_at"))
+      "#{explanation}<br>#{l(model.created_at.to_date, format: :decidim_short)}"
     end
 
     def follow_status
@@ -127,7 +130,7 @@ module Decidim
     def comments_count_status
       return render_comments_count unless has_link_to_resource?
 
-      link_to resource_path do
+      link_to resource_path, "aria-label" => "#{t("decidim.comments.comments_count")}: #{comments_count}", title: t("decidim.comments.comments_count") do
         render_comments_count
       end
     end