decidim-decidim_awesome 0.7.2 → 0.8.0

data/app/packs/stylesheets/vendor/select2-foundation-theme.scss

@@ -0,0 +1,348 @@
+span.select2-container--foundation {
+  vertical-align: top;
+}
+
+span.select2-container--foundation .selection {
+  margin: 0 0 1rem;
+}
+
+.select2-container--foundation {
+  /**
+   * Search field in the Select2 dropdown.
+   */
+
+  /**
+   * No outline for all search fields - in the dropdown
+   * and inline in multi Select2s.
+   */
+
+  /* Clear the selection. */
+
+  /**
+   * Address disabled Select2 styles.
+   *
+   * @see https://select2.github.io/examples.html#disabled
+   * @see http://getbootstrap.com/css/#forms-control-disabled
+   */
+
+  /* ------------------------------------*\
+          #DROPDOWN
+  \*------------------------------------ */
+}
+
+.select2-container--foundation .select2-selection {
+  background-color: #fefefe;
+  border: 1px solid #cacaca;
+  border-radius: 0;
+  color: #0a0a0a;
+  font-family: inherit;
+  font-size: 1rem;
+  background: #fefefe;
+  outline: 0;
+}
+
+.select2-container--foundation .select2-search--dropdown .select2-search__field {
+  background-color: #fefefe;
+  border: 1px solid #cacaca;
+  border-radius: 0;
+  color: #0a0a0a;
+  font-family: inherit;
+  font-size: 1rem;
+  border-radius: 0;
+}
+
+.select2-container--foundation .select2-search__field {
+  outline: 0;
+
+  /* Firefox 18- */
+
+  /**
+     * Firefox 19+
+     *
+     * @see http://stackoverflow.com/questions/24236240/color-for-styled-placeholder-text-is-muted-in-firefox
+     */
+}
+
+.select2-container--foundation .select2-search__field::-webkit-input-placeholder {
+  color: #8a8a8a;
+}
+
+.select2-container--foundation .select2-search__field:-moz-placeholder {
+  color: #8a8a8a;
+}
+
+.select2-container--foundation .select2-search__field::-moz-placeholder {
+  color: #8a8a8a;
+  opacity: 1;
+}
+
+.select2-container--foundation .select2-search__field:-ms-input-placeholder {
+  color: #8a8a8a;
+}
+
+.select2-container--foundation .select2-results__option {
+  /**
+     * Disabled results.
+     *
+     * @see https://select2.github.io/examples.html#disabled-results
+     */
+
+  /**
+     * Hover state.
+     */
+
+  /**
+     * Selected state.
+     */
+}
+
+.select2-container--foundation .select2-results__option[role=group] {
+  padding: 0;
+}
+
+.select2-container--foundation .select2-results__option[role=group] strong {
+  padding-left: .125rem;
+}
+
+.select2-container--foundation .select2-results__option[aria-disabled=true] {
+  color: #8a8a8a;
+  cursor: default;
+}
+
+.select2-container--foundation .select2-results__option--highlighted[aria-selected] {
+  background-color: #2199e8;
+  color: foreground(#2199e8);
+}
+
+.select2-container--foundation.select2-container--focus .select2-selection {
+  border: 1px solid #8a8a8a;
+}
+
+.select2-container--foundation.select2-container--open .select2-selection {
+  border: 1px solid #8a8a8a;
+  border-radius: 0;
+}
+
+.select2-container--foundation.select2-container--open {
+  /**
+     * Make the dropdown arrow point up while the dropdown is visible.
+     */
+}
+
+.select2-container--foundation.select2-container--open .select2-selection__arrow b {
+  transform: rotate(180deg);
+}
+
+.select2-container--foundation .select2-choice {
+  box-shadow: none;
+  background-image: none;
+}
+
+.select2-container--foundation .select2-choice div {
+  background-clip: padding-box;
+}
+
+.select2-container--foundation .select2-choice .select2-arrow {
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+  background-image: none;
+}
+
+.select2-container--foundation *:focus {
+  outline: 0;
+}
+
+.select2-container--foundation .select2-selection__clear {
+  color: #8a8a8a;
+  cursor: pointer;
+  float: left;
+  font-weight: bold;
+  margin-right: 0;
+}
+
+.select2-container--foundation .select2-selection__clear:hover {
+  color: #333;
+}
+
+.select2-container--foundation.select2-container--disabled .select2-selection {
+  border: 1px solid #cacaca;
+}
+
+.select2-container--foundation.select2-container--disabled .select2-selection,
+.select2-container--foundation.select2-container--disabled .select2-search__field {
+  cursor: default;
+}
+
+.select2-container--foundation.select2-container--disabled .select2-selection,
+.select2-container--foundation.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
+  background-color: #e6e6e6;
+  color: foreground(#e6e6e6);
+}
+
+.select2-container--foundation.select2-container--disabled .select2-selection__clear,
+.select2-container--foundation.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove {
+  display: none;
+}
+
+.select2-container--foundation .select2-dropdown {
+  border: 1px solid #8a8a8a;
+  border-top: 1px solid #cacaca;
+  background: #fefefe;
+  border-radius: 0;
+  overflow-x: hidden;
+  margin-top: -.0625rem;
+}
+
+.select2-container--foundation .select2-dropdown--above {
+  margin-top: .0625rem;
+  border-radius: 0;
+  border-top: 1px solid #8a8a8a;
+  border-bottom: 1px solid #cacaca;
+}
+
+.select2-container--foundation .select2-results > .select2-results__options {
+  /* Limit the dropdown height. */
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+/**
+ * Temporary fix for https://github.com/select2/select2-bootstrap-theme/issues/9
+ *
+ * Provides `!important` for certain properties of the class applied to the
+ * original `<select>` element to hide it.
+ *
+ * @see https://github.com/select2/select2/pull/3301
+ * @see https://github.com/fk/select2/commit/31830c7b32cb3d8e1b12d5b434dee40a6e753ada
+ */
+.form-control.select2-hidden-accessible {
+  position: absolute !important;
+  width: 1px !important;
+}
+
+/**
+ * Display override for inline forms
+ */
+.input-group span.select2-container--foundation {
+  margin: 0;
+  vertical-align: middle;
+}
+
+.input-group span.select2-container--foundation .selection .select2-selection {
+  vertical-align: middle;
+  border-radius: 0;
+}
+
+/****** Single SCSS *******/
+.select2-container--foundation .select2-selection--single,
+.select2-container--foundation .selection .select2-selection--single {
+  height: 2.4375rem;
+  line-height: 1.5;
+  padding: .5rem;
+}
+
+.select2-container--foundation .select2-selection--single .select2-selection__rendered,
+.select2-container--foundation .selection .select2-selection--single .select2-selection__rendered {
+  color: #0a0a0a;
+}
+
+.select2-container--foundation .select2-selection--single .select2-selection__arrow,
+.select2-container--foundation .selection .select2-selection--single .select2-selection__arrow {
+  height: 2.4375rem;
+  position: absolute;
+  top: 0;
+  right: 1px;
+  width: 20px;
+}
+
+.select2-container--foundation .select2-selection--single .select2-selection__arrow b,
+.select2-container--foundation .selection .select2-selection--single .select2-selection__arrow b {
+  border-color: #333 transparent transparent;
+  top: 50%;
+  border-style: solid;
+  border-width: 6px 4px 0;
+  height: 0;
+  left: 50%;
+  margin-left: -4px;
+  margin-top: -2px;
+  position: absolute;
+  width: 0;
+}
+
+.select2-container--foundation .select2-selection--single .select2-selection__placeholder,
+.select2-container--foundation .selection .select2-selection--single .select2-selection__placeholder {
+  color: #8a8a8a;
+}
+
+.select2-container--foundation .select2-selection--single .select2-selection__clear,
+.select2-container--foundation .selection .select2-selection--single .select2-selection__clear {
+  cursor: pointer;
+  float: right;
+  font-weight: bold;
+}
+
+/****** Multiple SCSS *******/
+.select2-container--foundation .select2-selection--multiple {
+  /* Clear the selection.  */
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice__remove:hover {
+  cursor: pointer;
+}
+
+.select2-container--foundation .select2-selection--multiple ul.select2-selection__rendered,
+.select2-container--foundation .select2-selection--multiple .select2-selection__rendered {
+  display: inherit;
+  box-sizing: border-box;
+  list-style: none;
+  margin: 0;
+  padding: 0 5px;
+  width: 100%;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice {
+  border-radius: 0;
+  padding: .1875rem .3125rem;
+  cursor: default;
+  float: left;
+  margin-right: .3125rem;
+  margin-top: .125rem;
+  margin-bottom: .125rem;
+  border: 1px solid #8a8a8a;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice__remove {
+  margin-right: 6px;
+  margin-left: 6px;
+  float: right;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-search--inline .select2-search__field {
+  background: transparent;
+  line-height: 1.5;
+  border: 0;
+  margin-top: 0;
+  min-width: 5rem;
+  height: 2.375rem;
+  box-shadow: none;
+  margin: 0;
+  margin-right: -2rem;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice__remove {
+  color: #8a8a8a;
+  cursor: pointer;
+  display: inline-block;
+  font-weight: bold;
+  margin-right: .25rem;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice__remove:hover {
+  color: #333;
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__clear {
+  margin-right: .1875rem;
+  margin-top: .5rem;
+}

data/app/presenters/decidim/decidim_awesome/menu_item_presenter_override.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module MenuItemPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def link_to(name = nil, options = nil, html_options = nil, &block)
+          html_options ||= {}
+          html_options[:target] = @menu_item.try(:target)
+
+          options ||= html_options
+          @view.link_to(name, options, html_options, &block)
+        end
+
+        def active
+          return @menu_item.active.call(url, @view) if @menu_item.try(:active).respond_to?(:call)
+
+          @menu_item&.active
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/menu_presenter_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module MenuPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def evaluated_menu
+          @evaluated_menu ||= if DecidimAwesome.enabled?(@name)
+                                Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
+                              else
+                                begin
+                                  menu = Decidim::Menu.new(@name)
+                                  menu.build_for(@view)
+                                  menu
+                                end
+                              end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim::Cw
+  module DecidimAwesome
+    # Transitional class to allow carrierwave to active storage migrations
+    class ImageUploader < Decidim::Cw::ImageUploader
+      process :validate_size, :validate_dimensions
+
+      version :thumbnail do
+        process resize_to_fit: [nil, 237]
+      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
+    end
+  end
+end

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

@@ -4,22 +4,10 @@ module Decidim
   module DecidimAwesome
     # This class deals with uploading images to a Blueprints.
     class ImageUploader < Decidim::ImageUploader
-      process :validate_size, :validate_dimensions
-
-      version :thumbnail do
-        process resize_to_fit: [nil, 237]
-      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
+      set_variants do
+        {
+          thumbnail: { resize_to_fit: [nil, 237] }
+        }
       end
     end
   end

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

@@ -4,13 +4,23 @@
   </div>
   <div class="card-section">
     <p>
-      <%= t ".decidim_version", version: decidim_version %>
-      <% if decidim_version_valid? %>
-        <%= check :ok %>
-      <% else %>
-        <%= check :ko %>
-      <% end %>
-      </p>
+      <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
+      <%= check decidim_version_valid? %>
+    </p>
+  </div>
+  <div class="card-section">
+    <p><%= t(".images_migrated") %>
+    <% if images_migrated? %>
+      <%= check true %></p>
+    <% else %>
+      <%= check false %></p>
+      <div class="callout alert">
+        <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
+        <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
+      </div>
+    <% end %>
+  </div>
+  <div class="card-section">
     <ul class="vertical menu">
       <% overrides.each do |group, props| %>
       <li>
@@ -19,11 +29,7 @@
           <% props.files.each do |file, md5| %>
           <li>
             <%= file %>
-            <% if valid?(props.spec, file) %>
-              <%= check :ok %>
-            <% else %>
-              <%= check :ko %>
-            <% end %>
+            <%= check(valid?(props.spec, file)) %>
           </li>
           <% end %>
         </ul>
@@ -36,15 +42,15 @@
         <strong><%= t ".head_tags" %></strong>
         <ul class="vertical menu">
         <% {
-          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome')]"
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
+          JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>
-            <% if head.xpath(xpath).count > 0 %>
-              <%= check :ok %>
+            <% if head.xpath(xpath).count.positive? %>
+              <%= check true %>
             <% else %>
-              <%= check :ko %>
+              <%= check false %>
               <p class="help-text"><%= t ".errors.#{part}" %>:</p>
               <code class="help-text code-block"><%= head_addons(part) %></code>
             <% end %>
@@ -56,15 +62,15 @@
         <strong><%= t ".admin_head_tags" %></strong>
         <ul class="vertical menu">
         <% {
-          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome/awesome_admin')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome')]"
+          CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
+          JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>
-            <% if admin_head.xpath(xpath).count > 0 %>
-              <%= check :ok %>
+            <% if admin_head.xpath(xpath).count.positive? %>
+              <%= check true %>
             <% else %>
-              <%= check :ko %>
+              <%= check false %>
               <p class="help-text"><%= t ".errors.#{part}" %>:</p>
               <code class="help-text code-block"><%= admin_addons(part) %></code>
             <% end %>

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

@@ -22,6 +22,6 @@
         </li>
       <% end %>
   </ul>
-  <a href="<%= new_constraint_path(key: key) %>" class="add-condition"><%= t ".add_condition" %></a>
+  <a href="<%= new_constraint_path(key: key) %>" class="add-condition" data-open="constraintsModal"><%= t ".add_condition" %></a>
 
 </div>

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

@@ -18,4 +18,4 @@
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

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

@@ -1,5 +1,6 @@
 <div class="row column decidim_awesome-form">
   <p class="help-text"><%= t("help.drag_and_drop_supported", scope: "decidim.decidim_awesome.admin.config.form") %></p>
+  <p class="help-text"><%= t("help.original_editor_override", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
   <% enabled_configs([:allow_images_in_full_editor, :allow_images_in_small_editor]).each do |key| %>
     <%= form.check_box key %>

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

@@ -22,4 +22,4 @@
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

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

@@ -1,10 +1,11 @@
 <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 %>),
+    <p class="help-text"><%= t("help.scoped_styles", scope: "decidim.decidim_awesome.admin.config.form") %>
+      <%= t("help.scoped_styles_variables", scope: "decidim.decidim_awesome.admin.config.form") %>
+    </p>
+    <p class="help-text" style="white-space: unset">
+      <% ["primary", "secondary", "success", "warning", "alert", "highlight", "highlight_alternative"].each do |color| %>
+        <span class="color-box <%= color %>" style="background-color: <%= current_organization.colors[color] %>"></span> var(--<%= color %>)
       <% end %>
     </p>
 
@@ -22,4 +23,4 @@
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/decidim_awesome/admin/form_exit_warn" %>
+<%= javascript_pack_tag "decidim_decidim_awesome_admin_form_exit_warn" %>

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

@@ -1,6 +1,6 @@
 <div class="reveal decidim_awesome modal loading" id="constraintsModal" data-reveal>
   <div class="modal-content">
-
+modal content
   </div>
 
   <div class="spinner"></div>

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

@@ -1,10 +1,10 @@
-<%= 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| %>
+<%= decidim_form_for(@form, method: :patch, url: decidim_admin_decidim_awesome.config_path(config_var), html: { class: "awesome-edit-config" }, data: { "safe-path" => decidim_admin_decidim_awesome.config_path(config_var) }) do |f| %>
   <div class="card">
     <div class="card-divider">
-      <h2 class="card-title"><%= t(".title", setting: params[:var]) %></h2>
+      <h2 class="card-title"><%= t(".title", setting: config_var) %></h2>
     </div>
     <div class="card-section">
-      <%= render partial: "form_#{params[:var]}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
+      <%= render partial: "form_#{config_var}", locals: { form: f, errors: defined?(errors) ? errors : nil } %>
     </div>
   </div>
   <div class="button--double form-general-submit">

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

@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="button--double form-general-submit">
-    <%= f.submit t(".save") %>
+    <button type="submit" class="button" name="commit" data-close><%= t(".save") %></button>
     <button class="button hollow" type="button" data-close><%= t(".cancel") %></button>
   </div>
 <% end %>

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

@@ -0,0 +1,6 @@
+<div>
+    <%= form.text_field :origin, help_text: t(".origin_help") %>
+    <%= form.text_field :destination, help_text: t(".destination_help") %>
+    <%= form.check_box :active %>
+    <%= form.check_box :pass_query, help_text: t(".pass_query_help").html_safe %>
+</div>

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

@@ -0,0 +1,13 @@
+<%= decidim_form_for(@form, url: custom_redirect_path, method: :patch, html: { class: :form }) 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 %>