decidim-core 0.23.6 → 0.24.0.rc1

data/app/assets/javascripts/decidim/map/controller/markers.js.es6

@@ -26,6 +26,11 @@
         $(`#${this.config.popupTemplateId}`).html()
       );
 
+      const updateCoordinates = (data) => {
+        $('input[data-type="latitude"]').val(data.lat);
+        $('input[data-type="longitude"]').val(data.lng);
+      };
+
       const bounds = new L.LatLngBounds(
         markersData.map(
           (markerData) => [markerData.latitude, markerData.longitude]
@@ -36,17 +41,30 @@
         let marker = L.marker([markerData.latitude, markerData.longitude], {
           icon: this.createIcon(),
           keyboard: true,
-          title: markerData.title
+          title: markerData.title,
+          draggable: markerData.draggable
         });
-        let node = document.createElement("div");
 
-        $.tmpl(this.config.popupTemplateId, markerData).appendTo(node);
-        marker.bindPopup(node, {
-          maxwidth: 640,
-          minWidth: 500,
-          keepInView: true,
-          className: "map-info"
-        }).openPopup();
+        if (markerData.draggable) {
+          updateCoordinates({
+            lat: markerData.latitude,
+            lng: markerData.longitude
+          });
+          marker.on("drag", (ev) => {
+            updateCoordinates(ev.target.getLatLng());
+          });
+        } else {
+          let node = document.createElement("div");
+
+          $.tmpl(this.config.popupTemplateId, markerData).appendTo(node);
+
+          marker.bindPopup(node, {
+            maxwidth: 640,
+            minWidth: 500,
+            keepInView: true,
+            className: "map-info"
+          }).openPopup();
+        }
 
         this.markerClusters.addLayer(marker);
       });

data/app/assets/javascripts/decidim/session_timeouter.js.es6

@@ -0,0 +1,78 @@
+((exports) => {
+  exports.$(() => {
+    const Foundation = exports.Foundation;
+    const $timeoutModal = $("#timeoutModal");
+    const timeoutInSeconds = parseInt($timeoutModal.data("session-timeout"), 10);
+    const secondsUntilTimeoutPath = $timeoutModal.data("seconds-until-timeout-path");
+    const interval = $timeoutModal.data("session-timeouter-interval");
+    let endsAt = exports.moment().add(timeoutInSeconds, "seconds");
+    const popup = new Foundation.Reveal($timeoutModal);
+    const $continueSessionButton = $("#continueSession");
+
+    // Ajax request is made at timeout_modal.html.erb
+    $continueSessionButton.on("click", () => {
+      $("#timeoutModal").foundation("close")
+      // In admin panel we have to hide all overlays
+      $(".reveal-overlay").css("display", "none");
+    })
+
+    if (!timeoutInSeconds) {
+      return;
+    }
+
+    const setTimer = (secondsUntilExpiration) => {
+      if (!secondsUntilExpiration) {
+        return;
+      }
+      endsAt = exports.moment().add(secondsUntilExpiration, "seconds")
+    }
+
+    const sessionTimeLeft = () => {
+      return $.ajax({
+        method: "GET",
+        url: secondsUntilTimeoutPath,
+        contentType: "application/json",
+        headers: {
+          "X-CSRF-Token": $("meta[name=csrf-token]").attr("content")
+        }
+      })
+    }
+
+    const exitInterval = setInterval(() => {
+      const diff = endsAt - exports.moment();
+      const diffInSeconds = Math.round(diff / 1000);
+      if (diffInSeconds > 150) {
+        return;
+      }
+
+      sessionTimeLeft().then((result) => {
+        const secondsUntilSessionExpires = result.seconds_remaining;
+        setTimer(secondsUntilSessionExpires)
+
+        if (secondsUntilSessionExpires <= 90) {
+          $timeoutModal.find("#reveal-hidden-sign-out")[0].click();
+        } else if (secondsUntilSessionExpires <= 150) {
+          popup.open();
+        }
+      });
+    }, interval);
+
+    // Devise restarts its own timer on ajax requests,
+    // so here we restart our.
+    $(document).on("ajax:complete", () => {
+      setTimer(timeoutInSeconds);
+    });
+
+    $(document).ajaxComplete((_event, _xhr, settings) => {
+      if (settings && settings.url === secondsUntilTimeoutPath) {
+        return;
+      }
+      setTimer(timeoutInSeconds);
+    });
+
+    window.addEventListener("beforeunload", () => {
+      clearInterval(exitInterval);
+      return;
+    });
+  })
+})(window)

