decidim-admin 0.27.5 → 0.28.0.rc4

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

@@ -1,9 +1,10 @@
 <div class="filters__section">
-  <div class="fcell filter">
+  <div class="fcell">
     <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
       <li>
         <a href="#" class="dropdown button">
           <%= t("filter_label", scope: "decidim.admin.filters") %>
+          <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
         </a>
         <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
       </li>
@@ -22,19 +23,14 @@
                              scope: "decidim.admin.filters.search_placeholder")
             ) %>
         <div class="input-group-button">
-          <button type="submit" class="button">
-            <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
+          <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+            <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
           </button>
         </div>
       </div>
     <% end %>
   </div>
 </div>
-<div class="card-section fcell grid-x">
-  <div class="cell medium-10 filter-status">
-    <%= applied_filters_tags(i18n_ctx) %>
-  </div>
-  <div class="cell auto text-right">
-    <%= admin_filters_pagination %>
-  </div>
+<div class="fcell grid-x" data-applied-filters-tags>
+  <%= applied_filters_tags(i18n_ctx) %>
 </div>

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

@@ -1,26 +1,15 @@
-<div class="row column gallery__container">
+<div class="row column gallery__container mt-4">
   <fieldset>
     <legend><%= t(".gallery_legend") %></legend>
 
-    <% if @form.photos.any? %>
-      <% @form.photos.each do |photo| %>
-        <div class="callout gallery__item" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
-          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-          <button class="close-button" aria-label="<%= t(".delete_image") %>" title="<%= t(".delete_image") %>" type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
-    <div class="row column">
+    <div>
       <%= form.attachment :photos,
-        multiple: true,
-        label: t(".add_images"),
-        button_label: t(".add_images"),
-        button_edit_label: t(".edit_images"),
-        help_i18n_scope: "decidim.forms.file_help.image" %>
+                          multiple: true,
+                          label: t(".add_images"),
+                          button_label: t(".add_images"),
+                          button_edit_label: t(".edit_images"),
+                          button_class: "button button__sm button__transparent-secondary",
+                          help_i18n_scope: "decidim.forms.file_help.image" %>
     </div>
   </fieldset>
 </div>

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

@@ -1,5 +1,7 @@
-<div class="callout callout--full <%= css %>" data-closable>
-  <%= text %>
+<div class="flash <%= css %>" data-closable>
+  <span class="flash__message">
+    <%= text %>
+  </span>
   <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

@@ -0,0 +1,68 @@
+<% 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">
+      <%= content_blocks_title %>
+
+      <div>
+        <button class="button button__sm button__secondary button--title" data-toggle="add-content-block-dropdown">
+          <%= add_content_block_text %>
+          <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+        </button>
+        <div class="dropdown-pane" id="add-content-block-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+          <ul class="vertical menu add-components font-normal">
+            <% available_manifests.each do |manifest| %>
+              <li><%= link_to t(manifest.public_name_key), resource_create_url(manifest.name), method: :post %></li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </h2>
+  </div>
+
+  <div class="card-section-draggable-list">
+    <div class="grid-container full">
+      <div class="grid-x grid-margin-x card-grid">
+        <div class="cell">
+          <div class="card">
+            <div class="card-section">
+              <h5 class="draggable-list-title"><%= 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">
+          <div class="card">
+            <div class="card-section">
+              <h5 class="draggable-list-title"><%= 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>
+  </div>
+</div>
+
+<script>
+  document.addEventListener("dragend", function (event) {
+    const activeBlocks = Array.prototype.slice.call(document.querySelectorAll(".js-list-actives li"));
+    const activeBlocksId = activeBlocks.map(block => block.dataset.contentBlockId);
+
+    $.ajax({
+      method: "PUT",
+      url: document.querySelector(".js-list-actives").dataset.sortUrl,
+      contentType: "application/json",
+      data: JSON.stringify({ ids_order: activeBlocksId })
+    });
+  })
+</script>

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

@@ -1,47 +1 @@
-<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>
+<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>

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

@@ -1,16 +1,26 @@
 <% add_decidim_page_title(t(content_block.public_name_key)) %>
-<%= 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 class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t content_block.public_name_key %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_content_block [&_button]:button [&_button]:button__sm [&_button]:button__secondary" }, url: resource_landing_page_content_block_path) do |form| %>
+      <div class="form__wrapper">
+        <div class="card py-4">
+          <div class="card-section">
+            <div class="row column">
+              <%= cell content_block.settings_form_cell, form, content_block: %>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit submit_button_text, class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= form.submit submit_button_text %>
-  </div>
-<% end %>
+</div>

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

