decidim-decidim_awesome 0.6.3 → 0.7.0

data/config/locales/sv.yml

@@ -2,55 +2,70 @@ sv:
   activemodel:
     attributes:
       config:
-        allow_images_in_full_editor: Allow images in the full HTML editor
-        allow_images_in_markdown_editor: Allow images in the markdown editor
-        allow_images_in_proposals: Allow images in the proposals editor
-        allow_images_in_small_editor: Allow images in the minimal HTML editor
-        auto_save_forms: Auto save forms in local storage
+        allow_images_in_full_editor: Tillåt bilder i den fullständiga HTML-editorn
+        allow_images_in_markdown_editor: Tillåt bilder i den fullständiga Markdown-editorn
+        allow_images_in_proposals: Tillåt bilder i förslagsfältet
+        allow_images_in_small_editor: Tillåt bilder i den minimala HTML-editorn
+        auto_save_forms: Spara formulär automatiskt i lokal lagring
         intergram_auto_no_response: A message that is sent one minute after the user sends its first message and no response was received
         intergram_auto_response: A message that is sent immediately after the user sends its first message
-        intergram_chat_id: Chat ID
-        intergram_color: Color of the widget
+        intergram_chat_id: Chatt ID
+        intergram_color: Huvudfärg för widget
         intergram_for_admins: Enable Intergram Chat in the admin backend
-        intergram_intro_message: First message when the user opens the chat for the first time
-        intergram_require_login: Only for logged users
+        intergram_intro_message: Första meddelandet när användaren öppnar chatten för första gången
+        intergram_require_login: Endast för inloggade användare
         intergram_title_closed: Closed chat title
         intergram_title_open: Opened chat title
         intergram_use_floating_button: If checked, the closed chat is always a button instead of a text
+        scoped_styles: 'Custom styles #%{id}'
         use_markdown_editor: Use a Markdown editor instead of the HTML editor
       constraint:
         component_id: or specifically in
         component_manifest: Only in components of type
         participatory_space_manifest: Apply to participatory spaces of type
-        participatory_space_slug: Only in
+        participatory_space_slug: Endast i
+      menu:
+        position: Position
+        raw_label: Etikett
+        target: Opens in
+        url: Webbadress
+        visibility: Synlighet
   decidim:
     admin:
       menu:
-        decidim_awesome: Decidim awesome
+        decidim_awesome: Decidim Awesome
     components:
       awesome_iframe:
         name: Fullscreen Iframe
         settings:
           global:
-            announcement: Announcement
-            iframe: Iframe code
+            announcement: Meddelande
+            iframe: Iframe kod
             iframe_help: 'Put your code as html: <iframe width="100%" height="700" frameBorder="0" allowFullscreen src="..."></iframe>. Content will be sanitized from other HTML tags. Ensure to use 100% as width to fill the screen.'
             no_margins: No margins between the iframe and the rest of the page
             viewport_width: Limit maximum width to the application viewport
           step:
             announcement: Announcement
-            iframe: Iframe code
+            iframe: Iframe kod
       awesome_map:
-        name: Awesome Map
+        name: Karta
         settings:
           global:
-            announcement: Announcement
+            announcement: Meddelande
             collapse: Start with collapsed menu
+            map_center: Map center (Latitude, Longitude)
+            map_center_help: 'Use decimal points (ie: 41.38879, 2.15899). Leave it empty to automatically fit all the markers'
             map_height: Map height (px)
+            map_zoom: Zoom (any number betwen 0 and 18)
+            map_zoom_help: Only applies if a map center is defined
+            menu_amendments: Show amendments
+            menu_hashtags: Show Hasthag search menu
+            menu_meetings: Visa möten
+            truncate: Maximum characters for popup descriptions
           step:
-            announcement: Announcement
-            show_accepted: Show accepted proposals
-            show_evaluating: Show evaluating proposals
+            announcement: Meddelande
+            show_accepted: Visa godkända förslag
+            show_evaluating: Visa förslag som utvärderas
             show_not_answered: Show not answered proposals
             show_rejected: Show rejected proposals
             show_withdrawn: Show withdrawn proposals
@@ -75,8 +90,16 @@ sv:
             delete: Delete
             edit: Edit
             title: 'Applicable only in these cases:'
+          create_scoped_style:
+            error: Error creating a new CSS box! %{error}
+            success: CSS box %{key} created successfully
+          destroy_scoped_style:
+            error: Error removing CSS box! %{error}
+            success: CSS box %{key} removed successfully
           experimental: Experimental options
           form:
