decidim-admin 0.28.0 → 0.28.2

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

@@ -2,9 +2,9 @@
 
 <section id="components">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".title") %>
-    </h2>
+    </h1>
   </div>
 
   <%= form_for @permissions_form, url: url_for(action: :update, **resource_params), html: { class: "form form-defaults" }, method: "put" do |permissions_form| %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form scope_types_edit" }) do |f| %>

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

@@ -1,13 +1,13 @@
 <% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
 <div class="card" id="scope-types">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.scope_types" %>
 
       <% if allowed_to? :create, :scope_type %>
         <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form scope_types_new" }) do |f| %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form edit_scope" }) do |f| %>

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

@@ -1,13 +1,13 @@
 <% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <% if parent_scope %>
         <%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
       <% else %>
         <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if @scopes.any? %>
     <div class="table-scroll">

data/app/views/decidim/admin/scopes/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, url: current_scopes_path, html: { class: " form form-defaults new_scope" }) do |f| %>

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

@@ -2,7 +2,7 @@
   <div class="fcell">
     <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
       <li>
-        <a href="#" class="dropdown button">
+        <a href="#" class="dropdown button button__sm button__secondary">
           <%= t("filter_label", scope: "decidim.admin.filters") %>
           <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
         </a>

data/app/views/decidim/admin/shared/_js-callout.html.erb

@@ -1,7 +1,7 @@
 <div class="flash <%= css %>" data-closable>
-  <span class="flash__message">
+  <div class="flash__message">
     <%= text %>
-  </span>
+  </div>
   <button class="close-button" type="button" data-close="">
     <span aria-hidden="true">×</span>
   </button>

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("edit_landing_page", scope: "decidim.admin.titles")) %>
 <div class="card edit_content_blocks">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= content_blocks_title %>
 
       <div>
@@ -17,7 +17,7 @@
           </ul>
         </div>
       </div>
-    </h2>
+    </h1>
   </div>
 
   <div class="card-section-draggable-list">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(content_block.public_name_key)) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t content_block.public_name_key %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -2,12 +2,12 @@
 
 <div class="card" id="page_topics">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("page_topics", scope: "decidim.admin.titles") %>
       <% if allowed_to? :create, :attachment_collection %>
         <%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if topics.any? %>
     <div class="table-scroll">

data/app/views/decidim/admin/static_page_topics/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title t(".title") %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("pages", scope: "decidim.admin.titles") %>
     <% if allowed_to? :create, :static_page %>
       <%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
     <% end %>
-  </h2>
+  </h1>
 </div>
 
 <% @topics.each do |topic| %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,10 +1,10 @@
 <% add_decidim_page_title(t("decidim.admin.titles.user_groups")) %>
 <div class="card" id="user-groups">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.user_groups" %>
       <%= link_to t(".verify_via_csv"), new_user_groups_csv_verification_path, class: "button button__sm button__secondary" %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector %>
   <div class="table-scroll">

data/app/views/decidim/admin/user_groups_csv_verifications/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("decidim.admin.titles.users")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.users" %>
       <% if allowed_to? :create, :admin_user %>
         <%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector %>
   <div class="table-scroll">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -8,7 +8,7 @@
 
         <% breadcrumb_items(:admin).each_with_index do |item, i| %>
           <span class="text-white">/</span>
-          <% item_label = decidim_html_escape(translated_attribute(item[:label])) %>
+          <% item_label = translated_attribute(item[:label]) %>
           <% if item[:url].present? && !is_active_link?(item[:url], :exclusive) %>
             <%= link_to(item_label, item[:url], class: "process-title-content-breadcrumb", data: { "external-link": false }, "aria-current": (item[:active] ? "page" : nil)) %>
           <% else %>

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

@@ -1,5 +1,9 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
+<%= legacy_favicon %>
+<%= favicon %>
+<%= apple_favicon %>
+<%= append_stylesheet_pack_tag "decidim_admin_overrides", media: "all" %>
 <%= stylesheet_pack_tag "decidim_core", "decidim_admin", media: "all" %>
 <%= javascript_pack_tag "decidim_core", "decidim_admin", defer: false %>
 <%= snippets.display(:head) %>

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

