Redesign: admin

decidim-accountability/app/helpers/decidim/accountability/admin/application_helper.rb

@@ -7,6 +7,7 @@ module Admin
       #
       module ApplicationHelper
         include Decidim::Admin::ResourceScopeHelper
+        include Decidim::PaginateHelper
       end
     end
   end

decidim-accountability/app/views/decidim/accountability/admin/import_results/new.html.erb

@@ -1,27 +1,31 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= form_tag(import_results_path, multipart: true, class: "form new_import") do %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= t(".title") %>
-      </h2>
-    </div>
-
-    <div class="card-section">
-      <div class="mb-s">
-        <p><%= t(".info",
-                 link_new_status: new_status_path,
-                 link_new_result: new_result_path,
-                 link_export_csv: link_to(t(".download_export"),exports_path(current_component, id: "results", format: "CSV"), method: :post)
-                ).try("html_safe") %></p>
+<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">
+    <%= form_tag(import_results_path, multipart: true, class: "form form-defaults new_import") do %>
+      <div class="card py-4">
+        <div class="card-section space-y-4">
+          <div class="row column">
+            <p><%= t(".info",
+                     link_new_status: new_status_path,
+                     link_new_result: new_result_path,
+                     link_export_csv: link_to(t(".download_export"),exports_path(current_component, id: "results", format: "CSV"), method: :post)
+                    ).try("html_safe") %></p>
+          </div>
+          <div class="row column">
+            <%= file_field_tag :csv_file %>
+          </div>
+        </div>
       </div>
-      <div class="row column">
-        <%= file_field_tag :csv_file %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= submit_tag t(".import"), class: "button button__sm button__secondary" %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= submit_tag t(".import"), class: "button" %>
-  </div>
-<% end %>
+</div>

decidim-accountability/app/views/decidim/accountability/admin/projects_import/new.html.erb

@@ -1,34 +1,44 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= form_for(@form, url: projects_import_index_path(@accountability), html: { class: "form import_projects" }) do |f| %>
-  <% if @form.origin_components.any? %>
-    <div class="card">
-      <div class="card-divider">
-        <h2 class="card-title"><%= t(".title") %></h2>
-      </div>
-      <div class="card-section">
-        <div class="row column">
-          <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
-        </div>
-        <div class="row column">
-          <% @form.origin_components.each do |component| %>
-            <small id="component_<%= component.id %>" class="help-text hide
-              <%= " form-error is-visible" if @form.selected_projects_count(component).zero? %>">
-              <%= t(".new_items", count: @form.selected_projects_count(component)) %>
-            </small>
-          <% end %>
-        </div>
-        <div class="row column">
-          <%= f.check_box :import_all_selected_projects, label: t(".import_all_selected_projects") %>
+<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">
+    <%= form_for(@form, url: projects_import_index_path(@accountability), html: { class: "form form-defaults import_projects" }) do |f| %>
+      <% if @form.origin_components.any? %>
+        <div class="form__wrapper">
+          <div class="card">
+            <div class="card-divider"></div>
+            <div class="card-section">
+              <div class="row column">
+                <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component"), label: t(".origin_component_id") %>
+              </div>
+              <div class="row column">
+                <% @form.origin_components.each do |component| %>
+                  <small id="component_<%= component.id %>" class="help-text hide
+                    <%= " form-error is-visible" if @form.selected_projects_count(component).zero? %>">
+                    <%= t(".new_items", count: @form.selected_projects_count(component)) %>
+                  </small>
+                <% end %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :import_all_selected_projects, label: t(".import_all_selected_projects") %>
+              </div>
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
 
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-    </div>
-  <% else %>
-    <p><%= t(".no_components") %></p>
-  <% end %>
-<% end %>
+        <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      <% else %>
+        <p><%= t(".no_components") %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>
 
 <%= append_javascript_pack_tag "decidim_accountability_admin_imports" %>

decidim-accountability/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -1,71 +1,72 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
+<div class="form__wrapper">
+  <div class="card">
+    <div class="card-divider"></div>
 
-    <% if @form.parent_id %>
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
       <div class="row column">
-        <%= form.select :parent_id, parent_results.map { |result| [translated_attribute(result.title), result.id] }, include_blank: true %>
+        <%= form.translated :editor, :description, aria: { label: :description } %>
       </div>
 
-    <% else %>
+      <% if @form.parent_id %>
 
-      <% if current_component.has_subscopes? %>
         <div class="row column">
-          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
+          <%= form.select :parent_id, parent_results.map { |result| [translated_attribute(result.title), result.id] }, include_blank: true %>
         </div>
-      <% end %>
 
-      <div class="row column">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
-      </div>
+      <% else %>
 
-    <% end %>
+        <% if current_component.has_subscopes? %>
+          <div class="row column">
+            <%= scopes_select_field form, :decidim_scope_id, root: current_component.scope %>
+          </div>
+        <% end %>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.date_field :start_date %>
-      </div>
+        <div class="row column">
+          <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: true, disable_parents: false %>
+        </div>
 
-      <div class="columns xlarge-6">
-        <%= form.date_field :end_date %>
-      </div>
-    </div>
+      <% end %>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
+      <div class="row">
+        <div class="columns xlarge-6">
+          <%= form.date_field :start_date %>
+        </div>
+
+        <div class="columns xlarge-6">
+          <%= form.date_field :end_date %>
+        </div>
       </div>
 
-      <div class="columns xlarge-6">
-        <%= form.number_field :progress %>
+      <div class="row">
+        <div class="columns xlarge-6">
+          <%= form.select :decidim_accountability_status_id, statuses.map { |status| [translated_attribute(status.name), status.id, { "data-progress" => status.progress }] }, include_blank: true %>
+        </div>
+
+        <div class="columns xlarge-6">
+          <%= form.number_field :progress %>
+        </div>
       </div>
-    </div>
 
-    <% if Decidim::Accountability.enable_proposal_linking %>
+      <% if Decidim::Accountability.enable_proposal_linking %>
+        <div class="row column">
+          <%= proposals_picker(form, :proposals, proposals_picker_results_path) %>
+        </div>
+      <% end %>
+
       <div class="row column">
-        <%= proposals_picker(form, :proposals, proposals_picker_results_path) %>
+        <% if @form.projects %>
+          <%= form.select :project_ids,
+                          @form.projects,
+                          {},
+                          { multiple: true, class: "chosen-select" } %>
+        <% end %>
       </div>
-    <% end %>
-
-    <div class="row column">
-      <% if @form.projects %>
-        <%= form.select :project_ids,
-                        @form.projects,
-                        {},
-                        { multiple: true, class: "chosen-select" } %>
-      <% end %>
-    </div>
 
+    </div>
   </div>
+
 </div>

decidim-accountability/app/views/decidim/accountability/admin/results/edit.html.erb

@@ -1,10 +1,21 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_result" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
-  </div>
-<% end %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+     <%= decidim_form_for(@form, html: { class: "form form-defaults edit_result" }) do |f| %>
+       <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+       <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>
 
 <%= append_javascript_pack_tag "decidim_accountability_admin" %>