decidim-admin 0.27.4 → 0.28.0.rc5

data/app/views/decidim/admin/components/_actions.html.erb

@@ -0,0 +1,44 @@
+<% if component.manifest.admin_engine %>
+  <%= icon_link_to "pencil-line", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>
+
+<% if allowed_to? :share, :component, component: component %>
+  <%= icon_link_to "share-line", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), target: :blank, class: "action-icon--share" %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>
+<% if allowed_to? :update, :component, component: component %>
+  <%= icon_link_to "settings-4-line", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>
+
+<% if allowed_to?(:update, :component, component: component) %>
+  <% if component.published? %>
+    <%= icon_link_to "close-circle-line", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
+  <% else %>
+    <%= icon_link_to "check-line", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
+  <% end %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>
+
+<%= icon_link_to "eye-line", main_component_path(component), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+<% if allowed_to? :update, :component, component: component %>
+  <% if component.manifest.actions.empty? %>
+    <%= icon "key-2-line", class: "action-icon action-icon--disabled" %>
+  <% else %>
+    <%= icon_link_to "key-2-line", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+  <% end %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>
+
+<% if allowed_to? :destroy, :component, component: component %>
+  <%= icon_link_to "delete-bin-line", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
+<% else %>
+  <span class="action-space icon"></span>
+<% end %>

data/app/views/decidim/admin/components/_component.html.erb

@@ -1,7 +1,9 @@
 <% if user_role_config.component_is_accessible?(component.manifest_name) %>
   <tr class="component-<%= component.id %>">
     <td>
-      <%= link_to main_component_path(component), target: "_blank" do %>
+      <% if component.manifest.admin_engine %>
+        <%= link_to translated_attribute(component.name), manage_component_path(component) %><br>
+      <% else %>
         <%= translated_attribute component.name %>
       <% end %>
     </td>
@@ -10,48 +12,10 @@
     </td>
     <%= td_resource_scope_for(component.scope) %>
     <td class="table-list__actions">
-      <% if component.manifest.admin_engine %>
-        <%= icon_link_to "pencil", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
-      <% else %>
-        <span class="action-space icon"></span>
-      <% end %>
-
-      <% if allowed_to?(:update, :component, component: component) %>
-        <% if component.published? %>
-          <%= icon_link_to "x", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
-        <% else %>
-          <%= icon_link_to "check", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
-        <% end %>
-      <% else %>
-        <span class="action-space icon"></span>
-      <% end %>
-
-      <% if allowed_to? :update, :component, component: component %>
-        <%= icon_link_to "cog", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
-      <% else %>
-        <span class="action-space icon"></span>
-      <% end %>
-
-      <% if allowed_to? :update, :component, component: component %>
-        <% if component.manifest.actions.empty? %>
-          <%= icon "key", class: "action-icon action-icon--disabled" %>
-        <% else %>
-          <%= icon_link_to "key", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
-        <% end %>
-      <% else %>
-        <span class="action-space icon"></span>
-      <% end %>
-
-      <% if allowed_to? :share, :component, component: component %>
-        <%= icon_link_to "share", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), class: "action-icon--share", target: "_blank" %>
-      <% else %>
-        <span class="action-space icon"></span>
-      <% end %>
-
-      <% if allowed_to? :destroy, :component, component: component %>
-        <%= icon_link_to "circle-x", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
+      <% if lookup_context.find_all("decidim/#{component.manifest_name}/admin/component/_actions").any? %>
+        <%= render partial: "decidim/#{component.manifest_name}/admin/component/actions", locals: { component: } %>
       <% else %>
-        <span class="action-space icon"></span>
+        <%= render partial: "actions", locals: { component: } %>
       <% end %>
     </td>
   </tr>

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