@@ -1,5 +1,6 @@
 <%
 js_configs = {
+  api_path: decidim_api.root_path(locale: nil),
   icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg"),
   messages: {
     "selfxssWarning": t("decidim.security.selfxss_warning"),

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

@@ -5,13 +5,13 @@
       <div class="hidden md:block">
         <%= sidebar_menu(secondary_root_menu).render %>
       </div>
-      <button data-component="dropdown" data-target="dropdown-menu-sidebar" data-auto-close="true" data-disabled-md="true" data-scroll-to-menu="true">
+      <button data-component="dropdown" data-target="dropdown-menu-sidebar" data-auto-close="true" data-scroll-to-menu="true">
         <span><%= t("menu", scope: "decidim.admin.titles") %></span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>
       </button>
 
-      <ul id="dropdown-menu-sidebar" class="md:hidden">
+      <ul id="dropdown-menu-sidebar" class="md:hidden" aria-hidden="true">
         <%= sidebar_menu(secondary_root_menu).render %>
       </ul>
     </div>

data/config/assets.rb

@@ -4,5 +4,6 @@ base_path = File.expand_path("..", __dir__)
 
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
+  decidim_admin_overrides: "#{base_path}/app/packs/entrypoints/decidim_admin_overrides.scss",
   decidim_admin: "#{base_path}/app/packs/entrypoints/decidim_admin.js"
 )

data/config/locales/ar.yml

@@ -150,6 +150,7 @@ ar:
           new: فئة جديدة
         export: تصدير الكل
         import: استيراد
+        manage: تدبير
         newsletter:
           new: رسالة إخبارية جديدة
         per_page: في كل صفحة
@@ -298,9 +299,6 @@ ar:
       dashboard:
         show:
           view_more_logs: عرض المزيد من السجلات
-      domain_whitelist:
-        form:
-          domain_too_short: نطاق الدومين قصير جداً
       exports:
         export_as: "%{name} ك %{export_format}"
         formats:
@@ -453,11 +451,13 @@ ar:
         help_sections: أقسام المساعدة
         homepage: الصفحة الرئيسية
         impersonations: التقليد
+        manage: تدبير
         newsletters: الرسائل الإخبارية
         participants: المشاركون
         scope_types: أنواع المجال
         scopes: مجالات
         settings: الإعدادات
+        static_page_topics: المواضيع
         static_pages: صفحات
         user_groups: المجموعات
         users: المشاركون
@@ -673,11 +673,6 @@ ar:
       organization_external_domain_whitelist:
         edit:
           update: تحديث
-        external_domain:
-          down: أسفل
-          external_domain: نطاق خارجي
-          remove: إزالة
-          up: أعلى
         form:
           add: إضافة إلى القائمة البيضاء
       participatory_space_private_users:
@@ -791,8 +786,10 @@ ar:
         areas: المناطق
         authorization_workflows: طرق التحقق
         dashboard: لوحة القيادة
+        edit_organization_appearance: تعديل مظهر الصفحة الرئيسية
         impersonatable_users: المشاركون في الإدارة
         impersonations: إدارة المشاركين
+        menu: القائمة الرئيسية
         pages: الصفحات
         panel: مدير
         participants: المشاركين
@@ -876,6 +873,7 @@ ar:
             participatory_space: الفضاء التشاركي
             reportable_type: النوع
             reported_content_url: تم الإبلاغ عن عنوان URL للمحتوى
+            reports: السبب
             visit_url: زيارة العنوان الشبكي
         report:
           fields:
@@ -885,3 +883,8 @@ ar:
   errors:
     messages:
       invalid_json: JSON غير صالح
+  layouts:
+    decidim:
+      admin:
+        global_moderations:
+          title: مُشرف عام