decidim-decidim_awesome 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9259114807c3c7f0dca652e83f99013ca524a6c68cdb4ece408de7efdaa6f8
-  data.tar.gz: '0937b4bf68c2240a022d99e0b15f2bb05407134d3a71c05ee6d325500af06843'
+  metadata.gz: 3401b18b924106ad65b4545904014b5c853485f897dc194affaa00665b07fe40
+  data.tar.gz: 68f73b33b0b31dc4addbd5f3f6dfa68b90ee5cd5ef56fa6f0ed91ee58c96fb73
 SHA512:
-  metadata.gz: 45c576b8359928d771d58f3b67a64ee4189ce36e7b252a08170abdd2b2eaccaf18754640cf7c9f591b0669b5b7335dc944330778e47c027e70b8d5833bdd21c5
-  data.tar.gz: b993edbf892739c8379baeba8e745117895cb09cf453345976cf9be6909e333a3855af3ff365f0a2677f8012e2944893884996fa8a9dd97bd8709898c5ddbe08
+  metadata.gz: 770a318ee4b9e08018709b7526cad4365ec373b75b2083d92e851a6f2eeb8eeee0e7ef51ed515a44a247b4129a4c929313434f99927f1eaa398cd25350151ca4
+  data.tar.gz: 5d3085dab5205c222eb52c57258b9cbdef9dfea5f1fa8a946700b40da53dea3d8514311672a48976def5a59408d52fd429f8864713361bbd68a97f5146e451db

data/README.md

@@ -121,7 +121,7 @@ Some things in the road-map:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-decidim_awesome", "~> 0.5.1"
+gem "decidim-decidim_awesome", "~> 0.6.0"
 ```
 
 And then execute:
@@ -135,9 +135,9 @@ bundle exec rails db:migrate
 Depending on your Decidim version, choose the corresponding Awesome version to ensure compatibility:
 
 | Awesome version | Compatible Decidim versions |
-|---|---|---|---|---|
+|---|---|
 | 0.5.x | 0.21.x, 0.22.x |
-
+| 0.6.x | 0.22.x, 0.23.x |
 
 ## Configuration
 
@@ -246,7 +246,7 @@ DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rspec
 
 However, this project also make use of the gem [Appraisals](https://github.com/thoughtbot/appraisal) in order to test againts several versions of Decidim. The idea is to suport same supported versions of Decidim.
 
-You can run run all tests againts all Decidim versions by using:
+You can run run all tests against all Decidim versions by using:
 ```bash
 bundle exec appraisal install
 DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake test_app
@@ -282,7 +282,7 @@ Appraisal uses custom gems for testing in the folder `gemfiles`, these gemfiles
 bundle exec appraisal install
 ```
 
-To update the Appraisal definitions maually do the following:
+To update the Appraisal definitions manually do the following:
 
 ```
 cd gemfiles

data/Rakefile

@@ -20,6 +20,11 @@ def copy_themes
   FileUtils.cp_r "lib/decidim/decidim_awesome/test/themes", "spec/decidim_dummy_app/app/assets/themes", verbose: true
 end
 
+def copy_headers
+  FileUtils.mkdir_p "spec/decidim_dummy_app/app/views/v0.11", verbose: true
+  FileUtils.cp_r "lib/decidim/decidim_awesome/test/layouts", "spec/decidim_dummy_app/app/views/v0.11/layouts", verbose: true
+end
+
 desc "copy test theme files"
 task :copy_themes do
   copy_themes
@@ -30,6 +35,7 @@ task test_app: "decidim:generate_external_test_app" do
   ENV["RAILS_ENV"] = "test"
   install_module("spec/decidim_dummy_app")
   copy_themes
+  copy_headers
 end
 
 desc "Generates a development app."

data/app/assets/config/decidim_decidim_awesome_manifest.js

@@ -1,2 +1,3 @@
 // = link decidim/decidim_awesome/application.js
+// = link decidim/decidim_awesome/awesome_map/legacy_map.js
 // = link decidim/decidim_awesome/awesome_map/map.js

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6

