decidim-core 0.13.1 → 0.14.1

data/app/assets/stylesheets/decidim/modules/_orgchart.scss

@@ -0,0 +1,62 @@
+.orgchart{
+  // Colors
+  $bg-color: $white;
+  $dot-color: $medium-gray;
+
+  // Dimensions
+  $dot-size: rem-calc(2px);
+  $dot-space: rem-calc(10px);
+
+  background: linear-gradient(90deg, $bg-color ($dot-space - $dot-size), transparent 1%) center, linear-gradient($bg-color ($dot-space - $dot-size), transparent 1%) center, $dot-color;
+  background-size: $dot-space $dot-space;
+
+  // Other vars
+  $stroke-width: 1px;
+  $stroke-color: $medium-gray;
+
+  .as-card{
+    fill: $bg-color;
+    stroke: $stroke-color;
+    stroke-width: $stroke-width;
+  }
+
+  .as-text{
+    font-weight: 600;
+    fill: $secondary;
+    text-anchor: middle;
+  }
+
+  .as-circle{
+    stroke: $stroke-color;
+    stroke-width: $stroke-width;
+    fill: $bg-color;
+  }
+
+  .link{
+    stroke: $stroke-color;
+    stroke-width: $stroke-width;
+  }
+
+  .node{
+    cursor: pointer;
+  }
+
+  .button{
+    $height: ($input-font-size * unitless-calc($input-line-height)) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1);
+
+    min-height: $height;
+    color: $body-font-color;
+    outline: none;
+    border: $border;
+    background-color: $input-background;
+    box-shadow: $input-shadow;
+
+    @if has-value($button-transition){
+      transition: $button-transition;
+    }
+
+    &:hover{
+      background-color: $input-background;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/modules/_status-labels.scss

@@ -10,7 +10,8 @@
   background-color: $primary;
 }
 
-.proposal-status{
+.proposal-status,
+.collaborative-draft-status{
   float: left;
   margin-right: .5rem;
 }

data/app/assets/stylesheets/decidim/modules/_typography.scss

@@ -125,6 +125,15 @@ hr{
   }
 }
 
+// text status-color
+$map: map-merge($foundation-palette, (muted: $muted));
+
+@each $key, $value in $map{
+  .text-#{$key}{
+    color: $value;
+  }
+}
+
 .text-large{
   font-size: 130%;
 }

data/app/assets/stylesheets/decidim/utils/_helpers.scss

@@ -62,6 +62,34 @@
   @include flex-align($x: justify, $y: bottom);
 }
 
+// flex--sc:
+// justify-content: flex-start;
+// align-items: center;
+.flex--fsc{
+  @include flex;
+  @include flex-align($x: left, $y: middle);
+}
+
+// flex--fsb:
+// justify-content: flex-start;
+// align-items: baseline;
+.flex--fsb{
+  @include flex;
+  @include flex-align($x: left, $y: null);
+
+  align-items: baseline;
+}
+
+// flex--fsb:
+// justify-content: center;
+// align-items: baseline;
+.flex--cb{
+  @include flex;
+  @include flex-align($x: center, $y: null);
+
+  align-items: baseline;
+}
+
 .scroll{
   max-height: 50vh;
   overflow-y: scroll;

data/app/assets/stylesheets/decidim/utils/_mixins.scss

@@ -88,6 +88,34 @@ $palette: $foundation-palette;
       margin-bottom: 0;
     }
   }
+
+  @else if $dir == row-reverse{
+    & > *{
+      margin: 0 $gap/2;
+    }
+
+    & > :last-child{
+      margin-left: 0;
+    }
+
+    & > :first-child{
+      margin-right: 0;
+    }
+  }
+
+  @else if $dir == column-reverse{
+    & > *{
+      margin: $gap/2 0;
+    }
+
+    & > :last-child{
+      margin-top: 0;
+    }
+
+    & > :first-child{
+      margin-bottom: 0;
+    }
+  }
 }
 
 @mixin ellipsis(){
@@ -102,3 +130,38 @@ $palette: $foundation-palette;
     content: $char;
   }
 }
+
+@mixin animation($animation){
+  -webkit-animation: $animation;
+  -o-animation: $animation;
+  animation: $animation;
+}
+
+@mixin spinner($size, $orbit, $satellite, $time){
+  @include animation( animation-spin $time infinite linear );
+  @include square($size);
+
+  box-sizing: border-box;
+  border-radius: 50%;
+  border: floor(($size / 8)) solid $orbit;
+  border-right-color: $satellite;
+  display: inline-block;
+  position: relative;
+}
+
+@mixin size($width, $height){
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size){
+  @include size($size, $size);
+}
+
+@keyframes animation-spin{
+  to{ transform: rotate(1turn); }
+}
+
+@-webkit-keyframes animation-spin{
+  to{ -webkit-transform: rotate(1turn); }
+}

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

@@ -1,5 +1,5 @@
 <% 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", scope: "decidim.proposals.proposals.show") }  do %>
     <%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %>
     <%= icon "x" %>
   <% end %>

data/app/cells/decidim/author_cell.rb

@@ -52,7 +52,7 @@ module Decidim
     def creation_date?
       return true if posts_controller?
       return unless from_context
-      return unless proposals_controller?
+      return unless proposals_controller? || collaborative_drafts_controller?
       return unless show_action?
       true
     end

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

