decidim-core 0.20.1 → 0.21.0

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

@@ -61,6 +61,7 @@
 @import "inline-filters";
 @import "reference";
 @import "status-labels";
+@import "process-stats";
 
 //Conference elements
 @import "conference-nav";

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

@@ -348,12 +348,18 @@ $navbar-active-shadow-medium: inset 0 4px 0 0 var(--primary);
   }
 }
 
-.topbar__edit__link a{
-  color: $medium-gray;
+.topbar__admin__link{
+  a{
+    color: $medium-gray;
 
-  &:hover{
-    background: $navbar-bg-hover;
-    color: $navbar-color-hover;
+    &:hover{
+      background: $navbar-bg-hover;
+      color: $navbar-color-hover;
+    }
+  }
+
+  ~ .topbar__admin__link{
+    margin-left: 1rem;
   }
 }
 

data/app/assets/stylesheets/decidim/modules/_process-stats.scss

@@ -0,0 +1,53 @@
+.process-stats{
+  overflow: hidden;
+  margin: 2rem 0;
+  display: flex;
+  flex-wrap: wrap;
+
+  &__title{
+    color: $muted;
+    text-transform: uppercase;
+    font-size: .9rem;
+    letter-spacing: .01em;
+    font-weight: 600;
+    margin-bottom: 0;
+  }
+
+  &__data{
+    text-align: center;
+    padding: 1rem .25rem;
+    width: calc(50% - 1rem);
+    margin: .5rem;
+    position: relative;
+
+    &::after{
+      content: "";
+      display: inline-block;
+      border-left: 2px solid $primary;
+      height: 2rem;
+      position: absolute;
+      left: 0;
+      top: calc(50% - 1rem);
+    }
+
+    @include breakpoint(medium down){
+      &:nth-child(odd)::after{
+        border: none;
+      }
+    }
+
+    @include breakpoint(mediumlarge){
+      width: calc(25% - 1rem);
+
+      &:nth-child(4n+1)::after{
+        border: none;
+      }
+    }
+  }
+
+  &__number{
+    font-weight: 800;
+    font-size: 2rem;
+    line-height: 1;
+  }
+}

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

@@ -25,3 +25,8 @@
 .label.light{
   color: $white;
 }
+
+.label.muted{
+  background: $muted;
+  color: $white;
+}

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

@@ -16,7 +16,7 @@ $tags-border: $border;
   }
 
   a{
-    display: block;
+    display: inline-block;
     border: $tags-border;
     padding: 0 .5rem;
   }
@@ -29,3 +29,9 @@ $tags-border: $border;
 .tags--inline{
   display: inline;
 }
+
+.tags--list{
+  li{
+    display: block;
+  }
+}

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

@@ -8,10 +8,18 @@ input{
 
 @mixin heading($heading){
   line-height: 1.2;
-  font-size: map-get(map-get(map-get($header-styles, small), $heading), 'font-size') / 16 + em;
+  font-size:
+    map-get(
+      map-get(map-get($header-styles, small), $heading),
+      "font-size"
+    ) / 16 + em;
 
   @include breakpoint(medium){
-    font-size: map-get(map-get(map-get($header-styles, medium), $heading), 'font-size') / 16 + em;
+    font-size:
+      map-get(
+        map-get(map-get($header-styles, medium), $heading),
+        "font-size"
+      ) / 16 + em;
   }
 }
 
@@ -116,6 +124,33 @@ hr{
   }
 }
 
+.data-title{
+  &__over{
+    color: $muted;
+    text-transform: uppercase;
+    font-size: .9rem;
+    letter-spacing: .01em;
+    font-weight: 800;
+    margin-bottom: .5rem;
+  }
+
+  &__main{
+    font-size: 2rem;
+    line-height: 1;
+    letter-spacing: .01em;
+    font-weight: 800;
+    margin-bottom: 0;
+  }
+
+  &__sub{
+    color: $muted;
+    text-transform: uppercase;
+    font-size: .9rem;
+    letter-spacing: .01em;
+    line-height: 1;
+  }
+}
+
 .page-title{
   margin-bottom: 3rem;
 }
@@ -139,7 +174,12 @@ hr{
 }
 
 // text status-color
-$map: map-merge($foundation-palette, (muted: $muted));
+$map: map-merge(
+  $foundation-palette,
+  (
+    muted: $muted,
+  )
+);
 
 @each $key, $value in $map{
   .text-#{$key}{
@@ -218,5 +258,10 @@ textarea,
 time,
 tt,
 var{
-  @include modifiers(color, (muted: $muted));
+  @include modifiers(
+    color,
+    (
+      muted: $muted,
+    )
+  );
 }

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

@@ -27,3 +27,13 @@
     font-url('decidim/Source_Sans_Pro_900.woff') format('woff'),
     font-url('decidim/Source_Sans_Pro_900.ttf') format('truetype');
 }
+
+@font-face{
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  src:
+    asset-data-url('decidim/Roboto-Regular.woff2') format('woff2'),
+    font-url('decidim/Roboto-Regular.woff') format('woff'),
+    font-url('decidim/Roboto-Regular.ttf') format('truetype');
+}

data/app/assets/stylesheets/decidim/utils/_toggle-expand.scss

@@ -7,3 +7,17 @@
     display: block;
   }
 }
