decidim-initiatives 0.27.4 → 0.28.0.rc5

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

@@ -1,87 +1,88 @@
 <% add_decidim_page_title(t("decidim.admin.titles.initiatives")) %>
-<div class="card with-overflow" id="initiatives">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t "decidim.admin.titles.initiatives" %>
-      <div class="button--title">
-        <% if allowed_to? :export, :initiatives %>
-          <%= export_dropdowns(query) %>
-        <% end %>
-      </div>
+<div class="card" id="initiatives">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t("decidim.admin.titles.initiatives") %>
+
+      <% if allowed_to? :export, :initiatives %>
+        <%= export_dropdowns(query) %>
+      <% end %>
     </h2>
   </div>
   <%= admin_filter_selector(:initiatives) %>
-  <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.initiatives.fields.id", scope: "decidim.admin") %></th>
+        <th class="table-list__left"><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
+        <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
+        <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
+        <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
+        <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
+        <th class="actions"><%= t ".actions_title" %></th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @initiatives.each do |initiative| %>
         <tr>
-          <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
-          <th><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
-          <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
-          <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
-          <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
-          <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
-          <th class="actions"><%= t ".actions_title" %></th>
-        </tr>
-        </thead>
-        <tbody>
-        <% @initiatives.each do |initiative| %>
-          <tr>
-            <td><%= initiative.id %></td>
-            <td>
-              <% if allowed_to? :edit, :initiative, initiative: initiative %>
-                <%= link_to translated_attribute(initiative.title),
-                            decidim_admin_initiatives.edit_initiative_path(initiative.to_param) %>
-              <% else %>
-                <%= translated_attribute(initiative.title) %>
-              <% end %>
-            </td>
-            <td><%= humanize_admin_state initiative.state %></td>
-            <td><%= initiative.supports_count %>/<%= initiative.scoped_type.supports_required %></td>
-            <td><%= l initiative.created_at, format: :short %></td>
-            <td><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
-            <td class="table-list__actions">
-              <% if allowed_to? :preview, :initiative, initiative: initiative %>
-                <%= icon_link_to "eye",
-                                 decidim_initiatives.initiative_path(initiative.to_param),
-                                 t(".preview"),
-                                 class: "action-icon--preview",
-                                 target: "_blank" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
+          <td><%= initiative.id %></td>
+          <td class="table-list__left">
+            <% if allowed_to? :edit, :initiative, initiative: initiative %>
+              <%= link_to translated_attribute(initiative.title),
+                          decidim_admin_initiatives.edit_initiative_path(initiative.to_param) %>
+            <% else %>
+              <%= translated_attribute(initiative.title) %>
+            <% end %>
+          </td>
+          <td><%= humanize_admin_state initiative.state %></td>
+          <td><%= initiative.supports_count %>/<%= initiative.scoped_type.supports_required %></td>
+          <td class="table-list__date"><%= l initiative.created_at, format: :short %></td>
+          <td class="table-list__date"><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
+          <td class="table-list__actions">
+            <% if allowed_to? :edit, :initiative, initiative: initiative %>
+              <%= icon_link_to "pencil-line",
+                               decidim_admin_initiatives.edit_initiative_path(initiative.to_param),
+                               t("actions.configure", scope: "decidim.admin"),
+                               class: "action-icon--edit" %>
+            <% else %>
+              <span class="action-space icon"></span>
+            <% end %>
 
-              <% if allowed_to? :edit, :initiative, initiative: initiative %>
-                <%= icon_link_to "pencil",
-                                 decidim_admin_initiatives.edit_initiative_path(initiative.to_param),
-                                 t("actions.configure", scope: "decidim.admin"),
-                                 class: "action-icon--edit" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
+            <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
+              <%= icon_link_to "chat-1-line", edit_initiative_answer_path(initiative.slug), t("actions.answer", scope: "decidim.initiatives"), class: "action-icon action-icon--answer" %>
+            <% else %>
+              <%= icon "chat-1-line", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
+            <% end %>
 
