decidim-core 0.22.0 → 0.23.3

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

@@ -0,0 +1,51 @@
+// = require decidim/map/controller
+// = require decidim/map/controller/markers
+// = require decidim/map/controller/static
+// = require_self
+
+((exports) => {
+  exports.Decidim = exports.Decidim || {};
+
+  const { MapMarkersController, MapStaticController } = exports.Decidim;
+
+  /**
+   * A factory method that creates a new map controller instance. This method
+   * can be overridden in order to return different types of maps for
+   * differently configured map elements.
+   *
+   * For instance, one map could pass an extra `type` configuration with the
+   * value "custom" for the map element, this factory method would identify
+   * it and then return a different controller for that map than the default.
+   * This would allow this types of maps to function differently.
+   *
+   * An example how to use in the ERB view:
+   *   <%= dynamic_map_for type: "custom" do %>
+   *     <%= javascript_include_tag "map_customization" %>
+   *   <% end %>
+   *
+   * And then the actual customization at `map_customization.js.es6`:
+   *   var originalCreateMapController = window.Decidim.createMapController;
+   *   window.Decidim.createMapController = (mapId, config) => {
+   *     if (config.type === "custom") {
+   *       // Obviously you need to implement CustomMapController for this to
+   *       // work.
+   *       return new window.Decidim.CustomMapController(mapId, config);
+   *     }
+   *
+   *     return originalCreateMapController(mapId, config);
+   *   }
+   *
+   * @param {string} mapId The ID of the map element.
+   * @param {Object} config The map configuration object.
+   * @returns {MapController} The controller for the map.
+   */
+  const createMapController = (mapId, config) => {
+    if (config.type === "static") {
+      return new MapStaticController(mapId, config);
+    }
+
+    return new MapMarkersController(mapId, config);
+  }
+
+  exports.Decidim.createMapController = createMapController;
+})(window);

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

@@ -0,0 +1,31 @@
+((exports) => {
+  const L = exports.L; // eslint-disable-line
+
+  L.DivIcon.SVGIcon.DecidimIcon = L.DivIcon.SVGIcon.extend({
+    options: {
+      fillColor: "#ef604d",
+      opacity: 0
+    },
+    _createPathDescription: function() {
+      return "M14 1.17a11.685 11.685 0 0 0-11.685 11.685c0 11.25 10.23 20.61 10.665 21a1.5 1.5 0 0 0 2.025 0c0.435-.435 10.665-9.81 10.665-21A11.685 11.685 0 0 0 14 1.17Zm0 17.415A5.085 5.085 0 1 1 19.085 13.5 5.085 5.085 0 0 1 14 18.585Z";
+    },
+    _createCircle: function() {
+      return ""
+    },
+    // Improved version of the _createSVG, essentially the same as in later
+    // versions of Leaflet. It adds the `px` values after the width and height
+    // CSS making the focus borders work correctly across all browsers.
+    _createSVG: function() {
+      const path = this._createPath();
+      const circle = this._createCircle();
+      const text = this._createText();
+      const className = `${this.options.className}-svg`;
+
+      const style = `width:${this.options.iconSize.x}px; height:${this.options.iconSize.y}px;`;
+
+      const svg = `<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="${className}" style="${style}">${path}${circle}${text}</svg>`;
+
+      return svg;
+    }
+  });
+})(window);

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

