decidim-decidim_awesome 0.6.2 → 0.6.7

data/app/forms/decidim/decidim_awesome/admin/constraint_form.rb

@@ -3,8 +3,6 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # A form object used to configure the endpoint.
-      #
       class ConstraintForm < Decidim::Form
         attribute :id, Integer
         attribute :participatory_space_manifest, String

data/app/forms/decidim/decidim_awesome/admin/intergram_form.rb

@@ -3,8 +3,6 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      # A form object used to configure the endpoint.
-      #
       class IntergramForm < Decidim::Form
         attribute :chat_id, String
         attribute :require_login, Boolean

data/app/forms/decidim/decidim_awesome/admin/menu_form.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class MenuForm < Decidim::Form
+        include Decidim::TranslatableAttributes
+        VISIBILITY_STATES = %w(default hidden logged non_logged).freeze
+
+        translatable_attribute :raw_label, String
+        attribute :url, String
+        attribute :position, Integer
+        attribute :target, String
+        attribute :visibility, String
+
+        validates :raw_label, translatable_presence: true
+        validates :url, presence: true
+        validates :position, numericality: { greater_than: 0 }
+        validates :visibility, inclusion: { in: VISIBILITY_STATES }
+        validates :target, inclusion: { in: ["", "_blank"] }
+
+        # remove query string from native menu element (to avoid interactions with the locale in the generated url)
+        def map_model(model)
+          self.url = Addressable::URI.parse(model.url).path if model.native?
+        end
+
+        def to_params
+          {
+            label: raw_label,
+            position: position,
+            url: url,
+            target: target,
+            visibility: visibility
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -18,7 +18,11 @@ module Decidim
         end
 
         def config_enabled?(var)
-          return DecidimAwesome.config.send(var) != :disabled unless var.is_a? Array
+          unless var.is_a?(Array)
+            return false unless DecidimAwesome.config.has_key?(var.to_sym)
+
+            return DecidimAwesome.config.send(var) != :disabled
+          end
 
           var.detect { |v| DecidimAwesome.config.send(v) != :disabled }
         end

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

@@ -24,11 +24,17 @@ module Decidim
                                  }
                                end.to_json,
           "data-collapsed" => current_component.settings.collapse,
+          "data-truncate" => current_component.settings.truncate,
+          "data-map-center" => current_component.settings.map_center,
+          "data-map-zoom" => current_component.settings.map_zoom,
+          "data-menu-amendments" => current_component.settings.menu_amendments,
+          "data-menu-meetings" => current_component.settings.menu_meetings,
+          "data-menu-hashtags" => current_component.settings.menu_hashtags,
           "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-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
@@ -54,7 +60,7 @@ module Decidim
           "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-show-rejected" => current_component.current_settings.show_rejected,
           "data-markers-data" => [].to_json
         }
 

data/app/permissions/decidim/decidim_awesome/admin/permissions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class Permissions < Decidim::DefaultPermissions
+        include ConfigConstraintsHelpers
+
+        def permissions
+          return permission_action if permission_action.scope != :admin
+
+          toggle_allow(config_enabled?(permission_action.subject)) if permission_action.action == :edit_config
+
+          permission_action
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -6,6 +6,8 @@ module Decidim
       def permissions
         return permission_action unless user
 
+        return Decidim::DecidimAwesome::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
+
         editor_image_action?
 
         permission_action

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 %>
+        <p class="form-error is-visible" id="custom-style-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>
+        <%= 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,15 +1,14 @@
-<%= 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>
     </div>
     <div class="card-section">
-      <%= render partial: "form_#{params[:var]}", locals: { form: f } %>
+      <%= render partial: "form_#{params[:var]}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
     </div>
   </div>
   <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>
-
 <%= render partial: "modal" %>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb

@@ -0,0 +1,7 @@
+<div>
+    <%= form.translated :text_field, :raw_label, help_text: t(".label_help") %>
+    <%= form.text_field :url , readonly: form.object.url.present? %>
+    <%= form.text_field :position %>
+    <%= form.select :target, target_options %>
+    <%= form.select :visibility, visibility_options %>
+</div>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: menu_hack_path, method: :patch) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: "form", object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,44 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= link_to t(".new"), decidim_admin_decidim_awesome.new_menu_hack_path, class: "button tiny button--title" %>
+    </h2>
+  </div>
+  <div class="card-section">
+  <div class="row column decidim_awesome-form">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("menu.raw_label", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.url", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.position", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.target", scope: "activemodel.attributes") %></th>
+          <th><%= t("menu.visibility", scope: "activemodel.attributes") %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% current_items.each do |item| %>
+          <tr<%= " class=menu_hack-addition" if item.try(:overrided?) == false %>>
+            <td><%= item.label %></td>
+            <td><%= item.url %></td>
+            <td><%= item.position %></td>
+            <td><%= target_options.invert[item.try(:target)||""] %></td>
+            <td><%= visibility_options.invert[item.try(:visibility)] %></td>
+            <td class="table-list__actions">
+              <%= icon_link_to "pencil", decidim_admin_decidim_awesome.edit_menu_hack_path(md5(item.url)), t(".edit"), class: "action-icon--edit" %>
+              <% if item.respond_to?(:overrided?) %>
+                <%= icon_link_to "circle-x", decidim_admin_decidim_awesome.menu_hack_path(md5(item.url)), t(".remove#{'_hack' if item.overrided?}"), method: :delete, class: "action-icon--remove", data: { confirm: t(".confirm_destroy") } %>
+              <% else %>
+                  <span class="action-icon">
+                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                  </span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: menu_hacks_path) do |f| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t ".title" %></h2>
+    </div>
+    <div class="card-section">
+      <%= render partial: "form", object: f %>
+    </div>
+  </div>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".save") %>
+  </div>
+<% end %>

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

@@ -6,7 +6,7 @@
     <div class="map-info__content">
       <h3>{{>title}}</h3>
       <div id="bodyContent">
-        <p>{{:body}}</p>
+        <div class="description">{{:body}}</div>
         <div class="map__date-adress">
           <div class="address card__extra">
             <div class="address__icon">{{:icon}}</div>
@@ -28,7 +28,7 @@
     <div class="map-info__content">
       <h3>{{>title.translation}}</h3>
       <div id="bodyContent">
-        <p>{{:body.translation}}</p>
+        <div class="description">{{:body.translation}}</div>
         <div class="map__date-adress">
           <div class="address card__extra">
             <div class="address__icon">{{:icon}}</div>
@@ -50,7 +50,7 @@
     <div class="map-info__content">
       <h3>{{>title.translation}}</h3>
       <div id="bodyContent">
-        <p>{{:description.translation}}</p>
+        <div class="description">{{:description.translation}}</div>
         <div class="map__date-adress">
           <div class="card__datetime">
             <div class="card__datetime__date">
@@ -78,14 +78,17 @@
 
   <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_map/map" %>
   <style type="text/css">
-    #map {
+    #map, .wrapper #map {
       height: <%= current_component.settings.map_height %>px;
     }
     <% current_categories.each do |category| %>
