decidim-admin 0.27.4 → 0.28.0.rc5

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

@@ -1,69 +1,68 @@
-<div class='card' id="private_users">
-  <div class="card-divider">
-    <h2 class="card-title">
+<% add_decidim_page_title(t(".title")) %>
+<div class="card" id="private_users">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
       <% if allowed_to? :create, :space_private_user %>
-        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button tiny button--title import" %>
-        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
+        <%= link_to t(".import_via_csv"), new_participatory_space_private_users_csv_imports_path, class: "button button__sm button__secondary import" %>
+        <%= link_to t("actions.participatory_space_private_user.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
     </h2>
   </div>
   <%= admin_filter_selector(:participatory_space_private_users) %>
-  <div class="card-section">
-    <% if participatory_space_private_users.any? %>
-      <div class="table-scroll">
-        <table class="stack">
-          <thead>
+  <% if participatory_space_private_users.any? %>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th>
+             <%= sort_link(query, :name, t("models.user.fields.name", scope: "decidim.admin"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc ) %>
+            </th>
+            <th class="actions"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% participatory_space_private_users.each do |private_user| %>
             <tr>
-              <th>
-               <%= sort_link(query, :name, t("models.user.fields.name", scope: "decidim.admin"), default_order: :desc ) %>
-              </th>
-              <th>
-                <%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc ) %>
-              </th>
-              <th>
-                <%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc ) %>
-              </th>
-              <th>
-                <%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc ) %>
-              </th>
-              <th class="actions"></th>
-            </tr>
-          </thead>
-          <tbody>
-            <% participatory_space_private_users.each do |private_user| %>
-              <tr>
-                <td>
-                  <%= private_user.user.name %><br>
-                </td>
-                <td>
-                  <%= private_user.user.email %><br>
-                </td>
-                <td>
-                  <% if private_user.user.invitation_sent_at %>
-                    <%= l private_user.user.invitation_sent_at, format: :short %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if private_user.user.invitation_accepted_at %>
-                    <%= l private_user.user.invitation_accepted_at, format: :short %>
-                  <% end %>
-                </td>
-                <td class="table-list__actions">
-                  <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
-                    <%= icon_link_to "reload", resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
-                  <% end %>
+              <td>
+                <%= private_user.user.name %><br>
+              </td>
+              <td>
+                <%= private_user.user.email %><br>
+              </td>
+              <td>
+                <% if private_user.user.invitation_sent_at %>
+                  <%= l private_user.user.invitation_sent_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if private_user.user.invitation_accepted_at %>
+                  <%= l private_user.user.invitation_accepted_at, format: :short %>
+                <% end %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to?(:invite, :space_private_user, private_user: private_user) && private_user.user.invited_to_sign_up? %>
+                  <%= icon_link_to "refresh-line", resend_invitation_participatory_space_private_user_path(current_participatory_space, private_user), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% end %>
 
-                  <% if allowed_to? :destroy, :space_private_user, private_user: private_user %>
-                    <%= icon_link_to "circle-x", participatory_space_private_user_path(current_participatory_space, private_user), 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>
-      <%= decidim_paginate participatory_space_private_users %>
-    <% end %>
-  </div>
+                <% if allowed_to? :destroy, :space_private_user, private_user: private_user %>
+                  <%= icon_link_to "delete-bin-line", participatory_space_private_user_path(current_participatory_space, private_user), 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>
+    <%= decidim_paginate participatory_space_private_users %>
+  <% end %>
 </div>

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

@@ -1,7 +1,19 @@
-<%= decidim_form_for(@form, url: participatory_space_private_users_path(current_participatory_space), html: { class: "form new_participatory_space_private_user" }) do |f| %>
-  <%= render partial: "decidim/admin/participatory_space_private_users/form", object: f, locals: { title: t(".title") } %>
+<% add_decidim_page_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: participatory_space_private_users_path(current_participatory_space), html: { class: "form-defaults form new_participatory_space_private_user" }) do |f| %>
+      <%= render partial: "decidim/admin/participatory_space_private_users/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>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,37 +1,54 @@
+<% add_decidim_page_title(t(".title")) %>
+
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+    </h1>
+  </div>
+</div>
+
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".destroy.title") %>
+      <%= t ".destroy.title" %>
     </h2>
   </div>
-  <div class="card-section">
+  <div class="card-section p-4">
     <% if @count != 0 %>
       <p><%= t(".destroy.explanation", count: @count) %></p>
       <%= link_to t(".destroy.button"),
                   destroy_all_participatory_space_private_users_csv_imports_path,
                   method: :delete,
-                  class: "button alert",
+                  class: "button button__sm button__secondary alert",
                   data: { confirm: t(".destroy.confirm") } %>
     <% else %>
       <p><%= t(".destroy.empty") %></p>
     <% end %>
   </div>
 </div>
