decidim-admin 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 274c7f56d154a162fb13149c6147303c700742f6b587c1df8194a903878622aa
-  data.tar.gz: a16fdeb3eeb31725ddc7354fc39231d21375d832657244314c8f8ae46da0dd47
+SHA1:
+  metadata.gz: f46260aa0ada7f6abf12a2fbcbeb49ad934ab96b
+  data.tar.gz: dfc683ac1696fb03f7cfe3692a4463bf7686b6ad
 SHA512:
-  metadata.gz: 1bff90772aec2d41c6a45eb38e0d7dae5f86dc83bc4a1ffa0f37675e0039babbb5b0cbb6baa0c883c909bf854764c581b68eb3aaf84b51a9b61b19a0866bd7b9
-  data.tar.gz: aae60f9826eb053730e72f5c66e2dd1c42ddfef10bdef78199454c59a58fcb56c252ff9b73189d71232479dab6410e1fd79bde2639602177eb2600b7d8cc47a5
+  metadata.gz: 4e2a00a75e46ffe964dc4d597e283d0c865600bef3fa8f9f6fe541e0e00b5ae521ae562a790da203be8ba88602190fec50b96b1ba99783c5ddeded915569eae4
+  data.tar.gz: ed7f0eeae02b8fb07eea69b636552a6a0335338266b9ff91ce17d2a1a4f8d0d9a0bf1cf8a3b3188318a2483981065a120f2200aa3dae58ed0de6bd3827a54584

data/README.md

@@ -4,10 +4,12 @@ This library adds an administration dashboard so users can manage their
 organization, participatory processes and all other entities.
 
 ## Usage
+
 This will add an admin dashboard to manage an organization an all its entities.
 It's included by default with Decidim.
 
 ## Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -15,8 +17,9 @@ gem 'decidim-admin'
 ```
 
 And then execute:
+
 ```bash