@@ -1,40 +1,65 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
+<div class="form__wrapper">
+  <div class="card" data-component="accordion" id="accordion-title">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-title" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="title">
+          <%= title %>
+        </h2>
+      </button>
+    </div>
 
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :name, autofocus: true %>
-      <%= form.number_field :weight %>
+    <div id="panel-title" class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :name, autofocus: true, aria: { label: :name } %>
+      </div>
+      <div class="row column">
+        <%= form.number_field :weight %>
+      </div>
+    </div>
+  </div>
+  <% if form.object.settings? %>
+    <div class="card" data-component="accordion" id="accordion-global_settings">
+      <div class="card-divider">
+        <button class="card-divider-button" data-open="true" data-controls="panel-global_settings" type="button">
+          <%= icon "arrow-right-s-line" %>
+          <h2 class="card-title" id="global_settings">
+            <%= t ".global_settings" %>
+          </h2>
+        </button>
+      </div>
 
-      <% if form.object.settings? %>
+      <div id="panel-global_settings" class="card-section">
         <fieldset class="global-settings">
-          <div class="card">
-            <div class="card-divider">
-              <legend><%= t ".global_settings" %></legend>
-            </div>
-            <div class="card-section">
-              <%= form.fields_for :settings, form.object.settings do |settings_fields| %>
-                <%= render partial: "decidim/admin/components/settings_fields",
-                           locals: {
-                             form: settings_fields,
-                             manifest: form.object.manifest,
-                             settings_name: :global,
-                             tabs_prefix: "global-settings"
-                           } %>
-              <% end %>
-            </div>
+          <div class="card-section">
+            <%= form.fields_for :settings, form.object.settings do |settings_fields| %>
+              <%= render partial: "decidim/admin/components/settings_fields",
+                         locals: {
+                           form: settings_fields,
+                           manifest: form.object.manifest,
+                           settings_name: :global,
+                           tabs_prefix: "global-settings"
+                         } %>
+            <% end %>
           </div>
         </fieldset>
-      <% end %>
+      </div>
+    </div>
+  <% end %>
+  <% if current_participatory_space.has_steps? %>
+    <div class="card" data-component="accordion" id="accordion-step_settings">
+      <div class="card-divider">
+        <button class="card-divider-button" data-open="true" data-controls="panel-step_settings" type="button">
+          <%= icon "arrow-right-s-line" %>
+          <h2 class="card-title" id="step_settings">
+            <%= t ".step_settings" %>
+          </h2>
+        </button>
+      </div>
 
-      <% if current_participatory_space.has_steps? %>
-        <fieldset class="step-settings">
-          <div class="card">
-            <div class="card-divider">
-              <legend><%= t ".step_settings" %></legend>
-            </div>
+      <div id="panel-step_settings" class="card-section">
+        <div class="row column">
+          <fieldset class="step-settings">
             <div class="card-section">
               <% current_participatory_space.steps.each do |step| %>
                 <fieldset class="step-settings-<%= step.id %>">
@@ -55,14 +80,24 @@
                 </fieldset>
               <% end %>
             </div>
-          </div>
-        </fieldset>
-      <% elsif form.object.default_step_settings? %>
-        <fieldset class="default-step-settings">
-          <div class="card">
-            <div class="card-divider">
-              <legend><%= t ".default_step_settings" %></legend>
-            </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  <% elsif form.object.default_step_settings? %>
+    <div class="card" data-component="accordion" id="accordion-default_step_settings">
+      <div class="card-divider">
+        <button class="card-divider-button" data-open="true" data-controls="panel-default_step_settings" type="button">
+          <%= icon "arrow-right-s-line" %>
+          <h2 class="card-title" id="default_step_settings">
+            <%= t ".default_step_settings" %>
+          </h2>
+        </button>
+      </div>
+
+      <div id="panel-default_step_settings" class="card-section">
+        <div class="row column">
+          <fieldset class="default-step-settings">
             <div class="card-section">
               <%= form.fields_for :default_step_settings, form.object.default_step_settings do |settings_fields| %>
                 <%= render partial: "decidim/admin/components/settings_fields",