-              <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
-                <%= icon_link_to "comment-square", edit_initiative_answer_path(initiative.slug), t("actions.answer", scope: "decidim.initiatives"), class: "action-icon action-icon--answer" %>
-              <% else %>
-                <%= icon "comment-square", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
-              <% end %>
+            <% if allowed_to? :read, :initiative, initiative: initiative %>
+              <%= icon_link_to "printer-line",
+                               decidim_initiatives.print_initiative_path(initiative),
+                               t(".print"),
+                               class: "action-icon--print",
+                               target: "_blank",
+                               data: { "external-link": false } %>
+            <% else %>
+              <span class="action-space icon"></span>
+            <% end %>
 
-              <% if allowed_to? :read, :initiative, initiative: initiative %>
-                <%= icon_link_to "print",
-                                 decidim_initiatives.print_initiative_path(initiative),
-                                 t(".print",),
-                                 class: "action-icon--print",
-                               target: :blank %>
+            <% if allowed_to? :preview, :initiative, initiative: initiative %>
+              <%= icon_link_to "eye-line",
+                               decidim_initiatives.initiative_path(initiative.to_param),
+                               t(".preview"),
+                               class: "action-icon--preview",
+                               target: "_blank",
+                               data: { "external-link": false } %>
             <% else %>
               <span class="action-space icon"></span>
-              <% end %>
-              <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
-            </td>
-        <% end %>
-        </tbody>
-      </table>
-      <%= paginate @initiatives, theme: "decidim" %>
-    </div>
+            <% end %>
+
+            <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate @initiatives %>

data/app/views/decidim/initiatives/admin/initiatives_settings/_form.html.erb

@@ -1,10 +1,9 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t(".title") %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row column">
-      <%= form.select :initiatives_order, [[t(".random"),"random"],[t(".date"),"recent"],[t(".signatures"),"most_voted"],[t(".comments"),"most_commented"],[t(".publication_date"),"recently_published"]] %>
-   </div>
+<div class="form__wrapper">
+  <div class="card">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.select :initiatives_order, [[t(".random"),"random"],[t(".date"),"recent"],[t(".signatures"),"most_voted"],[t(".comments"),"most_commented"],[t(".publication_date"),"recently_published"]] %>
+     </div>
+    </div>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb

@@ -1,8 +1,20 @@
 <% add_decidim_page_title(t("decidim.initiatives.admin.initiatives_settings.form.title")) %>
 
-<%= decidim_form_for(@form, html: { class: "form edit_initiatives_settings" }, url: initiatives_setting_path, method: :put) do |f| %>
-  <%= render partial: "form", object: f %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t "title", scope: "decidim.initiatives.admin.initiatives_settings.form" %>
+  </h2>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form form-defaults edit_initiatives_settings" }, url: initiatives_setting_path, method: :put) do |f| %>
+      <%= render partial: "form", object: f %>
+      <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>
-<% end %>
+</div>

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/_form.html.erb

@@ -1,7 +1,12 @@
-<div class="row column">
-  <%= scopes_picker_field form, :decidim_scopes_id, root: nil %>
-</div>
-
-<div class="row column">
-  <%= form.number_field :supports_required, min: 1, step: 1 %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= scopes_select_field form, :decidim_scopes_id, root: nil %>
+      </div>
+      <div class="row column">
+        <%= form.number_field :supports_required, min: 1, step: 1 %>
+      </div>
+    </div>
+  </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb

@@ -1,29 +1,23 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
 
-      <%= decidim_form_for @form,
-                           url: initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
-                           html: { class: "form edit_initiative_type_scope" } do |f| %>
-        <%= render partial: "form", object: f %>
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".update"), class: "button" %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
 
-          <% if allowed_to? :destroy, :initiative_type_scope, initiative_type_scope: current_initiative_type_scope %>
-              <%= link_to t(".destroy"), initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
-                          method: :delete,
-                          class: "alert button",
-                          data: { confirm: t(".confirm_destroy") } %>
-          <% end %>
+<div>
+  <div class="item__edit-form">
+    <%= decidim_form_for @form,
+                         url: initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
+                         html: { class: "form form-defaults edit_initiative_type_scope" } do |f| %>
 
