decidim-admin 0.21.0 → 0.22.0

data/app/assets/stylesheets/decidim/admin/extra/_show_email.scss

@@ -0,0 +1,31 @@
+.show_email{
+  padding: 0 $global-padding;
+
+  h4{
+    padding-top: $global-padding;
+
+    @include smallcaps;
+
+    color: $muted;
+  }
+
+  > div{
+    padding: $global-padding;
+    background-color: $medium-gray;
+  }
+
+  p{
+    text-align: center;
+    margin: 0;
+  }
+
+  #user_email + p{
+    display: none;
+    color: $muted;
+    font-style: italic;
+  }
+
+  #user_email:empty + p{
+    display: block;
+  }
+}

data/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss

@@ -18,6 +18,10 @@
     position: initial;
   }
 
+  .dropdown.menu > li > a{
+    background: transparent;
+  }
+
   .is-dropdown-submenu{
     z-index: 2;
   }

data/app/assets/stylesheets/decidim/admin/modules/_buttons.scss

@@ -24,7 +24,16 @@
 
   &.reverse{
     @include modifiers(color);
-    @include modifiers(background-color, (primary: $white, secondary: $white, success: $white, warning: $white, alert: $white));
+    @include modifiers(
+      background-color,
+      (
+        primary: $white,
+        secondary: $white,
+        success: $white,
+        warning: $white,
+        alert: $white,
+      )
+    );
   }
 }
 

data/app/assets/stylesheets/decidim/admin/modules/_cards.scss

@@ -1,10 +1,10 @@
 $card-padding-small: 1rem;
 
 .card-title{
-  @include smallcaps;
+  @include smallemphasis;
 
   button:not(.clear){
-    @include smallcaps;
+    @include smallemphasis;
   }
 
   // clearfix if there is no flex--* class in the same element

data/app/assets/stylesheets/decidim/admin/modules/_filters.scss

@@ -18,7 +18,6 @@
   }
 
   .button.dropdown{
-    text-transform: uppercase;
     font-weight: 600;
     letter-spacing: .1em;
   }
