decidim-admin 0.24.2 → 0.25.0.rc3

data/app/views/decidim/admin/organization_external_domain_whitelist/_external_domain.html.erb

@@ -0,0 +1,31 @@
+<div class="card external-domain" id="<%= id %>-field">
+  <div class="card-divider external-domain-divider">
+    <h2 class="card-title">
+      <span><%== icon("move") %></span>
+      <span><%= t(".external_domain") %></span>
+
+      <button class="button small alert hollow move-up-question button--title">
+        <%== "#{icon("arrow-top")} #{t(".up")}" %>
+      </button>
+
+      <button class="button small alert hollow move-down-question button--title">
+        <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+      </button>
+
+      <button class="button small alert hollow remove-external-domain button--title">
+        <%= t(".remove") %>
+      </button>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="grid-x">
+      <div class="cell auto">
+        <%= form.text_field :value %>
+      </div>
+    </div>
+    <%= form.hidden_field :id %>
+    <%= form.hidden_field :position, value: form.object.position || 0 %>
+    <%= form.hidden_field :deleted %>
+  </div>
+</div>

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

@@ -0,0 +1,37 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card">
+    <div class="card-section">
+      <% if form.send(:error?, :external_domains) %>
+        <div class="input-field">
+          <div>&nbsp;</div>
+          <%= form.send(:error_and_help_text, :external_domains) %>
+        </div>
+      <% end %>
+
+      <div class="external-domains">
+        <%= fields_for "external_domains[#{blank_external_domain.to_param}]", blank_external_domain do |external_domain_form| %>
+          <script type="text/template" class="decidim-template">
+            <%= render "external_domain",
+            form: external_domain_form,
+            id: blank_external_domain.to_param %>
+          </script>
+        <% end %>
+
+        <div class="external-domains-list">
+          <% @form.external_domains.each do |external_domain| %>
+            <%= fields_for "external_domains[]", external_domain do |external_domain_form| %>
+              <%= render "external_domain",
+              form: external_domain_form,
+              id: external_domain.to_param %>
+            <% end %>
+          <% end %>
+        </div>
+
+        <button class="button small hollow add-external-domain"><%= t(".add") %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_organization_external_domain_whitelist" }, url: organization_external_domain_whitelist_path, method: :patch) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -8,9 +8,9 @@
       <% end %>
     </h2>
   </div>
-
+  <%= admin_filter_selector(:participatory_space_private_users) %>
   <div class="card-section">
-    <% if collection.any? %>
+    <% if participatory_space_private_users.any? %>
       <div class="table-scroll">
         <table class="stack">
           <thead>
@@ -23,7 +23,7 @@
             </tr>
           </thead>
           <tbody>
-            <% collection.each do |private_user| %>
+            <% participatory_space_private_users.each do |private_user| %>
               <tr>
                 <td>
                   <%= private_user.user.name %><br>
@@ -55,7 +55,7 @@
           </tbody>
         </table>
       </div>
-      <%= decidim_paginate collection %>
+      <%= decidim_paginate participatory_space_private_users %>
     <% end %>
   </div>
 </div>

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

@@ -54,5 +54,3 @@
     <%= permissions_form.submit t(".submit") %>
   <% end %>
 </section>
-
-<%= javascript_include_tag "decidim/admin/resources_permissions" %>

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

@@ -1,7 +1,7 @@
-<div class="card">
+<div class="card" id="scope-types">
   <div class="card-divider">
     <% if allowed_to? :creste, :scope_type %>
-      <h2 class="card-title"><%= t "decidim.admin.titles.scope_types" %> <%= link_to t("actions.add", scope: "decidim.admin"), ["new", "scope_type"], class: "button tiny button--title" %></h2>
+      <h2 class="card-title"><%= t "decidim.admin.titles.scope_types" %> <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button tiny button--title new" %></h2>
     <% end %>
   </div>
   <div class="card-section">
@@ -26,7 +26,7 @@
               <td class="table-list__actions">
 
                 <% if allowed_to? :update, :scope_type, scope_type: scope_type %>