+
+.expanded-text{
+  .text-toggle__short{
+    display: none;
+  }
+
+  .text-toggle__long{
+    display: block;
+  }
+}
+
+.text-toggle__long{
+  display: none;
+}

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

@@ -14,7 +14,7 @@
         <% end %>
         <%= link_to resource_link_path, class: "card__link" do %>
           <h5 class="card__title mb-none">
-            <%= html_truncate resource_link_text, length: 100 %>
+            <%= html_truncate resource_link_text, length: 80 %>
           </h5>
         <% end %>
         <%= description %>

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,7 +17,7 @@
     data-keep-on-hover="true"
     data-allow-html="true"
     data-template-classes="light expanded"
-    tabindex="1"
+    tabindex="0"
     data-tip-text='<%= h render(:profile_minicard) %>'>
     <%= model.name %>
   </span>

data/app/cells/decidim/diff/attribute.erb

@@ -5,13 +5,23 @@
     </h3>
   </div>
 
-  <div class="row" id="diff_unified">
-    <%= diff_unified(data) %>
+  <div class="row" id="diff_view_unified_escaped">
+    <%= diff_unified(data, :html) %>
   </div>
 
-  <div class="row hide" id="diff_split">
-    <%= diff_split(data, "left") %>
+  <div class="row hide" id="diff_view_unified_unescaped">
+    <%= diff_unified(data, :unescaped_html) %>
+  </div>
+
+  <div class="row hide" id="diff_view_split_escaped">
+    <%= diff_split(data, "left", :html) %>
+
+    <%= diff_split(data, "right", :html) %>
+  </div>
+
+  <div class="row hide" id="diff_view_split_unescaped">
+    <%= diff_split(data, "left", :unescaped_html) %>
 
-    <%= diff_split(data, "right") %>
+    <%= diff_split(data, "right", :unescaped_html) %>
   </div>
 </div>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -0,0 +1,31 @@
+<% if show_html_view_dropdown? %>
+  <div class="diff-view-by diff-view-html" style="margin-left: 0;">
+    <div class="diff-view-by__dropdown">
+      <span class="diff-view-by__text">
+        <%= t("versions.dropdown.choose_diff_view_html") %>
+      </span>
+
+      <ul class="dropdown menu" data-dropdown-menu>
+        <li class="is-dropdown-submenu-parent">
+          <a id="diff-view-selected">
+            <%= t("versions.dropdown.option_escaped") %>
+          </a>
+
+          <ul class="menu">
+            <li>
+              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+                <%= t("versions.dropdown.option_escaped") %>
+              <% end %>
+            </li>
+
+            <li>
+              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+                <%= t("versions.dropdown.option_unescaped") %>
+              <% end %>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+  </div>
+<% end %>

data/app/cells/decidim/diff/diff_split.erb

@@ -5,7 +5,7 @@
 
   <div class="card">
     <div class="diff-data">
-      <%= output_split_diff(data, direction) %>
+      <%= output_split_diff(data, direction, format) %>
     </div>
   </div>
 </div>

data/app/cells/decidim/diff/diff_unified.erb

@@ -1,7 +1,7 @@
 <div class="mediumlarge-12 columns">
   <div class="card">
     <div class="diff-data">