@@ -1,9 +1,9 @@
 <div class="row column">
-  <%= form.translated :text_field, :title, autofocus: true %>
+  <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
 </div>
 
 <div class="row column">
-  <%= form.translated :text_field, :description %>
+  <%= form.translated :text_field, :description, aria: { label: :description } %>
 </div>
 
 <div class="row column">

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

@@ -1,14 +1,24 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_static_page_topic" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<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, html: { class: "form form-defaults edit_static_page_topic" }) do |f| %>
+        <div class="card pt-4">
+          <div class="card-section">
+            <%= render partial: "form", object: f %>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end %>
     </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
   </div>
-<% end %>
+</div>

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

@@ -0,0 +1,41 @@
+<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+
+<div class="card" id="page_topics">
+  <div class="item_show__header">
+    <h2 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>
+  </div>
+  <% if topics.any? %>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("activemodel.attributes.static_page_topic.name") %></th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% topics.each do |topic| %>
+            <tr>
+              <td>
+                <%= link_to translated_attribute(topic.title), [:edit, topic] %>
+              </td>
+              <td>
+                <% if allowed_to? :update, :static_page_topic, topic: topic %>
+                  <%= icon_link_to "pencil-line", [:edit, topic], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
+                <% if allowed_to? :destroy, :static_page_topic, topic: topic %>
+                  <%= icon_link_to "delete-bin-line", topic, 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>
+  <% end %>
+</div>

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

@@ -1,14 +1,24 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_static_page_topic" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<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, html: { class: "form form-defaults new_static_page_topic" }) do |f| %>
+        <div class="card pt-4">
+         <div class="card-section">
+           <%= render partial: "form", object: f %>
+         </div>
+        </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="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
   </div>
-<% end %>
+</div>

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

@@ -1,34 +1,49 @@
-<div class="row column">
-  <%= form.translated :text_field, :title, autofocus: true %>
-</div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
-<% if allowed_to? :update_slug, :static_page, static_page: form.object %>
-  <div class="row column slug">
-    <%= form.text_field :slug %>
-    <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url("pages", form.object.slug)) %></p>
-  </div>
-<% end %>
+      <% if allowed_to? :update_slug, :static_page, static_page: form.object %>
+        <div class="row column slug">
+          <div>
+            <%= form.label :slug %>
+          </div>
+          <%= form.text_field :slug, label: false, help_text: t(".slug_help_html", url: decidim_form_slug_url("pages", form.object.slug)) %>
+        </div>
+      <% end %>
 
-<div class="row column">
-  <%= form.translated :editor, :content %>
-</div>
+      <div class="row column mt-2">
+        <%= form.translated :editor, :content, aria: { label: :content } %>
+      </div>
 
-<div class="row column">
-  <%= form.select :topic_id, form.object.topics.map { |topic| [translated_attribute(topic.title), topic.id] }, include_blank: t(".none") %>
-</div>
+      <div class="row column">
+        <div>
+          <%= form.label :topic %>
+        </div>
+        <%= form.select :topic_id, form.object.topics.map { |topic| [translated_attribute(topic.title), topic.id] }, include_blank: t(".none"), label: false %>
+      </div>
 
-<%= render partial: "form_notable_changes", locals: { form: form } %>
+      <%= render partial: "form_notable_changes", locals: { form: } %>
 
-<div class="row column">
-  <%= form.number_field :weight %>
-</div>
+      <div class="row column">
+        <div>
+          <%= form.label :weight %>
+        </div>
+        <%= form.number_field :weight, label: false %>
+      </div>
 
-<div class="row column">
-  <%= form.check_box :show_in_footer %>
-</div>
+      <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 %>
+      <% if form.object.control_public_access? %>
+        <div class="row column">
+          <%= form.check_box :allow_public_access %>
+        </div>
+      <% end %>
+
+    </div>
   </div>
-<% end %>
+</div>

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

@@ -2,8 +2,7 @@
   <div class="row column">
     <%= form.check_box :changed_notably, value: false, help_text: t("changed_notably_help", scope: "decidim.admin.static_pages.edit") %>
 