@@ -0,0 +1,87 @@
+// = require leaflet
+// = require leaflet-tilelayer-here
+// = require leaflet-svg-icon
+// = require leaflet.markercluster
+// = require decidim/map/factory
+// = require_self
+
+/**
+ * @deprecated
+ *
+ * This adds support for the legacy style of map configuration and the methods
+ * available globally. This is not really needed unless someone is still relying
+ * on these methods or the have customizations that are hard to update.
+ */
+((exports) => {
+  exports.Decidim = exports.Decidim || {};
+
+  const legacyMapSupport = ($map) => {
+    const hereAppId = $map.data("here-app-id");
+    const hereAppCode = $map.data("here-app-code");
+    const hereApiKey = $map.data("here-api-key");
+
+    let mapApiConfig = null;
+    if (hereApiKey) {
+      mapApiConfig = { apiKey: hereApiKey };
+    } else if (hereAppId && hereAppCode) {
+      mapApiConfig = {
+        appId: hereAppId,
+        appCode: hereAppCode
+      };
+    } else {
+      throw new Error("Legacy map support: Please provide the HERE API configuration");
+    }
+
+    const markersData = $map.data("markers-data");
+
+    let markerColor = getComputedStyle(document.documentElement).getPropertyValue("--primary");
+    if (!markerColor || markerColor.length < 1) {
+      markerColor = "#ef604d";
+    }
+
+    // Configure the map element with the new style
+    const mapConfig = {
+      markerColor,
+      popupTemplateId: "marker-popup",
+      markers: markersData,
+      tileLayer: mapApiConfig
+    }
+
+    $map.data("decidim-map", mapConfig);
+
+    exports.Decidim.mapConfiguration = $.extend({
+      markerColor: markerColor
+    }, mapApiConfig);
+  };
+
+  const loadMap = (mapId, markersData) => {
+    // Allow the configured map service to configure the map, e.g. attaching the
+    // tile layer to the map.
+    const $map = $(`#${mapId}`);
+    $map.data("markers-data", markersData);
+    legacyMapSupport($map);
+
+    const mapData = $map.data("decidim-map");
+    const ctrl = exports.Decidim.createMapController(mapId, mapData);
+    const map = ctrl.load();
+
+    L.tileLayer.here(mapData.tileLayer).addTo(map);
+
+    ctrl.start();
+
+    exports.Decidim.currentMap = map;
+
+    return map;
+  };
+
+  $(() => {
+    const $map = $("#map");
+    if ($map.length > 0) {
+      loadMap($map.attr("id"), $map.data("markers-data"));
+    }
+  });
+
+  exports.Decidim.loadMap = loadMap;
+  exports.Decidim.currentMap = null;
+  exports.Decidim.mapConfiguration = {};
+})(window);

data/app/assets/javascripts/decidim/map/provider/default.js.es6

@@ -0,0 +1,22 @@
+// = require leaflet
+// = require leaflet-svg-icon
+// = require leaflet.markercluster
+// = require_self
+// = require decidim/map
+
+/**
+ * NOTE:
+ * This has to load before decidim/map in order for it to apply correctly when
+ * the map is initialized. The document.ready handler set by this script has to
+ * be registered before decidim/map registers its own.
+ */
+((exports) => {
+  const $ = exports.$; // eslint-disable-line
+
+  $(() => {
+    $("[data-decidim-map]").on("configure.decidim", (_ev, map, mapConfig) => {
+      const tilesConfig = mapConfig.tileLayer;
+      L.tileLayer(tilesConfig.url, tilesConfig.options).addTo(map);
+    });
+  });
+})(window);

data/app/assets/javascripts/decidim/map/provider/here.js.es6

@@ -0,0 +1,22 @@
+// = require leaflet
+// = require leaflet-tilelayer-here
+// = require leaflet-svg-icon
+// = require leaflet.markercluster
+// = require_self
+// = require decidim/map
+
+/**
+ * NOTE:
+ * This has to load before decidim/map in order for it to apply correctly when
+ * the map is initialized. The document.ready handler set by this script has to
+ * be registered before decidim/map registers its own.
+ */
+((exports) => {
+  const $ = exports.$; // eslint-disable-line
+
+  $(() => {
+    $("[data-decidim-map]").on("configure.decidim", (_ev, map, mapConfig) => {
+      L.tileLayer.here(mapConfig.tileLayer).addTo(map);
+    });
+  });
+})(window);

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

@@ -0,0 +1,19 @@
+((exports) => {
+  const console = exports.console;
+
+  if (!console) {
+    return;
+  }
+
+  $(() => {
+    const config = exports.Decidim.config;
+    const allMessages = config.get("messages");
+    if (!allMessages) {
+      return;
+    }
+    const messages = allMessages.selfxssWarning;
+
+    console.log(`%c${messages.title}`, "color:#f00;font-weight:bold;font-size:50px;");
+    console.log(`%c${messages.description}`, "font-size:24px;");
+  });
+})(window)

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

@@ -5,6 +5,8 @@
 @import "decidim/utils/settings";
 
 @include foundation-everything($flex: false);
+@include foundation-prototype-display;
+@include foundation-prototype-spacing;
 
 @import "decidim/utils/fontface";
 @import "decidim/utils/helpers";

data/app/assets/stylesheets/decidim/layouts/_home.scss

@@ -195,6 +195,11 @@
   padding: 4rem 0;
   text-align: center;
 
