decidim-core 0.14.4 → 0.15.0

data/app/assets/stylesheets/decidim/vizzs/_rowchart.scss

@@ -0,0 +1,77 @@
+.rowchart{
+  //common
+  .background{
+    fill: darken($body-background, 2.5);
+  }
+
+  .title{
+    fill: $muted;
+    text-transform: uppercase;
+    font-weight: 600;
+    font-size: rem-calc(24);
+  }
+
+  .subtitle{
+    fill: $muted;
+    font-size: rem-calc(14);
+  }
+
+  .tick{
+    opacity: .5;
+
+    .dashed{
+      stroke-dasharray: 3;
+    }
+  }
+
+  // helper to colors
+  @mixin loop-colors-types($color, $max: 12){
+    @for $i from 0 through ($max - 1){
+      $interval: ($i % 4) * 24 + 1;
+      $tints: tint($color, $interval);
+      $shades: shade($color, $interval);
+      $adjusts: adjust-color($color, $lightness: $interval, $hue: -$interval);
+
+      .type-#{$i}{
+        @if $i < 4{
+          fill: $tints;
+
+          &:hover{
+            cursor: pointer;
+            fill: complement($tints);
+          }
+        }
+
+        @else if $i >= 4 and $i < 8{
+          fill: $shades;
+
+          &:hover{
+            cursor: pointer;
+            fill: complement($shades);
+          }
+        }
+
+        @else{
+          fill: $adjusts;
+
+          &:hover{
+            cursor: pointer;
+            fill: complement($adjusts);
+          }
+        }
+      }
+    }
+  }
+
+  // default color
+  @include loop-colors-types($proposals);
+
+  // colors modifiers
+  $map: $foundation-palette;
+
+  @each $key, $value in $map{
+    &.#{$key}{
+      @include loop-colors-types($value);
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+<% activities.each do |activity| %>
+  <%= activity_cell_for(activity) %>
+<% end %>

data/app/cells/decidim/activities_cell.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Renders a collection of activities using a different cell for
+  # each one.
+  class ActivitiesCell < Decidim::ViewModel
+    include Decidim::CardHelper
+    include Decidim::IconHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    delegate :current_organization, to: :controller
+
+    # Since we're rendering each activity separatedly we need to trigger
+    # BatchLoader in order to accumulate all the ids to be found later.
+    def show
+      return if activities.blank?
+
+      activities.map do |activity|
+        activity.organization_lazy
+        activity.resource_lazy
+        activity.participatory_space_lazy
+        activity.component_lazy
+      end
+
+      render
+    end
+
+    def activity_cell_for(activity)
+      cell "#{activity.resource_type.constantize.name.underscore}_activity", activity
+    rescue NameError
+      cell "decidim/activity", activity
+    end
+
+    def activities
+      model
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+<article class="card">
+  <div class="card__content">
+    <% if title.present? %>
+      <div class="card__text">
+        <div class="text-medium">
+          <span class="icon--container">
+            <%= resource_icon resource, class: "primary" %>&nbsp;
+            <%= title %>
+          </span>
+        </div>
+      </div>
+    <% end %>
+    <div class="card__header mb-none">
+      <%= link_to resource_link_path, class: "card__link" do %>
+        <h5 class="card__title mb-none">
+          <%= html_truncate resource_link_text, length: 100 %>
+        </h5>
+      <% end %>
+    </div>
+  </div>
+</article>

data/app/cells/decidim/activity_cell.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to render public activities performed by users.
+  #
+  # Each model that we want to represent should inherit from this cell and
+  # tweak the necessary methods (usually `title` is enough).
+  class ActivityCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include Decidim::IconHelper
+    include Decidim::ApplicationHelper
+
+    def show
+      return unless renderable?
+      render
+    end
+
+    # Since activity logs could be linked to resource no longer available
+    # this method is added in order to skip rendering a cell if there's
+    # not enough data.
+    def renderable?
+      resource.present? && participatory_space.present? && published?
+    end
+
+    # The resource linked to the activity.
+    def resource
+      model.resource_lazy
+    end
+
+    # The title to show at the card.
+    #
+    # The card will also be displayed OK if there's no title.
+    def title
+      return unless resource.respond_to?(:title)
+
+      if resource.title.is_a?(String)
+        resource.title
+      elsif resource.title.is_a?(Hash)
+        translated_attribute(resource.title)
+      end
+    end
+
+    # The link to the resource linked to the activity.
+    def resource_link_path
+      resource_locator(resource).path
+    end
+
+    # The text to show as the link to the resource.
+    def resource_link_text
+      translated_attribute(resource.title)
+    end
+
+    private
+
+    def published?
+      return true unless resource.respond_to?(:published?)
+      resource.published?
+    end
+
+    def component
+      model.component_lazy
+    end
+
+    def organization
+      model.organization_lazy
+    end
+
+    def user
+      model.user_lazy
+    end
+
+    def participatory_space
+      return resource if resource.is_a?(Decidim::Participable)
+
+      model.participatory_space_lazy
+    end
+
+    def participatory_space_link
+      link_to(
+        translated_attribute(participatory_space.title),
+        resource_locator(participatory_space).path
+      )
+    end
+  end
+end

data/app/cells/decidim/address/details.erb

@@ -0,0 +1,7 @@
+<% if model.respond_to? :location %>
+  <strong><%= translated_attribute model.location %></strong><br />
+<% end %>
+<span><%= model.address %></span><br />
+<% if model.respond_to? :location_hints %>
+  <span><%= translated_attribute model.location_hints %></span>
+<% end %>

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

@@ -0,0 +1,14 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= resource_icon %>
+    </li>
+    <li class="card-data__item">
+      <div class="text-left">
+        <div class="card__icondata--address">
+          <%= render :details %>
+        </div>
+      </div>
+    </li>
+  </ul>
+</div>

data/app/cells/decidim/address_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the address of a meeting.
+  class AddressCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include LayoutHelper
+
+    def details
+      render
+    end
+
+    private
+
+    def resource_icon
+      icon "meetings", class: "icon--big"
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
-<% if profile_path? %>
+<% if can_be_contacted? %>
   <%= link_to_current_or_new_conversation_with(model) %>
 <% end %>

data/app/cells/decidim/author_cell.rb

@@ -12,6 +12,7 @@ module Decidim
     include Messaging::ConversationHelper
 
     property :profile_path
+    property :can_be_contacted?
 
     delegate :current_user, to: :controller, prefix: false
 

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

@@ -6,7 +6,7 @@
       </div>
     </div>
     <div class="card__content">
-      <div class="card__header">
+      <div class="card__header" style="opacity: <%= opacity %>;">
         <div class="badge-container">
           <%= image_tag badge.image, class: "badge__logo" %>
         </div>
@@ -22,7 +22,7 @@
         <div class="p-xs">
           <div class="flex--sbc">
             <strong class="text-uppercase muted">
-              <%= t "decidim.gamification.level", level: status.level %>
+              <%= level_title %>
             </strong>
             <div class="badge-level">
               <% badge.levels.each_with_index do |_threshold, level| %>

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

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

data/app/cells/decidim/badge_cell.rb

@@ -8,46 +8,68 @@ module Decidim
 
     delegate :current_user, to: :controller
 
+    def small
+      render "small"
+    end
+
     def badge
       @options[:badge]
     end
 
-    def user
-      model
+    def level_title
+      t "decidim.gamification.level", level: status.level
+    end
+
+    def own_profile?
+      return @own_profile if defined?(@own_profile)
+
+      @own_profile = if model.is_a?(User)
+                       model == current_user
+                     elsif model.is_a?(UserGroup) && current_user
+                       current_user.user_groups.include?(model)
+                     end
     end
 
     def description
-      if user == current_user && status.level.zero?
-        t "decidim.gamification.badges.#{badge.name}.unearned_own"
-      elsif user == current_user && status.level.positive?
-        t "decidim.gamification.badges.#{badge.name}.description_own", score: status.score
-      elsif user != current_user && status.level.zero?
-        t "decidim.gamification.badges.#{badge.name}.unearned_another"
-      elsif user != current_user && status.level.positive?
-        t "decidim.gamification.badges.#{badge.name}.description_another", score: status.score
+      if own_profile? && status.level.zero?
+        score_descriptions[:unearned_own]
+      elsif own_profile? && status.level.positive?
+        score_descriptions[:description_own]
+      elsif !own_profile? && status.level.zero?
+        score_descriptions[:unearned_another]
+      elsif !own_profile? && status.level.positive?
+        score_descriptions[:description_another]
       end
     end
 
     def tooltip
-      if user == current_user
+      if own_profile?
         if status.next_level_in
           t "decidim.gamification.badges.#{badge.name}.next_level_in", score: status.next_level_in
         else
           t "decidim.gamification.reached_top"
         end
       else
-        t "decidim.gamification.badges.#{badge.name}.explanation"
+        badge.description(controller.current_organization.name)
       end
     end
 
     def badge_name
-      t "decidim.gamification.badges.#{badge.name}.name"
+      badge.translated_name
+    end
+
+    def opacity
+      status.level < 1 ? 0.2 : 1
     end
 
     private
 
+    def score_descriptions
+      badge.score_descriptions(status.score)
+    end
+
     def status
-      @status ||= Decidim::Gamification.status_for(user, badge.name)
+      @status ||= options[:status] || Decidim::Gamification.status_for(model, badge.name)
     end
   end
 end

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

@@ -1,6 +1,9 @@
-<p><%= t "decidim.gamification.description" %></p>
+<p>
+  <%= t "decidim.gamification.description" %>
+  <%= link_to t("decidim.gamification.all_badges_link"), gamification_badges_path %>
+</p>
 <div class="row small-up-2 medium-up-4 card-grid badges">
-  <% Decidim::Gamification.badges.sort_by(&:name).each do |badge| %>
-    <%= cell "decidim/badge", user, badge: badge %>
+  <% available_badges.each do |badge| %>
+    <%= cell "decidim/badge", model, badge: badge %>
   <% end %>
 </div>

data/app/cells/decidim/badges_cell.rb

@@ -5,10 +5,10 @@ module Decidim
     include Decidim::ApplicationHelper
     include Decidim::Core::Engine.routes.url_helpers
 
-    delegate :current_user, to: :controller
-
-    def user
-      model
+    def available_badges
+      Decidim::Gamification.badges.select do |badge|
+        badge.valid_for?(model)
+      end.sort_by(&:name)
     end
   end
 end

data/app/cells/decidim/coauthorships_cell.rb

@@ -19,7 +19,7 @@ module Decidim
     include Decidim::ApplicationHelper
 
     def show
-      if authorable? || official?
+      if authorable?
         cell "decidim/author", presenter_for_author(model), extra_classes.merge(has_actions: has_actions?, from: model)
       else
         cell(
@@ -41,7 +41,13 @@ module Decidim
     end
 
     def presenters_for_identities(coauthorable)
-      coauthorable.identities.map { |identity| present(identity) }
+      coauthorable.identities.map do |identity|
+        if identity.is_a?(Decidim::Organization)
+          "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
+        else
+          present(identity)
+        end
+      end
     end
 
     def presenter_for_author(authorable)