data/app/assets/javascripts/decidim.js.es6

@@ -38,6 +38,7 @@
 // = require decidim/responsive_horizontal_tabs.js
 // = require decidim/geocoding/attach_input
 // = require decidim/security/selfxss_warning
+// = require decidim/session_timeouter
 
 // = require_self
 // = require decidim/configuration

data/app/assets/stylesheets/decidim/_variables.scss

@@ -1,3 +1,12 @@
+// Foundation Variables
+$primary-color: null;
+$secondary-color: null;
+$success-color: null;
+$warning-color: null;
+$alert-color: null;
+$-zf-size: null;
+$-zf-bp-value: null;
+
 // Variables
 
 $primary: #cb3c29 !default;

data/app/assets/stylesheets/decidim/email.scss

@@ -1091,7 +1091,7 @@ a{
 }
 
 a:hover{
-  color: #147dc2;
+  color: var(--secondary);
 }
 
 a:active{
@@ -1246,7 +1246,13 @@ table.button.large table a{
 
 table.button.expand,
 table.button.expanded{
-  width: 100% !important;
+  width: 100%;
+}
+
+// Fix for Outlook to center the button
+table.button.expand > tr > td,
+table.button.expanded > tr > td{
+  text-align: center;
 }
 
 table.button.expand table,
@@ -1255,6 +1261,12 @@ table.button.expanded table{
   margin: auto;
 }
 
+// Fix for Outlook to center the button link text
+table.button.expand table > tr > td,
+table.button.expanded table > tr > td{
+  text-align: center;
+}
+
 table.button.expand table a,
 table.button.expanded table a{
   text-align: center;

data/app/assets/stylesheets/decidim/extras/_external-links.scss

@@ -1,6 +1,5 @@
 .external-link-container{
   position: relative;
-  display: inline-block;
 }
 
 .external-link-indicator{

data/app/assets/stylesheets/decidim/extras/_process_stats.scss

@@ -28,7 +28,7 @@
     .icon{
       width: 1.5em;
       height: 1.5em;
-      color: #599aa6;
+      color: var(--secondary);
       vertical-align: middle;
       margin-right: .5rem;
     }

data/app/assets/stylesheets/decidim/extras/_results-per-page.scss

@@ -9,6 +9,7 @@ $order-border: $border;
   flex-wrap: wrap;
 
   a:hover{
+    color: var(--secondary);
     text-decoration: underline;
   }
 

data/app/assets/stylesheets/decidim/modules/_author-avatar.scss

@@ -11,13 +11,13 @@ $author-data-color: $muted;
   @include flex;
   @include flex-align($x: left, $y: middle);
 
-  color: $author-data-color;
+  color: var(--secondary);
   font-size: .9rem;
   padding-left: 30px;
   position: relative;
 
   .author__name{
-    color: $anchor-color;
+    color: var(--secondary);
     margin-bottom: 0;
   }
 

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

@@ -339,7 +339,7 @@
   background-color: $muted;
 
   &:hover{
-    background-color: var(--secondary);
+    background-color: var(--primary);
   }
 
   &.hollow{
@@ -371,7 +371,7 @@
 
 .link{
   cursor: pointer;
-  color: $anchor-color;
+  color: var(--secondary);
   font-weight: 600;
 
   &:hover{

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

@@ -89,6 +89,10 @@ a .card__title{
 .card__header{
   margin-bottom: $card-padding / 2;
 
+  .card__title{
+    margin-bottom: .5rem;
+  }
+
   &.collapse{
     margin-bottom: 0;
   }
@@ -957,6 +961,7 @@ a .card__title{
       font-size: $global-font-size;
       text-transform: none;
       justify-content: left;
+      flex-direction: row;
 
       strong{
         text-transform: uppercase;
@@ -1090,12 +1095,24 @@ a .card__title{
   @include flex;
   @include flex-align($x: left, $y: null);
 
+  flex-direction: column;
+
+  @include breakpoint(medium){
+    flex-direction: row;
+  }
+
   > *{
     padding: $global-margin;
     flex: 0 0 25%;
 
     &:not(:nth-child(4n)){
-      border-right: $card-border;
+      border-right: 0;
+      border-bottom: $card-border;
+
+      @include breakpoint(medium){
+        border-bottom: 0;
+        border-right: $card-border;
+      }
     }
   }
 }

data/app/assets/stylesheets/decidim/modules/_collapsible-list.scss

@@ -36,7 +36,7 @@
 
   .collapsible-list__see-more{
     display: none;
-    color: #599aa6;
+    color: $secondary;
   }
 
   .collapsible-list__see-more:hover{

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

@@ -113,6 +113,10 @@ $comment-form-bg: $light-gray;
     color: $white;
     outline: none;
   }
+
+  form.button_to{
+    display: inline-block;
+  }
 }
 
 .comment__votes--up{
@@ -207,7 +211,7 @@ $comment-form-bg: $light-gray;
   }
 
   a:focus{
-    background-color: $secondary;
+    background-color: var(--secondary);
     color: $white;
     outline: none;
   }

data/app/assets/stylesheets/decidim/modules/_conference-speaker.scss

@@ -78,9 +78,10 @@
   @include breakpoint(medium){
     position: relative;
 
-    &:nth-of-type(4n + 3) .speaker-bio,
-    &:nth-of-type(4n + 4) .speaker-bio{
-      transform: translateY(-10%) translateX(-50%);
+    &:nth-of-type(4) .speaker-bio,
+    &:nth-of-type(4n + 5) .speaker-bio,
+    &:nth-of-type(5n) .speaker-bio,{
+      transform: translateY(-10%) translateX(-60%);
     }
   }
 }

data/app/assets/stylesheets/decidim/modules/_data-picker.scss

@@ -78,6 +78,13 @@
       }
     }
   }
+
+  .picker-values{
+    .label.primary{
+      background: #eee;
+      color: #202734;
+    }
+  }
 }
 
 #data_picker-modal{

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

@@ -30,6 +30,10 @@
   line-height: 1;
 }
 
+.extra__date-container{
+  margin-bottom: 1rem;
+}
+
 .extra__month{
   display: block;
   font-size: 1rem;

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

@@ -46,6 +46,10 @@ label,
   margin-top: $form-spacing * -1;
 }
 
+#registration_user_nickname_characters{
+  margin-top: 1rem;
+}
+
 .form-input-extra-before{
   margin-bottom: $form-spacing / 2;
 }

data/app/assets/stylesheets/decidim/modules/_loading-spinner.scss

@@ -10,3 +10,37 @@
     vertical-align: middle;
   }
 }
+
+.spinner-container{
+  position: relative;
+  cursor: wait;
+
+  &::before{
+    content: " ";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba($white, .8);
+    z-index: 1;
+  }
+
+  &::after{
+    -webkit-animation: animation-spin 800ms infinite linear;
+    animation: animation-spin 800ms infinite linear;
+    width: 25px;
+    height: 25px;
+    box-sizing: border-box;
+    border-radius: 50%;
+    border: 3px solid #e8e8e8;
+    border-right-color: var(--primary);
+    display: inline-block;
+    position: absolute;
+    content: "";
+    vertical-align: middle;
+    z-index: 1;
+    top: 47%;
+    left: 47%;
+  }
+}

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

@@ -52,6 +52,7 @@
 @import "decidim/modules/versions";
 @import "decidim/modules/sticky";
 @import "decidim/modules/notification";
+@import "decidim/modules/space-stats";
 
 //Process elements
 @import "decidim/modules/process-header";
@@ -64,7 +65,6 @@
 @import "decidim/modules/inline-filters";
 @import "decidim/modules/reference";
 @import "decidim/modules/status-labels";
-@import "decidim/modules/process-stats";
 
 //Conference elements
 @import "decidim/modules/conference-nav";

data/app/assets/stylesheets/decidim/modules/_opinion-toggle.scss

@@ -50,6 +50,6 @@
   &:hover,
   &:focus,
   &.is-active{
-    background-color: $secondary;
+    background-color: var(--secondary);
   }
 }

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

@@ -73,3 +73,9 @@
 .reveal__trigger{
   cursor: pointer;
 }
+
+.reveal__buttons{
+  display: flex;
+  justify-content: space-between;
+  padding: 0 1rem;
+}

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

@@ -66,6 +66,7 @@
       // this is the prefix div
       @extend .input-group-label;
 
+      padding: 0;
       border-#{$global-right}: 0;
       width: 8%;
       height: 3rem;

data/app/assets/stylesheets/decidim/modules/{_process-stats.scss → _space-stats.scss}

@@ -1,4 +1,4 @@
-.process-stats{
+.space-stats{
   overflow: hidden;
   margin: 2rem 0;
   display: flex;

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

@@ -1,4 +1,4 @@
-<div class="card card--activity" id="<%= element_id %>">
+<div class="card card--activity">
   <div class="card__content">
     <div class="card__text">
       <div class="text-medium">

data/app/cells/decidim/activity_cell.rb

@@ -36,9 +36,10 @@ module Decidim
       resource_title = resource.try(:resource_title) || resource.try(:title)
       return if resource_title.blank?
 
-      if resource_title.is_a?(String)
+      case resource_title
+      when String
         resource_title
-      elsif resource_title.is_a?(Hash)
+      when Hash
         translated_attribute(resource_title)
       end
     end
@@ -50,9 +51,10 @@ module Decidim
       resource_description = resource.try(:resource_description) || resource.try(:description)
       return if resource_description.blank?
 
-      resource_description = if resource_description.is_a?(String)
+      resource_description = case resource_description
+                             when String
                                resource_description
-                             elsif resource_description.is_a?(Hash)
+                             when Hash
                                translated_attribute(resource_description)
                              end
 
@@ -66,7 +68,7 @@ module Decidim
 
     # The text to show as the link to the resource.
     def resource_link_text
-      translated_attribute(resource.title)
+      decidim_html_escape(translated_attribute(resource.title))
     end
 
     def created_at
@@ -82,12 +84,6 @@ module Decidim
       model.user_lazy if resource.respond_to?(:user)
     end
 
-    delegate :action, to: :model
-
-    def element_id
-      "action-#{model.id}"
-    end
-
     private
 
     def published?
@@ -107,9 +103,10 @@ module Decidim
     def author
       return unless show_author? && user.is_a?(UserBaseEntity)
 
-      presenter = if user.is_a?(Decidim::User)
+      presenter = case user
+                  when Decidim::User
                     UserPresenter.new(user)
-                  elsif user.is_a?(Decidim::UserGroup)
+                  when Decidim::UserGroup
                     UserGroupPresenter.new(user)
                   end
 
@@ -126,7 +123,7 @@ module Decidim
 
     def participatory_space_link
       link_to(
-        translated_attribute(participatory_space.title),
+        decidim_html_escape(translated_attribute(participatory_space.title)),
         resource_locator(participatory_space).path
       )
     end

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

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

data/app/cells/decidim/address_cell.rb

@@ -5,32 +5,11 @@ module Decidim
   class AddressCell < Decidim::ViewModel
     include Cell::ViewModel::Partial
     include LayoutHelper
-    include Decidim::SanitizeHelper
 
     def details
       render
     end
 
-    def has_location?
-      model.respond_to?(:location)
-    end
-
-    def has_location_hints?
-      model.respond_to?(:location_hints)
-    end
-
-    def location_hints
-      decidim_sanitize(translated_attribute(model.location_hints))
-    end
-
-    def location
-      decidim_sanitize(translated_attribute(model.location))
-    end
-
-    def address
-      decidim_sanitize(translated_attribute(model.address))
-    end
-
     private
 
     def resource_icon

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

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

data/app/cells/decidim/announcement_cell.rb

@@ -22,12 +22,32 @@ module Decidim
 
     private
 
+    def has_title?
+      announcement.is_a?(Hash) && announcement.has_key?(:title)
+    end
+
     def callout_class
-      model[:callout_class] ||= "secondary"
+      options[:callout_class] ||= "secondary"
     end
 
     def announcement
-      model[:announcement]
+      model
+    end
+
+    def clean_title
+      clean(announcement[:title])
+    end
+
+    def clean_body
+      Array(announcement[:body]).map { |paragraph| tag.p(clean(paragraph)) }.join("")
+    end
+
+    def clean_announcement
+      clean(announcement)
+    end
+
+    def clean(value)
+      decidim_sanitize(translated_attribute(value))
     end
   end
 end

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

@@ -0,0 +1,10 @@
+<% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
+  <button type="button" class="link-alt" data-open="<%= current_user.present? ? "flagUserModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.proposals.proposals.show") %>" aria-controls="<%= current_user.present? ? "flagUserModal" : "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>
+
+  <%= cell("decidim/flag_modal", model).flag_user %>
+<% end %>

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

@@ -4,7 +4,7 @@
       <%= cell("decidim/user_profile", raw_model).user_data %>
     </div>
     <div class="card__text card--picture-offset">
-      <%= link_to t("decidim.profiles.show.view_full_profile"), profile_path %>
+      <%= text_link_to_current_or_new_conversation_with(model) %>
     </div>
   </div>
   <div class="ml-s">