-      .awesome_map-category_<%= category[:id] %> {
-        background-color: <%= category[:color] %> !important;
+      /* TODO: remove when diching 0.22 */
+      i.awesome_map-category_<%= category[:id] %> {
         margin-left: <%= category[:parent] ? "1" : "0" %>em;
       }
+      .awesome_map-category-<%= category[:id] %> i {
+        background-color: <%= category[:color] %> !important;
+      }
     <% end %>
   </style>
   <script>

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) %>
@@ -26,6 +31,11 @@
           <%= aria_selected_link_to I18n.t("menu.livechat", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.config_path(:livechat) %>
         </li>
       <% end %>
+      <% if config_enabled? :menu %>
+        <li <% if is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to I18n.t("menu.menu_hacks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.menu_hacks_path %>
+        </li>
+      <% end %>
       <li <% if is_active_link?(decidim_admin_decidim_awesome.checks_path) %> class="is-active" <% end %>>
         <%= aria_selected_link_to I18n.t("menu.checks", scope: "decidim.decidim_awesome.admin"), decidim_admin_decidim_awesome.checks_path %>
       </li>

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") %>",
@@ -7,9 +7,12 @@ window.DecidimAwesome.texts = {
   "autosaved_error": "<%= j t(".autosaved_error") %>",
   "autosaved_retrieved": "<%= j t(".autosaved_retrieved") %>",
   "categories": "<%= j t(".categories") %>",
+  "hashtags": "<%= j t(".hashtags") %>",
   "proposals": "<%= j t(".proposals") %>",
   "meetings": "<%= j t(".meetings") %>",
-  "amendments": "<%= j t(".amendments") %>"
+  "amendments": "<%= j t(".amendments") %>",
+  "items": "<%= j t(".items") %>",
+  "select_deselect_all": "<%= j t(".select_deselect_all") %>"
 }
 <% if defined? questionnaire %>
   window.DecidimAwesome.current_questionnaire = "edit_questionnaire_<%= questionnaire.id %>";

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" %>

data/app/views/v0.23/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" %>

data/config/locales/ca.yml

@@ -17,12 +17,19 @@ ca:
         intergram_title_closed: Títol del xat tancat
         intergram_title_open: Títol del xat obert
         intergram_use_floating_button: Si està marcat, el xat tancat és sempre un botó en lloc d'un text
+        scoped_styles: 'Estils personalitzats #%{id}'
         use_markdown_editor: Fes servir l'editor Markdown en comptes de l'editor HTML
       constraint:
         component_id: o específicament a
         component_manifest: Només en components de tipus
         participatory_space_manifest: Aplica-ho a espais participatius de tipus
         participatory_space_slug: Només a
+      menu:
+        position: Posició
+        raw_label: Etiqueta
+        target: Obre a
+        url: URL
+        visibility: Visibilitat
   decidim:
     admin:
       menu:
@@ -46,7 +53,15 @@ ca:
           global:
             announcement: Anunci
             collapse: Inicia amb el menú col·lapsat
+            map_center: Centre del mapa (Latitud, Longitud)
+            map_center_help: 'Utilitza un punt per marcar els decimals (pe: 41.38879, 2.15899). Deixa aquest camp buit per incloure automàticament tots els marcadors'
             map_height: Alçada del mapa (px)
+            map_zoom: Zoom (qualsevol nombre entre 0 i 18)
+            map_zoom_help: Només s’aplica si es defineix el punt central del mapa
+            menu_amendments: Mostrar esmenes
+            menu_hashtags: Mostrar el menú de cerca per hashtag
+            menu_meetings: Mostrar trobades
+            truncate: Nombre màxim de caràcters per les descripcions emergents
           step:
             announcement: Anunci
             show_accepted: Mostra les propostes acceptades
@@ -75,8 +90,16 @@ ca:
             delete: Esborra
             edit: Edita
             title: 'S''aplica només en aquests casos:'
+          create_scoped_style:
+            error: Error en crear una nova caixa CSS! %{error}
+            success: Caixa CSS %{key} creada correctament
+          destroy_scoped_style:
+            error: Error en eliminar una caixa CSS! %{error}
+            success: Caixa CSS %{key} eliminada correctament
           experimental: Opcions experimentals
           form:
+            errors:
+              incorrect_css: 'El CSS de la caixa #%{key} no és vàlid'
             help:
               allow_images_in_full_editor: Això afegirà un botó per pujar imatges a l'editor HTML complet.
               allow_images_in_markdown_editor: Això permetrà a l'editor markdown pujar imatges amb "copiar i enganxar" o "arrastrant i deixant anar".
@@ -86,7 +109,13 @@ ca:
               drag_and_drop_supported: Quan es pugin imatges, es pot fer a través del mètode de "arrossegar i deixar anar". Les imatges seran pujades al servidor i inserides com recursos externs (no es fa servir codificació en línia base64).
               intergram_about: Intergram utilitza el Telegram Messenger per gestionar un widget de xat en viu de suport incrustat a la part inferior de la pàgina.
               intergram_config: 'Convida a la <a href="https://web.telegram.org/#/im?p=@IntergramBot">@Intergram bot</a> al teu grup o comença un xat amb ella directament. <a href="https://github.com/idoco/intergram#embed-intergram-in-your-website-with-these-2-simple-steps">+ info</a>'
+              scoped_styles: Crea CSS personalitzats que només s'apliquin a determinades parts de la web pública (per fer-ho, utilitza l'editor de restriccions)
+              scoped_styles_variables: 'Pots fer servir les següents variables CSS pels colors personalitzats de l''organització:'
               use_markdown_editor: Això substituirà l'editor HTML (Quill), en el seu lloc s'utilitzarà un editor Markdown tant a l'admin com a la pàgina pública per processar el text (a la base de dades el text es desarà com a markdown)
+          form_styles:
+            new: Afegeix una nova caixa CSS
+            remove: Elimina aquesta caixa CSS
+            sure_to_remove: Estàs segura que vols eliminar aquesta caixa CSS?
           rich_text_editor_in_public_views: 'NOTA: "Editor de text enriquit per participants" està habilitat a la configuració general, aquesta opció no aplicarà. Feu servir les modificacions d''editor general per afegir imatges a les propostes.'
           show:
             title: Modificacions per %{setting}
@@ -94,7 +123,7 @@ ca:
           system: A tot arreu excepte espais participatius
           update:
             error: Error actualitzant la configuració! %{error}
-            success: Configuració actualitzada correctament!
+            success: Configuració actualitzada correctament
         constraints:
           create:
             error: Error creant una nova restricció
@@ -119,8 +148,44 @@ ca:
           checks: Compatibilitat de sistema
           editors: Modificacions als editors
           livechat: Xat en directe
+          menu_hacks: Retocs al menú
           proposals: Modificacions a propostes
+          styles: Estils personalitzats
           surveys: Formularis i enquestes
+        menu_hacks:
+          create:
+            error: 'Error en crear un nou ítem de menú: %{error}'
+            success: Ítem de menú creat correctament
+          destroy:
+            error: 'Error en eliminar l''ítem de menú: %{error}'
+            success: Ítem de menú eliminat correctament
+          edit:
+            save: Desar
+            title: Editar ítem de menú
+          form:
+            label_help: Les traduccions no es detecten automàticament, asegura't de completar tots els camps!
+            target:
+              blank: Nova finestra
+              self: La mateixa finestra
+            visibility:
+              default: Visible
+              hidden: Sempre ocult
+              logged: Només visible per usuàries loguejades
+              non_logged: Només visible per usuàries no loguejades
+          index:
+            confirm_destroy: Estàs segura que vols eliminar aquest retoc?
+            edit: Editar
+            new: Nou ítem
+            remove: Eliminar addició
+            remove_hack: Eliminar retoc
+            title: Menú principal
+          new:
+            save: Desar
+            title: Nou ítem de menú
+          update:
+            error: 'Error en actualitzar l''ítem de menú: %{error}'
+            success: Ítem de menú actualitzat correctament
+          url_exists: Aquesta URL ha estat configurada en un altre ítem de menú, si us plau edita'l en comptes de crear-ne un de nou.
       config:
         intergram:
           auto_no_response: Sembla que no hi ha ningú disponible per a respondre en aquest moment. Si us plau, indica'ns com et podem contactar i ens comunicarem amb tu tan aviat com ens sigui possible.
@@ -132,7 +197,7 @@ ca:
       editor_images:
         create:
           error: Error en pujar la imatge!
-          success: La imatge s'ha pujat correctament!
+          success: Imatge pujada correctament
       map_component:
         map:
           error:
@@ -153,5 +218,8 @@ ca:
           autosaved_success: Dades desades a l'emmagatzematge local
           categories: Categories
           drag_and_drop_image: Afegeix imatges "arrastrant i deixant anar" o bé enganxant-les.
+          hashtags: Hashtags
+          items: elements
           meetings: Trobades
           proposals: Propostes
+          select_deselect_all: Seleccionar/desseleccionar tot