-                  <%= icon_link_to "pencil", ["edit", scope_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
+                  <%= icon_link_to "pencil", [:edit, scope_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
                 <% end %>
 
                 <% if allowed_to? :destroy, :scope_type, scope_type: scope_type %>

data/app/views/decidim/admin/shared/_gallery.html.erb

@@ -5,7 +5,7 @@
     <% if @form.photos.any? %>
       <% @form.photos.each do |photo| %>
         <div class="callout gallery__item" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
           <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
           <button class="close-button" aria-label="<%= t(".delete_image") %>" title="<%= t(".delete_image") %>" type="button" data-close>
             <span aria-hidden="true">&times;</span>

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

@@ -3,7 +3,6 @@
 </div>
 
 <% if allowed_to? :update_slug, :static_page, static_page: form.object %>
-  <%= javascript_include_tag "decidim/slug_form" %>
   <div class="row column slug">
     <%= form.text_field :slug %>
     <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url("pages", form.object.slug)) %></p>

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

@@ -81,7 +81,7 @@
                   <% if !user_group.verified? %>
                     <%= icon_link_to "circle-check", decidim_admin.verify_user_group_path(user_group), t("actions.verify", scope: "decidim.admin"), method: :put, class: "action-icon--verify" %>
                   <% else %>
-                    <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img" %>
+                    <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.verify", scope: "decidim.admin") %>
                   <% end %>
                 <% end %>
 
@@ -89,7 +89,7 @@
                   <% if !user_group.rejected? %>
                     <%= icon_link_to "circle-x", decidim_admin.reject_user_group_path(user_group), t("actions.reject", scope: "decidim.admin"), method: :put, class: "action-icon--reject" %>
                   <% else %>
-                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
+                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.reject", scope: "decidim.admin") %>
                   <% end %>
                 <% end %>
               </td>

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

@@ -7,18 +7,19 @@
       <% end %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.user.fields.role", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.name", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.email", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.last_sign_in_at", scope: "decidim.admin") %></th>