-<div class="card" id='user-groups'>
+
+<div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t ".title" %>
+      <%= t ".csv_upload.title" %>
     </h2>
   </div>
-  <div class="card-section">
-    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form" }) do |form| %>
-      <p><%= t(".explanation") %></p>
+  <div class="card-section p-4">
+    <%= decidim_form_for(@form, url: participatory_space_private_users_csv_imports_path, html: { class: "form form-defaults" }) do |form| %>
+      <div class="mb-s">
+        <p><%= t(".explanation") %></p>
+        <p><%= t(".example_file") %></p>
+        <code class="code-block"><%= t(".explanation_example", csv_col_sep: Decidim.default_csv_col_sep) %></code>
+      </div>
       <div class="row column">
-        <%= form.upload :file, required: true %>
+        <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
       </div>
 
-      <div class="button--double form-general-submit">
-        <%= form.submit t(".upload") %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".upload"), class: "button button__sm button__secondary" %>
+        </div>
       </div>
     <% end %>
   </div>

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

@@ -1,21 +1,23 @@
-<%= decidim_form_for(@form, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title flex--sbc">
-        <%= reminder_manifest.message(:title, count: @form.try(:reminder_amount)) %>
-      </h2>
-    </div>
-    <div class="card-section">
-      <div class="row">
-        <div class="columns small-12">
-          <p><%= reminder_manifest.message(:description) %></p>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
+      <div class="card pb-4">
+        <div class="card-divider">
+          <h2 class="card-title">
+            <%= reminder_manifest.message(:title, count: @form.try(:reminder_amount)) %>
+          </h2>
+        </div>
+        <div class="card-section">
+          <div class="row column">
+            <p><%= reminder_manifest.message(:description) %></p>
+          </div>
         </div>
       </div>
-      <div class="row">
-        <div class="columns small-12 text-center">
-          <%= form.submit t(".submit") %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".submit"), class: "button button__sm button__secondary" %>
         </div>
       </div>
-    </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,56 +1,55 @@
+<% add_decidim_page_title(t(".title")) %>
+
 <section id="components">
-  <div class="row">
-    <div class="columns">
-      <h3>
-        <%= t(".title") %>
-        <% if resource %>
-          -
-          <% if resource.is_a?(Decidim::Resourceable) %>
-            <%= link_to(resource_title(resource), resource_locator(resource).path) %>
-          <% else %>
-            <%= strip_tags resource_title(resource) %>
-          <% end %>
-        <% end %>
-      </h3>
-    </div>
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t(".title") %>
+    </h2>
   </div>
-  <%= form_for @permissions_form, url: url_for(action: :update, **resource_params), method: "put" do |permissions_form| %>
-    <%= permissions_form.fields_for :permissions, permissions_form.object do |action_permission_form| %>
-      <% action_permission_form.object.permissions.each do |action, permission| %>
-        <fieldset class="card <%= action %>-permission">
-          <% if @component %>
-            <div class="card-divider"><%= t("#{@component.manifest.name}.actions.#{action}", scope: "decidim.components") %></div>
-          <% else %>
-            <div class="card-divider"><%= t("#{resource.resource_manifest.name}.actions.#{action}", scope: "decidim.resources") %></div>
-          <% end %>
 
-          <div class="card-section">
-            <%= action_permission_form.fields_for(action, permission) do |permission_form| %>
-              <%= permission_form.collection_check_boxes :authorization_handlers,
-                                                         authorizations,
-                                                         :name,
-                                                         :description do |b| %>
-                <div>
-                  <%= b.label { b.check_box + b.text } %>
-                  <% if permission.authorization_handlers_names.include? b.value %>
-                    <div id="authorization-handler-<%= b.value %>" class="authorization-handler">
-                      <%= render "options_form", form: permission_form, handler_name: b.value %>
-                    </div>
-                  <% else %>
-                    <% missing_permission = Decidim::Admin::PermissionForm.new(authorization_handlers: { b.value => {} }) %>
-                    <%= action_permission_form.fields_for(action, missing_permission) do |missing_permission_form| %>
-                      <div id="authorization-handler-<%= b.value %>" class="authorization-handler" style="display:none">
-                        <%= render "options_form", form: missing_permission_form, handler_name: b.value %>
+  <%= form_for @permissions_form, url: url_for(action: :update, **resource_params), html: { class: "form form-defaults" }, method: "put" do |permissions_form| %>
+    <div class="form__wrapper">
+      <%= permissions_form.fields_for :permissions, permissions_form.object do |action_permission_form| %>
+        <% action_permission_form.object.permissions.each do |action, permission| %>
+          <fieldset class="card <%= action %>-permission">
+            <% if @component %>
+              <div class="card-divider"><%= t("#{@component.manifest.name}.actions.#{action}", scope: "decidim.components") %></div>
+            <% else %>
+              <div class="card-divider"><%= t("#{resource.resource_manifest.name}.actions.#{action}", scope: "decidim.resources") %></div>
+            <% end %>
+
+            <div class="card-section p-4">
+              <%= action_permission_form.fields_for(action, permission) do |permission_form| %>
+                <%= permission_form.collection_check_boxes :authorization_handlers,
+                                                           authorizations,
+                                                           :name,
+                                                           :description do |b| %>
+                  <div class="row column">
+                    <%= b.label { b.check_box + b.text } %>
+                    <% if permission.authorization_handlers_names.include? b.value %>
+                      <div id="authorization-handler-<%= b.value %>" class="authorization-handler">
+                        <%= render "options_form", form: permission_form, handler_name: b.value %>
                       </div>