+            errors:
+              incorrect_css: 'CSS in box #%{key} is invalid'
             help:
               allow_images_in_full_editor: This will add an image uploader icon in all the editors WYSIWYG with the full toolbar enabled.
               allow_images_in_markdown_editor: This will allow markdown editor to upload images by copy & paste or drag & drop.
@@ -86,7 +109,13 @@ sv:
               drag_and_drop_supported: When uploading images, Drag & Drop is supported. Images will be uploaded to the server and inserted as external resources (it doesn't use base64 inline encoding).
               intergram_about: Intergram uses Telegram messenger to handle a live support chat widget embedded in the bottom of the page.
               intergram_config: 'Invite the <a href="https://web.telegram.org/#/im?p=@IntergramBot">@Intergram bot</a> to your group or start a chat with it directly. <a href="https://github.com/idoco/intergram#embed-intergram-in-your-website-with-these-2-simple-steps">+ info</a>'
+              scoped_styles: Create custom CSS that applies only in certain parts of the public web (use the restrictions editor for that)
+              scoped_styles_variables: 'You can use the following CSS variables for organization customized colors:'
               use_markdown_editor: This will substitute the Quill WYSIWYG editor, use a Markdown editor instead. Text will be rendered as HTML in the public pages (text in database will be saved as markdown text)
+          form_styles:
+            new: Add a new CSS box
+            remove: Remove this CSS box
+            sure_to_remove: Are you sure you want to destroy this CSS box?
           rich_text_editor_in_public_views: 'NOTE: "Rich text editor for participants" is enabled, this option won''t apply. Use the editors hacks instead to enable images in proposals.'
           show:
             title: Tweaks for %{setting}
@@ -94,7 +123,7 @@ sv:
           system: Everywhere except participatory spaces
           update:
             error: Error updating configuration! %{error}
-            success: Configuration updated successfully!
+            success: Configuration updated successfully
         constraints:
           create:
             error: Error creating condition case
@@ -119,8 +148,44 @@ sv:
           checks: System compatibility
           editors: Editor hacks
           livechat: Live Chat
+          menu_hacks: Menu tweaks
           proposals: Proposals hacks
+          styles: Custom styles
           surveys: Surveys & forms
+        menu_hacks:
+          create:
+            error: Error creating menu item! %{error}
+            success: Menu item created successfully
+          destroy:
+            error: Error removing menu item! %{error}
+            success: Menu item removed successfully
+          edit:
+            save: Spara
+            title: Redigera menyobjekt
+          form:
+            label_help: Translations aren't automatically detected, be sure to fill in all the fields!
+            target:
+              blank: Nytt fönster
+              self: Samma fönster
+            visibility:
+              default: Synligt
+              hidden: Alltid dolt
+              logged: Endast synlig för inloggade användare
+              non_logged: Only visible for non-logged users
+          index:
+            confirm_destroy: Are you sure to remove this customization?
+            edit: Edit
+            new: New item
+            remove: Remove addition
+            remove_hack: Remove customization
+            title: Main menu
+          new:
+            save: Spara
+            title: New menu item
+          update:
+            error: Error updating menu item! %{error}
+            success: Menu item updated successfully
+          url_exists: The same URL is already configured, please edit that instead of creating it again.
       config:
         intergram:
           auto_no_response: It seems that no one is available to answer right now. Please tell us how we can contact you, and we will get back to you as soon as we can.
@@ -132,14 +197,14 @@ sv:
       editor_images:
         create:
           error: Error uploading image!
-          success: Image uploaded successfully!
+          success: Image uploaded successfully
       map_component:
         map:
           error:
             unavailable: The map is unavailable. Please configure geocoding to enable this component.
           show:
-            view_meeting: View meeting
-            view_proposal: View proposal
+            view_meeting: Visa möte
+            view_proposal: Visa förslag
   layouts:
     decidim:
       admin:
@@ -153,5 +218,8 @@ sv:
           autosaved_success: Data saved in local storage
           categories: Categories
           drag_and_drop_image: Add images by dragging & dropping or pasting them.
-          meetings: Meetings
-          proposals: Proposals
+          hashtags: Hashtags
+          items: items
+          meetings: Möten
+          proposals: Förslag
+          select_deselect_all: Select/deselect all

data/lib/decidim/decidim_awesome.rb

@@ -18,6 +18,7 @@ module Decidim
     autoload :SystemChecker, "decidim/decidim_awesome/system_checker"
     autoload :ContentRenderes, "decidim/decidim_awesome/content_renderers"
     autoload :ContextAnalyzers, "decidim/decidim_awesome/context_analyzers"
+    autoload :MenuHacker, "decidim/decidim_awesome/menu_hacker"
 
     # Boolean configuration options
     #
@@ -71,6 +72,20 @@ module Decidim
       {}
     end
 
+    # allows to keep modifications for the main menu
+    # can return :disabled to completly remove this feature
+    # otherwise it should be an array (some overrides can be specified by default):
+    # [
+    #    {
+    #       url: "/a-new-link",
+    #       label: { "en" => "The label to show in the menu" },
+    #       position: 10
+    #    }
+    # ]
+    config_accessor :menu do
+      []
+    end
+
     # these settings do not follow the :disabled convention but
     # depends on the previous intergram configurations
     config_accessor :intergram_url do

data/lib/decidim/decidim_awesome/admin_engine.rb

@@ -12,6 +12,7 @@ module Decidim
       routes do
         # Add admin engine routes here
         resources :constraints
+        resources :menu_hacks, except: [:show]
         resources :config, param: :var, only: [:show, :update]
         post :new_scoped_style, to: "config#new_scoped_style"
         post :destroy_scoped_style, param: :key, to: "config#destroy_scoped_style"

data/lib/decidim/decidim_awesome/awesome_helpers.rb

@@ -56,7 +56,7 @@ module Decidim
 
         styles = awesome_config[:scoped_styles]&.filter do |key, _value|
           config = AwesomeConfig.find_by(var: "scoped_style_#{key}", organization: current_organization)
-          @awesome_config_instance.valid_in_context?(config.constraints)
+          @awesome_config_instance.valid_in_context?(config&.constraints)
         end
         @awesome_custom_styles = styles.values.join("\n")
       end

data/lib/decidim/decidim_awesome/checksums.yml

@@ -1,17 +1,20 @@
 decidim-admin:
   /app/views/layouts/decidim/admin/_header.html.erb:
-    decidim-0.22: 6af51ec6b8a760b0ee6e00a7834f5f9a
     decidim-0.23: 45f0e15f1b02a1c1a73b1a2184fd55af
 decidim-core:
   /app/views/layouts/decidim/_head.html.erb:
-    decidim-0.22: bf16a58cd9e6d3f73e6875ff3d0b1e48
     decidim-0.23: e7f5eea07e884665474948ea750fc720
   /app/assets/javascripts/decidim/editor.js.es6:
-    decidim-0.22: 797d0ec1c9e79453cf6718f82d2fdd27
     decidim-0.23: cb059b8ff0ffc62c67eb99d8d7a6637b
     decidim-0.23.1: 4787f73f0f33661e3897404f10019d26
+    decidim-0.24: 35262835144421baa700a34ca0939396
+  /app/presenters/decidim/menu_presenter.rb:
+    decidim-0.23: 042743c44a2aff284b493c7bebbccbb3
+    decidim-0.24: 284c96f19cd98df091d8178d6db5a8b3
+  /app/presenters/decidim/menu_item_presenter.rb:
+    decidim-0.23: 70db39954b5840924530bf94d2a0a73a
 decidim-proposals:
   /app/presenters/decidim/proposals/proposal_presenter.rb:
-    decidim-0.22: 7d60c8310d7fa4e38d9a27080c22b12c
     decidim-0.23: 437c0c25151f605401a4f14d090ba5ea
     decidim-0.23.1: 892021b2ce9ac10c2e1b738e6948cde0
+    decidim-0.24: 0b6717a3eeecad03277cea5ed6ba1fb7

data/lib/decidim/decidim_awesome/config.rb

@@ -119,9 +119,7 @@ module Decidim
       def enabled_for_organization?(key)
         case key.to_sym
         when :allow_images_in_proposals
-          if @organization.respond_to? :rich_text_editor_in_public_views
-            return false if @organization.rich_text_editor_in_public_views
-          end
+          return false if @organization.rich_text_editor_in_public_views
         end
         true
       end

data/lib/decidim/decidim_awesome/engine.rb

@@ -15,13 +15,13 @@ module Decidim
       end
 
       initializer "decidim_awesome.view_helpers" do
-        ActionView::Base.send :include, AwesomeHelpers
+        ActionView::Base.include AwesomeHelpers
       end
 
       initializer "decidim_decidim_awesome.assets" do |app|
         app.config.assets.precompile += %w(decidim_decidim_awesome_manifest.js decidim_decidim_awesome_manifest.css)
-        # add to precompile any present
-        Dir.glob(Rails.root.join("app", "assets", "themes", "*.*")).each do |path|
+        # add to precompile any present theme asset
+        Dir.glob(Rails.root.join("app/assets/themes/*.*")).each do |path|
           app.config.assets.precompile << path
         end
       end

data/lib/decidim/decidim_awesome/iframe_component/component.rb

@@ -43,7 +43,7 @@ Decidim.register_component(:awesome_iframe) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
+        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
       }
     }
 

