decidim-proposals 0.27.7 → 0.28.0.rc4

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb

@@ -1,24 +1,20 @@
 <div id="js-scope-change-proposals-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_scope_proposals_path, method: :post, remote: true, id: "js-form-scope-change-proposals", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(update_scope_proposals_path, method: :post, remote: true, id: "js-form-scope-change-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
     </div>
 
-    <%= scopes_picker_tag(
-          :scope_id,
-          try(:current_participatory_space)&.scope,
-          field: t("models.proposal.fields.scope", scope: "decidim.proposals")
-        ) %>
+    <%= scopes_select_tag(:scope_id) %>
 
     <%= submit_tag(
           t("decidim.proposals.admin.proposals.index.update_scope_button"),
           id: "js-submit-scope-change-proposals",
-          class: "button small button--simple float-left"
+          class: "button button__sm button__secondary small button--simple float-left"
         ) %>
 
-    <button id="js-cancel-scope-change-proposals" class="button tiny clear compact js-cancel-bulk-action" type="button">
+    <button id="js-cancel-scope-change-proposals" class="button button__sm button__secondary button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
       <%= t("decidim.proposals.admin.proposals.index.cancel") %>
     </button>
   <% end %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb

@@ -1,5 +1,5 @@
 <div id="js-split-proposals-actions" class="hide js-bulk-action-form">
-  <%= form_tag(proposals_split_path, method: :post, id: "js-form-split-proposals", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(proposals_split_path, method: :post, id: "js-form-split-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_components_select((current_component.siblings + [current_component])) %>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.split_button"), id: "js-submit-split-proposals", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.split_button"), id: "js-submit-split-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-split-proposals" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-split-proposals" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb

@@ -1,5 +1,5 @@
 <div id="js-unassign-proposals-from-valuator-actions" class="hide js-bulk-action-form">
-  <%= form_tag(valuation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-valuator", class: "flex--cc flex-gap--1") do %>
+  <%= form_tag(valuation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-valuator", class: "form form-defaults flex items-center gap-x-2") do %>
     <div class="checkboxes hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
@@ -8,8 +8,8 @@
 
     <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.unassign_from_valuator")) %>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_valuator_button"), id: "js-submit-unassign-proposals-from-valuator", class: "button small button--simple float-left") %>
+    <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_valuator_button"), id: "js-submit-unassign-proposals-from-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-unassign-proposals-from-valuator" class="button tiny clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-unassign-proposals-from-valuator" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

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

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_proposal proposal_form_admin" })  do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".update") %>
-    </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">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_proposal proposal_form_admin" })  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>

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

@@ -1,85 +1,72 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card with-overflow">
-  <div class="card-divider">
-    <h2 class="card-title flex--sbc">
+<div class="card">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <div>
         <%= t(".title") %>
         <span id="js-selected-proposals-count" class="component-counter component-counter--inline" title="<%= t("decidim.proposals.admin.proposals.index.selected") %>"></span>
       </div>
-      <%= render partial: "bulk-actions" %>
+        <%= render partial: "bulk-actions" %>
+        <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
   <%= admin_filter_selector(:proposals) %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th>
-              <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
-            </th>
-            <th>
-              <%= sort_link(query, :id, t("models.proposal.fields.id", scope: "decidim.proposals"), default_order: :desc ) %>
-            </th>
-            <th>
-              <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
-            </th>
-            <th>
-              <%= sort_link(query, :category_name, t("models.proposal.fields.category", scope: "decidim.proposals") ) %>
-            </th>
-
-            <% if resource_with_scopes_enabled? %>
-              <th>
-                <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
-              </th>
-            <% end %>
+  <div class="table-scroll mt-16">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th>
+            <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
+          </th>
+          <th class="!text-left">
+            <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+          </th>
+          <th>
+            <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
+          </th>
 
+          <% unless current_settings.publish_answers_immediately? %>
             <th>
-              <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
+              <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
             </th>
+          <% end %>
 
-            <% unless current_settings.publish_answers_immediately? %>
-              <th>
-                <%= sort_link(query, :state_published, t("models.proposal.fields.published_answer", scope: "decidim.proposals") ) %>
-              </th>
-            <% end %>
-
-            <% if current_settings.votes_enabled? %>
-              <th>
-                <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
-              </th>
-            <% end %>
-
-            <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
-              <th>
-                <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
-              </th>
-            <% end %>
-
+          <% if current_settings.votes_enabled? %>
             <th>
-              <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+              <%= sort_link(query, :proposal_votes_count, t("models.proposal.fields.votes", scope: "decidim.proposals") ) %>
             </th>
+          <% end %>
 
+          <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
             <th>
-              <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+              <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
             </th>
+          <% end %>
 
-            <th>
-              <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
-            </th>
+          <th>
+            <%= sort_link(query, :proposal_notes_count, t("models.proposal.fields.notes", scope: "decidim.proposals") ) %>
+          </th>
 
-            <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% proposals.each do |proposal| %>
-            <%= render partial: "proposal-tr", locals: { proposal: proposal } %>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate proposals, theme: "decidim" %>
-    </div>
+          <th>
+            <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+          </th>
+
+          <th>
+            <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
+          </th>
+
+          <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% proposals.each do |proposal| %>
+          <%= render partial: "proposal-tr", locals: { proposal: } %>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals_admin" %>
+<%= decidim_paginate proposals %>
+
+<%= append_javascript_pack_tag "decidim_proposals_admin" %>

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

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_proposal proposal_form_admin" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+<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-defaults form new_proposal proposal_form_admin" }) 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/proposals/admin/proposals/publish_answers.js.erb

@@ -1,8 +1,8 @@
-$("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+$("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")
-    .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+    .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id) }) %>");
 <% end %>
 
 $(".js-check-all").prop('checked', false);