+                    <% else %>
+                      <% missing_permission = Decidim::Admin::PermissionForm.new(authorization_handlers: { b.value => {} }) %>
+                      <%= action_permission_form.fields_for(action, missing_permission) do |missing_permission_form| %>
+                        <div id="authorization-handler-<%= b.value %>" class="authorization-handler" style="display:none">
+                          <%= render "options_form", form: missing_permission_form, handler_name: b.value %>
+                        </div>
+                      <% end %>
                     <% end %>
-                  <% end %>
-                </div>
+                  </div>
+                <% end %>
               <% end %>
-            <% end %>
-          </div>
-        </fieldset>
+            </div>
+          </fieldset>
+        <% end %>
       <% end %>
-    <% end %>
-    <%= permissions_form.submit t(".submit") %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= permissions_form.submit t(".submit"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    </div>
   <% end %>
 </section>

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

@@ -1,7 +1,10 @@
-
-<div class="row column">
-  <%= form.translated :text_field, :name %>
-</div>
-<div class="row column">
-  <%= form.translated :text_field, :plural %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="row column">
+      <%= form.translated :text_field, :name, aria: { label: :name } %>
+    </div>
+    <div class="row column">
+      <%= form.translated :text_field, :plural, aria: { label: :plural } %>
+    </div>
+  </div>
 </div>

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

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

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

@@ -1,43 +1,49 @@
 <% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
 <div class="card" id="scope-types">
-  <div class="card-divider">
-    <% if allowed_to? :creste, :scope_type %>
-      <h2 class="card-title"><%= t "decidim.admin.titles.scope_types" %> <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button tiny button--title new" %></h2>
-    <% end %>
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
+      <%= t "decidim.admin.titles.scope_types" %>
+
+      <% if allowed_to? :create, :scope_type %>
+        <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
+      <% end %>
+    </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.scope_type.fields.name", scope: "decidim.admin") %></th>
+          <th><%= t("models.scope_type.fields.plural", scope: "decidim.admin") %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% scope_types.each do |scope_type| %>
           <tr>
-            <th><%= t("models.scope_type.fields.name", scope: "decidim.admin") %></th>
-            <th><%= t("models.scope_type.fields.plural", scope: "decidim.admin") %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% scope_types.each do |scope_type| %>
-            <tr>
-              <td>
+            <td>
+              <% if allowed_to? :update, :scope_type, scope_type: scope_type %>
+                <%= link_to translated_attribute(scope_type.name), [:edit, scope_type] %>
+              <% else %>
                 <%= translated_attribute(scope_type.name) %>
-              </td>
-              <td>
-                <%= translated_attribute(scope_type.plural) %>
-              </td>
-              <td class="table-list__actions">
+              <% end %>
+            </td>
+            <td>
+              <%= translated_attribute(scope_type.plural) %>
+            </td>
+            <td class="table-list__actions">
 
-                <% if allowed_to? :update, :scope_type, scope_type: scope_type %>
-                  <%= icon_link_to "pencil", [:edit, scope_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
-                <% end %>
+              <% if allowed_to? :update, :scope_type, scope_type: scope_type %>
+                <%= icon_link_to "pencil-line", [:edit, scope_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
+              <% end %>
 
-                <% if allowed_to? :destroy, :scope_type, scope_type: scope_type %>
-                  <%= icon_link_to "circle-x", scope_type, 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>
+              <% if allowed_to? :destroy, :scope_type, scope_type: scope_type %>
+                <%= icon_link_to "delete-bin-line", scope_type, 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>
 </div>

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

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

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

@@ -1,13 +1,15 @@
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="row column">
+      <%= form.translated :text_field, :name, aria: { label: :name } %>
+    </div>
 
-<div class="row column">
-  <%= form.translated :text_field, :name %>
-</div>
+    <div class="row column">
+      <%= form.text_field :code %>
+    </div>
 
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.text_field :code %>
-  </div>
-  <div class="columns xlarge-6">
-    <%= form.collection_select :scope_type_id, organization_scope_types, :id, :name %>
+    <div class="row column">
+      <%= form.collection_select :scope_type_id, organization_scope_types, :id, :name %>
+    </div>
   </div>
 </div>

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

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