data/lib/decidim/decidim_awesome/map_component/component.rb

@@ -16,7 +16,13 @@ Decidim.register_component(:awesome_map) do |component|
     # Available types: :integer, :boolean
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :map_height, type: :integer, default: 700
+    settings.attribute :map_center, type: :string, default: ""
+    settings.attribute :map_zoom, type: :integer, default: 8
+    settings.attribute :truncate, type: :integer, default: 255
     settings.attribute :collapse, type: :boolean, default: false
+    settings.attribute :menu_amendments, type: :boolean, default: true
+    settings.attribute :menu_meetings, type: :boolean, default: true
+    settings.attribute :menu_hashtags, type: :boolean, default: true
   end
 
   component.settings(:step) do |settings|
@@ -26,7 +32,7 @@ Decidim.register_component(:awesome_map) do |component|
     settings.attribute :show_evaluating, type: :boolean, default: true
     settings.attribute :show_accepted, type: :boolean, default: true
     # Not possible yet (needs graphql update):
-    # settings.attribute :show_rejected, type: :boolean, default: false
+    settings.attribute :show_rejected, type: :boolean, default: false
     settings.attribute :show_withdrawn, type: :boolean, default: false
   end
 
@@ -47,7 +53,7 @@ Decidim.register_component(:awesome_map) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
+        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
       }
     }
 

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class MenuHacker
+      include Decidim::TranslatableAttributes
+      def initialize(name, view)
+        @name = name
+        @organization = view.try(:current_organization)
+        @user = view.try(:current_user)
+        @view = view
+      end
+
+      # returns a combined array of the Decidim defined menu and the hacked stored as config vars
+      def items(include_invisible: false)
+        return @items if @items
+
+        @items = default_items
+        menu_overrides.each do |item|
+          default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
+          if default
+            item.send("overrided?=", true)
+            @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
+          end
+          @items << item
+        end
+
+        @items.select!(&:visible?) unless include_invisible
+        @items.sort_by!(&:position)
+      end
+
+      private
+
+      attr_accessor :organization, :user
+      attr_reader :name, :view
+
+      def default_items
+        @default_items ||= build_menu.instance_variable_get(:@items).map do |item|
+          item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
+          item
+        end
+      end
+
+      def build_menu
+        menu = Decidim::Menu.new(name)
+        menu.build_for(view)
+        menu
+      end
+
+      def menu_overrides
+        @menu_overrides ||= current_config.map do |item|
+          OpenStruct.new(
+            label: translated_attribute(item["label"], organization),
+            raw_label: item["label"],
+            url: item["url"],
+            position: item["position"] || 1,
+            # see options in https://github.com/comfy/active_link_to
+            active: method(:activate?),
+            visibility: item["visibility"],
+            visible?: visible?(item),
+            target: item["target"],
+            overrided?: false
+          )
+        end
+      end
+
+      def activate?(url, view)
+        urls = @items.map(&:url).sort_by(&:length).reverse
+        url == urls.find { |u| view.request.original_fullpath.start_with?(u) }
+      end
+
+      def visible?(item)
+        case item["visibility"]
+        when "hidden"
+          false
+        when "logged"
+          user.present?
+        when "non_logged"
+          user.blank?
+        else
+          true
+        end
+      end
+
+      def current_config
+        @current_config ||= (AwesomeConfig.find_by(var: name, organization: organization)&.value || []).filter { |i| i.is_a? Hash }
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -14,7 +14,7 @@ module Decidim
           @overrides = checksums.map do |package, files|
             props = {
               spec: ::Gem::Specification.find_by_name(package),
-              files: files.map { |file, signatures| [file, signatures.values] }.to_h
+              files: files.transform_values(&:values)
             }
             [package, to_struct(props)]
           end