@@ -0,0 +1,36 @@
+<div class="column">
+  <article 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>
+    </div>
+    <div class="card__content">
+      <div class="card__header">
+        <div class="badge-container">
+          <%= image_tag badge.image, class: "badge__logo" %>
+        </div>
+      </div>
+      <div class="card__text text-center">
+        <strong><%= badge_name %></strong>
+      </div>
+      <div class="card__text text-center">
+        <%= description %>
+      </div>
+    </div>
+    <div class="card__footer card__footer--transparent">
+        <div class="p-xs">
+          <div class="flex--sbc">
+            <strong class="text-uppercase muted">
+              <%= t "decidim.gamification.level", level: status.level %>
+            </strong>
+            <div class="badge-level">
+              <% badge.levels.each_with_index do |_threshold, level| %>
+                <div class="<%= "is-achieved" if status.level >= (level + 1) %>"></div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+    </div>
+  </article>
+</div>

data/app/cells/decidim/badge_cell.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  class BadgeCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include Decidim::IconHelper
+
+    delegate :current_user, to: :controller
+
+    def badge
+      @options[:badge]
+    end
+
+    def user
+      model
+    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
+      end
+    end
+
+    def tooltip
+      if user == current_user
+        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"
+      end
+    end
+
+    def badge_name
+      t "decidim.gamification.badges.#{badge.name}.name"
+    end
+
+    private
+
+    def status
+      @status ||= Decidim::Gamification.status_for(user, badge.name)
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+<p><%= t "decidim.gamification.description" %></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 %>
+  <% end %>
+</div>

data/app/cells/decidim/badges_cell.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class BadgesCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    delegate :current_user, to: :controller
+
+    def user
+      model
+    end
+  end
+end

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

@@ -13,5 +13,5 @@
     </div>
   <% end %>
 
-  <%= render :author if has_author? %>
+  <%= render_authorship if has_authors? %>
 </div>

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

@@ -1,9 +1,8 @@
 <div class="column" id="<%= dom_id(model) %>">
   <article 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 %>
 

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

@@ -0,0 +1,7 @@
+<div class="card__top">
+  <% if render_space? %>
+    <div class="card__content text-small">
+      <span class="muted"><%= searchable_resource_human_name(model.participatory_space.class) %>:</span>&nbsp;<%= link_to translated_attribute(model.participatory_space.title), Decidim::ResourceLocatorPresenter.new(model.participatory_space).path %>
+    </div>
+  <% end %>
+</div>

data/app/cells/decidim/card_m_cell.rb

@@ -10,6 +10,7 @@ module Decidim
     include Decidim::SanitizeHelper
     include Decidim::CardHelper
     include Decidim::LayoutHelper
+    include Decidim::SearchesHelper
 
     def show
       render
@@ -54,24 +55,8 @@ module Decidim
       decidim_sanitize(html_truncate(text, length: 100))
     end
 
-    def decidim
-      Decidim::Core::Engine.routes.url_helpers
-    end
-
-    def has_author?
-      model.is_a?(Decidim::Authorable)
-    end
-
-    def author
-      present(model).author
-    end
-
     def has_authors?
-      model.is_a?(Decidim::Coauthorable)
-    end
-
-    def hidden_elements_count_i18n_key
-      "decidim.proposals.#{model.class.name.demodulize}.show.hidden_authors_count"
+      model.is_a?(Decidim::Authorable) || model.is_a?(Decidim::Coauthorable)
     end
 
     def has_actions?
@@ -140,5 +125,17 @@ module Decidim
         render :comments_counter
       end
     end
+
+    def render_authorship
+      cell("decidim/coauthorships", model, extra_small: true, has_actions: has_actions?)
+    end
+
+    def render_space?
+      context[:show_space].presence && model.respond_to?(:participatory_space)
+    end
+
+    def render_top?
+      render_space?
+    end
   end
 end

data/app/cells/decidim/coauthorships_cell.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a collapsible list of a model's coauthors.
+  #
+  # Available sizes:
+  #  - any number from 1 to 12
+  #  - default value is 1
+  #  - it is delegated to the `decidim/collapsible_list` cell
+  #
+  # Extra params:
+  # - `extra_small` => boolean: when this cell is included in small places this
+  #     option adds extra css ("author-data--small") to make the box smaller.
+  #
+  # Example:
+  #
+  #    cell("decidim/coauthorships", @proposal)
+  class CoauthorshipsCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+
+    def show
+      if authorable? || official?
+        cell "decidim/author", presenter_for_author(model), extra_classes.merge(has_actions: has_actions?, from: model)
+      else
+        cell(
+          "decidim/collapsible_authors",
+          presenters_for_identities(model),
+          cell_name: "decidim/author",
+          cell_options: extra_classes,
+          size: size,
+          from: model,
+          has_actions: has_actions?
+        )
+      end
+    end
+
+    private
+
+    def official?
+      model.respond_to?(:official?) && model.official?
+    end
+
+    def presenters_for_identities(coauthorable)
+      coauthorable.identities.map { |identity| present(identity) }
+    end
+
+    def presenter_for_author(authorable)
+      if official?
+        "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
+      elsif authorable.user_group
+        Decidim::UserGroupPresenter.new(authorable.user_group)
+      else
+        Decidim::UserPresenter.new(authorable.author)
+      end
+    end
+
+    def authorable?
+      model.is_a?(Decidim::Authorable)
+    end
+
+    def has_actions?
+      options[:has_actions] == true
+    end
+
+    def extra_classes
+      if options[:extra_small]
+        { extra_classes: ["author-data--small"] }
+      else
+        {}
+      end
+    end
+
+    def size
+      options[:size] || 1
+    end
+  end
+end