+  ul,
+  ol{
+    list-style-position: inside;
+  }
+
   .heading3{
     @include breakpoint(medium down){
       font-size: 1.3em;

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

@@ -1084,3 +1084,18 @@ a .card__title{
     }
   }
 }
+
+// card row
+.card__row{
+  @include flex;
+  @include flex-align($x: left, $y: null);
+
+  > *{
+    padding: $global-margin;
+    flex: 0 0 25%;
+
+    &:not(:nth-child(4n)){
+      border-right: $card-border;
+    }
+  }
+}

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

@@ -18,6 +18,20 @@ $help-text-margin-top: ($form-spacing * .5) * -1;
   padding: .5rem 1rem;
 }
 
+label,
+.field{
+  &.has-tribute{
+    position: relative;
+
+    .tribute-container{
+      top: auto;
+      margin-top: -$form-spacing;
+      max-width: none;
+      width: 100%;
+    }
+  }
+}
+
 .help-text{
   display: block;
   line-height: 1.2;

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

@@ -13,15 +13,15 @@
 }
 
 .wrapper-mini{
-  padding: 1.2rem 1rem;
+  padding: 1.2rem 1rem 0;
   position: relative;
 
   @include breakpoint(medium){
-    padding: 2rem 1.5rem;
+    padding: 2rem 1.5rem 0;
   }
 
   @include breakpoint(large){
-    padding: 3rem 4rem;
+    padding: 3rem 4rem 0;
   }
 }
 
@@ -72,3 +72,11 @@ body{
     margin-right: -.5rem;
   }
 }
+
+.translation-bar{
+  a.button{
+    margin-bottom: 0;
+    margin-top: -4px;
+    margin-right: 5px;
+  }
+}

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

@@ -93,3 +93,38 @@
     min-width: 12em;
   }
 }
+
+.static-map{
+  cursor: pointer;
+  height: 120px;
+  width: 120px;
+
+  .leaflet-popup-pane,
+  .leaflet-control{
+    cursor: pointer;
+  }
+
+  &:focus{
+    outline: $anchor-outline-focus;
+    outline-color: var(--highlight);
+    outline-offset: $anchor-outline-offset;
+  }
+
+  &,
+  .leaflet-control-attribution{
+    a{
+      &:hover,
+      &:focus{
+        text-decoration: none;
+        outline: none;
+      }
+    }
+  }
+
+  &,
+  &.leaflet-touch{
+    .leaflet-control-attribution{
+      font-size: .55rem;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/modules/_progress-bar.scss

@@ -66,4 +66,8 @@
       text-transform: uppercase;
     }
   }
+
+  &.progress__bar--horizontal{
+    margin-bottom: .35rem;
+  }
 }

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

@@ -26,6 +26,11 @@
     display: flex;
     justify-content: center;
     padding: 10px 0 50px; // bottom padding is needed to avoid hiding buttons on mobiles because of https://stackoverflow.com/questions/37112218/css3-100vh-not-constant-in-mobile-browser
+
+    @include breakpoint(medium){
+      padding-bottom: 0;
+      margin-bottom: -1rem;
+    }
   }
 }
 

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

@@ -11,7 +11,8 @@
 }
 
 .proposal-status,
-.collaborative-draft-status{
+.collaborative-draft-status,
+.project-status{
   float: left;
   margin-right: .5rem;
 }

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

@@ -1,4 +1,4 @@
-<% if flagable? %>
+<% 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">

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

@@ -18,7 +18,7 @@
     data-allow-html="true"
     data-template-classes="light expanded"
     data-tip-text='<%= h render(:profile_minicard) %>'>
-    <%= model.name %>
+    <%= author_name %>
   </span>
 
   <% if model.badge.present? %>
@@ -28,7 +28,7 @@
   <% end %>
 <% else %>
   <span class="author__name">
-    <%= model.name %>
+    <%= author_name %>
   </span>
 
   <% if model.badge.present? %>

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
@@ -56,7 +60,6 @@ module Decidim
 
     def creation_date?
       return unless from_context
-      return unless proposals_controller? || collaborative_drafts_controller? || posts_controller?
       return unless show_action? && (from_context.respond_to?(:published_at) || from_context.respond_to?(:created_at))
 
       true
@@ -83,7 +86,7 @@ module Decidim
     def actionable?
       return false if options[:has_actions] == false
 
-      (user_author? && posts_controller?) || withdrawable? || flagable?
+      withdrawable? || flaggable?
     end
 
     def user_author?