decidim-elections 0.27.5 → 0.28.0.rc4

data/app/views/decidim/elections/admin/steps/index.html.erb

@@ -1,47 +1,54 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= translated_attribute(election.title) %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <% steps(current_step).each_with_index do |step, i| %>
-      <% if i > 0 %>&nbsp;&gt;&nbsp;<% end %>
-      <span class="<%= step.last %>"><%= t("steps.#{step.first}.title", scope: "decidim.elections.admin") %></span>
-    <% end %>
-  </div>
+<% add_decidim_page_title(t("title", scope: "decidim.elections.trustee_zone.elections.key_ceremony_steps", election: translated_attribute(election.title))) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("title", scope: "decidim.elections.trustee_zone.elections.key_ceremony_steps", election: translated_attribute(election.title)) %>
+  </h2>
 </div>
 
-<% if @form %>
-  <%= decidim_form_for(@form, url: election_step_path(election, current_step), method: :patch, html: { class: "form step #{current_step}" }) do |f| %>
-    <%= render partial: current_step.to_s, locals: { form: @form, f: f } %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <div class="card mb-4">
+      <div class="p-4">
+        <% steps(current_step).each_with_index do |step, i| %>
+          <% if i > 0 %>&nbsp;&gt;&nbsp;<% end %>
+          <span class="<%= step.last %>"><%= t("steps.#{step.first}.title", scope: "decidim.elections.admin") %></span>
+        <% end %>
+      </div>
+    </div>
+    <% if @form %>
+
+      <%= decidim_form_for(@form, url: election_step_path(election, current_step), method: :patch, html: { class: "form form-defaults step #{current_step}" }) do |f| %>
+        <div class="form__wrapper">
+          <%= render partial: current_step.to_s, locals: { form: @form, f: } %>
+        </div>
 
-    <%= f.hidden_field :current_step %>
+        <%= f.hidden_field :current_step %>
 
-    <% if @form.main_button? %>
-      <div class="button--double form-general-submit">
-        <%= f.button type: :submit, class: "button", disabled: @form.invalid? do %>
+        <% if @form.main_button? %>
+          <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+            <%= f.button type: :submit, class: "button button__sm button__secondary", disabled: @form.invalid? do %>
+              <% if @form.pending_action %>
+                <span class='loading-spinner'></span> <%= t("steps.processing", scope: "decidim.elections.admin") %>
+              <% else %>
+                <%= t("steps.#{current_step}.submit", scope: "decidim.elections.admin") %>
+              <% end %>
+            <% end %>
+          </div>
           <% if @form.pending_action %>
-            <span class='loading-spinner'></span> <%= t("steps.processing", scope: "decidim.elections.admin") %>
-          <% else %>
-            <%= t("steps.#{current_step}.submit", scope: "decidim.elections.admin") %>
+            <div id="pending_action"
+                data-api-endpoint-url="<%= bulletin_board_server %>"
+                data-message-id="<%= @form.pending_action.message_id %>"></div>
+
+            <%= append_javascript_pack_tag "decidim_elections_admin" %>
           <% end %>
         <% end %>
-      </div>
-      <% if @form.pending_action %>
-        <div id="pending_action"
-            data-api-endpoint-url="<%= bulletin_board_server %>"
-            data-message-id="<%= @form.pending_action.message_id %>"></div>
-
-        <%= javascript_pack_tag "decidim_elections_admin_pending_action" %>
       <% end %>
+    <% else %>
+      <div class="content <%= current_step %>">
+        <%= render partial: current_step.to_s %>
+      </div>
     <% end %>
-  <% end %>
-<% else %>
-  <div class="content <%= current_step %>">
-    <%= render partial: current_step.to_s %>
-  </div>
-<% end %>
 
-<%= render "decidim/elections/shared/broken_promises_modal" %>
+    <%= render "decidim/elections/shared/broken_promises_modal" %>
+  </div>
+</div>

data/app/views/decidim/elections/admin/trustees_participatory_spaces/_form.html.erb

@@ -1,19 +1,15 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title %>
-    </h2>
-  </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
 
-  <div class="card-section">
-    <div class="user-fields">
-      <div class="row column user-fields--user-picker">
-        <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
-        <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
-          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-        end %>
+    <div id="panel-title" class="card-section">
+      <div class="user-fields">
+        <div class="row column user-fields--user-picker">
+          <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
+          <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false }, prompt_options) do |user|
+            { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+          end %>
+        </div>
       </div>
     </div>
   </div>
-
 </div>

data/app/views/decidim/elections/admin/trustees_participatory_spaces/index.html.erb

@@ -1,69 +1,66 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card" id="trustees">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.elections", name: t("models.trustee.name", scope: "decidim.elections.admin")), new_trustee_path, class: "button tiny button--title new" %>
+      <%= link_to t("actions.new_trustee", scope: "decidim.elections"), new_trustee_path, class: "button button__sm button__secondary new ml-auto" %>
     </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("models.trustees_participatory_space.fields.name", scope: "decidim.elections") %></th>
+          <th><%= t("models.trustees_participatory_space.fields.email", scope: "decidim.elections") %></th>
+          <th><%= t("models.trustees_participatory_space.fields.public_key", scope: "decidim.elections") %></th>
+          <th><%= t("models.trustees_participatory_space.fields.notification", scope: "decidim.elections") %></th>
+          <th><%= t("models.trustees_participatory_space.fields.status", scope: "decidim.elections") %></th>
+          <th class="actions"><%= t("actions.title", scope: "decidim.elections") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% trustees.each do |trustee| %>
           <tr>