-$ bundle
+bundle
 ```
 
 ## Features
@@ -26,10 +29,10 @@ $ bundle
 This feature allows an admin to create pages to serve static content. Some
 example of this kind of pages could be:
 
-  * Terms and Conditions
-  * FAQ
-  * Accessibility guidelines
-  * About the project
+* Terms and Conditions
+* FAQ
+* Accessibility guidelines
+* About the project
 
 All the pages can be created with I18n support and will be accessible as
 `/pages/:page-slug`. You can link them at your website the same way you link
@@ -40,7 +43,9 @@ are links to them inside the Decidim framework, see `Decidim::StaticPage` for
 the default list.
 
 ## Contributing
+
 See [Decidim](https://github.com/decidim/decidim).
 
 ## License
+
 See [Decidim](https://github.com/decidim/decidim).

data/app/assets/javascripts/decidim/admin/application.js.es6

@@ -1,6 +1,6 @@
 // = require jquery
-// = require jquery_ujs
 // = require foundation
+// = require rails-ujs
 // = require ./tab_focus
 // = require ./toggle_nav
 // = require ./sort_list.component

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

@@ -20,9 +20,7 @@
 
 .button--title{
   margin-bottom: 0;
-  @include breakpoint(mediumlarge){
-    float: right;
-  }
+  float: right;
   &:not(:first-child){
     margin-right: 1rem;
   }
@@ -33,12 +31,10 @@
   .button:not(:last-child){
     margin-right: 1rem;
   }
-  @include breakpoint(mediumlarge){
-    display: flex;
-    align-items: center;
-    .button{
-      margin-bottom: 0;
-    }
+  display: flex;
+  align-items: center;
+  .button{
+    margin-bottom: 0;
   }
 }
 

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

@@ -4,6 +4,7 @@ $card-padding-small: 1rem;
   @include smallcaps;
   font-size: 1rem;
   @include clearfix;
+  width: 100%;
 }
 
 .card-footer{

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

@@ -22,3 +22,4 @@
 @import "action-icon";
 @import "char-counter";
 @import "component-counter";
+@import "pics";

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

@@ -0,0 +1,5 @@
+.thumbnail-list{
+  @include thumbnail;
+
+  margin-bottom: 0;
+}

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

@@ -38,6 +38,13 @@
     }
   }
 
+  &.table-list--lastleft{
+    th:last-child,
+    td:last-child{
+      text-align: left;
+    }
+  }
+
   a:not(.button){
     color: $body-font-color;
     &:hover{

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

@@ -45,7 +45,7 @@ module Decidim
 
       def authorized_user?
         form.authorization.user = @user
-        AuthorizeUser.call(form.authorization) do
+        Verifications::AuthorizeUser.call(form.authorization) do
           on(:ok) do
             return true
           end

data/app/controllers/decidim/admin/authorization_workflows_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class AuthorizationWorkflowsController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/users"
+
+      def index
+        authorize! :index, :authorization_workflows
+
+        @workflows = Decidim::Verifications.admin_workflows
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/feature_permissions_controller.rb

@@ -46,7 +46,9 @@ module Decidim
       end
 
       def authorizations
-        current_organization.available_authorizations.map(&:constantize).map(&:handler_name)
+        Verifications::Adapter.from_collection(
+          current_organization.available_authorizations
+        )
       end
 
       def feature

data/app/forms/decidim/admin/impersonate_managed_user_form.rb

@@ -11,7 +11,7 @@ module Decidim
         extend(Virtus.model)
 
         # Set the authorization dynamic attribute as a nested form class based on the handler name.
-        attribute(:authorization, attributes.dig(:authorization, :handler_name).classify.constantize)
+        attribute(:authorization, Decidim::AuthorizationHandler.handler_for(attributes.dig(:authorization, :handler_name)))
 
         super
       end

data/app/forms/decidim/admin/managed_user_form.rb

@@ -16,7 +16,7 @@ module Decidim
         extend(Virtus.model)
 
         # Set the authorization dynamic attribute as a nested form class based on the handler name.
-        attribute(:authorization, attributes.dig(:authorization, :handler_name).classify.constantize)
+        attribute(:authorization, Decidim::AuthorizationHandler.handler_for(attributes.dig(:authorization, :handler_name)))
 
         super
       end

data/app/forms/decidim/admin/organization_appearance_form.rb

@@ -29,7 +29,7 @@ module Decidim
       translatable_attribute :description, String
       translatable_attribute :welcome_text, String
 
-      validates :cta_button_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9-/]+\z} }, allow_blank: true
+      validates :cta_button_path, format: { with: %r{\A[a-zA-Z]+[a-zA-Z0-9\-/]+\z} }, allow_blank: true
       validates :official_img_header,
                 :official_img_footer,
                 :homepage_image,

data/app/helpers/decidim/admin/icon_link_helper.rb

@@ -18,12 +18,14 @@ module Decidim
         link_to(link,
                 method: options[:method],
                 class: "action-icon #{options[:class]}",
-                data: { tooltip: true, disable_hover: false }.merge(options[:data] || {}),
-                tooltip: true,
-                disable_hover: false,
+                data: options[:data] || {},
                 title: title,
                 target: options[:target]) do
-          icon(icon_name)
+          content_tag(:span, class: "simple-has-tip",
+                             data: { tooltip: true, disable_hover: false, click_open: false },
+                             title: title) do
+            icon(icon_name)
+          end
         end
       end
     end

data/app/models/decidim/admin/abilities/admin_ability.rb

@@ -45,6 +45,9 @@ module Decidim
           end
 
           can [:index, :verify, :reject], UserGroup
+
+          can :index, :authorization_workflows
+          can [:index, :update], Authorization
         end
 
         private

data/app/views/decidim/admin/authorization_workflows/index.html.erb

@@ -0,0 +1,32 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("decidim.admin.titles.authorization_workflows") %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <table class="table-list table-list--lastleft">
+      <thead>
+        <tr>
+          <th><%= t("decidim.authorization_handlers.name") %></th>
+          <th><%= t("decidim.authorization_handlers.help") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @workflows.each do |manifest| %>
+          <tr>
+            <% workflow = Decidim::Verifications::Adapter.new(manifest) %>
+            <td><%= link_to workflow.fullname, workflow.admin_root_path %></td>
+            <td>
+              <ul>
+                <% t("decidim.authorization_handlers.admin.#{workflow.key}.help").each do |tip| %>
+                  <li><%= tip %></li>
+                <% end %>
+              </ul>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -1,5 +1,5 @@
 <span class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
-<div class="dropdown-pane" id="export-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+<div class="dropdown-pane" id="export-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-features">
     <% feature.manifest.export_manifests.each do |manifest| %>
       <% %w{CSV JSON Excel}.each do |format| %>

data/app/views/decidim/admin/feature_permissions/edit.html.erb

@@ -14,7 +14,7 @@
             <div class="card-section">
               <%= form.select :authorization_handler_name,
                 authorizations.map { |authorization|
-                  [t("#{authorization}.name", scope: "decidim.authorization_handlers"), authorization]
+                  [authorization.description, authorization.key]
                 }, include_blank: t(".everyone") %>
               <%= form.text_field :options %>
             </div>

data/app/views/decidim/admin/moderations/index.html.erb

@@ -34,9 +34,7 @@
               </td>
               <td>
                 <%=
-                  link_to moderation.reportable.reported_content_url, target: "_blank" do
-                    (moderation.reportable.reported_content_url + " " + icon("external-link")).html_safe
-                  end
+                  link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), moderation.reportable.reported_content_url
                 %>
               </td>
               <td>

data/app/views/decidim/admin/newsletters/_form.html.erb

@@ -3,7 +3,7 @@
 </div>
 
 <div class="row column">
-  <%= form.translated :editor, :body %>
+  <%= form.translated :editor, :body, toolbar: "basic-no-video" %>
 </div>
 
 <div class="row column">

data/app/views/decidim/admin/newsletters/index.html.erb

@@ -30,19 +30,13 @@
               </td>
               <td class="table-list__actions">
                 <% if can?(:update, newsletter) && !newsletter.sent? %>
-                  <%= link_to decidim_admin.edit_newsletter_path(newsletter), data: { tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.edit", scope: "decidim.admin"), class: "action-icon edit" do %>
-                    <%= icon "pencil" %>
-                  <% end %>
+                  <%= icon_link_to "pencil", decidim_admin.edit_newsletter_path(newsletter), t("actions.edit", scope: "decidim.admin"), class: "edit" %>
                 <% end %>
 
-                <%= link_to decidim_admin.newsletter_path(newsletter), data: { tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.preview", scope: "decidim.admin"), class: "action-icon preview" do %>
-                  <%= icon "eye" %>
-                <% end %>
+                <%= icon_link_to "eye", decidim_admin.newsletter_path(newsletter), t("actions.preview", scope: "decidim.admin"), class: "preview" %>
 
                 <% if can?(:destroy, newsletter) && !newsletter.sent? %>
-                  <%= link_to decidim_admin.newsletter_path(newsletter), method: :delete, data: { confirm: t(".confirm_delete"), tooltip: true, disable_hover: false }, :'aria-haspopup' => true, title: t("actions.destroy", scope: "decidim.admin"), class: "action-icon action-icon--remove" do %>
-                    <%= icon "circle-x" %>
-                  <% end %>
+                  <%= icon_link_to "circle-x", decidim_admin.newsletter_path(newsletter), t("actions.destroy", scope: "decidim.admin"), method: :delete, data: { confirm: t(".confirm_delete") }, class: "action-icon--remove" %>
                 <% end %>
               </td>
             </tr>

data/app/views/layouts/decidim/admin/users.html.erb

@@ -17,6 +17,18 @@
       <li <% if is_active_link?(decidim_admin.managed_users_path) %> class="is-active" <% end %>>
         <%= link_to t("menu.managed_users", scope: "decidim.admin"), decidim_admin.managed_users_path %>
       </li>
+      <li <% if is_active_link?(decidim_admin.authorization_workflows_path) %> class="is-active" <% end %>>
+        <%= link_to t("menu.authorization_workflows", scope: "decidim.admin"), decidim_admin.authorization_workflows_path %>
+        <ul>
+          <% Decidim::Verifications.admin_workflows.each do |manifest| %>
+            <% workflow = Decidim::Verifications::Adapter.new(manifest) %>
+
+            <li <% if is_active_link?(workflow.admin_root_path) %> class="is-active" <% end %>>
+              <%= link_to workflow.fullname, workflow.admin_root_path %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
     </ul>
   </div>
 <% end %>

data/config/locales/ca.yml

@@ -13,6 +13,7 @@ ca:
       feature:
         name: Nom
         weight: Pes
+      id: ID
       newsletter:
         body: Cos
         subject: Assumpte
@@ -132,7 +133,7 @@ ca:
           success: Categoria actualitzada correctament.
       dashboard:
         show:
-          welcome: Benvingut al nou panell d'administració de Decidim.
+          welcome: Benvingut al tauler d'administració de Decidim.
       exports:
         export_as: "%{name} com a %{export_format}"
         notice: La teva exportació està actualment en curs. Rebràs un correu electrònic quan hagi finalitzat.
@@ -386,6 +387,7 @@ ca:
           error: S'ha produït un error en l'actualització d'aquests pàgina.
           success: La pàgina s'ha actualitzat correctament.
       titles:
+        authorization_workflows: Mètodes de verificació
         dashboard: Tauler de control
         impersonations: Suplantacions
         managed_users: Usuaris gestionats
@@ -451,6 +453,7 @@ ca:
             reportable: Tipus
             reported_content_url: URL contingut del contingut reportat
             reports: Denúncies
+            visit_url: Visiteu l'URL
   errors:
     messages:
       invalid_json: JSON no vàlid

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
       feature:
         name: Name
         weight: Weight
+      id: ID
       newsletter:
         body: Body
         subject: Subject
@@ -132,7 +133,7 @@ en:
           success: Category updated successfully.
       dashboard:
         show:
-          welcome: Welcome to the new Decidim Panel Admin.
+          welcome: Welcome to the Decidim Admin Panel.
       exports:
         export_as: "%{name} as %{export_format}"
         notice: Your export is currently in progress. You'll receive an email when it's complete.
@@ -386,6 +387,7 @@ en:
           error: There was an error when updating this page.
           success: Page updated successfully
       titles:
+        authorization_workflows: Verification methods
         dashboard: Dashboard
         impersonations: Impersonations
         managed_users: Managed users
@@ -451,6 +453,7 @@ en:
             reportable: Reportable
             reported_content_url: Reported content URL
             reports: Reports
+            visit_url: Visit URL
   errors:
     messages:
       invalid_json: Invalid JSON

data/config/locales/es.yml

@@ -13,6 +13,7 @@ es:
       feature:
         name: Nombre
         weight: Peso
+      id: ID
       newsletter:
         body: Cuerpo
         subject: Asunto
@@ -132,7 +133,7 @@ es:
           success: Categoría actualizada correctamente.
       dashboard:
         show:
-          welcome: Bienvenido al nuevo panel de administración de Decidim.
+          welcome: Bienvenido al panel de administración de Decidim.
       exports:
         export_as: "%{name} como %{export_format}"
         notice: Su exportación está actualmente en curso. Recibirá un correo electrónico cuando esté completo.
@@ -386,6 +387,7 @@ es:
           error: Se ha producido un error en la actualización de ésta página.
           success: La página se ha actualizado correctamente.
       titles:
+        authorization_workflows: Métodos de verificación
         dashboard: Panel de control
         impersonations: Suplantaciones
         managed_users: Usuarios gestionados
@@ -451,6 +453,7 @@ es:
             reportable: Tipo
             reported_content_url: URL del contenido reportado
             reports: Denuncias
+            visit_url: Visita la URL
   errors:
     messages:
       invalid_json: JSON no válido