-            <th><%= t("models.user.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :role, t("models.user.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :name, t("models.user.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :created_at, t("models.user.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th></th>
           </tr>
         </thead>

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

@@ -11,7 +11,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/admin/header" %>
-    <%= foundation_datepicker_locale_tag %>
   </head>
   <body>
     <%= render partial: "layouts/decidim/timeout_modal" %>
@@ -29,5 +28,6 @@
     <%= render partial: "layouts/decidim/admin/template_bottom" %>
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
+    <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
   </body>
 </html>

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

@@ -1,7 +1,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= stylesheet_link_tag    "decidim/admin/application", media: "all" %>
-<%= javascript_include_tag "decidim/confirm" %>
-<%= javascript_include_tag "decidim/admin/application" %>
+<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
+<%= javascript_pack_tag "decidim_admin", defer: false %>
 <%= organization_colors %>
 <%= snippets.display(:head) %>

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

@@ -1,6 +1,6 @@
 <%
 js_configs = {
-  icons_path: image_path("decidim/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
   messages: {
     "selfxssWarning": {
       title: t("decidim.security.selfxss_warning.title"),

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

@@ -2,7 +2,7 @@
   <a href="#menu" class="menu-trigger"><%= icon "menu" %></a>
   <%= link_to decidim.root_path, class: "logo", target: "_blank" do %>
     <% if current_organization.logo.present? %>
-      <%= image_tag current_organization.logo.url, alt: current_organization.name %>
+      <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization.name %>
     <% else %>
       <%= current_organization.name %>
     <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= global_moderation_menu.render(title: t(".title" )) %>
+  <%= sidebar_menu(:admin_global_moderation_menu).render(title: t(".title" )) %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= organization_settings_menu.render(title: t(".title") ) %>
+  <%= sidebar_menu(:admin_settings_menu).render(title: t(".title") ) %>
 <% end %>
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>

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

@@ -1,55 +1,5 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t ".title" %>
-    </div>
-    <ul>
-      <% if allowed_to? :read, :admin_user %>
-        <li <% if is_active_link?(decidim_admin.users_path) %> class="is-active" <% end %>>
-          <%= link_to t("menu.admins", scope: "decidim.admin"), decidim_admin.users_path %>
-        </li>
-      <% end %>
-      <% if current_organization.user_groups_enabled? && allowed_to?(:index, :user_group) %>
-        <li <% if is_active_link?(decidim_admin.user_groups_path) %> class="is-active" <% end %>>
-          <%= link_to t("menu.user_groups", scope: "decidim.admin"), decidim_admin.user_groups_path %>
-        </li>
-      <% end %>
-      <% if allowed_to? :index, :officialization %>
-        <li <% if is_active_link?(decidim_admin.officializations_path) %> class="is-active" <% end %>>
-          <%= link_to t("menu.participants", scope: "decidim.admin"), decidim_admin.officializations_path %>
-        </li>
-      <% end %>
-      <% if allowed_to? :index, :impersonatable_user %>
-        <li <% if is_active_link?(decidim_admin.impersonatable_users_path) %> class="is-active" <% end %>>
-          <%= link_to t("menu.impersonations", scope: "decidim.admin"), decidim_admin.impersonatable_users_path %>
-          <ul>
-            <li <% if is_active_link?(decidim_admin.conflicts_path) %> class="is-active" <% end %>>
-              <%= %>
-              <%= link_to link_to t("title", scope: "decidim.admin.conflicts"), decidim_admin.conflicts_path %>
-            </li>
-          </ul>
-        </li>
-      <% end %>
-      <% if allowed_to? :index, :moderate_users %>
-        <li <% if is_active_link?(decidim_admin.moderated_users_path) %> class="is-active" <% end %>>
-          <%= link_to t("menu.reported_users", scope: "decidim.admin"), decidim_admin.moderated_users_path %>
-        </li>
-      <% end %>
-      <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| %>
-            <% next unless current_organization.available_authorizations.include?(manifest.name.to_s) %>
-            <% 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>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_user_menu).render(title: t(".title") ) %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/config/assets.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_admin: "#{base_path}/app/packs/entrypoints/decidim_admin.js"
+)

data/config/locales/ar.yml

@@ -23,7 +23,6 @@ ar:
       component:
         name: اسم
         published_at: نشرت في
-        weight: وزن
       id: هوية شخصية
       newsletter:
         body: المحتوى
@@ -90,12 +89,10 @@ ar:
         show_in_footer: تظهر في تذييل الصفحة
         slug: سبيكة العنوان الشبكي
         title: العنوان
-        weight: وزن
       static_page_topic:
         description: وصف
         show_in_footer: تظهر في تذييل الصفحة
         title: العنوان
-        weight: وزن
       user_group_csv_verification:
         file: ملف
     errors:
@@ -125,7 +122,6 @@ ar:
       actions:
         add: إضافة
         browse: تصفح
-        export: تصدير
         manage: تدبير
         new: جديد %{name}
         per_page: في كل صفحة

data/config/locales/bg.yml

@@ -24,7 +24,6 @@ bg:
       component:
         name: Име
         published_at: Публикувано на
-        weight: Тегло
       id: ID
       newsletter:
         body: Тяло
@@ -97,12 +96,10 @@ bg:
         show_in_footer: Покажи в долния колонтитул
         slug: Съкратен URL
         title: Заглавие
-        weight: Тегло
       static_page_topic:
         description: Описание
         show_in_footer: Покажи в долния колонтитул
         title: Заглавие
-        weight: Тегло
       user_group_csv_verification:
         file: Файл
     errors:

data/config/locales/ca.yml

@@ -24,7 +24,7 @@ ca:
       component:
         name: Nom
         published_at: Publicat el
-        weight: Pes
+        weight: Ordre de posició
       id: ID
       import:
         user_group_id: Importar com
@@ -43,6 +43,7 @@ ca:
         default_locale: Idioma per defecte
         description: Descripció
         enable_omnipresent_banner: Mostrar el banner omnipresent
+        enable_participatory_space_filters: Habilitar els filtres a l'espai de participació
         facebook_handler: Nom d'usuari de Facebook
         favicon: Icona
         force_authentication: Forçar autenticació
@@ -112,12 +113,12 @@ ca:
         show_in_footer: Mostra al peu de pàgina
         slug: Nom curt d'URL
         title: Títol
-        weight: Pes
+        weight: Ordre de posició
       static_page_topic:
         description: Descripció
         show_in_footer: Mostra al peu de pàgina
         title: Títol
-        weight: Pes
+        weight: Ordre de posició
       user_group_csv_verification:
         file: Fitxer
     errors:
@@ -157,7 +158,6 @@ ca:
         browse: Explorar
         category:
           new: Nova categoria
-        export: Exporta
         import: Importar
         manage: Gestionar
         new: Nou %{name}
@@ -336,6 +336,12 @@ ca:
         show:
           view_more_logs: Veure més registres
           welcome: Benvinguda al tauler d'administració de Decidim.
+      domain_whitelist:
+        form:
+          domain_too_short: El domini és massa curt
+        update:
+          error: Hi ha hagut un error en incloure el domini en la llista blanca
+          success: Hem actualitzat correctament la llista blanca de dominis
       exports:
         export_as: "%{name} com a %{export_format}"
         formats:
@@ -356,6 +362,17 @@ ca:
           values:
             'false': Oficialitzada
             'true': No oficialitzada
+        participatory_space_private_users:
+          user_invitation_accepted_at_not_null:
+            label: Invitació acceptada
+            values:
+              'false': No acceptada
+              'true': Acceptada
+          user_invitation_sent_at_not_null:
+            label: S'ha enviat la invitació
+            values:
+              'false': No enviada
+              'true': Enviada
         private_space_eq:
           label: Privat
           values:
@@ -373,13 +390,14 @@ ca:
           name_or_nickname_or_email_cont: Buscar %{collection} per correu electrònic, nom o àlies.
           reported_id_string_or_reported_content_cont: Cercar %{collection} per id o contingut reportable.
           title_cont: Buscar %{collection} per títol.
+          user_name_or_user_email_cont: Cerca %{collection} per nom o correu electrònic.
         state_eq:
           label: Estat
       forms:
         file_help:
           import:
             explanation: 'Instruccions per a l''arxiu:'
-            message_1: Estan suportats els arxius CSV, JSON i Excel (.xls)
+            message_1: Estan suportats els arxius CSV, JSON i Excel (.xlsx)
             message_2: Pels arxius CSV, el separador entre columnes ha de ser un punt i coma (";")
       help_sections:
         error: S'ha produït un error en actualitzar les seccions d'ajuda
@@ -431,7 +449,7 @@ ca:
           accepted_mime_types:
             csv: csv
             json: json
-            xls: xls
+            xlsx: xlsx
           actions:
             back: Tornar
           file_legend: Afegir un arxiu d'importació que serà processat.
@@ -457,6 +475,7 @@ ca:
         areas: Àrees
         configuration: Configuració
         dashboard: Tauler de control
+        external_domain_whitelist: Llista blanca de dominis externs
         help_sections: Seccions d'ajuda
         homepage: Pàgina d'inici
         impersonations: Impersonacions
@@ -728,6 +747,17 @@ ca:
             layout_appearance_title: Edita l'aparença del disseny global
             preview: Previsualitzar
           omnipresent_banner_appearance_title: Edita banner omnipresent
+      organization_external_domain_whitelist:
+        edit:
+          update: Actualitza
+        external_domain:
+          down: Avall
+          external_domain: Domini extern
+          remove: Lleva
+          up: Amunt
+        form:
+          add: Afegeix a llista blanca
+          title: Llista blanca de dominis externs
       organization_homepage:
         edit:
           active_content_blocks: Blocs de contingut actiu