@@ -0,0 +1,215 @@
+// = require decidim/map
+// = require leaflet.featuregroup.subgroup
+// = require decidim/decidim_awesome/awesome_map/categories
+// = require decidim/decidim_awesome/awesome_map/proposals
+// = require decidim/decidim_awesome/awesome_map/meetings
+// = require_self
+
+((exports) => {
+  const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
+
+  const collapsedMenu = $("#map").data("collapsed");
+  const components = $("#map").data("components");
+  const popupMeetingTemplateId = "marker-meeting-popup";
+  const popupProposalTemplateId = "marker-proposal-popup";
+
+  const cluster = L.markerClusterGroup();
+  const amendments = [];
+
+  const layers = {};
+
+  const control = L.control.layers(null, null, {
+    position: 'topleft', 
+    sortLayers: false,
+    collapsed: collapsedMenu, 
+    // hideSingleBase: true
+  });
+  const allMarkers = [];
+
+  const drawMarker = (element, marker, component) => {
+    let tmpl = component.type === "proposals" ? popupProposalTemplateId : popupMeetingTemplateId,
+        node = document.createElement("div");
+
+    $.tmpl($(`#${tmpl}`), element).appendTo(node);
+    
+    marker.bindPopup(node, {
+      maxwidth: 640,
+      minWidth: 500,
+      keepInView: true,
+      className: "map-info"
+    }).openPopup();
+    
+    allMarkers.push({
+      marker: marker,
+      component: component,
+      element: element
+    });
+
+    // Check if it has amendments, add it to a list
+    if(element.amendments && element.amendments.length) {
+      element.amendments.forEach((amendment) => {
+        amendments.push(amendment.emendation.id);
+      });
+    }
+    // Add to category layer
+    let cat = getCategory(element.category);
+    if(layers[cat.id]) {
+      marker.addTo(layers[cat.id].group);
+      // show category if hidden
+      const $label = $(`.awesome_map-category_${cat.id}`).closest("label");
+      const $parent = $(`.awesome_map-category_${cat.parent}`).closest("label");
+      $label.show();
+      // update number of items
+      $label.attr("title", parseInt($label.attr("title") || 0) + 1);
+      // show parent if apply
+      $parent.show();
+      $parent.attr("title", parseInt($parent.attr("title") || 0) + 1);
+      // update component stats
+      const $component = $(`#awesome_map-component-${component.id}`);
+      $component.attr("title", parseInt($component.attr("title") || 0) + 1);
+    }
+
+    return marker;
+  };
+
+  const loadElements = (map) => {
+    // legends
+    control.addTo(map);
+    cluster.addTo(map);
+
+    // Load markers
+    components.forEach((component) => {  
+      if(component.type == "proposals") {
+        // add control layer for proposals
+        layers.proposals = {
+          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.proposals}</span>`,
+          group: L.featureGroup.subGroup(cluster)
+        };
+        control.addOverlay(layers.proposals.group, layers.proposals.label);
+        layers.proposals.group.addTo(map);
+
+        // add control layer for amendments if any
+        if(component.amendments) {
+          layers.amendments = {
+            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendments}</span>`,
+            group: L.featureGroup.subGroup(cluster)
+          }
+          control.addOverlay(layers.amendments.group, layers.amendments.label);
+          layers.amendments.group.addTo(map);
+        }
+
+        fetchProposals(component, '', (element, marker) => {
+            drawMarker(element, marker, component).addTo(layers.proposals.group);
+          }, () => {
+            // finall call
+            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
+            allMarkers.forEach((item) => {
+              // add marker to amendments layers if it's an amendment
+              if(amendments.find((a) => a == item.element.id)) {
+                item.marker.removeFrom(layers.proposals.group);
+                item.marker.addTo(layers.amendments.group);
+              }
+            });
+          });
+      }
+      
+      if(component.type == "meetings") {
+        // add control layer for meetings
+        layers.meetings = {
+          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}</span>`,
+          group: L.featureGroup.subGroup(cluster)
+        };
+        control.addOverlay(layers.meetings.group, layers.meetings.label);
+        layers.meetings.group.addTo(map);
+      
+        fetchMeetings(component, '', (element, marker) => {
+            drawMarker(element, marker, component).addTo(layers.meetings.group);
+          }, () => {
+            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
+          });
+      }
+    });
+
+
+    // add categories control layers
+    if(window.AwesomeMap.categories.length) {
+      let lastLayer = layers[Object.keys(layers)[Object.keys(layers).length - 1]];
+      // Add Categories "title"
+      if(lastLayer) {
+        lastLayer.label = `${lastLayer.label}<hr><b>${window.DecidimAwesome.texts.categories}</b>`;
+        control.removeLayer(lastLayer.group);
+        control.addOverlay(lastLayer.group, lastLayer.label);
+      }
+
+      window.AwesomeMap.categories.forEach((category) => {
+        // add control layer for this category
+        layers[category.id] = {
+          label: `<i class="awesome_map-category_${category.id}"></i> ${category.name}`,
+          group: L.featureGroup.subGroup(cluster)
+        };
+        layers[category.id].group.addTo(map);
+        control.addOverlay(layers[category.id].group, layers[category.id].label);
+        // hide layer by default, it will be activated if there's any marker in it
+        setTimeout(() => {
+          $(`.awesome_map-category_${category.id}`).closest("label").hide();
+        });
+      });
+
+      // watch events for subcategories syncronitzation
+      const getCatFromClass = (name) => {
+        let id = name.match(/awesome_map-category_(\d+)/) 
+        if(!id) return;
+        const cat = getCategory(id[1]);
+        if(!cat || !cat.name) return;
+
+        return cat;        
+      };
+
+      const indeterminateInput = (id) => {
+        $('[class^="awesome_map-category_"]').parent().prev().prop("indeterminate", false);
+        if(id) {
+          let $input = $(`.awesome_map-category_${id}`).parent().prev();
+          if(!$input.prop("checked")) {
+            $input.prop("indeterminate", true);
+          }
+        }
+      };
+
+      map.on('overlayadd', (e) => {
+        const cat = getCatFromClass(e.name);
+        if(!cat) return;
+        // if it's a children, put the parent to indeterminate
+        indeterminateInput(cat.parent);
+      });
+
+      // on remove a parent category, remove all children
+      map.on('overlayremove', (e) => {
+        const cat = getCatFromClass(e.name);
+        if(!cat) return;
+        cat.children().forEach((c) => {
+          let $el = $(`.awesome_map-category_${c.id}`);
+          if($el.parent().prev().prop("checked")) {
+            $el.click();
+          }
+        });
+      });
+
+    }
+
+  };
+
+  // currentMap might not be loaded yet so let's delay a bit
+  // TODO: improve this
+  const waitMap = () => {
+    if(exports.Decidim && exports.Decidim.currentMap) {
+      loadElements(exports.Decidim.currentMap);
+    } else {
+      setTimeout(() => {
+        waitMap();
+      }, 100);
+    }
+  };
+
+  waitMap();
+
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6

@@ -1,4 +1,3 @@
-// = require decidim/map
 // = require leaflet.featuregroup.subgroup
 // = require decidim/decidim_awesome/awesome_map/categories
 // = require decidim/decidim_awesome/awesome_map/proposals
@@ -8,8 +7,8 @@
 ((exports) => {
   const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
 
-  const collapsedMenu = $("#map").data("collapsed");
-  const components = $("#map").data("components");
+  const collapsedMenu = $("#awesome-map").data("collapsed");
+  const components = $("#awesome-map").data("components");
   const popupMeetingTemplateId = "marker-meeting-popup";
   const popupProposalTemplateId = "marker-proposal-popup";
 
@@ -91,7 +90,7 @@
         // add control layer for amendments if any
         if(component.amendments) {
           layers.amendments = {
-            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendment}/span>`,
+            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendments}</span>`,
             group: L.featureGroup.subGroup(cluster)
           }
           control.addOverlay(layers.amendments.group, layers.amendments.label);
@@ -116,7 +115,7 @@
       if(component.type == "meetings") {
         // add control layer for meetings
         layers.meetings = {
-          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}/span>`,
+          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}</span>`,
           group: L.featureGroup.subGroup(cluster)
         };
         control.addOverlay(layers.meetings.group, layers.meetings.label);
@@ -198,18 +197,8 @@
 
   };
 
-  // currentMap might not be loaded yet so let's delay a bit
-  // TODO: improve this
-  const waitMap = () => {
-    if(exports.Decidim && exports.Decidim.currentMap) {
-      loadElements(exports.Decidim.currentMap);
-    } else {
-      setTimeout(() => {
-        waitMap();
-      }, 100);
-    }
-  };
-
-  waitMap();
+  $("#map").on("ready.decidim", (ev, map) => {
+    loadElements(map);
+  });
 
 })(window);

data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6

@@ -1,4 +1,3 @@
-// = require quill.min
 // = require image-upload.min
 // = require image-resize.min
 // = require inscrybmde.min.js
@@ -11,7 +10,7 @@
   exports.DecidimAwesome = exports.DecidimAwesome || {};
 
   // Redefines Quill editor with images
-  if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor) {
+  if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor || exports.DecidimAwesome.use_markdown_editor) {
 
     const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image"];
 
@@ -54,7 +53,6 @@
         toolbar: quillToolbar
       };
       const $input = $(container).siblings('input[type="hidden"]');
-      // https://github.com/decidim/decidim/pull/6422
       container.innerHTML = $input.val() || "";
       const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
 

data/app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb

@@ -3,8 +3,15 @@
 # Tune Proposal presenter to use markdown if configured
 Decidim::Proposals::ProposalPresenter.class_eval do
   def body(links: false, extras: true, strip_tags: false)
-    text = proposal.body
-    text = strip_tags(text) if strip_tags
+    if respond_to? :translated_attribute
+      text = translated_attribute(proposal.body)
+
+      text = strip_tags(sanitize_text(text)) if strip_tags
+    else
+      # TODO: remove when 0.22 is diched
+      text = proposal.body
+      text = strip_tags(text) if strip_tags
+    end
 
     renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
     text = renderer.render(links: links, extras: extras).html_safe

data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb

@@ -12,10 +12,18 @@ module Decidim
 
         layout "decidim/admin/decidim_awesome"
 
-        helper_method :overrides, :valid?, :decidim_version, :decidim_version_valid?
+        helper_method :overrides, :valid?, :decidim_version, :decidim_version_valid?, :head, :admin_head, :head_addons, :admin_addons
 
         private
 
+        def head
+          @head ||= Nokogiri::HTML(render_to_string(partial: "layouts/decidim/head"))
+        end
+
+        def admin_head
+          @admin_head = Nokogiri::HTML(render_to_string(partial: "layouts/decidim/admin/header"))
+        end
+
         def overrides
           SystemChecker.to_h
         end
@@ -31,6 +39,26 @@ module Decidim
         def decidim_version_valid?
           Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version)
         end
+
+        def head_addons(part)
+          case part
+          when :CSS
+            ['<%= stylesheet_link_tag "decidim/decidim_awesome/application", media: "all" %>',
+             '<%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>'].join("\n")
+          when :JavaScript
+            ['<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>',
+             '<%= javascript_include_tag "decidim/decidim_awesome/application" %>'].join("\n")
+          end
+        end
+
+        def admin_addons(part)
+          case part
+          when :CSS
+            '<%= stylesheet_link_tag "decidim/decidim_awesome/admin", media: "all" %>'
+          when :JavaScript
+            '<%= javascript_include_tag "decidim/decidim_awesome/admin" %>'
+          end
+        end
       end
     end
   end

data/app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb

@@ -10,8 +10,6 @@ module Decidim
 
         layout false
 
-        # helper_method :participatory_space_manifests, :participatory_spaces_list, :translate_constraint_value
-
         def new
           @form = form(ConstraintForm).from_params(filtered_params, setting: current_setting)
         end

data/app/controllers/decidim/decidim_awesome/map_component/map_controller.rb

@@ -8,11 +8,18 @@ module Decidim
         helper_method :map_components
 
         def show
-          render :error if Decidim.geocoder.blank?
+          render :error unless maps_enabled?
         end
 
         private
 
+        def maps_enabled?
+          return Decidim::Map.configured? if defined?(Decidim::Map)
+
+          # TODO: remove when 0.22 support is diched
+          Decidim.geocoder.present?
+        end
+
         def map_components
           @map_components ||= current_participatory_space.components.published.filter do |component|
             case component.manifest.name

data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb

@@ -6,6 +6,10 @@ module Decidim
       module ConfigConstraintsHelpers
         include Decidim::TranslatableAttributes
 
+        def check(status)
+          content_tag(:span, icon("check", class: "icon", aria_label: status, role: "img"), class: "text-#{status == :ok ? "success" : "alert"}")
+        end
+
         # returns only non :disabled vars in config
         def enabled_configs(vars)
           vars.filter do |var|

data/app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -3,7 +3,33 @@
 module Decidim
   module DecidimAwesome
     module MapHelper
-      def dynamic_map_for(components)
+      include Decidim::MapHelper
+
+      def awesome_map_for(components, &block)
+        return legacy_map_for(components, &block) unless defined?(Decidim::Map)
+
+        map = dynamic_map_for({}, {}, &block)
+        return unless map
+
+        map_html_options = {
+          "class" => "awesome-map",
+          "id" => "awesome-map",
+          "data-components" => components.map do |component|
+                                 {
+                                   id: component.id,
+                                   type: component.manifest.name,
+                                   name: translated_attribute(component.name),
+                                   url: Decidim::EngineRouter.main_proxy(component).root_path,
+                                   amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component: component).only_emendations.count : 0
+                                 }
+                               end.to_json,
+          "data-collapsed" => current_component.settings.collapse
+        }
+        content_tag(:div, map, map_html_options)
+      end
+
+      # TODO: remove when 0.22 support is diched
+      def legacy_map_for(components)
         return if Decidim.geocoder.blank?
 
         map_html_options = {

data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb

@@ -6,9 +6,9 @@
     <p>
       <%= t ".decidim_version", version: decidim_version %>
       <% if decidim_version_valid? %>
-        <span class="text-success"><%= icon("check", class: "icon", aria_label: "ok", role: "img") %></span>
+        <%= check :ok %>
       <% else %>
-        <span class="text-alert"><%= icon("x", class: "icon", aria_label: "ko", role: "img") %></span>
+        <%= check :ko %>
       <% end %>
       </p>
     <ul class="vertical menu">
@@ -19,11 +19,11 @@
           <% props.files.each do |file, md5| %>
           <li>
             <%= file %>
-              <% if valid?(props.spec, file) %>
-                <span class="text-success"><%= icon("check", class: "icon", aria_label: "ok", role: "img") %></span>
-              <% else %>
-                <span class="text-alert"><%= icon("x", class: "icon", aria_label: "ko", role: "img") %></span>
-              <% end %>
+            <% if valid?(props.spec, file) %>
+              <%= check :ok %>
+            <% else %>
+              <%= check :ko %>
+            <% end %>
           </li>
           <% end %>
         </ul>
@@ -31,5 +31,47 @@
       </li>
       <% end %>
     </ul>
+    <ul class="vertical menu heads">
+      <li>
+        <strong><%= t ".head_tags" %></strong>
+        <ul class="vertical menu">
+        <% {
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome')]",
+          JavaScript: "//script[contains(@src,'decidim_awesome')]"
+          }.each do |part, xpath| %>
+          <li>
+            <%= part %>
+            <% if head.xpath(xpath).count > 0 %>
+              <%= check :ok %>
+            <% else %>
+              <%= check :ko %>
+              <p class="help-text"><%= t ".errors.#{part}" %>:</p>
+              <code class="help-text code-block"><%= head_addons(part) %></code>
+            <% end %>
+          </li>
+          <% end %>
+        </ul>
+      </li>
+      <li>
+        <strong><%= t ".admin_head_tags" %></strong>
+        <ul class="vertical menu">
+        <% {
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome/admin')]",
+          JavaScript: "//script[contains(@src,'decidim_awesome/admin')]"
+          }.each do |part, xpath| %>
+          <li>
+            <%= part %>
+            <% if admin_head.xpath(xpath).count > 0 %>
+              <%= check :ok %>
+            <% else %>
+              <%= check :ko %>
+              <p class="help-text"><%= t ".errors.#{part}" %>:</p>
+              <code class="help-text code-block"><%= admin_addons(part) %></code>
+            <% end %>
+          </li>
+          <% end %>
+        </ul>
+      </li>
+    </ul>
   </div>
 </div>

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -1,6 +1,6 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<%= dynamic_map_for map_components do %>
+<%= awesome_map_for map_components do %>
 
   <template id="marker-proposal-popup">
     <div class="map-info__content">
@@ -70,5 +70,9 @@
     window.AwesomeMap = window.AwesomeMap || {};
     window.AwesomeMap.categories = <%= current_categories.to_json.html_safe %>;
   </script>
-  <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/map" %>
+  <% if version_prefix == "v0.23" %>
+    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/map" %>
+  <% else %>
+    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/legacy_map" %>
+  <% end %>
 <% end %>

data/app/views/{v0.21 → v0.23}/layouts/decidim/_head.html.erb

@@ -19,16 +19,20 @@
 
 <%= favicon %>
 <%= stylesheet_link_tag    "application", media: "all" %>
+<%= invisible_captcha_styles %>
 
 <%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
 <%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
 
 <%= organization_colors %>
+<%= javascript_include_tag "decidim/confirm" %>
 <%= javascript_include_tag "application" %>
 <%= foundation_datepicker_locale_tag %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
+<%= snippets.display(:head) %>
+<%= content_for :header_snippets %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 <%= javascript_include_tag "decidim/decidim_awesome/application" %>

data/app/views/{v0.21 → v0.23}/layouts/decidim/admin/_header.html.erb

@@ -1,7 +1,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag    "decidim/admin/application", media: "all" %>
+<%= javascript_include_tag "decidim/confirm" %>
 <%= javascript_include_tag "decidim/admin/application" %>
+<%= organization_colors %>
+<%= snippets.display(:head) %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 

data/config/locales/en.yml

@@ -59,10 +59,17 @@ en:
       admin:
         checks:
           index:
+            admin_head_tags: Awesome tags included in the admin application header
             decidim-admin: From Admin module
             decidim-core: From Core module
             decidim-proposals: From Proposals module
             decidim_version: Decidim version %{version}
+            errors:
+              CSS: Head does not contain the required <link> stylesheet entries. To
+                solve it, you can manually add it to your custom _head.html.erb
+              JavaScript: Head does not contain the required <script> Javascript entries.
+                To solve it, you can manually add it to your custom admin/_header.html.erb
+            head_tags: Awesome tags included in the application header
             title: System compatibility checks
         config:
           constraints:

data/lib/decidim/decidim_awesome/awesome_helpers.rb

@@ -46,9 +46,7 @@ module Decidim
       end
 
       def version_prefix
-        return "v0.21" if Decidim.version.start_with? "0.21"
-
-        "v0.22"
+        "v#{Decidim.version[0..3]}"
       end
     end
   end

data/lib/decidim/decidim_awesome/checksums.yml

@@ -1,15 +1,15 @@
 decidim-admin:
   /app/views/layouts/decidim/admin/_header.html.erb:
-    decidim-0.21: 6f0c010b1dcf912be1b3e0ff9f156026
     decidim-0.22: 6af51ec6b8a760b0ee6e00a7834f5f9a
+    decidim-0.23: 45f0e15f1b02a1c1a73b1a2184fd55af
 decidim-core:
   /app/views/layouts/decidim/_head.html.erb:
-    decidim-0.21: b261c55492d047ba730eed8b39be0304
     decidim-0.22: bf16a58cd9e6d3f73e6875ff3d0b1e48
+    decidim-0.23: e7f5eea07e884665474948ea750fc720
   /app/assets/javascripts/decidim/editor.js.es6:
-    decidim-0.21: 797d0ec1c9e79453cf6718f82d2fdd27
     decidim-0.22: 797d0ec1c9e79453cf6718f82d2fdd27
+    decidim-0.23: cb059b8ff0ffc62c67eb99d8d7a6637b
 decidim-proposals:
   /app/presenters/decidim/proposals/proposal_presenter.rb:
-    decidim-0.21: d7a6e1e55613de8949ace284307a7674
     decidim-0.22: 7d60c8310d7fa4e38d9a27080c22b12c
+    decidim-0.23: 437c0c25151f605401a4f14d090ba5ea

data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb

@@ -0,0 +1,2 @@
+<%= stylesheet_link_tag    "application", media: "all" %>
+<%= javascript_include_tag "application" %>

data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb

@@ -0,0 +1,3 @@
+<%= stylesheet_link_tag    "decidim/admin/application", media: "all" %>
+<%= javascript_include_tag "decidim/admin/application" %>
+

data/lib/decidim/decidim_awesome/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.5.1"
-    COMPAT_DECIDIM_VERSION = [">= 0.21.0", "< 0.23"].freeze
-    DECIDIM_VERSION = "0.22"
+    VERSION = "0.6.0"
+    COMPAT_DECIDIM_VERSION = [">= 0.22.0", "< 0.24"].freeze
+    DECIDIM_VERSION = "0.23.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -84,20 +84,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
 description: Some usability and UX tweaks for Decidim.
 email:
 - ivan@platoniq.net
@@ -119,6 +119,7 @@ files:
 - app/assets/javascripts/decidim/decidim_awesome/application.js
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/api_fetcher.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/categories.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6
@@ -158,7 +159,6 @@ files:
 - app/forms/decidim/decidim_awesome/admin/intergram_form.rb
 - app/forms/decidim/decidim_awesome/editor_image_form.rb
 - app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb
-- app/helpers/decidim/decidim_awesome/application_helper.rb
 - app/helpers/decidim/decidim_awesome/map_helper.rb
 - app/models/decidim/decidim_awesome/application_record.rb
 - app/models/decidim/decidim_awesome/awesome_config.rb
@@ -185,10 +185,10 @@ files:
 - app/views/layouts/decidim/admin/decidim_awesome.html.erb
 - app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb
 - app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb
-- app/views/v0.21/layouts/decidim/_head.html.erb
-- app/views/v0.21/layouts/decidim/admin/_header.html.erb
 - app/views/v0.22/layouts/decidim/_head.html.erb
 - app/views/v0.22/layouts/decidim/admin/_header.html.erb
+- app/views/v0.23/layouts/decidim/_head.html.erb
+- app/views/v0.23/layouts/decidim/admin/_header.html.erb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -219,6 +219,8 @@ files:
 - lib/decidim/decidim_awesome/map_component/engine.rb
 - lib/decidim/decidim_awesome/system_checker.rb
 - lib/decidim/decidim_awesome/test/factories.rb
+- lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb
+- lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb
 - lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb
 - lib/decidim/decidim_awesome/test/themes/css.lvh.me.css
 - lib/decidim/decidim_awesome/test/themes/erb.lvh.me.scss.erb

data/app/helpers/decidim/decidim_awesome/application_helper.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DecidimAwesome
-    # Custom helpers, scoped to the decidim_awesome engine.
-    #
-    module ApplicationHelper
-    end
-  end
-end