-          <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb

@@ -1,21 +1,23 @@
 <% add_decidim_page_title(t(".title")) %>
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
 
-  <div class="card-section">
-    <div class="row column">
-      <%= decidim_form_for @form,
-                           url: initiatives_type_initiatives_type_scopes_path(params[:initiatives_type_id]),
-                           html: { class: "form new_initiatives_type_scopes" } do |f| %>
-        <%= render partial: "form", object: f %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+
+<div>
+  <div class="item__edit-form">
+    <%= decidim_form_for @form,
+                         url: initiatives_type_initiatives_type_scopes_path(params[:initiatives_type_id]),
+                         html: { class: "form form-defaults new_initiatives_type_scopes" } do |f| %>
 
-        <div class="button--double form-general-submit">
-          <%= f.submit t(".create") %>
-          <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb

@@ -1,105 +1,122 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+<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">
+          <%= t("initiatives.form.title", scope: "decidim.initiatives.admin") %>
+        </h2>
+      </button>
     </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
+    <div id="panel-title" class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
+
+      <div class="row column">
+        <%= form.translated :editor, :description, aria: { label: :description } %>
+      </div>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.upload :banner_image, required: true %>
+      <div class="row">
+        <div class="columns">
+          <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
+        </div>
       </div>
     </div>
   </div>
-</div>
-
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".options" %></h2>
-  </div>
 
-  <div class="card-section">
-    <div class="row column">
-      <%= form.select :signature_type, form.object.signature_type_options %>
+  <div class="card" data-component="accordion" id="accordion-options">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-options" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="options">
+          <%= t("initiatives_types.form.options", scope: "decidim.initiatives.admin") %>
+        </h2>
+      </button>
     </div>
 
-    <div class="row column">
-      <%= form.check_box :attachments_enabled %>
-    </div>
+    <div id="panel-options" class="card-section">
+      <div class="row column">
+        <%= form.select :signature_type, form.object.signature_type_options %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :undo_online_signatures_enabled %>
-    </div>
+      <div class="row column">
+        <%= form.check_box :attachments_enabled %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :custom_signature_end_date_enabled %>
-    </div>
+      <div class="row column">
+        <%= form.check_box :undo_online_signatures_enabled %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :area_enabled %>
-    </div>
+      <div class="row column">
+        <%= form.check_box :custom_signature_end_date_enabled %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :child_scope_threshold_enabled %>
-      <p class="help-text"><%== t(".child_scope_threshold_enabled_help") %></p>
-    </div>
+      <div class="row column">
+        <%= form.check_box :area_enabled %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :only_global_scope_enabled %>
-      <p class="help-text"><%== t(".only_global_scope_enabled_help") %></p>
-    </div>
+      <div class="row column">
+        <%= form.check_box :child_scope_threshold_enabled, help_text: t(".child_scope_threshold_enabled_help_html") %>
+      </div>
+
+      <div class="row column">
+        <%= form.check_box :only_global_scope_enabled, help_text: t(".only_global_scope_enabled_help_html") %>
+      </div>
 
-    <div class="row column" id="promoting-committee-details">
-      <%= form.check_box :promoting_committee_enabled %>
+      <div id="promoting-committee-details">
+        <div class="row column">
+          <%= form.check_box :promoting_committee_enabled %>
+        </div>
 
-      <div class="row column minimum-committee-members-details">
-        <%= form.number_field :minimum_committee_members, min: 0, step: 1 %>
+        <div class="row column minimum-committee-members-details">
+          <%= form.number_field :minimum_committee_members, min: 0, step: 1 %>
+        </div>
       </div>
-    </div>
 
-    <div class="row column">
-      <%= form.check_box :comments_enabled %>
-    </div>
+      <div class="row column">
+        <%= form.check_box :comments_enabled %>
+      </div>
 
