decidim-decidim_awesome 0.5.1 → 0.6.4

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/editor_images_controller.rb

@@ -42,7 +42,7 @@ module Decidim
         {
           image: params[:image],
           author_id: current_user.id,
-          path: request.original_fullpath
+          path: request.referer
         }
       end
     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/forms/decidim/decidim_awesome/admin/config_form.rb

@@ -12,10 +12,21 @@ module Decidim
         attribute :use_markdown_editor, Boolean
         attribute :allow_images_in_markdown_editor, Boolean
         attribute :auto_save_forms, Boolean
+        attribute :scoped_styles, Hash
         attribute :intergram_for_admins, Boolean
         attribute :intergram_for_admins_settings, IntergramForm
         attribute :intergram_for_public, Boolean
         attribute :intergram_for_public_settings, IntergramForm
+
+        # convert to nil anything not specified in the params (UpdateConfig command ignores nil entries)
+        def self.from_params(params, additional_params = {})
+          instance = super(params, additional_params)
+          nillable_keys = instance.attributes.keys - params.keys.map(&:to_sym)
+          nillable_keys.each do |key|
+            instance.send("#{key}=", nil)
+          end
+          instance
+        end
       end
     end
   end

data/app/forms/decidim/decidim_awesome/editor_image_form.rb

@@ -11,6 +11,8 @@ module Decidim
 
       validates :author_id, presence: true
       validates :image, presence: true
+
+      alias organization current_organization
     end
   end
 end

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,38 @@
 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,
+          "data-show-not-answered" => current_component.current_settings.show_not_answered,
+          "data-show-accepted" => current_component.current_settings.show_accepted,
+          "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
+          "data-show-evaluating" => current_component.current_settings.show_evaluating
+          # "data-show-rejected" => current_component.current_settings.show_rejected
+        }
+        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 = {
@@ -19,6 +50,11 @@ module Decidim
                                  }
                                end.to_json,
           "data-collapsed" => current_component.settings.collapse,
+          "data-show-not-answered" => current_component.current_settings.show_not_answered,
+          "data-show-accepted" => current_component.current_settings.show_accepted,
+          "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
+          "data-show-evaluating" => current_component.current_settings.show_evaluating,
+          # "data-show-rejected" => current_component.current_settings.show_rejected,
           "data-markers-data" => [].to_json
         }
 

data/app/models/decidim/decidim_awesome/editor_image.rb

@@ -11,9 +11,10 @@ module Decidim
       validates :organization, presence: true
       validates :author, presence: true
 
-      validates :image,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :image, presence: true
+      # validates :image,
+      #           file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+      #           file_content_type: { allow: ["image/jpeg", "image/png"] }
 
       mount_uploader :image, Decidim::DecidimAwesome::ImageUploader
 

data/app/uploaders/decidim/decidim_awesome/image_uploader.rb

@@ -10,10 +10,19 @@ module Decidim
         process resize_to_fit: [nil, 237]
       end
 
+      # TODO: remove when diching 0.22 support
       def extension_white_list
         %w(jpg jpeg png)
       end
 
+      def extension_whitelist
+        %w(jpg jpeg png)
+      end
+
+      def content_type_whitelist
+        %w(image/jpeg image/png)
+      end
+
       def max_image_height_or_width
         8000
       end

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/admin/config/_form_styles.html.erb

@@ -0,0 +1,28 @@
+<div class="row column decidim_awesome-form">
+  <% if config_enabled? :scoped_styles %>
+    <p class="help-text"><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+    <p class="help-text">
+      <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %><br>
+      <% [:primary, :secondary, :success, :warning, :alert, :highlight, :highlight_alternative].each do |color| %>
+        var(--<%= color %>),
+      <% end %>
+    </p>
+
+    <% form.object.scoped_styles&.each do |key, value| %>
+      <div class="scoped-style" data-key="<%= key %>">
+        <%= label_tag :scoped_styles do %>
+          <%= t("config.scoped_styles", scope: "activemodel.attributes", id: key) %>
+          <%= link_to t(".remove"), decidim_admin_decidim_awesome.destroy_scoped_style_path(key: key), method: :post, class: "float-right", data: { confirm: t(".sure_to_remove") } %>
+        <% end %>
+        <%= text_area_tag key, value, name: "config[scoped_styles][#{key}]", rows: 5 %>
+        <%= render(partial: "decidim/decidim_awesome/admin/config/constraints", locals: { key: "scoped_style_#{key}", constraints: constraints_for("scoped_style_#{key}") }) %>
+      </div>
+    <% end %>
+
+    <%= link_to t(".new"), decidim_admin_decidim_awesome.new_scoped_style_path, method: :post %>
+
+  <% end %>
+</div>
+
+
+<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>

data/app/views/decidim/decidim_awesome/admin/config/show.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(params[:var])) do |f| %>
+<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(params[:var]), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(params[:var]) }) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t(".title", setting: params[:var]) %></h2>

data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb

@@ -1,7 +1,12 @@
+<%= announcement = render(partial: "decidim/shared/component_announcement") %>
+
 <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_iframe/iframe" %>
 
 <style rel="stylesheet" type="text/css">
-<%= ".wrapper { padding: 0; }" if remove_margins? %>
+<% if remove_margins? %>
+  <%= ".wrapper { padding-left: 0;padding-right: 0;padding-bottom: 0; }" %>
+  <%= ".wrapper { padding-top: 0; }" unless announcement.present? %>
+<% end %>
 </style>
 
 <div class="awesome-iframe<%= " row" if viewport_width? %>">

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

@@ -1,58 +1,80 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
-<%= dynamic_map_for map_components do %>
+<%= awesome_map_for map_components do %>
 
-  <template id="marker-proposal-popup">
+  <script id="legacy-marker-proposal-popup" type="text/x-jsrender">
     <div class="map-info__content">
-      <h3>${title}</h3>
+      <h3>{{>title}}</h3>
       <div id="bodyContent">
-        <p>{{html body}}</p>
+        <p>{{:body}}</p>
         <div class="map__date-adress">
           <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
+            <div class="address__icon">{{:icon}}</div>
             <div class="address__details">
-              <span>${address}</span><br>
+              <span>{{>address}}</span><br>
             </div>
           </div>
         </div>
         <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
+          <a href="{{>link}}" class="button button--sc">
             <%= t(".view_proposal") %>
           </a>
         </div>
       </div>
     </div>
-  </template>
+  </script>
+
+  <script id="marker-proposal-popup" type="text/x-jsrender">
+    <div class="map-info__content">
+      <h3>{{>title.translation}}</h3>
+      <div id="bodyContent">
+        <p>{{:body.translation}}</p>
+        <div class="map__date-adress">
+          <div class="address card__extra">
+            <div class="address__icon">{{:icon}}</div>
+            <div class="address__details">
+              <span>{{>address}}</span><br>
+            </div>
+          </div>
+        </div>
+        <div class="map-info__button">
+          <a href="{{>link}}" class="button button--sc">
+            <%= t(".view_proposal") %>
+          </a>
+        </div>
+      </div>
+    </div>
+  </script>
 
-  <template id="marker-meeting-popup">
+  <script id="marker-meeting-popup" type="text/x-jsrender">
     <div class="map-info__content">
-      <h3>${title.translation}</h3>
+      <h3>{{>title.translation}}</h3>
       <div id="bodyContent">
-        <p>{{html description.translation}}</p>
+        <p>{{:description.translation}}</p>
         <div class="map__date-adress">
           <div class="card__datetime">
             <div class="card__datetime__date">
-              ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
+              {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
             </div>
-            <div class="card__datetime__time">${starTime}</div>
+            <div class="card__datetime__time">{{>starTime}}</div>
           </div>
           <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
+            <div class="address__icon">{{:icon}}</div>
             <div class="address__details">
-              <strong>{{html location.translation}}</strong><br>
-              <span>${address}</span><br>
-              <span>{{html locationHints.translation}}</span>
+              <strong>{{:location.translation}}</strong><br>
+              <span>{{>address}}</span><br>
+              <span>{{:locationHints.translation}}</span>
             </div>
           </div>
         </div>
         <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
+          <a href="{{>link}}" class="button button--sc">
             <%= t("decidim.meetings.meetings_map.view_meeting") %>
           </a>
         </div>
       </div>
     </div>
-  </template>
+  </script>
 
   <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_map/map" %>
   <style type="text/css">
@@ -70,5 +92,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/layouts/decidim/admin/decidim_awesome.html.erb

@@ -16,6 +16,11 @@
           <%= aria_selected_link_to I18n.t("menu.surveys", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:surveys) %>
         </li>
       <% end %>
+      <% if config_enabled? :scoped_styles %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:styles)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:styles) %>
+        </li>
+      <% end %>
       <% if config_enabled? :allow_images_in_proposals %>
         <li <% if is_active_link?(decidim_admin_decidim_awesome.config_path(:proposals)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to I18n.t("menu.proposals", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:proposals) %>

data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb

@@ -1,5 +1,5 @@
 <script>
-window.DecidimAwesome = <%= awesome_config.to_json.html_safe %>;
+window.DecidimAwesome = <%= javascript_config_vars %>;
 window.DecidimAwesome.editor_uploader_path = "<%= decidim_decidim_awesome.editor_images_path %>";
 window.DecidimAwesome.texts = {
   "drag_and_drop_image": "<%= j t(".drag_and_drop_image") %>",

data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb

@@ -0,0 +1,3 @@
+<style media="all">
+  <%= awesome_custom_styles %>
+</style>

data/app/views/v0.22/layouts/decidim/_head.html.erb

@@ -23,6 +23,7 @@
 
 <%= stylesheet_link_tag    "decidim/decidim_awesome/application", media: "all" %>
 <%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>
+<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_custom_styles %>
 
 <%= organization_colors %>
 <%= javascript_include_tag "decidim/confirm" %>