-    <div class="callout secondary">
-      <%= t("last_notable_change", scope: "decidim.admin.static_pages.index") %>: <%= @tos_version_formatted %>
-    </div>
+    <% announcement_message = t("last_notable_change", scope: "decidim.admin.static_pages.edit", tos_version_formatted: @tos_version_formatted) %>
+    <%= cell("decidim/announcement", announcement_message, callout_class: "warning") %>
   </div>
 <% end %>

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

@@ -4,58 +4,54 @@
       <h2 class="card-title">
         <% if topic %>
           <%= translated_attribute(topic.title) %>
-          <%= link_to t(".destroy"), [topic], class: "button tiny button--title destroy", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-          <%= link_to t(".edit"), [:edit, topic], class: "button tiny button--title new" %>
         <% else %>
           <%= t(".without_topic") %>
         <% end %>
       </h2>
     <% end %>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <% if pages.any? %>
-        <table class="table-list">
-          <thead>
+  <div class="table-scroll">
+    <% if pages.any? %>
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.static_page.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.static_page.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= t("last_notable_change", scope: "decidim.admin.static_pages.index") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% pages.each do |page| %>
             <tr>
-              <th><%= t("models.static_page.fields.title", scope: "decidim.admin") %></th>
-              <th><%= t("models.static_page.fields.created_at", scope: "decidim.admin") %></th>
-              <th><%= t("last_notable_change", scope: "decidim.admin.static_pages.index") %></th>
-              <th></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% pages.each do |page| %>
-              <tr>
-                <td>
-                  <%= link_to translated_attribute(page.title), [:edit, page] %><br>
-                </td>
-                <td>
-                  <%= l page.created_at, format: :short %>
-                </td>
-                <td>
-                  <% if allowed_to? :update_notable_changes, :static_page, static_page: page %>
-                    <%= @tos_version_formatted %>
-                  <% end %>
-                </td>
-                <td class="table-list__actions">
-                  <% if allowed_to? :update, :static_page, static_page: page %>
-                    <%= icon_link_to "pencil", [:edit, page], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                  <% end %>
+              <td>
+                <%= link_to translated_attribute(page.title), [:edit, page] %><br>
+              </td>
+              <td>
+                <%= l page.created_at, format: :short %>
+              </td>
+              <td>
+                <% if allowed_to? :update_notable_changes, :static_page, static_page: page %>
+                  <%= @tos_version_formatted %>
+                <% end %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to? :update, :static_page, static_page: page %>
+                  <%= icon_link_to "pencil-line", [:edit, page], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% end %>
 
-                  <%= icon_link_to "eye", decidim.page_path(page), t("actions.view", scope: "decidim.admin.static_pages"), class: "action-icon--preview" %>
+                <%= icon_link_to "eye-line", decidim.page_path(page), t("actions.view", scope: "decidim.admin.static_pages"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
 
-                  <% if allowed_to? :destroy, :static_page, static_page: page %>
-                    <%= icon_link_to "circle-x", page, 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>
-      <% else %>
-        <p><em><%= t(".empty") %></em></p>
-      <% end %>
-    </div>
+                <% if allowed_to? :destroy, :static_page, static_page: page %>
+                  <%= icon_link_to "delete-bin-line", page, 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>
+    <% else %>
+      <p><em><%= t(".empty") %></em></p>
+    <% end %>
   </div>
 </div>

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

@@ -1,14 +1,24 @@
 <% add_decidim_page_title t(".title") %>
-<%= decidim_form_for(@form, html: { class: "form edit_static_page" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
+<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 edit_static_page" }) do |f| %>
+      <div class="card">
+        <div class="card-section">
+          <%= render partial: "form", object: f %>
+        </div>
+      </div>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
-  </div>
-<% end %>
+</div>
+
+<%= render partial: "decidim/admin/shared/landing_page/content_blocks" if content_blocks? %>

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

@@ -1,8 +1,20 @@
 <% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+
+<div class="item_show__header">
+  <h2 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>
+</div>
+
 <% @topics.each do |topic| %>
-  <%= render partial: "topic", locals: { pages: topic.pages, topic: topic } %>
+  <%= render partial: "topic", locals: { pages: topic.pages, topic: } %>
 <% end %>
 
 <% if @orphan_pages.any? %>
-  <%= render partial: "topic", locals: { pages: @orphan_pages, topic: nil } %>
+  <div class="mt-4">
+    <%= render partial: "topic", locals: { pages: @orphan_pages, topic: nil } %>
+  </div>
 <% end %>