decidim-admin 0.23.0 → 0.24.0.rc1

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

@@ -8,11 +8,12 @@
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t(".name") %></th>
-            <th><%= t(".nickname") %></th>
-            <th><%= t(".created_at") %></th>
-            <th><%= t(".status") %></th>
+            <th><%= sort_link(query, :name, t(".name"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :nickname, t(".nickname"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :created_at, t(".created_at"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :officialized_at, t(".status"), default_order: :desc) %></th>
             <th><%= t(".badge") %></th>
+            <th><%= sort_link(query, :user_moderation_report_count, t(".reports"), default_order: :desc) %></th>
             <th><%= t(".actions") %></th>
           </tr>
         </thead>
@@ -29,8 +30,16 @@
               <td><%= l user.created_at, format: :short %></td>
               <td><%= user.officialized? ? t(".officialized") : t(".not_officialized") %></td>
               <td><%= translated_attribute(user.officialized_as) %></td>
+              <td><%= user.report_count %></td>
 
               <td class="table-list__actions">
+                <% if allowed_to?(:block, :admin_user) %>
+                  <% if user.blocked? %>
+                    <%= icon_link_to "ban", user_block_path(user_id: user.id), t(".unblock"), class: "action-icon action-icon--disabled", method: :delete %>
+                  <% else %>
+                    <%= icon_link_to "ban", new_user_block_path(user_id: user.id), t(".block"), class: "action-icon action-icon" %>
+                  <% end %>
+                <% end %>
                 <% if allowed_to? :show_email, :user, user: user %>
                   <%= icon_link_to "envelope-open", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %>
                 <% end %>

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

@@ -5,10 +5,6 @@
     <h2 class="card-title"><%= t ".homepage_appearance_title" %></h2>
   </div>
   <div class="card-section">
-    <div class="row column">
-      <%= form.check_box :show_statistics %>
-    </div>
-
     <div class="row column">
       <%= form.translated :editor, :description %>
     </div>

data/app/views/decidim/admin/organization_appearance/form/_colors.html.erb

@@ -13,7 +13,7 @@
       <%= form.color_field :highlight_alternative_color, value: current_organization.colors["highlight-alternative"] %>
     </div>
 
-    <% if true %>
+    <% if Decidim.enable_html_header_snippets %>
       <div class="row column">
         <%= form.text_area :header_snippets %>
         <p class="help-text"><%= t(".header_snippets_help") %></p>

data/app/views/decidim/admin/organization_appearance/form/_images.html.erb

@@ -11,19 +11,19 @@
 
     <div class="organization-images">
       <div class="preview">
-        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
 
       <div class="preview">
-        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
 
       <div class="preview">
-        <%= form.upload :official_img_header, dimensions_info: current_organization.official_img_header.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :official_img_header, dimensions_info: current_organization.official_img_header.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
 
       <div class="preview">
-        <%= form.upload :official_img_footer, dimensions_info: current_organization.official_img_footer.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :official_img_footer, dimensions_info: current_organization.official_img_footer.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
     </div>
   </div>

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

@@ -4,7 +4,7 @@
       <%= t(".title") %>
       <% if allowed_to? :create, :space_private_user %>
         <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_import_path, class: "button tiny button--title import" %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_space_private_user.name", scope: "decidim.admin")), url_for(action: :new), class: "button tiny button--title new" %>
+        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>
   </div>

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

@@ -15,7 +15,7 @@
     <% end %>
 
     <div class="row column">
-      <%= form.file_field :add_photos, multiple: false, label: t(".add_images") %>
+      <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
     </div>
   </fieldset>
 </div>

data/app/views/decidim/admin/shared/landing_page/edit.html.erb

@@ -0,0 +1,47 @@
+<div class="grid-container full">
+  <div class="grid-x grid-margin-x card-grid">
+    <div class="cell small-6">
+      <div class="card">
+        <div class="card-section">
+          <h5><%= active_content_blocks_title %></h5>
+
+          <ul class="draggable-list js-connect js-list-actives" data-sort-url="<%= resource_sort_url %>">
+            <% active_blocks.each do |content_block| %>
+              <%= cell resource_content_block_cell, content_block %>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+
+    <div class="cell small-6">
+      <div class="card">
+        <div class="card-section">
+          <h5><%= inactive_content_blocks_title %></h5>
+
+          <ul class="draggable-list js-connect js-list-availables">
+            <% inactive_blocks.each do |content_block_or_manifest| %>
+              <%= cell resource_content_block_cell, content_block_or_manifest %>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  document.addEventListener("dragend", function (event) {
+    var activeBlocks = Array.prototype.slice.call(document.querySelectorAll(".js-list-actives li"));
+    var activeBlocksManifestName = activeBlocks.map(block => block.dataset.contentBlockManifestName);
+    var sortUrl = document.querySelector(".js-list-actives").dataset.sortUrl;
+    var target = event.target;
+
+    $.ajax({
+      method: "PUT",
+      url: sortUrl,
+      contentType: "application/json",
+      data: JSON.stringify({ manifests: activeBlocksManifestName })
+    });
+  })
+</script>

data/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb

@@ -0,0 +1,15 @@
+<%= decidim_form_for(@form, html: { class: "form edit_content_block" }, url: resource_landing_page_content_block_path) do |form| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t content_block.public_name_key %></h2>
+    </div>
+
+    <div class="card-section">
+      <%= cell content_block.settings_form_cell, form, content_block: content_block %>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= form.submit submit_button_text %>
+  </div>
+<% end %>

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

@@ -27,3 +27,9 @@
 <div class="row column">
   <%= form.check_box :show_in_footer %>
 </div>
+
+<% if form.object.control_public_access? %>
+  <div class="row column">
+    <%= form.check_box :allow_public_access %>
+  </div>
+<% end %>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t "decidim.admin.titles.users" %>
       <% if allowed_to? :create, :admin_user %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.user.name", scope: "decidim.admin")), ["new", "user"], class: "button tiny button--title" %>
+        <%= link_to t("actions.user.new", scope: "decidim.admin"), ["new", "user"], class: "button tiny button--title" %>
       <% end %>
     </h2>
   </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("titles.panel", scope: "decidim.admin")) %>
+<% add_decidim_page_title(current_organization.name) %>
 <!doctype html>
 <html class="no-js" lang="<%= I18n.locale %>">
   <head>
@@ -7,15 +9,17 @@
     <meta name="copyright" content="">
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title><%= title %></title>
+    <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/admin/header" %>
     <%= foundation_datepicker_locale_tag %>
   </head>
   <body>
+    <%= render partial: "layouts/decidim/timeout_modal" %>
     <%= render partial: "layouts/decidim/admin/template_top" %>
     <div class="layout-nav">
       <%= main_menu.render %>
       <%= yield :secondary_nav if content_for? :secondary_nav %>
+      <%= yield :sidebar_menu_nav if content_for? :sidebar_menu_nav %>
     </div>
     <div class="layout-content">
       <div class="container">

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

@@ -2,9 +2,9 @@
   <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: title %>
+      <%= image_tag current_organization.logo.url, alt: current_organization.name %>
     <% else %>
-      <%= title %>
+      <%= current_organization.name %>
     <% end %>
   <% end %>
   <div class='tool-bar'>

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

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

data/app/views/layouts/decidim/admin/newsletters.erb

@@ -4,7 +4,7 @@
       <%= t ".title" %>
     </div>
     <div class="secondary-nav__actions">
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin")), ["newsletter_templates"], class: "button expanded small new" %>
+      <%= link_to t("actions.newsletter.new", scope: "decidim.admin"), ["newsletter_templates"], class: "button expanded small new" %>
     </div>
   </div>
 <% end %>

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

@@ -1,37 +1,6 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav">
-    <div class="secondary-nav__title">
-      <%= t ".title" %>
-    </div>
-    <ul>
-      <li <% if is_active_link?(decidim_admin.edit_organization_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.configuration", scope: "decidim.admin"), decidim_admin.edit_organization_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.edit_organization_appearance_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.appearance", scope: "decidim.admin"), decidim_admin.edit_organization_appearance_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.edit_organization_homepage_path, /^\/admin\/organization\/homepage/) %> class="is-active" <% end %>>
-        <%= link_to t("menu.homepage", scope: "decidim.admin"), decidim_admin.edit_organization_homepage_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.scopes_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.scopes", scope: "decidim.admin"), decidim_admin.scopes_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.scope_types_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.scope_types", scope: "decidim.admin"), decidim_admin.scope_types_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.areas_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.areas", scope: "decidim.admin"), decidim_admin.areas_path %>
-      </li>
-      <li <% if is_active_link?(decidim_admin.area_types_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.area_types", scope: "decidim.admin"), decidim_admin.area_types_path %>
-      </li>
-      <li <% if allowed_to?(:update, :help_sections) && is_active_link?(decidim_admin.help_sections_path) %> class="is-active" <% end %>>
-        <%= link_to t("menu.help_sections", scope: "decidim.admin"), decidim_admin.help_sections_path %>
-      </li>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= organization_settings_menu.render(title: t(".title") ) %>
 <% end %>
-
 <%= render "layouts/decidim/admin/application" do %>
   <%= yield %>
 <% end %>

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

@@ -22,6 +22,17 @@
       <% 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 %>>

data/config/locales/ar.yml

@@ -29,7 +29,6 @@ ar:
         body: المحتوى
         subject: الموضوع
       organization:
-        address: خادم SMTP
         alert_color: تنبيه
         badges_enabled: تمكين الشارات
         cta_button_path: دعوة إلى العمل مسار زر
@@ -59,20 +58,16 @@ ar:
         omnipresent_banner_short_description: وصف قصير
         omnipresent_banner_title: العنوان
         omnipresent_banner_url: العنوان الشبكي
-        password: الكلمة السرية
-        port: المَنفذ
         primary_color: ابتدائي
         reference_prefix: بادئة المرجع
         rich_text_editor_in_public_views: إتاحة محرر النص الغني للمشارِكين
         secondary_color: ثانوي
         send_welcome_notification: إرسال إشعار بالترحيب
-        show_statistics: عرض الإحصائيات
         success_color: نجاح
         time_zone: المنطقة الزمنية
         tos_version: شروط وأحكام الخدمة
         twitter_handler: مُعرّف حساب تويتر
         user_groups_enabled: تمكين المجموعات
-        user_name: اسم المستخدم
         warning_color: تحذير
         welcome_notification_body: محتوى إشعار الترحيب
         welcome_notification_subject: موضوع إشعار الترحيب
@@ -141,7 +136,6 @@ ar:
         accept:
           success: رائع! لقد قمت بالموافقة على شروط الإستخدام للمدير.
         actions:
-          accept: أوافق على شروط المدير هذه
           are_you_sure: هل أنت متأكد مِن أنك رافض لشروط المدير؟
           refuse: ارفض شروط المدير
           title: وافق على شروط وأحكام الإستخدام
@@ -526,7 +520,6 @@ ar:
           instagram: إينستاجرام
           social_handlers: التواصل الاجتماعي
           twitter: تويتر
-          url: العنوان الشبكي
           youtube: يوتيوب
         update:
           error: حدثت مشكلة أثناء تحديث هذه المؤسسة.
@@ -560,7 +553,6 @@ ar:
           error: حدثت مشكلة في حذف مشارك خاص لهذه المساحة التشاركية.
           success: المشاركة الفضاء الفضاء وصول المشاركين دمرت بنجاح.
         index:
-          import_via_csv: استيراد عبر ملف csv
           title: المشاركة الفضاء المشارك الخاص
         new:
           create: إنشاء
@@ -740,7 +732,6 @@ ar:
           fields:
             hidden_at: مخبأة في
             report_count: عد
-            reportable: الإبلاغ عنها
             reported_content_url: تم الإبلاغ عن عنوان URL للمحتوى
             reports: تقارير
             visit_url: زيارة العنوان الشبكي

data/config/locales/bg.yml

@@ -30,7 +30,6 @@ bg:
         body: Тяло
         subject: Тема
       organization:
-        address: Име на SMTP хост
         alert_color: Аларма
         badges_enabled: Включи значките
         comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
@@ -66,20 +65,16 @@ bg:
         omnipresent_banner_short_description: Кратко описание
         omnipresent_banner_title: Заглавие
         omnipresent_banner_url: URL адрес
-        password: Парола
-        port: Порт
         primary_color: Основен
         reference_prefix: Префикс на препратка
         rich_text_editor_in_public_views: Разреши редактора на rich text за участниците
         secondary_color: Вторичен
         send_welcome_notification: Изпращай приветствия
-        show_statistics: Покажи статистиката
         success_color: Успешно
         time_zone: Часова зона
         tos_version: Версия на условия за ползване
         twitter_handler: Манипулатор на Twitter
         user_groups_enabled: Разреши групи
-        user_name: Потребителско име
         warning_color: Предупреждение
         welcome_notification_body: Тяло на приветствието
         welcome_notification_subject: Тема на приветствието

data/config/locales/ca.yml

@@ -30,7 +30,6 @@ ca:
         body: Cos
         subject: Assumpte
       organization:
-        address: Nom del servidor SMTP
         alert_color: Alerta
         badges_enabled: Habilitar les ensenyes
         comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
@@ -66,20 +65,16 @@ ca:
         omnipresent_banner_short_description: Breu descripció
         omnipresent_banner_title: Títol
         omnipresent_banner_url: URL
-        password: Contrasenya
-        port: Port
         primary_color: Primària
         reference_prefix: prefix de referència
         rich_text_editor_in_public_views: Habilitar l'editor de text enriquit
         secondary_color: Secundari
         send_welcome_notification: Envia la notificació de benvinguda
-        show_statistics: Mostrar estadístiques
         success_color: Èxit
         time_zone: Zona horària
         tos_version: Versió dels Termes de Servei
         twitter_handler: Nom d'usuària de Twitter
         user_groups_enabled: Habilitar grups
-        user_name: Àlies
         warning_color: Avís
         welcome_notification_body: Cos de la notificació de benvinguda
         welcome_notification_subject: Assumpte de la notificació de benvinguda
@@ -96,6 +91,7 @@ ca:
         organization: Organització
         plural: Plural
       static_page:
+        allow_public_access: Permet l'accés sense autenticació
         changed_notably: S'han produït canvis notables.
         content: Contingut
         organization: Organització
@@ -136,21 +132,32 @@ ca:
     admin:
       actions:
         add: Afegir
+        attachment:
+          new: Nou arxiu adjunt
+        attachment_collection:
+          new: Nova col·lecció d'arxius adjunts
         browse: Explorar
+        category:
+          new: Nova categoria
         export: Exporta
         manage: Gestionar
         new: Nou %{name}
+        newsletter:
+          new: Nou butlletí
+        participatory_space_private_user:
+          new: Nou usuari privat de l'espai participatiu
         per_page: Per pàgina
         permissions: Permisos
         reject: Rebutjar
         share: Compartir
+        user:
+          new: Nou usuari
         verify: Verificar
       admin_terms_of_use:
         accept:
           error: S'ha produït un error en acceptar els Termes i Condicions dell panell d'administració.
           success: Genial! Has acceptat els Termes i Condicions del panell d'administració.
         actions:
-          accept: Estic d'acord amb aquests termes
           are_you_sure: Segur que vols rebutjar els Termes i Condicions del panell d'administració?
           refuse: Rebutjar els termes
           title: Accepto els Termes i Condicions d'Administració
@@ -229,6 +236,12 @@ ca:
       autocomplete:
         no_results: No s'han trobat resultats
         search_prompt: Escriu com a mínim tres caràcters per cercar
+      block_user:
+        new:
+          action: Bloquejar compte i enviar justificació
+          description: El bloqueig d'una usuària deixarà el seu compte inservible, pots facilitar a la teva justificació i directrius les maneres que consideris per tal de desbloquejar a la usuària.
+          justification: Justificació
+          title: Bloquejar a la usuària %{name}
       categories:
         create:
           error: S'ha produït un error en crear aquesta categoria.
@@ -300,6 +313,9 @@ ca:
         category_id_eq:
           label: Categoria
         filter_label: Filtre
+        moderations:
+          reportable_type_string_eq:
+            label: Tipus
         officialized_at_null:
           label: Estat
           values:
@@ -481,6 +497,9 @@ ca:
             does_not_belong: No pertany
             offensive: Ofensiu
             spam: Contingut no desitjat
+        reports:
+          index:
+            author: Autor(s)
       newsletter_templates:
         index:
           preview_template: Previsualitzar
@@ -546,6 +565,9 @@ ca:
           error: S'ha produït un error en actualitzar aquest butlletí.
           success: Butlletí actualitzat correctament. Si us plau, revisa'l abans d'enviar-lo.
       officializations:
+        block:
+          error: S'ha produït un error en bloquejar a la participant
+          success: Participant bloqueada correctament
         create:
           success: La participant s'ha oficialitzat correctament
         destroy:
@@ -553,6 +575,7 @@ ca:
         index:
           actions: Accions
           badge: Insígnia
+          block: Bloquejar usuària
           created_at: Creat el
           name: Nom
           nickname: Àlies
@@ -562,6 +585,7 @@ ca:
           reofficialize: Torna a oficialitzar
           show_email: Mostra l'adreça de correu
           status: Estat
+          unblock: Desbloquejar usuària
           unofficialize: Des-oficialitzar
         new:
           badge: Insígnia d'oficialització
@@ -575,6 +599,9 @@ ca:
           hidden: ocult
           show: Mostra
           title: Mostra l'adreça de correu electrònic de la participant
+        unblock:
+          error: S'ha produït un error al desbloquejar a la participant
+          success: Participant desbloquejada correctament
       organization:
         edit:
           title: Edita organització
@@ -586,7 +613,6 @@ ca:
           rich_text_editor_in_public_views_help: En algunes àrees de text, les participants podran inserir algunes etiquetes HTML amb l'editor de text enriquit.
           social_handlers: Social
           twitter: Twitter
-          url: URL
           youtube: YouTube
         update:
           error: S'ha produït un error en actualitzar aquesta organització.
@@ -621,7 +647,6 @@ ca:
           error: S'ha produït un error en eliminar una participant participada d'aquest espai participatiu.
           success: L'accés de la participant a l'espai de participació privat s'ha eliminat correctament.
         index:
-          import_via_csv: Importar via csv
           title: Participant de l'espai participatiu privat
         new:
           create: Crear
@@ -831,7 +856,6 @@ ca:
           fields:
             hidden_at: Data d'ocultació
             report_count: Recompte
-            reportable: Tipus
             reported_content_url: URL contingut del contingut reportat
             reports: Denúncies
             visit_url: Visiteu l'URL