decidim-decidim_awesome 0.10.2 → 0.11.1

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin_global.scss

@@ -0,0 +1,19 @@
+@import "stylesheets/decidim/decidim_awesome/shared/spinner";
+@import "stylesheets/decidim/decidim_awesome/admin/intergram_fixes";
+@import "stylesheets/decidim/decidim_awesome/forms/custom_fields";
+
+.component__show {
+  &_private_data {
+    &-grid {
+      @apply bg-background grid-cols-2 gap-4 my-4 p-2;
+
+      .date_info {
+        @apply italic text-gray text-sm mt-4;
+
+        a {
+          @apply not-italic text-secondary;
+        }
+      }
+    }
+  }
+}

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

@@ -1,20 +1,5 @@
-@import "codemirror/lib/codemirror"; // used by inscribemde
-@import "stylesheets/decidim/decidim_awesome/editors/markdown_editor";
-@import "stylesheets/decidim/decidim_awesome/editors/quill_editor";
-@import "stylesheets/decidim/decidim_awesome/forms/autosave";
 @import "stylesheets/decidim/decidim_awesome/voting/voting_cards";
-
-.decidim_awesome-custom_fields {
-  dd {
-    >div:last-child {
-      margin-bottom: 1rem;
-    }
-
-    &[name="textarea"] {
-      >div > p {
-        margin-top: 1rem;
-        margin-bottom: 0;
-      }
-    }
-  }
-}
+@import "stylesheets/decidim/decidim_awesome/shared/spinner";
+@import "stylesheets/decidim/decidim_awesome/forms/autosave";
+@import "stylesheets/decidim/decidim_awesome/forms/custom_fields";
+@import "stylesheets/decidim/decidim_awesome/amendments/modal";

data/app/packs/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss

@@ -1,4 +1,4 @@
-.wrapper {
+.participatory-space__container {
   .awesome-iframe {
     margin: 0 auto;
 

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

@@ -2,18 +2,6 @@
 .dropdown-pane {
   z-index: 1000;
 }
-// Override padding in this component
-.wrapper {
-  padding: 0;
-
-  .callout.announcement {
-    margin-top: 2rem;
-  }
-
-  .google-map {
-    margin-bottom: 0;
-  }
-}
 
 #awesome-map {
   width: 100%;
@@ -21,21 +9,35 @@
   justify-content: center;
   align-items: center;
 
-  // .leaflet-marker-icon.svg-icon svg path{
-  //   filter: drop-shadow(3px 3px 2px rgba(0, 0, 0, .7));
-  // }
-
   .loading-spinner {
     z-index: 10000;
     position: absolute;
-    right: 0;
-    top: 0;
+    right: 50%;
+    top: 50%;
   }
 
-  .leaflet-container {
+  .leaflet-popup-content {
     font: inherit;
 
-    #bodyContent .description {
+    h3 {
+      @apply mb-2;
+    }
+
+    a {
+      @apply text-white;
+    }
+
+    .description {
+      @apply m-0 px-0 text-sm font-sans text-white;
+
+      p {
+        @apply mt-0;
+      }
+
+      a {
+        @apply underline;
+      }
+
       img,
       iframe {
         max-height: 5em;
@@ -45,7 +47,7 @@
 
   .leaflet-control-layers-list {
     hr {
-      margin: .5em 0;
+      margin: 0.5em 0;
     }
 
     b {
@@ -55,13 +57,13 @@
 
     label {
       line-height: 1;
-      font-size: .8rem;
-      margin: 0 .5em .5em;
+      font-size: 0.8rem;
+      margin: 0 0.5em 0.5em;
 
       i {
         display: inline-block;
-        width: .8rem;
-        height: .8rem;
+        width: 0.8rem;
+        height: 0.8rem;
         background-color: var(--primary);
       }
     }
@@ -72,7 +74,7 @@
   }
 
   .map-legend {
-    background: rgba(255, 255, 255, .8);
+    background: rgba(255, 255, 255, 0.8);
     padding: 1em;
     border: 2px solid #bbb;
     border-radius: 4px;
@@ -83,7 +85,7 @@
     cursor: pointer;
 
     &::after {
-      content: '';
+      content: "";
       width: 0;
       height: 0;
       border-left: 5px solid transparent;
@@ -103,6 +105,10 @@
   }
 }
 
+.participatory-space__container #awesome-map {
+  @apply mt-8 mb-8;
+}
+
 #awesome_map- {
   &categories-control {
     display: none;
@@ -112,10 +118,10 @@
       display: none;
 
       i {
-        margin-left: .5em;
+        margin-left: 0.5em;
         display: inline-block;
-        width: .8rem;
-        height: .8rem;
+        width: 0.8rem;
+        height: 0.8rem;
         border-radius: 50%;
         background-color: var(-- primary);
       }
@@ -144,11 +150,11 @@
       line-height: 1;
       background-color: #f0f0f0;
       border-radius: 5px;
-      margin: .5rem;
-      padding: .5rem;
+      margin: 0.5rem;
+      padding: 0.5rem;
 
       span {
-        margin: 0 .5rem 2px 0;
+        margin: 0 0 2px 0.4em;
       }
 
       input {
@@ -157,8 +163,8 @@
     }
 
     .awesome_map-toggle_all_tags {
-      margin: .5rem 1rem;
-      font-size: .875rem;
+      margin: 0.5rem 1rem;
+      font-size: 0.875rem;
     }
 
     .hashtags-container,

data/app/packs/stylesheets/decidim/decidim_awesome/forms/autosave.scss

@@ -1,10 +1,10 @@
 .awesome_autosave-notice {
-  background-color: rgba(var(--success-rgb), .8);
+  background-color: rgb(var(--success-rgb) / 90%);
   position: fixed;
-  top: 0;
-  right: 0;
-  margin: 2em;
-  padding: .5em 1em;
+  top: 90%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  padding: 1em 2em;
   border-radius: 4px;
   border: 1px solid var(--success);
   font-weight: 600;
@@ -12,6 +12,6 @@
   z-index: 1000;
 
   &.error {
-    background-color: rgba(var(--alert-rgb), .8);
+    background-color: rgb(var(--alert-rgb) / 90%);
   }
 }

data/app/packs/stylesheets/decidim/decidim_awesome/forms/custom_fields.scss

@@ -0,0 +1,118 @@
+.decidim_awesome-custom_fields {
+  &.private_body {
+    @apply px-4 py-6 mt-8 border border-gray rounded-s rounded-ee bg-gray-5 text-black font-normal;
+  }
+
+  .private_body-disclosure {
+    @apply -mt-4 mb-8 text-lg italic;
+
+    svg {
+      @apply inline-block w-6 h-6 mr-2 align-bottom;
+    }
+  }
+
+  dt {
+    @apply font-sans font-semibold;
+  }
+
+  dd {
+    @apply px-0;
+  }
+
+  // styles to tune a bit the form presentation in proposals creation
+  .proposal_custom_field {
+    h1 {
+      @apply font-sans font-bold text-4xl mt-4;
+    }
+
+    h2 {
+      @apply font-sans font-bold text-3xl mt-4;
+    }
+
+    h3 {
+      @apply font-sans font-semibold text-2xl mt-4;
+    }
+
+    h4 {
+      @apply font-sans font-semibold text-xl mt-4;
+    }
+
+    h5 {
+      @apply font-sans font-semibold text-lg mt-4;
+    }
+
+    h6 {
+      @apply font-sans font-semibold text-md mt-4;
+    }
+
+    p {
+      @apply mt-4;
+    }
+
+    // replace tooltips javascript with css
+    label {
+      .tooltip-element {
+        @apply m-0 p-0 invisible block;
+
+        &::before {
+          @apply visible text-xs text-gray-2 italic font-thin;
+
+          content: attr(tooltip);
+        }
+      }
+    }
+
+    .form-group:not(:first-of-type) {
+      @apply mt-6;
+    }
+
+    .form-control {
+      @apply w-full block mt-4;
+
+      &:not(.reset-defaults) {
+        @apply inline-block px-4 py-2 border border-gray outline outline-1 outline-transparent rounded bg-background-2 text-black font-normal placeholder:text-gray focus:outline-2 focus:outline-secondary disabled:bg-background-3 disabled:text-gray-2 disabled:cursor-not-allowed;
+
+        &.sm {
+          @apply px-1 py-0.5 text-sm;
+        }
+
+        &.sm-icon {
+          @apply pr-1 pl-6 py-0.5 text-sm;
+        }
+
+        &.is-invalid-input:not(:focus) {
+          @apply outline-2 outline-alert;
+        }
+      }
+
+      /* read-only can be applied only to input and textarea, otherwise selects will be set as readonly */
+      &:not(select) {
+        @apply read-only:bg-background read-only:border-0 read-only:text-gray-2;
+      }
+    }
+
+    .formbuilder-checkbox {
+      > label {
+        @apply font-normal;
+      }
+    }
+
+    .formbuilder-autocomplete {
+      @apply relative;
+
+      .formbuilder-autocomplete-list {
+        @apply z-20 max-h-52 outline outline-1 outline-transparent rounded border border-gray text-black font-normal;
+
+        li {
+          @apply cursor-pointer rounded px-4 py-2 bg-background-2;
+
+          &.active-option {
+            @apply bg-background;
+          }
+        }
+
+        display: none;
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/shared/spinner.scss

@@ -0,0 +1,26 @@
+// Loading spinner does not ocuppy all the width and height as the new spinner-container
+.loading-spinner {
+  @apply relative cursor-wait;
+
+  &::before {
+    @apply content-[""] ml-[50%] md:ml-[calc(50%-0.75rem)] block w-6 h-6 rounded-full animate-spin border-4 border-l-background border-y-background border-r-secondary z-20;
+  }
+
+  &.alert {
+    &::before {
+      @apply border-r-alert;
+    }
+  }
+
+  &.warning {
+    &::before {
+      @apply border-r-warning;
+    }
+  }
+
+  &.primary {
+    &::before {
+      @apply border-r-primary;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/decidim_awesome/voting/voting_cards.scss

@@ -8,54 +8,6 @@
 .voting-voting_cards {
   $rectangle-width: 3rem;
 
-  // ProposalM card
-  &-card {
-    a {
-      margin-bottom: 0;
-
-      > svg {
-        margin-bottom: 2px;
-        vertical-align: middle;
-      }
-
-      &.button {
-        &.weight_0 {
-          background-color: var(--voting-cards-weight-0);
-        }
-
-        &.weight_1 {
-          background-color: var(--voting-cards-weight-1);
-        }
-
-        &.weight_2 {
-          background-color: var(--voting-cards-weight-2);
-        }
-
-        &.weight_3 {
-          background-color: var(--voting-cards-weight-3);
-        }
-      }
-    }
-
-    .votes_counter {
-      .weight_0 {
-        color: var(--voting-cards-weight-0);
-      }
-
-      .weight_1 {
-        color: var(--voting-cards-weight-1);
-      }
-
-      .weight_2 {
-        color: var(--voting-cards-weight-2);
-      }
-
-      .weight_3 {
-        color: var(--voting-cards-weight-3);
-      }
-    }
-  }
-
   margin-bottom: 1.5rem;
   border-bottom: 2px solid #d9d9d9;
 
@@ -65,11 +17,12 @@
     border-bottom: none;
 
     .vote-card {
-      margin-top: .5rem;
+      margin-top: 0.5rem;
 
       .vote-label {
         margin-bottom: 1rem;
-        color: $black;
+
+        @apply text-black;
       }
     }
 
@@ -80,15 +33,16 @@
   }
 
   &.loading {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
     position: relative;
 
+    @apply relative cursor-wait;
+
     &::before {
-      @include spinner(25px, $medium-gray, var(--primary), 800ms);
+      @apply content-[""] block w-6 h-6 rounded-full animate-spin border-4 border-l-background border-y-background border-r-secondary;
 
       z-index: 1000;
-      content: "";
       vertical-align: middle;
       position: absolute;
       top: calc(50% - 12.5px);
@@ -102,7 +56,7 @@
   }
 
   .votes_counter {
-    letter-spacing: .2rem;
+    letter-spacing: 0.2rem;
     font-size: 1rem;
   }
 
@@ -123,7 +77,7 @@
       width: $rectangle-width;
       height: calc($rectangle-width * 2);
       vertical-align: middle;
-      margin: -.5rem 0 0 .5rem;
+      margin: -0.5rem 0 0 0.5rem;
       max-width: 100%;
       transition: transform 150ms ease-in-out;
 
@@ -171,7 +125,7 @@
   }
 
   .dim {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
   }
 
@@ -190,7 +144,7 @@
     .vote-count {
       font-size: 2rem;
       font-weight: bolder;
-      margin-bottom: 0;
+      margin-bottom: 0.5rem;
     }
   }
 
@@ -199,8 +153,8 @@
 
     &:hover {
       text-decoration: none;
-      font-size: .9rem;
-      margin-top: .1rem;
+      font-size: 0.9rem;
+      margin-top: 0.1rem;
     }
   }
 
@@ -221,3 +175,31 @@
     }
   }
 }
+
+.vote_proposal_modal {
+  div.button__sm {
+    display: inline-block;
+  }
+
+  .vote-label {
+    @apply ml-2;
+  }
+}
+
+.card__list-metadata {
+  .voting-weight_3 {
+    color: var(--voting-cards-weight-3);
+  }
+
+  .voting-weight_2 {
+    color: var(--voting-cards-weight-2);
+  }
+
+  .voting-weight_1 {
+    color: var(--voting-cards-weight-1);
+  }
+
+  .voting-weight_0 {
+    color: var(--voting-cards-weight-0);
+  }
+}

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

@@ -10,6 +10,7 @@ module Decidim
           return permission_action if permission_action.scope != :admin
           return permission_action unless user
           return permission_action if user.read_attribute("admin").blank?
+          return permission_action unless permission_action.action == :edit_config
 
           if permission_action.subject == :admin_accountability && DecidimAwesome.admin_accountability.respond_to?(:include?)
             if global?
@@ -17,8 +18,14 @@ module Decidim
             else
               toggle_allow(DecidimAwesome.admin_accountability.include?(:participatory_space_roles))
             end
-          elsif permission_action.action == :edit_config
-            toggle_allow(config_enabled?(permission_action.subject))
+          elsif permission_action.subject == :private_data && config_enabled?(:proposal_private_custom_fields)
+            if private_data.present?
+              allow! if private_data.destroyable?
+            else
+              allow!
+            end
+          else
+            toggle_allow(config_enabled?(*permission_action.subject))
           end
 
           permission_action
@@ -27,7 +34,11 @@ module Decidim
         private
 
         def global?
-          context.fetch(:global)
+          context.fetch(:global, nil)
+        end
+
+        def private_data
+          context.fetch(:private_data, nil)
         end
       end
     end

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

@@ -14,15 +14,14 @@ module Decidim
       end
 
       def editor_image_action?
-        return unless permission_action.subject == :editor_image
+        return false unless permission_action.subject == :editor_image
 
         config = context.fetch(:awesome_config, {})
 
         return allow! if user.admin?
         return allow! if config[:allow_images_in_proposals]
-        return allow! if config[:allow_images_in_small_editor]
-        return allow! if config[:allow_images_in_full_editor]
-        return allow! if config[:allow_images_in_markdown_editor]
+        return allow! if config[:allow_images_in_editors]
+        return allow! if config[:allow_videos_in_editors]
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/breadcrumb_root_menu_item_presenter_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module BreadcrumbRootMenuItemPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def arrow_link(text, url, args = {})
+          link_to url, extended_html_options.merge(class: args.with_indifferent_access[:class]) do
+            "<span>#{text}</span> #{icon("arrow-right-line")}".html_safe
+          end
+        end
+
+        def extended_html_options
+          {}.tap do |opts|
+            opts[:target] = "_blank" if @menu_item.try(:target) == "_blank"
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_item_presenter_override.rb

@@ -6,12 +6,12 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        def link_to(name = nil, options = nil, html_options = nil, &block)
+        def link_to(name = nil, options = nil, html_options = nil, &)
           html_options ||= {}
           html_options[:target] = @menu_item.try(:target)
 
           options ||= html_options
-          @view.link_to(name, options, html_options, &block)
+          @view.link_to(name, options, html_options, &)
         end
 
         def active
@@ -19,6 +19,14 @@ module Decidim
 
           @menu_item&.active
         end
+
+        def active_for_breadcrumb?
+          is_active_link?(url, @menu_item.try(:original_active) || active)
+        end
+
+        def hacked_not_overriding?
+          !(@menu_item.is_a?(Decidim::MenuItem) || @menu_item.overrided?)
+        end
       end
     end
   end

data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_presenter_override.rb

@@ -17,6 +17,14 @@ module Decidim
                                 end
                               end
         end
+
+        def active_item_for_breadcrumb
+          presented_items.find do |item|
+            next if item.hacked_not_overriding?
+
+            item.active_for_breadcrumb?
+          end
+        end
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/proposals/proposal_presenter_override.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Override Proposal Presenter to access private field.
+      module ProposalPresenterOverride
+        extend ActiveSupport::Concern
+        included do
+          def private_body(*)
+            return unless proposal
+
+            proposal.private_body
+          end
+        end
+      end
+    end
+  end
+end