decidim-decidim_awesome 0.6.5 → 0.7.2

data/app/assets/stylesheets/decidim/decidim_awesome/admin/codemirror.scss

@@ -0,0 +1,27 @@
+.awesome-edit-config{
+  .scoped_styles_container,
+  .proposal_custom_fields_container{
+    .form-error{
+      margin: 0;
+    }
+
+    >.CodeMirror{
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+      border-top: .5em solid #e0e0e0;
+      border-right: .5em solid #e0e0e0;
+      border-bottom: .5em solid #e0e0e0;
+      min-height: 6em;
+      height: auto;
+      max-height: 40em;
+      resize: vertical;
+      overflow: vertical !important;
+
+      >.CodeMirror-scroll{
+        >.CodeMirror-gutters{
+          background: #e0e0e0;
+        }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/admin/constraints.scss

@@ -28,10 +28,22 @@
       &.component_id{
         background-color: #ee449c;
       }
+
+      &.constraint{
+        &-none{
+          background-color: #ff3000;
+        }
+      }
     }
 
     a{
       margin-left: 1rem;
     }
+
+    &.inactive{
+      .label:not(.constraint-none){
+        filter: saturate(10%);
+      }
+    }
   }
 }

data/app/assets/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss

@@ -0,0 +1,66 @@
+// hide custom-fields inside tabs, an extra (unique) container is used instead
+.tabs-content {
+  .proposal_custom_field {
+    display: none;
+  }
+}
+
+.proposal_custom_fields{
+  &_editor{
+    background-color: #e0e0e0;
+    padding: .5em .5em 1em;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+
+    label{
+      display: inline-block;
+      max-width: 100%;
+      font-weight: 600 !important;
+    }
+
+    li[type]{
+      display: inherit;
+      width: 100%;
+      height: inherit;
+      margin: inherit;
+      border: inherit;
+      box-shadow: inherit;
+      font-size: inherit;
+      font-weight: inherit;
+      line-height: inherit;
+      color: inherit;
+    }
+
+    .form-group{
+      background-color: inherit;
+      margin: 0;
+      padding: 0;
+    }
+
+    .form-wrap.form-builder .form-group{
+      margin-bottom: 10px !important;
+    }
+
+    .form-control{
+      color: #555;
+      background-color: #fff;
+      border: 1px solid #ccc;
+      box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+      transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+      margin: 0;
+      padding: 6px 12px;
+    }
+  }
+
+  &_container{
+    .constraints-editor{
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+    }
+  }
+}
+
+// Custom fields tunning
+.rendered-form .form-control.ql-container{
+  height: auto !important;
+}

data/app/assets/stylesheets/decidim/decidim_awesome/admin/user_picker.scss

@@ -0,0 +1,35 @@
+@import "select2";
+@import "select2-foundation-theme";
+
+.multiusers-select-container{
+  form label{
+    margin-bottom: 1rem;
+  }
+
+  .switch-paddle{
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 1em;
+  }
+}
+
+.select2-container--foundation .select2-selection--multiple .select2-selection__choice{
+  display: inline-block;
+  float: none;
+  font-weight: normal;
+
+  .is-admin{
+    &::before{
+      content: '⛔';
+      display: inline-block;
+      margin-right: .3em;
+    }
+
+    text-decoration: line-through;
+    color: #bbb;
+  }
+}
+
+.form-conversations-submit{
+  margin-top: 2rem;
+}

data/app/assets/stylesheets/decidim/decidim_awesome/{admin.scss → awesome_admin.scss}

@@ -1,4 +1,5 @@
 //= require github.min
+//= require codemirror
 //= require inscrybmde.min
 //= require_self
 
@@ -6,6 +7,10 @@
 @import "decidim/utils/settings";
 @import "decidim/utils/mixins";
 @import "./admin/constraints";
+@import "./admin/codemirror";
+@import "./admin/user_picker";
+@import "./admin/custom_fields";
+@import "./admin/auto_edits";
 @import "./editors/quill_editor";
 @import "./editors/markdown_editor";
 
@@ -17,7 +22,7 @@
   font-size: .8em;
 }
 
