decidim-admin 0.27.8 → 0.28.0.rc4

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

@@ -1,14 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_static_page" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form form-defaults new_static_page" }) do |f| %>
       <%= render partial: "form", object: f %>
-    </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
-  </div>
-<% end %>
+</div>

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

@@ -1,68 +1,68 @@
 <% add_decidim_page_title(t("decidim.admin.titles.user_groups")) %>
-<div class="card" id='user-groups'>
-  <div class="card-divider">
-    <h2 class="card-title">
+<div class="card" id="user-groups">
+  <div class="item_show__header">
+    <h2 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 tiny button--title" %>
+      <%= link_to t(".verify_via_csv"), new_user_groups_csv_verification_path, class: "button button__sm button__secondary" %>
     </h2>
   </div>
   <%= admin_filter_selector %>
-
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= sort_link(query, :name, t("models.user_group.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :document_number, t("models.user_group.fields.document_number", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :phone, t("models.user_group.fields.phone", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :users_count, t("models.user_group.fields.users_count", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :created_at, t("models.user_group.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :state, t("models.user_group.fields.state", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= t("models.user_group.fields.actions", scope: "decidim.admin") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @user_groups.each do |user_group| %>
-            <tr data-user-group-id="<%= user_group.id %>">
-              <td><%= user_group.name %></td>
-              <td><%= user_group.document_number %></td>
-              <td><%= user_group.phone %></td>
-              <td><%= user_group.users.size %></td>
-              <td><%= l user_group.created_at, format: :short %></td>
-              <td>
-              <% if user_group.verified? %>
-                <%= t(".state.verified") %>
-              <% end %>
-              <% if user_group.rejected? %>
-                <%= t(".state.rejected") %>
-              <% end %>
-              <% if user_group.pending? %>
-                <%= t(".state.pending") %>
-              <% end %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to?(:verify, :user_group, user_group: user_group) %>
-                  <% 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", aria_label: t("actions.verify", scope: "decidim.admin") %>
-                  <% end %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= sort_link(query, :name, t("models.user_group.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :nickname, t("models.user_group.fields.nickname", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :document_number, t("models.user_group.fields.document_number", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :phone, t("models.user_group.fields.phone", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :users_count, t("models.user_group.fields.users_count", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :created_at, t("models.user_group.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :state, t("models.user_group.fields.state", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= t("models.user_group.fields.actions", scope: "decidim.admin") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @user_groups.each do |user_group| %>
+          <tr data-user-group-id="<%= user_group.id %>">
+            <td><%= link_to_if user_group.nickname.present?, user_group.name, decidim.profile_path(user_group.nickname) %></td>
+            <td><%= link_to_if user_group.nickname.present?, user_group.nickname, decidim.profile_path(user_group.nickname) %></td>
+            <td><%= user_group.document_number %></td>
+            <td><%= user_group.phone %></td>
+            <td><%= user_group.users.size %></td>
+            <td><%= l user_group.created_at, format: :short %></td>
+            <td>
+            <% if user_group.verified? %>
+              <%= t(".state.verified") %>
+            <% end %>
+            <% if user_group.rejected? %>
+              <%= t(".state.rejected") %>
+            <% end %>
+            <% if user_group.pending? %>
+              <%= t(".state.pending") %>
+            <% end %>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:verify, :user_group, user_group: user_group) %>
+                <% if !user_group.verified? %>
+                  <%= icon_link_to "checkbox-circle-line", decidim_admin.verify_user_group_path(user_group), t("actions.verify", scope: "decidim.admin"), method: :put, class: "action-icon--verify" %>
+                <% else %>
+                  <%= icon "checkbox-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.verify", scope: "decidim.admin") %>
                 <% end %>
+              <% end %>
 
-                <% if allowed_to?(:reject, :user_group, user_group: user_group) %>
-                  <% 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", aria_label: t("actions.reject", scope: "decidim.admin") %>
-                  <% end %>
+              <% if allowed_to?(:reject, :user_group, user_group: user_group) %>
+                <% if !user_group.rejected? %>
+                  <%= icon_link_to "delete-bin-line", decidim_admin.reject_user_group_path(user_group), t("actions.reject", scope: "decidim.admin"), method: :put, class: "action-icon--reject" %>
+                <% else %>
+                  <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.reject", scope: "decidim.admin") %>
                 <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @user_groups, theme: "decidim" %>
-    </div>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+
+<%= decidim_paginate @user_groups %>

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

@@ -1,20 +1,31 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card" id='user-groups'>
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t ".title" %>
-    </h2>
-  </div>
-  <div class="card-section">
-    <%= decidim_form_for(@form, url: user_groups_csv_verification_path, html: { class: "form" }) do |form| %>
-      <p><%= t(".explanation") %></p>
-      <div class="row column">
-        <%= form.upload :file, required: true %>
-      </div>
-
-      <div class="button--double form-general-submit">
-        <%= form.submit t(".upload") %>
-      </div>
-    <% end %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <div class="form__wrapper">
+      <%= decidim_form_for(@form, url: user_groups_csv_verification_path, html: { class: "form form-defaults" }) do |form| %>
+        <div class="card pt-4">
+          <div class="card-section">
+            <div class="row column">
+              <p><%= t(".explanation") %></p>
+              <p><%= t(".example_file") %></p>
+              <code class="code-block"><%= t(".explanation_example") %></code>
+            </div>
+            <div class="row column">
+              <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+            </div>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= form.submit t(".upload"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>

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

@@ -1,11 +1,17 @@
-<div class="row column">
-  <%= form.text_field :name, label: t(".name") %>
-</div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.text_field :name, label: t(".name") %>
+      </div>
 
-<div class="row column">
-  <%= form.email_field :email, label: t(".email") %>
-</div>
+      <div class="row column">
+        <%= form.email_field :email, label: t(".email") %>
+      </div>
 
-<div class="row column">
-  <%= form.select :role, @form.available_roles_for_select, label: t(".role") %>
+      <div class="row column">
+        <%= form.select :role, @form.available_roles_for_select, label: t(".role") %>
+      </div>
+    </div>
+  </div>
 </div>

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

@@ -1,65 +1,63 @@
 <% add_decidim_page_title(t("decidim.admin.titles.users")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 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 tiny button--title" %>
+        <%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
       <% end %>
     </h2>
   </div>
   <%= admin_filter_selector %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <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>
-        <tbody>
-          <% @users.each do |user| %>
-            <tr data-user-id="<%= user.id %>">
-              <td><%= t("models.user.fields.roles.#{user.active_role}", scope: "decidim.admin") %></td>
-              <td><%= user.name %></td>
-              <td><%= user.email %></td>
-              <td>
-                <% if user.invitation_sent_at %>
-                  <%= l user.invitation_sent_at, format: :short %>
-                <% end %>
-              </td>
-              <td>
-                <% if user.invitation_accepted_at %>
-                  <%= l user.invitation_accepted_at, format: :short %>
-                <% end %>
-              </td>
-              <td>
-                <% if user.last_sign_in_at %>
-                  <%= l user.last_sign_in_at, format: :short %>
-                <% end %>
-              </td>
-              <td><%= l user.created_at, format: :short %></td>
-              <td class="table-list__actions">
-                <% if allowed_to?(:invite, :admin_user, user: user) && user.invited_to_sign_up? %>
-                  <%= icon_link_to "reload", [:resend_invitation, user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
-                <% end %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <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>
+      <tbody>
+        <% @users.each do |user| %>
+          <tr data-user-id="<%= user.id %>">
+            <td><%= t("models.user.fields.roles.#{user.active_role}", scope: "decidim.admin") %></td>
+            <td><%= user.name %></td>
+            <td><%= user.email %></td>
+            <td>
+              <% if user.invitation_sent_at %>
+                <%= l user.invitation_sent_at, format: :short %>
+              <% end %>
+            </td>
+            <td>
+              <% if user.invitation_accepted_at %>
+                <%= l user.invitation_accepted_at, format: :short %>
+              <% end %>
+            </td>
+            <td>
+              <% if user.last_sign_in_at %>
+                <%= l user.last_sign_in_at, format: :short %>
+              <% end %>
+            </td>
+            <td><%= l user.created_at, format: :short %></td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:invite, :admin_user, user: user) && user.invited_to_sign_up? %>
+                <%= icon_link_to "refresh-line", [:resend_invitation, user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+              <% end %>
 
-                <% if allowed_to? :destroy, :admin_user, user: user %>
-                  <%= icon_link_to "circle-x", user, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @users, theme: "decidim" %>
-    </div>
+              <% if allowed_to? :destroy, :admin_user, user: user %>
+                <%= icon_link_to "delete-bin-line", user, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate @users %>

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

@@ -1,15 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_user" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form form-defaults new_user" }) do |f| %>
       <%= render partial: "form", object: f %>
-    </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
-  </div>
-<% end %>
+</div>

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

@@ -0,0 +1,24 @@
+<% if current_user && !current_user.remember_created_at %>
+  <% timeout_time_seconds = Decidim.config.expire_session_after.to_i %>
+  <% prevent_timeout_for = try(:prevent_timeout_seconds) || 0 %>
+  <div class="reveal" id="timeoutModal" data-close-on-click="false" data-close-on-esc="false"
+    data-seconds-until-timeout-path="<%= decidim.seconds_until_timeout_path %>"
+    data-heartbeat-path="<%= decidim.heartbeat_path %>"
+    data-session-timeout="<%= timeout_time_seconds %>"
+    data-prevent-timeout-seconds="<%= prevent_timeout_for %>"
+    data-session-timeout-interval="<%= Decidim.config.session_timeout_interval.to_i * 1000 %>" data-reveal>
+    <h2><%= t("title", scope: "layouts.decidim.timeout_modal") %></h2>
+    <p><%= t("body", scope: "layouts.decidim.timeout_modal", minutes: (timeout_time_seconds / 60) - 2) %></p>
+
+    <div class="reveal__buttons">
+      <%= link_to t("log_out", scope: "layouts.decidim.timeout_modal"), decidim.destroy_user_session_path, method: :delete, class: "button warning" %>
+      <%= link_to "", decidim.destroy_user_session_path(translation_suffix: :timed_out), method: :delete, id: "reveal-hidden-sign-out", class: "hide" %>
+      <%= button_to t("continue_session", scope: "layouts.decidim.timeout_modal"),
+                    decidim.heartbeat_path,
+                    id: "continueSession",
+                    class: "button primary",
+                    remote: true,
+                    method: :post %>
+    </div>
+  </div>
+<% end %>

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

@@ -13,19 +13,57 @@
     <%= render partial: "layouts/decidim/admin/header" %>
   </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">
-        <%= yield %>
+
+    <main class="main">
+      <div class="layout-wrapper">
+        <div class="block md:hidden col-start-1 col-end-2">
+          <%= render partial: "layouts/decidim/admin/title_bar_responsive" %>
+        </div>
+        <div class="relative md:flex grow min-h-max w-full">
+          <div class="layout-nav">
+            <%= link_to decidim_admin.root_path, class: "logo hidden md:block", data: { "external-link": false }, aria: { label: t("decidim.accessibility.logo", organization: current_organization.name) } do %>
+              <% if current_organization.logo.present? %>
+                <%= image_tag current_organization.attached_uploader(:logo).path, alt: current_organization.name %>
+              <% else %>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 134 109">
+                  <g fill="#fff">
+                  <path d="M0 44.664a18.345 18.345 0 0 1 1.44-7.14 18.633 18.633 0 0 1 4.116-6.053 19.014 19.014 0 0 1 6.165-4.048A19.326 19.326 0 0 1 18.997 26h15.205a3.842 3.842 0 0 1 2.684 1.093A3.696 3.696 0 0 1 38 29.726v74.548c0 .489-.098.973-.29 1.426-.19.452-.47.863-.822 1.208A3.856 3.856 0 0 1 34.202 108H18.997c-5.037-.002-9.867-1.965-13.429-5.458C2.006 99.048.003 94.312 0 89.37V44.664ZM80.202 0H49.798C47.7 0 46 1.684 46 3.76v101.48c0 2.076 1.7 3.76 3.798 3.76h30.404c2.097 0 3.798-1.684 3.798-3.76V3.76C84 1.683 82.3 0 80.202 0ZM134 89.506a18.157 18.157 0 0 1-3.205 10.276 18.896 18.896 0 0 1-8.528 6.811 19.477 19.477 0 0 1-10.978 1.05 19.165 19.165 0 0 1-9.726-5.064 18.352 18.352 0 0 1-5.198-9.472 18.043 18.043 0 0 1 1.082-10.688 18.614 18.614 0 0 1 6.998-8.302A19.363 19.363 0 0 1 115 71c5.04.002 9.873 1.952 13.435 5.422C132 79.892 134 84.599 134 89.506Z" />
+                  </g>
+                </svg>
+              <% end %>
+            <% end %>
+            <%= main_menu_modules.render %>
+            <%= main_menu.render %>
+          </div>
+          <div class="layout-content">
+            <div class="hidden md:block">
+              <%= render partial: "layouts/decidim/admin/title_bar" %>
+            </div>
+            <%= yield :secondary_nav if content_for? :secondary_nav %>
+            <%= yield :sidebar_menu_nav if content_for? :sidebar_menu_nav %>
+            <%= yield :aside_menu_nav if content_for? :aside_menu_nav %>
+
+            <%= render partial: "layouts/decidim/admin/breadcrumb" %>
+            <%= render partial: "layouts/decidim/admin/callouts_full" %>
+
+            <% if has_secondary_root_menu? %>
+              <div class="layout-content__container-sidebar" data-content>
+                <%= render "layouts/decidim/admin/sidebar_menu" do %>
+                  <%= yield %>
+                <% end %>
+              </div>
+            <% else %>
+              <div class="layout-content__container" data-content>
+                <%= admin_tabs(tab_menu_name).render if defined?(has_tab_menu?) && has_tab_menu? %>
+                <%= yield %>
+              </div>
+            <% end %>
+          </div>
+        </div>
       </div>
-    </div>
-    <%= render partial: "layouts/decidim/admin/template_bottom" %>
+    </main>
+
+    <%= render partial: "layouts/decidim/timeout_modal" %>
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>

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

@@ -0,0 +1,26 @@
+<div class="process-title">
+  <div class="layout-content__container">
+    <div class="process-title-content">
+      <div class="process-title-content-breadcrumb-container-left">
+        <%= link_to decidim_admin.root_path, class: "process-title-content-icon-home", data: { "external-link": false }, aria: { label: "home" } do %>
+          <%= icon "home-gear-line" %>
+        <% end %>
+
+        <% breadcrumb_items(:admin).each_with_index do |item, i| %>
+          <span class="text-white">/</span>
+          <% item_label = decidim_html_escape(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 %>
+            <%= content_tag(:span, item_label, tabindex: "0", "aria-current": "page", class: "process-title-content-breadcrumb") %>
+          <% end %>
+        <% end %>
+      </div>
+      <% if content_for?(:breadcrumb_context_menu) %>
+        <div class="process-title-content-breadcrumb-container-right">
+          <%= yield :breadcrumb_context_menu %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -1,14 +1,3 @@
-<div class="callout-wrapper">
-  <% flash.each do |key, value| %>
-    <% if /_html\Z/.match?(key)
-         key = key.gsub(/_html\Z/, "")
-         value = decidim_sanitize(value)
-    end %>
-    <div class="callout <%= FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING[key.to_sym] %> callout--full" data-closable>
-      <%= value %>
-      <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
-        <span aria-hidden="true">&times;</span>
-      </button>
-    </div>
-  <% end %>
+<div class="callout-wrapper mb-0 mx-4">
+  <%= display_flash_messages %>
 </div>

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

@@ -1,9 +1,5 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
-<%= legacy_favicon %>
-<%= favicon %>
-<%= apple_favicon %>
-<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
-<%= javascript_pack_tag "decidim_admin", defer: false %>
-<%= organization_colors %>
+<%= 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,12 +1,9 @@
 <%
 js_configs = {
-  api_path: decidim_api.root_path(locale: nil),
-  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg"),
   messages: {
-    "selfxssWarning": {
-      title: t("decidim.security.selfxss_warning.title"),
-      description: t("decidim.security.selfxss_warning.description")
-    }
+    "selfxssWarning": t("decidim.security.selfxss_warning"),
+    editor: t("editor")
   }
 }
 character_messages = {

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

@@ -0,0 +1,24 @@
+
+<div class="sidebar-menu__container">
+  <div class="sidebar-menu">
+    <div id="admin-sidebar-menu-settings">
+      <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">
+        <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">
+        <%= sidebar_menu(secondary_root_menu).render %>
+      </ul>
+    </div>
+  </div>
+
+  <div class="item_show__wrapper">
+    <%= admin_tabs(tab_menu_name).render if defined?(has_tab_menu?) && has_tab_menu? %>
+    <%= yield %>
+  </div>
+</div>