@@ -74,13 +109,18 @@
                            } %>
               <% end %>
             </div>
-          </div>
-        </fieldset>
-      <% end %>
-
-      <% if component && component.persisted? && !component.published? %>
-        <%= render partial: "decidim/admin/share_tokens/share_tokens", locals: { share_tokens: form.object.share_tokens } %>
-      <% end %>
+          </fieldset>
+        </div>
+      </div>
     </div>
-  </div>
+  <% end %>
+  <% if component && component.persisted? && !component.published? %>
+    <div class="card" data-component="accordion" id="accordion-share_tokens">
+      <div id="panel-share_tokens" class="card-section">
+        <div class="row column">
+            <%= render partial: "decidim/admin/share_tokens/share_tokens", locals: { share_tokens: form.object.share_tokens } %>
+        </div>
+      </div>
+    </div>
+  <% end %>
 </div>

data/app/views/decidim/admin/components/_resource_action.html.erb

@@ -0,0 +1,9 @@
+<% if allowed_to?(:update, :component, component: current_component) %>
+  <%= link_to Decidim::EngineRouter.admin_proxy(current_component.participatory_space).edit_component_path(current_component.id),
+              class: "button button__sm button__secondary" do %>
+    <%= icon "settings-4-line" %>
+    <span>
+      <%= t("actions.configure", scope: "decidim.admin") %>
+    </span>
+  <% end %>
+<% end %>

data/app/views/decidim/admin/components/_settings_fields.html.erb

@@ -1,10 +1,13 @@
 <% manifest.settings(settings_name).attributes.each do |field_name, settings_attribute| %>
-  <%= settings_attribute_input(
-    form,
-    settings_attribute,
-    field_name,
-    "decidim.components.#{manifest.name}.settings.#{settings_name}",
-    tabs_prefix: tabs_prefix,
-    readonly: settings_attribute.readonly?(component: @component)
-  ) %>
+  <div class="row column mb-2">
+    <%= settings_attribute_input(
+      form,
+      settings_attribute,
+      field_name,
+      "decidim.components.#{manifest.name}.settings.#{settings_name}",
+      tabs_prefix:,
+      readonly: settings_attribute.readonly?(component: @component),
+      editor: settings_attribute.editor?(component: @component)
+    ) %>
+  </div>
 <% end %>

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

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t(".title", name: t("#{@component.manifest.name}.name", scope: "decidim.components"))) %>
-<%= decidim_form_for([current_participatory_space, @form], url: component_path(current_participatory_space, @component), method: "put", html: { class: "form edit_component" }) do |form| %>
-  <%= render partial: "form", object: form, locals: { component: @component, title: t(".title", name: t("#{@component.manifest.name}.name", scope: "decidim.components")) } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title", name: t("#{manifest.name}.name", scope: "decidim.components")) %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".update") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for([current_participatory_space, @form], url: component_path(current_participatory_space, @component), method: "put", html: { class: "form form-defaults edit_component" }) do |form| %>
+      <%= render partial: "form", object: form, locals: { component: @component, title: t(".title", name: t("#{@component.manifest.name}.name", scope: "decidim.components")) } %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,35 +1,40 @@
 <% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t("components.title", scope: "decidim.admin") %>
+
       <% if allowed_to?(:create, :component) %>
-        <button class="dropdown tiny button button--title" data-toggle="add-component-dropdown"><%= t "components.index.add", scope: "decidim.admin" %></button>
+      <div class="relative">
+        <button class="button button__sm button__secondary button--title" data-toggle="add-component-dropdown">
+          <%= t "components.index.add", scope: "decidim.admin" %>
+          <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+        </button>
         <div class="dropdown-pane" id="add-component-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
-          <ul class="vertical menu add-components">
+          <ul class="vertical menu add-components font-normal">
             <% @manifests.each do |manifest| %>
               <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
             <% end %>
           </ul>
         </div>