-      <%= output_unified_diff(data) %>
+      <%= output_unified_diff(data, format) %>
     </div>
   </div>
 </div>

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

@@ -1,4 +1,5 @@
 <%= render :diff_mode_dropdown %>
+<%= render :diff_mode_html %>
 
 <% diff_data.each do |data| %>
   <%= attribute(data) %>

data/app/cells/decidim/diff_cell.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/diffy_extension"
+
 module Decidim
   # This cell renders the diff between `:old_data` and `:new_data`.
   class DiffCell < Decidim::ViewModel
@@ -10,12 +12,12 @@ module Decidim
       render locals: { data: data }
     end
 
-    def diff_unified(data)
-      render locals: { data: data }
+    def diff_unified(data, format)
+      render locals: { data: data, format: format }
     end
 
-    def diff_split(data, direction)
-      render locals: { data: data, direction: direction }
+    def diff_split(data, direction, format)
+      render locals: { data: data, direction: direction, format: format }
     end
 
     private
@@ -25,6 +27,11 @@ module Decidim
       model
     end
 
+    # The item associated with the current_version.
+    def item
+      current_version.item
+    end
+
     # DiffRenderer class for the current_version's item; falls back to `BaseDiffRenderer`.
     def diff_renderer_class
       "#{current_version.item_type.deconstantize}::DiffRenderer".constantize
@@ -50,13 +57,13 @@ module Decidim
     # changes between lines.
     #
     # Returns an HTML-safe string.
-    def output_unified_diff(data)
+    def output_unified_diff(data, format)
       Diffy::Diff.new(
         data[:old_value].to_s,
         data[:new_value].to_s,
         allow_empty_diff: false,
         include_plus_and_minus_in_html: true
-      ).to_s(:html).html_safe
+      ).to_s(format)
     end
 
     # Outputs the diff as HTML with side-by-side changes between lines.
@@ -64,14 +71,20 @@ module Decidim
     # The left side represents deletions while the right side represents insertions.
     #
     # Returns an HTML-safe string.
-    def output_split_diff(data, direction)
+    def output_split_diff(data, direction, format)
       Diffy::SplitDiff.new(
         data[:old_value].to_s,
         data[:new_value].to_s,
         allow_empty_diff: false,
-        format: :html,
+        format: format,
         include_plus_and_minus_in_html: true
       ).send(direction)
     end
+
+    # Gives the option to view HTML unescaped for better user experience.
+    # Official means created from admin (where rich text editor is enabled).
+    def show_html_view_dropdown?
+      item.try(:official?) || current_organization.rich_text_editor_in_public_views?
+    end
   end
 end

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

@@ -2,16 +2,26 @@
   <% if current_user %>
     <% if current_user.follows?(model) %>
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, method: :delete, remote: true do %>
-        <%= icon "bell", icon_options %>
-        <span>
+        <span class="icon-wrap">
+          <%= icon "bell", icon_options %>
+          <%= model.followers.count %>
+        </span>
+        <span class="text-wrap">
           <%= t("follows.destroy.button", scope: "decidim") %>
         </span>
       <% end %>
     <% else %>
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, remote: true do %>
-        <%= icon "bell", icon_options %>
-        <span>
-          <%= t("follows.create.button", scope: "decidim") %>
+        <span class="icon-wrap">
+          <%= icon "bell", icon_options %>
+          <%= model.followers.count %>
+        </span>
+        <span class="text-wrap">
+          <% if current_user.follows?(model.try(:participatory_space)) %>
+            <%= t("follows.create.participatory_space", scope: "decidim") %>
+          <% else %>
+            <%= t("follows.create.button", scope: "decidim") %>
+          <% end %>
         </span>
       <% end %>
     <% end %>
@@ -24,8 +34,11 @@
       :'aria-haspopup' => true,
       title: t("decidim.shared.follow_button.sign_in_before_follow"),
       remote: true) do %>
-      <%= icon "bell", icon_options %>
-      <span>
+      <span class="icon-wrap">
+        <%= icon "bell", icon_options %>
+        <%= model.followers.count %>
+      </span>
+      <span class="text-wrap">
         <%= t("follows.create.button", scope: "decidim") %>
       </span>
     <% end %>