@@ -28,6 +27,8 @@
 
     & > li.is-dropdown-submenu-parent > a{
       padding-right: 1rem;
+      background-color: $button-background;
+      color: $white;
 
       &::after{
         border-top-color: $white;
@@ -58,7 +59,6 @@
 
   .label{
     font-weight: 600;
-    text-transform: uppercase;
     margin-top: .5rem;
 
     .type-icon{

data/app/assets/stylesheets/decidim/admin/modules/_forms.scss

@@ -58,7 +58,7 @@ textarea{
 }
 
 .legend{
-  @include smallcaps;
+  @include smallemphasis;
 
   margin-bottom: 1rem;
 }
@@ -130,7 +130,7 @@ textarea{
   }
 }
 
-.participatory_texts_disabled{
+.readonly_container{
   cursor: not-allowed;
   opacity: .5;
 }

data/app/assets/stylesheets/decidim/admin/modules/_import_result.scss

@@ -0,0 +1,10 @@
+.new_import .import-process-info{
+  margin-top: 1em;
+  font-style: italic;
+
+  span.attribute-name{
+    background-color: lightgrey;
+    font-style: normal;
+    padding: 1px 4px;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_loading-spinner.scss

@@ -0,0 +1,11 @@
+.loading-spinner{
+  height: 25px;
+  text-align: center;
+
+  &::before{
+    @include spinner(25px, $medium-gray, var(--primary), 800ms);
+
+    content: "";
+    vertical-align: middle;
+  }
+}

data/app/assets/stylesheets/decidim/admin/modules/_main-nav.scss

@@ -22,7 +22,6 @@
     display: block;
     color: $medium-gray;
     font-size: .7rem;
-    text-transform: uppercase;
 
     &:hover{
       background-color: lighten($dark-gray, 10);

data/app/assets/stylesheets/decidim/admin/modules/_modules.scss

@@ -28,10 +28,14 @@
 @import "dropdown";
 @import "agenda";
 @import "draggable-list";
+@import "loading-spinner";
+@import "import_result";
 
 // mentions__container
 @import "decidim/modules/tags";
 @import "decidim/modules/input-tags";
 @import "decidim/modules/input-mentions";
-@import "decidim/modules/input-hashtags";
 @import "decidim/modules/input-gallery";
+
+//Admin dashboard
+@import "users_statistics";

data/app/assets/stylesheets/decidim/admin/modules/_process-header.scss

@@ -1,6 +1,5 @@
 .assembly-header__title,
 .process-header__title{
-  text-transform: uppercase;
   font-size: .8rem;
   margin-bottom: 1rem;
   color: $muted;

data/app/assets/stylesheets/decidim/admin/modules/_secondary-nav.scss

@@ -64,7 +64,6 @@ $process-title-height: 3rem;
 .secondary-nav__title,
 .process-title-content{
   margin-bottom: 1.5rem;
-  text-transform: uppercase;
   font-size: .8rem;
   letter-spacing: .1em;
   font-weight: bold;

data/app/assets/stylesheets/decidim/admin/modules/_table-list.scss

@@ -9,10 +9,6 @@
   border-collapse: collapse;
   border-spacing: 0;
 
-  th{
-    text-transform: uppercase;
-  }
-
   th,
   td{
     border-bottom: 1px solid rgba(black, .05);
@@ -130,7 +126,6 @@
   margin-left: -1.5 * $global-padding;
   font-size: 80%;
   font-weight: 600;
-  text-transform: uppercase;
 
   &.expanded{
     display: inline-block;

data/app/assets/stylesheets/decidim/admin/modules/_users_statistics.scss

@@ -0,0 +1,18 @@
+.table-list.users_count tbody tr td.title{
+  text-align: center;
+  color: $medium-gray;
+}
+
+.table-list.users_count th:not(:first-child),
+.table-list.users_count td:not(:first-child){
+  text-align: center;
+}
+
+.table-list.users_count th:last-child,
+.table-list.users_count td:last-child{
+  text-align: center;
+}
+
+.table-list.users_count th{
+  text-transform: capitalize;
+}

data/app/assets/stylesheets/decidim/admin/utils/_mixins.scss

@@ -18,6 +18,13 @@
   font-size: .9em;
 }
 
+//Small emphasis
+@mixin smallemphasis{
+  font-weight: 600;
+  letter-spacing: .1em;
+  font-size: .9em;
+}
+
 // Status modifier mixin
 $palette: $foundation-palette;
 
@@ -80,3 +87,38 @@ $side:(
 }
 
 @include make-spaces()
+
+  @mixin animation($animation){
+  -webkit-animation: $animation;
+  -o-animation: $animation;
+  animation: $animation;
+}
+
+@mixin spinner($size, $orbit, $satellite, $time){
+  @include animation( animation-spin $time infinite linear );
+  @include square($size);
+
+  box-sizing: border-box;
+  border-radius: 50%;
+  border: floor(($size / 8)) solid $orbit;
+  border-right-color: $satellite;
+  display: inline-block;
+  position: relative;
+}
+
+@mixin size($width, $height){
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size){
+  @include size($size, $size);
+}
+
+@keyframes animation-spin{
+  to{ transform: rotate(1turn); }
+}
+
+@-webkit-keyframes animation-spin{
+  to{ -webkit-transform: rotate(1turn); }
+}

data/app/assets/stylesheets/decidim/admin/utils/_settings.scss

@@ -276,7 +276,7 @@ $breadcrumbs-item-color: $primary-color;
 $breadcrumbs-item-color-current: $black;
 $breadcrumbs-item-color-disabled: $medium-gray;
 $breadcrumbs-item-margin: .75rem;
-$breadcrumbs-item-uppercase: true;
+$breadcrumbs-item-uppercase: false;
 $breadcrumbs-item-separator: true;
 $breadcrumbs-item-separator-color: $medium-gray;
 
@@ -443,6 +443,9 @@ $input-background-focus: $white;
 $input-background-disabled: $light-gray;
 $input-border: 1px solid $light-gray;
 $input-border-focus: 1px solid map-get($foundation-palette, primary);
+$input-outline: 0;
+$input-outline-focus: 2px solid $primary-color;
+$input-outline-offset: 2px;
 $input-padding: $form-spacing / 2;
 $input-shadow: inset 0 1px 2px rgba($black, .1);
 $input-shadow-focus: 0 0 5px $medium-gray;

data/app/cells/decidim/admin/content_block/show.erb

@@ -4,10 +4,10 @@
     <div>
       <% if has_settings? %>
         <%= link_to decidim_admin.edit_organization_homepage_content_block_path(manifest_name), class: "mr-s text-muted" do %>
-          <%= icon "pencil" %>
+          <%= icon "pencil", role: "img" %>
         <% end %>
       <% end %>
-      <%= icon "menu" %>
+      <%= icon "menu", role: "img" %>
     </div>
   </div>
 </li>

data/app/commands/decidim/admin/create_newsletter.rb

@@ -8,25 +8,50 @@ module Decidim
       # Initializes the command.
       #
       # form - The source fo data for this newsletter.
+      # content_block - An instance of `Decidim::ContentBlock` that holds the
+      #     newsletter attributes.
       # user - The User that authored this newsletter.
-      def initialize(form, user)
+      def initialize(form, content_block, user)
         @form = form
+        @content_block = content_block
         @user = user
       end
 
       def call
-        return broadcast(:invalid) unless @form.valid?
+        return broadcast(:invalid) unless form.valid?
 
-        newsletter = Decidim.traceability.create!(
+        transaction do
+          create_newsletter
+          create_content_block
+        end
+
+        broadcast(:ok, newsletter)
+      end
+
+      private
+
+      attr_reader :user, :form, :newsletter, :content_block
+
+      def create_newsletter
+        @newsletter = Decidim.traceability.create!(
           Newsletter,
-          @user,
-          subject: @form.subject,
-          body: @form.body,
-          author: @user,
-          organization: @user.organization
+          user,
+          subject: form.subject,
+          author: user,
+          organization: user.organization
         )
+      end
 
-        broadcast(:ok, newsletter)
+      def create_content_block
+        UpdateContentBlock.call(form, content_block, user) do
+          on(:ok) do |content_block|
+            content_block.update(scoped_resource_id: newsletter.id)
+            @content_block = content_block
+          end
+          on(:invalid) do
+            raise "There was a problem persisting the changes to the content block"
+          end
+        end
       end
     end
   end

data/app/commands/decidim/admin/reorder_content_blocks.rb

@@ -77,7 +77,7 @@ module Decidim
       def create_content_block(manifest_name, weight)
         Decidim::ContentBlock.create!(
           organization: organization,
-          scope: scope,
+          scope_name: scope,
           weight: weight,
           manifest_name: manifest_name
         )

data/app/commands/decidim/admin/update_component.rb

@@ -33,13 +33,15 @@ module Decidim
       private
 
       def update_component
-        @previous_settings = @component.attributes["settings"].dup
-
+        @previous_settings = @component.attributes["settings"].with_indifferent_access
         @component.name = form.name
+        @component.weight = form.weight
+
+        restore_readonly_settings!
+
         @component.settings = form.settings
         @component.default_step_settings = form.default_step_settings
         @component.step_settings = form.step_settings
-        @component.weight = form.weight
 
         @settings_changed = @component.settings_changed?
 
@@ -57,6 +59,28 @@ module Decidim
       def current_settings
         @component.attributes["settings"]
       end
+
+      # Keep previous values for readonly settings
+      def restore_readonly_settings!
+        browse_readonly_settings("global") do |attribute|
+          form.settings[attribute] = @previous_settings.dig("global", attribute)
+        end
+
+        browse_readonly_settings("step") do |attribute|
+          form.default_step_settings[attribute] = @previous_settings.dig("default_step", attribute) if form.default_step_settings.present?
+          if form.step_settings.present?
+            form.step_settings.each do |step_name, step|
+              step[attribute] = @previous_settings.dig("steps", step_name, attribute)
+            end
+          end
+        end
+      end
+
+      def browse_readonly_settings(settings_name)
+        @component.manifest.settings(settings_name).attributes
+                  .select { |_attribute, obj| obj.readonly?(component: @component) }
+                  .each { |attribute, _obj| yield(attribute) }
+      end
     end
   end
 end

data/app/commands/decidim/admin/update_content_block.rb

@@ -26,11 +26,12 @@ module Decidim
 
         transaction do
           update_content_block_settings
+          content_block.save!
           update_content_block_images
           content_block.save!
         end
 
-        broadcast(:ok)
+        broadcast(:ok, content_block)
       end
 
       private

data/app/commands/decidim/admin/update_newsletter.rb

@@ -11,25 +11,47 @@ module Decidim
       # user       - The user that updates the newsletter.
       def initialize(newsletter, form, user)
         @newsletter = newsletter
+        @content_block = newsletter.template
         @form = form
         @user = user
         @organization = user.organization
       end
 
       def call
-        return broadcast(:invalid) unless @form.valid?
-        return broadcast(:invalid) if @newsletter.sent?
-        return broadcast(:invalid) unless @organization == @newsletter.organization
+        return broadcast(:invalid) unless form.valid?
+        return broadcast(:invalid) if newsletter.sent?
+        return broadcast(:invalid) unless organization == newsletter.organization
 
+        transaction do
+          update_newsletter
+          update_content_block
+        end
+
+        broadcast(:ok, newsletter)
+      end
+
+      private
+
+      attr_reader :user, :newsletter, :content_block, :organization, :form
+
+      def update_newsletter
         @newsletter = Decidim.traceability.update!(
-          @newsletter,
-          @user,
-          subject: @form.subject,
-          body: @form.body,
-          author: @user
+          newsletter,
+          user,
+          subject: form.subject,
+          author: user
         )
+      end
 
-        broadcast(:ok, @newsletter)
+      def update_content_block
+        UpdateContentBlock.call(form, content_block, user) do
+          on(:ok) do |content_block|
+            @content_block = content_block
+          end
+          on(:invalid) do
+            raise "There was a problem persisting the changes to the content block"
+          end
+        end
       end
     end
   end