-            <th><%= t("models.trustees_participatory_space.fields.name", scope: "decidim.elections") %></th>
-            <th><%= t("models.trustees_participatory_space.fields.email", scope: "decidim.elections") %></th>
-            <th><%= t("models.trustees_participatory_space.fields.public_key", scope: "decidim.elections") %></th>
-            <th><%= t("models.trustees_participatory_space.fields.notification", scope: "decidim.elections") %></th>
-            <th><%= t("models.trustees_participatory_space.fields.status", scope: "decidim.elections") %></th>
-            <th class="actions"><%= t("actions.title", scope: "decidim.elections") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% trustees.each do |trustee| %>
-            <tr>
-              <td>
-                <% if trustee.name.present? %>
-                  <%= trustee.name %>
-                <% else %>
-                  <%= trustee.user.name %>
-                <% end %>
-              </td>
-              <td>
-                <%= trustee.user.email %>
-              </td>
-              <td>
-                <%= present(trustee).public_key_thumbprint %>
-              </td>
-              <td>
-                <%= trustee.created_at.ctime %>
-              </td>
-              <td>
-                <% if trustee_current_participatory_space(trustee).considered %>
-                  <%= t("models.trustees_participatory_space.fields.considered", scope: "decidim.elections") %>
-                <% else %>
-                  <%= t("models.trustees_participatory_space.fields.inactive", scope: "decidim.elections") %>
-                <% end %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to?(:update, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
-                  <%= icon_link_to considered_icon_action_for(trustee), edit_trustee_path(trustee_current_participatory_space(trustee)), considered_label_action_for(trustee), class: "action-icon--edit" %>
-                <% else %>
-                  <%= icon considered_icon_action_for(trustee), class: "action-icon action-icon--disabled", role: "img", aria_label: considered_label_action_for(trustee) %>
-                <% end %>
+            <td>
+              <% if trustee.name.present? %>
+                <%= trustee.name %>
+              <% else %>
+                <%= trustee.user.name %>
+              <% end %>
+            </td>
+            <td>
+              <%= trustee.user.email %>
+            </td>
+            <td>
+              <%= present(trustee).public_key_thumbprint %>
+            </td>
+            <td>
+              <%= trustee.created_at.ctime %>
+            </td>
+            <td>
+              <% if trustee_current_participatory_space(trustee).considered %>
+                <%= t("models.trustees_participatory_space.fields.considered", scope: "decidim.elections") %>
+              <% else %>
+                <%= t("models.trustees_participatory_space.fields.inactive", scope: "decidim.elections") %>
+              <% end %>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:update, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
+                <%= icon_link_to "close-circle-line", edit_trustee_path(trustee_current_participatory_space(trustee)), considered_label_action_for(trustee), class: "action-icon--edit" %>
+              <% else %>
+                <%= icon "close-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: considered_label_action_for(trustee) %>
+              <% end %>
 
-                <% if allowed_to?(:delete, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
-                  <%= icon_link_to "circle-x", trustee_path(trustee_current_participatory_space(trustee)), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
-                <% else %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate trustees, theme: "decidim" %>
-    </div>
+              <% if allowed_to?(:delete, :trustee_participatory_space, trustee_participatory_space: trustee_current_participatory_space(trustee)) %>
+                <%= icon_link_to "delete-bin-line", trustee_path(trustee_current_participatory_space(trustee)), t("actions.destroy", scope: "decidim.elections"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.elections") } %>
+              <% else %>
+                <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.destroy", scope: "decidim.elections") %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate trustees %>

data/app/views/decidim/elections/admin/trustees_participatory_spaces/new.html.erb

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, url: trustees_path, html: { class: "form new_trustee" }) 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(".create") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: trustees_path, html: { class: "form-defaults form new_trustee" }) 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(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/elections/elections/_elections.html.erb

@@ -1,24 +1,17 @@
 <% if elections.none? %>
-  <div class="callout warning">
-    <%= t("decidim.elections.warnings.no_elections_warning") %>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.elections.warnings.no_elections_warning"), callout_class: "warning") %>
 <% elsif scheduled_elections.none? %>
-  <div class="callout warning">
-    <%= t("decidim.elections.warnings.no_scheduled_elections_warning") %>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.elections.warnings.no_scheduled_elections_warning"), callout_class: "warning") %>
 <% end %>
 
-<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
-  <div class="column">
-    <%= order_selector available_orders, i18n_scope: "decidim.elections.orders" %>
-  </div>
-  <div class="column">
-    <%= render partial: "decidim/shared/results_per_page" %>
-  </div>
-</div>
+<h2 class="h5 md:h3 decorator"><%= t("elections_count", scope: "decidim.elections.elections.count", count: paginated_elections.total_count) %></h2>
+
+<%= order_selector available_orders, i18n_scope: "decidim.elections.orders" %>
 
-<div class="row small-up-1 medium-up-2 card-grid">
-  <%= render paginated_elections %>
+<div class="card__grid-grid">
+  <% paginated_elections.each do |election| %>
+    <%= card_for election %>
+  <% end %>
 </div>
 
 <%= decidim_paginate paginated_elections %>