-    <div class="row column">
-      <%= form.check_box :collect_user_extra_fields %>
-    </div>
+      <div class="row column">
+        <%= form.check_box :collect_user_extra_fields %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :extra_fields_legal_information %>
+      <div class="row column">
+        <%= form.translated :editor, :extra_fields_legal_information, aria: { label: :extra_fields_legal_information } %>
+      </div>
     </div>
   </div>
-</div>
-
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".authorizations" %></h2>
-  </div>
 
-  <div class="card-section">
-    <div class="row column">
-      <%=
-        form.select(
-          :document_number_authorization_handler,
-          current_organization.available_authorizations.map { |name| [t("#{name}.name", scope: "decidim.authorization_handlers"), name] },
-          include_blank: true
-        )
-      %>
+  <div class="card" data-component="accordion" id="accordion-authorizations">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-authorizations" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="authorizations">
+          <%= t("initiatives_types.form.authorizations", scope: "decidim.initiatives.admin") %>
+        </h2>
+      </button>
     </div>
 
-    <% if current_organization.available_authorizations.include? "sms" %>
+    <div id="panel-authorizations" class="card-section">
       <div class="row column">
-        <%= form.check_box :validate_sms_code_on_votes %>
+        <%=
+          form.select(
+            :document_number_authorization_handler,
+            current_organization.available_authorizations.map { |name| [t("#{name}.name", scope: "decidim.authorization_handlers"), name] },
+            include_blank: true
+          )
+        %>
       </div>
-    <% end %>
+
+      <% if current_organization.available_authorizations.include? "sms" %>
+        <div class="row column">
+          <%= form.check_box :validate_sms_code_on_votes %>
+        </div>
+      <% end %>
+    </div>
   </div>
-</div>
 
-<%= javascript_pack_tag "decidim_initiatives_admin" %>
+  <%= append_javascript_pack_tag "decidim_initiatives_admin" %>
+</div>

data/app/views/decidim/initiatives/admin/initiatives_types/_initiative_type_scopes.html.erb

@@ -1,42 +1,44 @@
-<div class="card">
+<div class="card" data-component="accordion" id="accordion-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>">
   <div class="card-divider">
-    <h2 class="card-title">
-      <%= t ".title" %>
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.initiatives_type_scope.name", scope: "decidim.admin")),
+    <h2 class="card-title gap-2" id="<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>">
+      <button class="card-divider-button" data-open="true" data-controls="panel-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <span>
+          <%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>
+        </span>
+      </button>
+      <%= link_to t("actions.new_initiative_type_scope", scope: "decidim.admin"),
                   new_initiatives_type_initiatives_type_scope_path(initiative_type),
-                  class: "button tiny button--title" if allowed_to? :create, :initiative_type_scope %>
+                  class: "button button__sm button__secondary flex-none" if allowed_to? :create, :initiative_type_scope %>
     </h2>
   </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <div class="table-scroll">
-        <table class="table-list">
-          <thead>
+  <div id="panel-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>" class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+        <tr>
+          <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
+          <th class="text-right">
+            <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
+          </th>
+          <th class="actions"></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% initiative_type.scopes.each do |s| %>
           <tr>
-            <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
-            <th class="text-right">
-              <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
-            </th>
-            <th class="actions"></th>
+            <td><%= translated_attribute(s.scope_name) %></td>
+            <td class="text-right"><%= s.supports_required %></td>
+            <td class="table-list__actions">
+              <%= icon_link_to "pencil-line",
+                               decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
+                               t("actions.configure", scope: "decidim.admin"),
+                               class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
+            </td>
           </tr>
-          </thead>
-          <tbody>
-          <% initiative_type.scopes.each do |s| %>
-            <tr>
-              <td><%= translated_attribute(s.scope_name) %></td>
-              <td class="text-right"><%= s.supports_required %></td>
-              <td class="table-list__actions">
-                <%= icon_link_to "pencil",
-                                decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
-                                t("actions.configure", scope: "decidim.admin"),
-                                class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
-              </td>
-            </tr>
-          <% end %>
-          </tbody>
-        </table>
-      </div>
+        <% end %>
+        </tbody>
+      </table>
     </div>
   </div>
 </div>