-.decidim_awesome {
+.decidim_awesome{
   &.modal{
     .spinner{
       @include spinner(25px, #aaa, var(--secondary), 800ms);
@@ -33,17 +38,27 @@
     }
   }
 
-  &-form {
+  &-form{
     margin-bottom: 2em;
     border-bottom: 1px solid #999;
     padding-bottom: 1.5em;
+    .help-text {
+      white-space: pre-wrap;
+    }
   }
-  &-form:last-child {
+
+  &-form:last-child{
     border-bottom: none;
     padding-bottom: 0;
   }
 }
 
-tbody tr.menu_hack-addition {
+tbody tr.menu_hack-addition{
   background: rgb(255, 248, 222);
 }
+
+.secondary-nav {
+  li .icon {
+    margin-right: 0.5rem;
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_application.scss

@@ -0,0 +1,22 @@
+//= require github.min
+//= require inscrybmde.min
+//= require_self
+
+@import "./editors/quill_editor";
+@import "./editors/markdown_editor";
+@import "./forms/autosave";
+
+.decidim_awesome-custom_fields{
+  dd{
+    >div:last-child{
+      margin-bottom: 1rem;
+    }
+
+    &[name="textarea"]{
+      >div > p{
+        margin-top: 1rem;
+        margin-bottom: 0;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/leaflet.scss.erb

@@ -7,3 +7,12 @@
 .leaflet-default-icon-path {
   background-image: url(<%= asset_path "marker-icon.png" %>);
 }
+.leaflet-container {
+  font: inherit;
+
+  #bodyContent .description {
+    img, iframe {
+      max-height: 5em;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/map.scss

@@ -1,4 +1,3 @@
-// = require decidim/map
 @import "decidim/decidim_awesome/awesome_map/leaflet";
 
 // Increase z-index for components menu otherwise map hides menu extensions
@@ -63,4 +62,99 @@
     border: 2px solid #bbb;
     border-radius: 4px;
   }
+
+  .awesome_map-title-control{
+    display: block;
+    cursor: pointer;
+
+    &::after{
+      content: '';
+      width: 0;
+      height: 0;
+      border-left: 5px solid transparent;
+      border-right: 5px solid transparent;
+      border-top: 5px solid black;
+      border-bottom: 0;
+      display: inline-block;
+      margin: 0 0 2px 5px;
+    }
+  }
+
+  .active{
+    .awesome_map-title-control::after{
+      border-top: 0;
+      border-bottom: 5px solid black;
+    }
+  }
+
+  #awesome_map-{
+    &categories-control{
+      display: none;
+
+      label{
+        margin-left: .5rem;
+        display: none;
+
+        i{
+          display: inline-block;
+          width: .8rem;
+          height: .8rem;
+          border-radius: 50%;
+          background-color: var(-- primary);
+        }
+
+        &.subcategory{
+          padding-left: 1em;
+        }
+      }
+
+      .categories-container{
+        display: none;
+      }
+
+      &.active{
+        .categories-container{
+          display: block;
+        }
+      }
+    }
+
+    &hashtags-control{
+      display: none;
+
+      label{
+        display: inline-block;
+        line-height: 1;
+        background-color: #f0f0f0;
+        border-radius: 5px;
+        margin: .5rem;
+        padding: .5rem;
+
+        span{
+          margin: 0 .5rem 2px 0;
+        }
+
+        input{
+          vertical-align: top;
+        }
+      }
+
+      .awesome_map-toggle_all_tags{
+        margin: .5rem 1rem;
+        font-size: .875rem;
+      }
+
+      .hashtags-container,
+      .awesome_map-toggle_all_tags{
+        display: none;
+      }
+
+      &.active{
+        .hashtags-container,
+        .awesome_map-toggle_all_tags{
+          display: block;
+        }
+      }
+    }
+  }
 }

data/app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss

@@ -1,6 +1,6 @@
 // editor tweaks
 //
-.CodeMirror{
+.editor .CodeMirror{
   color: #333;
   font-weight: normal;
   line-height: 1.45;

data/app/assets/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss

@@ -1,7 +1,22 @@
+@import "decidim/variables";
+@import "decidim/utils/settings";
+@import "decidim/utils/mixins";
+
 .editor-loading{
-  background: url(loading.gif) no-repeat center right;
+  &::before{
+    @include spinner(25px, $medium-gray, var(--primary), 800ms);
+
+    float: right;
+    content: "";
+    vertical-align: middle;
+  }
 }
 
 .editor-container{
   overflow: hidden;
 }
+
+.editor.hashtags__container>p.help-text {
+  margin-top: -1rem;
+  margin-bottom: 1.5rem;
+}

data/app/awesome_overrides/forms/decidim/proposals/proposal_wizard_create_step_form_override.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# Recreate validations to take into account custom fields and ignore the length limit in proposals
+Decidim::Proposals::ProposalWizardCreateStepForm.class_eval do
+  clear_validators!
+
+  validates :title, presence: true, etiquette: true
+  validates :title, length: { in: 15..150 }
+  validates :body, presence: true, etiquette: true, unless: ->(form) { form.override_validations? }
+  validates :body, proposal_length: {
+    minimum: 15,
+    maximum: ->(record) { record.override_validations? ? 0 : record.component.settings.proposal_length }
+  }
+
+  validate :body_is_not_bare_template, unless: ->(form) { form.override_validations? }
+
+  def override_validations?
+    return false if context.current_component.settings.participatory_texts_enabled
+
+    custom_fields.present?
+  end
+
+  def custom_fields
+    awesome_config = Decidim::DecidimAwesome::Config.new(context.current_organization)
+    awesome_config.context_from_component(context.current_component)
+    awesome_config.collect_sub_configs_values("proposal_custom_field")
+  end
+end

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

@@ -2,16 +2,24 @@
 
 Decidim::MenuPresenter.class_eval do
   def evaluated_menu
-    @evaluated_menu ||= if Decidim::DecidimAwesome.config.send(@name) == :disabled
+    @evaluated_menu ||= if awesome_override?
+                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
+                        else
                           begin
                             menu = Decidim::Menu.new(@name)
                             menu.build_for(@view)
                             menu
                           end
-                        else
-                          Decidim::DecidimAwesome::MenuHacker.new(@name, @view)
                         end
   end
+
+  private
+
+  def awesome_override?
+    return false unless Decidim::DecidimAwesome.config.has_key?(@name)
+
+    Decidim::DecidimAwesome.config.send(@name) != :disabled
+  end
 end
 
 Decidim::MenuItemPresenter.class_eval do

data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb

@@ -0,0 +1,74 @@
+<section class="wrapper-home map-block home-section">
+  <div class="row">
+
+    <%= section_title %></h3>
+
+    <div class="row">
+      <div class="columns medium-12">
+        <%= awesome_map_for global_map_components do %>
+          <script id="marker-proposal-popup" type="text/x-jsrender">
+            <div class="map-info__content">
+              <h3>{{>title.translation}}</h3>
+              <div id="bodyContent">
+                <div class="description">{{:body.translation}}</div>
+                <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", scope: "decidim.decidim_awesome.map_component.map.show") %>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </script>
+
+          <script id="marker-meeting-popup" type="text/x-jsrender">
+            <div class="map-info__content">
+              <h3>{{>title.translation}}</h3>
+              <div id="bodyContent">
+                <div class="description">{{:description.translation}}</div>
+                <div class="map__date-adress">
+                  <div class="card__datetime">
+                    <div class="card__datetime__date">
+                      {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
+                    </div>
+                    <div class="card__datetime__time">{{>starTime}}</div>
+                  </div>
+                  <div class="address card__extra">
+                    <div class="address__icon">{{:icon}}</div>
+                    <div class="address__details">
+                      <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">
+                    <%= t("decidim.meetings.meetings_map.view_meeting") %>
+                  </a>
+                </div>
+              </div>
+            </div>
+          </script>
+
+          <style type="text/css">
+            #awesome-map .leaflet-container {
+              height: <%= model.settings.map_height %>px;
+            }
+          </style>
+          <script>
+            window.AwesomeMap = window.AwesomeMap || {};
+            window.AwesomeMap.categories = <%= all_categories.to_json.html_safe %>;
+          </script>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module ContentBlocks
+      class MapCell < Decidim::ViewModel
+        include Decidim::DecidimAwesome::MapHelper
+        include Decidim::CardHelper
+
+        delegate :snippets, to: :controller
+        delegate :settings, to: :model
+        alias current_settings settings
+
+        def hide_controls
+          true
+        end
+
+        def all_categories
+          return if @all_categories.present?
+
+          @category_ids ||= Decidim::Category.pluck(:id, :decidim_participatory_space_type, :decidim_participatory_space_id).select do |category|
+            _id, space_type, space_id = category
+            space = space_type.constantize.find(space_id)
+            space.organization == current_organization
+          end.map(&:first)
+
+          @all_categories ||= Decidim::Category.where(id: @category_ids)
+        end
+
+        def global_map_components
+          @global_map_components ||= Decidim::Component.where(manifest_name: [:meetings, :proposals]).published.filter do |component|
+            case component.manifest.name
+            when :meetings
+              true
+            when :proposals
+              component.settings.geocoding_enabled
+            else
+              false
+            end
+          end
+        end
+
+        def section_title
+          return if model.settings.title.blank?
+          return if model.settings.title.values.join.blank?
+
+          content_tag :h3, class: "section-heading" do
+            translated_attribute(model.settings.title)
+          end
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/decidim_awesome/content_blocks/map_form/show.erb

@@ -0,0 +1,61 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <h3><%= t("text_settings", scope: i18n_scope) %></h3>
+
+  <div class="row">
+    <%= settings_fields.translated :text_field, :title, label: t("title", scope: i18n_scope) %>
+  </div>
+
+  <h3 class="mt-m"><%= t("map_settings", scope: i18n_scope) %></h3>
+
+  <div class="row two-buttons">
+    <div>
+      <%= settings_fields.number_field :truncate, label: t("truncate", scope: i18n_scope) %>
+    </div>
+    <div>
+      <%= settings_fields.number_field :map_height, label: t("map_height", scope: i18n_scope) %>
+    </div>
+  </div>
+
+  <div class="row two-buttons">
+    <div>
+      <%= settings_fields.text_field :map_center, label: t("map_center", scope: i18n_scope) %>
+      <%= t("map_center_help", scope: i18n_scope) %>
+    </div>
+    <div><%= settings_fields.number_field :map_zoom, label: t("map_zoom", scope: i18n_scope) %>
+      <%= t("map_zoom_help", scope: i18n_scope) %>
+    </div>
+  </div>
+  <div class="row two-buttons">
+    <div>
+      <%= settings_fields.check_box :menu_amendments, label: t("menu_amendments", scope: i18n_scope) %>
+    </div>
+    <div><%= settings_fields.check_box :menu_meetings, label: t("menu_meetings", scope: i18n_scope) %>
+    </div>
+  </div>
+  <div class="row two-buttons">
+    <div><%= settings_fields.check_box :show_not_answered, label: t("show_not_answered", scope: i18n_scope) %></div>
+    <div><%= settings_fields.check_box :show_accepted, label: t("show_accepted", scope: i18n_scope) %>
+    </div>
+  </div>
+  <div class="row two-buttons">
+    <div><%= settings_fields.check_box :show_withdrawn, label: t("show_withdrawn", scope: i18n_scope) %></div>
+    <div><%= settings_fields.check_box :show_evaluating, label: t("show_evaluating", scope: i18n_scope) %>
+    </div>
+  </div>
+  <div class="row">
+      <%= settings_fields.check_box :show_rejected, label: t("show_rejected", scope: i18n_scope) %>
+  </div>
+<% end %>
+
+<style>
+  .two-buttons {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 1em;
+  }
+  .two-buttons > div {
+    width: 50%;
+  }
+</style>

data/app/cells/decidim/decidim_awesome/content_blocks/map_form_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module ContentBlocks
+      class MapFormCell < Decidim::ViewModel
+        alias form model
+
+        def content_block
+          options[:content_block]
+        end
+
+        def i18n_scope
+          "decidim.decidim_awesome.content_blocks.map"
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      module NeedsConstraintHelpers
+        private
+
+        def create_constraint_never(var)
+          settings = { "participatory_space_manifest" => "none" }
+          subconfig = AwesomeConfig.find_or_initialize_by(var: "#{var}_#{@ident}", organization: @organization)
+          @constraint = ConfigConstraint.create!(
+            awesome_config: subconfig,
+            settings: settings
+          )
+        end
+
+        def constraint_can_be_destroyed?(constraint)
+          return true if constraint.awesome_config.blank?
+          return true if constraint.awesome_config.constraints.count > 1
+
+          case constraint.awesome_config.var.to_s
+          when /^proposal_custom_field/
+            false
+          else
+            true
+          end
+        end
+      end
+    end
+  end
+end