+      </div>
       <% end %>
     </h2>
   </div>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <th><%= t(".headers.name") %></th>
-          <th><%= t(".headers.type") %></th>
-          <%= th_resource_scope_label(t(".headers.scope")) %>
-          <th><%= t(".headers.actions") %></th>
-        </thead>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <th><%= t(".headers.name") %></th>
+        <th><%= t(".headers.type") %></th>
+        <%= th_resource_scope_label(t(".headers.scope")) %>
+        <th><%= t(".headers.actions") %></th>
+      </thead>
 
-        <tbody>
-          <%= render partial: "component", collection: @components %>
-        </tbody>
-      </table>
-    </div>
+      <tbody>
+        <%= render partial: "component", collection: @components %>
+      </tbody>
+    </table>
   </div>
 </div>

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

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t(".title", name: t("#{manifest.name}.name", scope: "decidim.components"))) %>
-<%= decidim_form_for([current_participatory_space, @form], url: components_path(type: params[:type]), method: "post", html: { class: "form new_component" }) do |form| %>
-  <%= render partial: "form", object: form, locals: { component: @component, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.components")) } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title", name: t("#{manifest.name}.name", scope: "decidim.components")) %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".add") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for([current_participatory_space, @form], url: components_path(type: params[:type]), method: "post", html: { class: "form form-defaults new_component" }) do |form| %>
+      <%= render partial: "form", object: form, locals: { component: @component, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.components")) } %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".add"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -2,30 +2,28 @@
   <div class="card-divider">
     <div class="card-title">Transfer User</div>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th></th>
-            <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
-            <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td><%= t("name", scope: "decidim.admin.conflicts.transfer") %></td>
-            <td><%= @form.conflict.current_user.name %></td>
-            <td><%= @form.conflict.managed_user.name %></td>
-          </tr>
-          <tr>
-            <td><%= t("email", scope: "decidim.admin.conflicts.transfer") %></td>
-            <td><%= @form.conflict.current_user.email %></td>
-            <td><%= @form.conflict.managed_user.email.present? ? @form.conflict.managed_user.email : "-" %></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
+          <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><%= t("name", scope: "decidim.admin.conflicts.transfer") %></td>
+          <td><%= @form.conflict.current_user.name %></td>
+          <td><%= @form.conflict.managed_user.name %></td>
+        </tr>
+        <tr>
+          <td><%= t("email", scope: "decidim.admin.conflicts.transfer") %></td>
+          <td><%= @form.conflict.current_user.email %></td>
+          <td><%= @form.conflict.managed_user.email.presence || "-" %></td>
+        </tr>
+      </tbody>
+    </table>
   </div>
 </div>
 
@@ -40,7 +38,7 @@
     </div>
   </div>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t("title", scope: "decidim.admin.conflicts.transfer") %>
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <%= f.submit t("title", scope: "decidim.admin.conflicts.transfer"), class: "button button__sm button__secondary" %>
   </div>
 <% end %>

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

@@ -1,35 +1,32 @@
 <% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t("title", scope: "decidim.admin.conflicts") %>
     </h2>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
+          <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
+          <th><%= t("attempts", scope: "decidim.admin.conflicts") %></th>
+          <th><%= t("solved", scope: "decidim.admin.conflicts") %></th>
+          <th class="table-list__actions"><%= t("title", scope: "decidim.admin.conflicts.transfer") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @conflicts.each do |conflict| %>
           <tr>
-            <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
-            <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
-            <th><%= t("attempts", scope: "decidim.admin.conflicts") %></th>
-            <th><%= t("solved", scope: "decidim.admin.conflicts") %></th>
-            <th class="table-list__actions"><%= t("title", scope: "decidim.admin.conflicts.transfer") %></h1>
-
+            <td><%= conflict.current_user.name %></td>
+            <td><%= conflict.managed_user.name %></td>
+            <td><%= conflict.times %></td>
+            <td><%= t(conflict.solved, scope: "decidim.admin.conflicts") %></td>
+            <td><%= icon_link_to "download-line", decidim_admin.edit_conflict_path(conflict), t("title", scope: "decidim.admin.conflicts.transfer") %></td>
           </tr>
-        </thead>
-        <tbody>
-          <% @conflicts.each do |conflict| %>
-            <tr>
-              <td><%= conflict.current_user.name %></td>
-              <td><%= conflict.managed_user.name %></td>
-              <td><%= conflict.times %></td>
-              <td><%= t(conflict.solved, scope: "decidim.admin.conflicts") %></td>
-              <td><%= icon_link_to "transfer", decidim_admin.edit_conflict_path(conflict), t("title", scope: "decidim.admin.conflicts.transfer") %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/decidim/admin/dashboard/_pending_moderations.html.erb

@@ -0,0 +1,12 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <p><%= t(".anouncement", count: count_pending_moderations) %></p>
+    <p><%= link_to t(".goto_moderation"), moderations_path, class: "button button__sm button__secondary mt-2" %></p>
+  </div>
+</div>

data/app/views/decidim/admin/dashboard/show.html.erb

@@ -1,19 +1,27 @@
 <% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
 
-<h2 class="card-title">
-  <%= t "decidim.admin.titles.dashboard" %>
-</h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+  <%= t "decidim.admin.titles.dashboard" %> <%= current_organization.name %>
+  </h2>
+</div>
 
 <div class="content">
-  <p><%= t ".welcome" %></p>
-
   <% unless current_user.admin_terms_accepted? %>
     <%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
   <% end %>
 
-  <div class="grid-x grid-margin-x">
-    <% if allowed_to? :read, :users_statistics %>
-      <div class="cell small-12 medium-6 large-4">
+  <% if count_pending_moderations.positive? && allowed_to?(:read, :global_moderation) %>
+    <div class="grid-x grid-margin-x">
+      <div class="cell small-6 medium-6 large-6">
+        <%= render "pending_moderations" %>
+      </div>
+    </div>
+  <% end %>
+
+  <% if allowed_to? :read, :users_statistics %>
+    <div class="grid-x grid-margin-x">
+      <div class="cell small-6 medium-6 large-6">
         <%= render(
           partial: "decidim/admin/users_statistics/users_count",
           locals: {
@@ -21,16 +29,16 @@
           }
         ) %>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 
   <div class="grid-x grid-margin-x">
     <% if allowed_to? :read, :metrics %>
-      <div class="cell small-6">
+      <div class="cell small-6 medium-6 large-6">
         <%= render(
           partial: "decidim/admin/metrics/metrics",
           locals: {
-            metrics_presenter: metrics_presenter,
+            metrics_presenter:,
             show_link_to_more: true
           }
         ) %>
@@ -38,20 +46,18 @@
     <% end %>
 
     <% if allowed_to? :read, :admin_log %>
-      <div class="cell small-6">
-        <%= render partial: "decidim/admin/logs/logs_list", locals: { logs: latest_action_logs } %>
+      <div class="cell small-6 medium-6 large-6">
+        <%= render partial: "decidim/admin/logs/logs_list", locals: { logs: latest_action_logs, display_filters: false } %>
         <% if latest_action_logs.any? %>
-          <div class="text-center"><%= link_to t(".view_more_logs"), logs_path %></div>
+          <div class="mt-4">
+            <%= link_to t(".view_more_logs"), logs_path, class: "button button__sm button__secondary" %>
+          </div>
         <% end %>
       </div>
     <% end %>
   </div>
 
   <% if current_user.admin_terms_accepted? %>
-    <p class="text-right">
-      <small>
-        <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_use"), admin_terms_show_path) %>
-      </small>
-    </p>
+    <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
   <% end %>
 </div>