decidim-admin 0.30.1 → 0.31.0.rc1

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

@@ -1,10 +1,11 @@
 <% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+
 <div class="card" id="user-groups">
   <div class="item_show__header">
     <h1 class="item_show__header-title"><%= t "decidim.admin.titles.participants" %></h1>
   </div>
   <%= admin_filter_selector %>
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <thead>
       <tr>
@@ -20,38 +21,96 @@
       <tbody>
       <% @users.each do |user| %>
         <tr data-user-id="<%= user.id %>">
-          <td><%= link_to_if user.nickname.present?, user.name, decidim.profile_path(user.nickname) %></td>
-          <td><%= link_to_if user.nickname.present?, user.nickname, decidim.profile_path(user.nickname) %></td>
-          <td><%= l user.created_at, format: :short %></td>
-          <td><%= user.officialized? ? t(".officialized") : t(".not_officialized") %></td>
-          <td><%= translated_attribute(user.officialized_as) %></td>
-          <td><%= user.report_count %></td>
+          <td data-label="<%= t(".name") %>">
+            <%= link_to_if user.nickname.present?, user.name, decidim.profile_path(user.nickname) %>
+          </td>
+          <td data-label="<%= t(".nickname") %>">
+            <%= link_to_if user.nickname.present?, user.nickname, decidim.profile_path(user.nickname) %>
+          </td>
+          <td data-label="<%= t(".created_at") %>">
+            <%= l user.created_at, format: :short %>
+          </td>
+          <td data-label="<%= t(".status") %>">
+            <%= user.officialized? ? t(".officialized") : t(".not_officialized") %>
+          </td>
+          <td data-label="<%= t(".badge") %>">
+            <%= translated_attribute(user.officialized_as) %>
+          </td>
+          <td data-label="<%= t(".reports") %>">
+            <%= user.report_count %>
+          </td>
+          <td data-label="<%= t(".actions") %>" class="table-list__actions">
+            <button type="button" data-controller="dropdown" data-target="actions-user-<%= user.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: user.nickname.presence || user.id) %>">
+              <%= icon "more-fill", class: "text-secondary" %>
+            </button>
+
+            <div class="inline-block relative">
+              <ul id="actions-user-<%= user.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                <% if allowed_to?(:block, :admin_user, user: user) %>
+                  <% if user.blocked? %>
+                    <li class="dropdown__item">
+                      <%= link_to user_block_path(user_id: user.id), method: :delete, class: "dropdown__button dropdown__button--danger" do %>
+                        <%= icon "forbid-2-line" %>
+                        <%= t(".unblock") %>
+                      <% end %>
+                    </li>
+                  <% else %>
+                    <li class="dropdown__item">
+                      <%= link_to new_user_block_path(user_id: user.id), class: "dropdown__button" do %>
+                        <%= icon "forbid-2-line" %>
+                        <%= t(".block") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+
+                  <hr>
+                <% end %>
+
+                <% if allowed_to?(:show_email, :user, user: user) %>
+                  <li class="dropdown__item">
+                    <%= link_to show_email_officialization_path(user_id: user.id), class: "dropdown__button", data: { full_name: user.name, dialog_open: "show-email-modal" } do %>
+                      <%= icon "mail-open-line" %>
+                      <%= t(".show_email") %>
+                    <% end %>
+                  </li>
+                <% end %>
+
+                <% unless user.blocked? %>
+                  <% unless current_user == user %>
+                    <li class="dropdown__item">
+                      <%= link_to current_or_new_conversation_path_with(user), class: "dropdown__button" do %>
+                        <%= icon "mail-line" %>
+                        <%= t(".send_message") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+
+                  <hr>
 
-          <td class="table-list__actions">
-            <% if allowed_to?(:block, :admin_user, user: user) %>
-              <% if user.blocked? %>
-                <%= icon_link_to "forbid-2-line", user_block_path(user_id: user.id), t(".unblock"), class: "action-icon action-icon--disabled", method: :delete %>
-              <% else %>
-                <%= icon_link_to "forbid-2-line", new_user_block_path(user_id: user.id), t(".block"), class: "action-icon action-icon" %>
-              <% end %>
-            <% end %>
-            <% if allowed_to? :show_email, :user, user: user %>
-              <%= icon_link_to "mail-open-line", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, dialog_open: "show-email-modal" } %>
-            <% end %>
-            <% unless user.blocked? %>
-              <% unless current_user == user %>
-                <%= icon_link_to "mail-line", current_or_new_conversation_path_with(user), t("decidim.contact"), class: "action-icon--new" %>
-              <% end %>
-              <% if user.officialized? %>
-                <%= icon "checkbox-circle-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".officialize") %>
-                <%= icon_link_to "pencil-line", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
-                <%= icon_link_to "delete-bin-line", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
-              <% else %>
-                <%= icon_link_to "checkbox-circle-line", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
-                <%= icon "pencil-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".reofficialize") %>
-                <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t(".unofficialize") %>
-              <% end %>
-            <% end %>
+                  <% if user.officialized? %>
+                    <li class="dropdown__item">
+                      <%= link_to new_officialization_path(user_id: user.id), class: "dropdown__button" do %>
+                        <%= icon "pencil-line" %>
+                        <%= t(".reofficialize") %>
+                      <% end %>
+                    </li>
+                    <li class="dropdown__item">
+                      <%= link_to officialization_path(user.id), method: :delete, class: "dropdown__button" do %>
+                        <%= icon "delete-bin-line" %>
+                        <%= t(".unofficialize") %>
+                      <% end %>
+                    </li>
+                  <% else %>
+                    <li class="dropdown__item">
+                      <%= link_to new_officialization_path(user_id: user.id), class: "dropdown__button" do %>
+                        <%= icon "checkbox-circle-line" %>
+                        <%= t(".officialize") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+                <% end %>
+              </ul>
+            </div>
           </td>
         </tr>
       <% end %>

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

@@ -1,96 +1,10 @@
 <div class="form__wrapper">
-  <div class="card pt-4">
-    <div class="card-section">
-      <div class="row column">
-        <div class="columns">
-          <%= form.translated :text_field, :name %>
-        </div>
 
-        <div class="columns">
-          <div class="label--tabs">
-            <label for="organization_social_handlers">
-              <%= t(".social_handlers") %>
-            </label>
-            <ul class="tabs tabs--lang" data-tabs id="organization_social_handlers">
-              <% first_handler = Decidim::Organization::SOCIAL_HANDLERS.first %>
-              <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
-                <li class="tabs-title <%= " is-active" if handler == first_handler %>">
-                  <a href="#<%= handler %>" <% if handler == first_handler %> aria-selected="true" <% end %>>
-                    <%= t(".#{handler}") %>
-                  </a>
-                </li>
-              <% end %>
-            </ul>
-          </div>
-          <div class="tabs-content" data-tabs-content="organization_social_handlers">
-            <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
-              <div class="tabs-panel <%= " is-active" if handler == first_handler %>" id="<%= handler %>"
-                aria-hidden="<% if handler == first_handler %>false<% else %>true<% end %>">
-                <%= form.text_field "#{handler}_handler", label: false %>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      </div>
+  <%= render partial: "decidim/admin/organization/form/basic_configuration", locals: { form: } %>
+  <%= render partial: "decidim/admin/organization/form/logos", locals: { form: } %>
+  <%= render partial: "decidim/admin/organization/form/colors", locals: { form: } %>
+  <%= render partial: "decidim/admin/organization/form/welcome_notification", locals: { form: } %>
+  <%= render partial: "decidim/admin/organization/form/admin_terms_of_service", locals: { form: } %>
+  <%= render partial: "decidim/admin/organization/form/extra_features", locals: { form: } %>
 
-      <div class="row column">
-        <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
-      </div>
-
-      <div class="row column">
-        <%= form.time_zone_select :time_zone %>
-      </div>
-
-      <div class="row column">
-        <%= form.text_field :reference_prefix %>
-      </div>
-
-      <div class="row column">
-        <%= form.check_box :badges_enabled %>
-      </div>
-
-      <div class="row column">
-        <%= form.check_box :user_groups_enabled %>
-      </div>
-
-      <div class="row column">
-        <%= form.check_box :enable_participatory_space_filters %>
-      </div>
-
-      <% if Decidim.config.enable_machine_translations %>
-        <div class="row column">
-          <%= form.check_box :enable_machine_translations %>
-        </div>
-
-        <div class="row column">
-          <%= form.label :machine_translation_display_priority, t("activemodel.attributes.organization.machine_translation_display_priority") %>
-            <%= form.collection_radio_buttons :machine_translation_display_priority, form.object.machine_translation_priorities, :first, :last %>
-        </div>
-      <% end %>
-
-      <div class="row column">
-        <%= form.text_field :comments_max_length %>
-      </div>
-
-      <div class="row column">
-        <%= form.check_box :rich_text_editor_in_public_views, help_text: t(".rich_text_editor_in_public_views_help") %>
-      </div>
-
-      <div class="row column" id="welcome-notification-details">
-        <%= form.check_box :send_welcome_notification %>
-        <div class="send-welcome-notification-details">
-          <%= form.check_box :customize_welcome_notification %>
-
-          <div class="customize-welcome-notification-details">
-            <%= form.translated :text_field, :welcome_notification_subject, aria: { label: :welcome_notification_subject } %>
-            <%= form.translated :editor, :welcome_notification_body, aria: { label: :welcome_notification_body } %>
-          </div>
-        </div>
-      </div>
-
-      <div class="row column">
-        <%= form.translated :editor, :admin_terms_of_service_body, aria: { label: :admin_terms_of_service_body } %>
-      </div>
-    </div>
-  </div>
 </div>

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

@@ -8,11 +8,7 @@
 
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form edit_organization" }, url: organization_path) do |f| %>
-    <div class="card">
-      <div class="card-section">
-        <%= render partial: "form", object: f %>
-      </div>
-    </div>
+    <%= 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" %>

data/app/views/decidim/admin/organization/form/_admin_terms_of_service.html.erb

@@ -0,0 +1,15 @@
+<div class="card" data-controller="accordion" id="accordion-admin_terms_of_service">
+  <div class="card-divider">
+    <button class="card-divider-button" data-open="true" data-controls="panel-admin_terms_of_service" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="admin_terms_of_service">
+        <%= t("admin_terms_of_service", scope: "decidim.admin.organization.form") %>
+      </h2>
+    </button>
+  </div>
+  <div id="panel-admin_terms_of_service" class="card-section">
+    <div class="row column">
+      <%= form.translated :editor, :admin_terms_of_service_body, aria: { label: :admin_terms_of_service_body } %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/organization/form/_basic_configuration.html.erb

@@ -0,0 +1,31 @@
+<div class="card" data-controller="accordion" id="accordion-basic_configuration">
+  <div class="card-divider">
+    <button class="card-divider-button" data-open="true" data-controls="panel-basic_configuration" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="basic_configuration">
+        <%= t("basic_configuration", scope: "decidim.admin.organization.form") %>
+      </h2>
+    </button>
+  </div>
+  <div id="panel-basic_configuration" class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :name %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description, aria: { label: :description } %>
+    </div>
+
+    <div class="row column">
+      <%= form.collection_select :default_locale, localized_locales(current_organization.available_locales), :id, :name %>
+    </div>
+
+    <div class="row column">
+      <%= form.time_zone_select :time_zone %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :reference_prefix %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/{organization_appearance → organization}/form/_colors.html.erb

@@ -1,9 +1,9 @@
-<div class="card" data-component="accordion" id="accordion-colors">
+<div class="card" data-controller="accordion" id="accordion-colors">
   <div class="card-divider">
     <button class="card-divider-button" data-open="true" data-controls="panel-colors" type="button">
       <%= icon "arrow-right-s-line" %>
       <h2 class="card-title" id="colors">
-        <%= t("colors_title", scope: "decidim.admin.organization_appearance.form.colors") %>
+        <%= t("colors_title", scope: "decidim.admin.organization.form.colors") %>
       </h2>
     </button>
   </div>
@@ -11,24 +11,24 @@
     <div class="row column">
       <details class="color-picker">
         <summary>
-          <%= t(".title") %>
+          <%= t("title", scope: "decidim.admin.organization.form.colors") %>
         </summary>
 
         <div class="color-picker__box">
-          <p><%= t(".explanation") %></p>
+          <p><%= t("explanation", scope: "decidim.admin.organization.form.colors") %></p>
 
           <label class="color-picker__label_choose">
-            <%= t(".choose_color") %>
+            <%= t("choose_color", scope: "decidim.admin.organization.form.colors") %>
             <div id="primary-selector"></div>
           </label>
 
           <label class="color-picker__label_saturation" for="primary-saturation">
-            <%= t(".saturation") %>
+            <%= t("saturation", scope: "decidim.admin.organization.form.colors") %>
             <input id="primary-saturation" type="range" min="0" max="100">
           </label>
 
           <fieldset>
-            <legend><%= t(".legend_html") %></legend>
+            <legend><%= t("legend_html", scope: "decidim.admin.organization.form.colors") %></legend>
 
             <label>
               <%= t("primary_color", scope: "activemodel.attributes.organization") %>
@@ -49,12 +49,12 @@
             </label>
 
             <button id="set-colors" class="button button__sm button__secondary">
-              <%= t(".update_suggested_colors") %>
+              <%= t("update_suggested_colors", scope: "decidim.admin.organization.form.colors") %>
             </button>
           </fieldset>
         </div>
       </details>
-      <%= cell("decidim/announcement", t(".colors_warning_html"), callout_class: "warning") %>
+      <%= cell("decidim/announcement", t("colors_warning_html", scope: "decidim.admin.organization.form.colors"), callout_class: "warning") %>
 
       <div class="organization-colors">
         <%= form.color_field :primary_color, value: current_organization.colors["primary"] %>

data/app/views/decidim/admin/organization/form/_extra_features.html.erb

@@ -0,0 +1,84 @@
+<div class="card" data-controller="accordion" id="accordion-extra_features">
+  <div class="card-divider">
+    <button class="card-divider-button" data-open="true" data-controls="panel-extra_features" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="extra_features">
+        <%= t("extra_features", scope: "decidim.admin.organization.form") %>
+      </h2>
+    </button>
+  </div>
+  <div id="panel-extra_features" class="card-section">
+    <div class="row column">
+      <%= form.check_box :badges_enabled %>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :enable_participatory_space_filters %>
+    </div>
+
+    <% if Decidim.config.enable_machine_translations %>
+      <div class="row column">
+        <%= form.check_box :enable_machine_translations %>
+      </div>
+
+      <div class="row column">
+        <%= form.label :machine_translation_display_priority, t("activemodel.attributes.organization.machine_translation_display_priority") %>
+          <%= form.collection_radio_buttons :machine_translation_display_priority, form.object.machine_translation_priorities, :first, :last %>
+      </div>
+    <% end %>
+
+    <div class="row column">
+      <%= form.check_box :rich_text_editor_in_public_views, help_text: t("rich_text_editor_in_public_views_help", scope: "decidim.admin.organization.form") %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :comments_max_length %>
+    </div>
+
+    <div class="row column">
+      <div class="columns">
+        <div class="label--tabs">
+          <label for="organization_social_handlers">
+            <%= t("social_handlers", scope: "decidim.admin.organization.form") %>
+          </label>
+          <ul class="tabs tabs--lang" data-tabs id="organization_social_handlers">
+            <% first_handler = Decidim::Organization::SOCIAL_HANDLERS.first %>
+            <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+              <li class="tabs-title <%= " is-active" if handler == first_handler %>">
+                <a href="#<%= handler %>" <% if handler == first_handler %> aria-selected="true" <% end %>>
+                  <%= t("#{handler}", scope: "decidim.admin.organization.form") %>
+                </a>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+        <div class="tabs-content" data-tabs-content="organization_social_handlers">
+          <% Decidim::Organization::SOCIAL_HANDLERS.each do |handler| %>
+            <div class="tabs-panel <%= " is-active" if handler == first_handler %>" id="<%= handler %>"
+              aria-hidden="<% if handler == first_handler %>false<% else %>true<% end %>">
+              <%= form.text_field "#{handler}_handler", label: false %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :enable_omnipresent_banner, data: { controller: :toggle, "toggle-toggle-value": "omnipresent_banner_details" } %>
+    </div>
+
+    <div id="omnipresent_banner_details" class="column" <%= form.object.enable_omnipresent_banner ? nil : "hidden" %>>
+      <div class="row column">
+        <%= form.translated :text_field, :omnipresent_banner_title, aria: { label: :omnipresent_banner_title } %>
+      </div>
+
+      <div class="row column">
+        <%= form.translated :text_field, :omnipresent_banner_short_description, aria: { label: :omnipresent_banner_short_description } %>
+      </div>
+
+      <div class="row column">
+        <%= form.url_field :omnipresent_banner_url %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/{organization_appearance/form/_images.html.erb → organization/form/_logos.html.erb}

@@ -1,9 +1,9 @@
-<div class="card" data-component="accordion" id="accordion-layout_appearance_title">
+<div class="card" data-controller="accordion" id="accordion-layout_appearance_title">
   <div class="card-divider">
     <button class="card-divider-button" data-open="true" data-controls="panel-layout_appearance_title" type="button">
       <%= icon "arrow-right-s-line" %>
       <h2 class="card-title" id="layout_appearance_title">
-        <%= t("layout_appearance_title", scope: "decidim.admin.organization_appearance.form.images") %>
+        <%= t("organization_logos", scope: "decidim.admin.organization.form.logos") %>
       </h2>
     </button>
   </div>
@@ -11,8 +11,8 @@
   <div id="panel-layout_appearance_title" class="card-section">
     <div class="row column">
       <div>
-        <label for="minimap"><%= t(".preview") %></label>
-        <%= render "decidim/admin/organization_appearance/form/minimap" %>
+        <label for="minimap"><%= t("preview", scope: "decidim.admin.organization.form.logos") %></label>
+        <%= render "decidim/admin/organization/form/minimap" %>
       </div>
 
       <div class="mt-8 grid grid-cols-1 md:grid-cols-2 gap-8">

data/app/views/decidim/admin/organization/form/_welcome_notification.html.erb

@@ -0,0 +1,25 @@
+<div class="card" data-controller="accordion" id="accordion-welcome_notification">
+  <div class="card-divider">
+    <button class="card-divider-button" data-open="true" data-controls="panel-welcome_notification" type="button">
+      <%= icon "arrow-right-s-line" %>
+      <h2 class="card-title" id="welcome_notification">
+        <%= t("welcome_notification", scope: "decidim.admin.organization.form") %>
+      </h2>
+    </button>
+  </div>
+
+  <div id="panel-welcome_notification" class="card-section">
+    <div class="row column" id="welcome-notification-details">
+      <%= form.check_box :send_welcome_notification, data: { controller: :toggle, "toggle-toggle-value": "send_welcome_notification_details" } %>
+
+      <div id="send_welcome_notification_details" class="column" <%= form.object.send_welcome_notification ? nil : "hidden" %>>
+        <%= form.check_box :customize_welcome_notification, data: { controller: :toggle, "toggle-toggle-value": "customize_welcome_notification_details" } %>
+
+        <div id="customize_welcome_notification_details" class="column" <%= form.object.customize_welcome_notification ? nil : "hidden" %>>
+          <%= form.translated :text_field, :welcome_notification_subject, aria: { label: :welcome_notification_subject } %>
+          <%= form.translated :editor, :welcome_notification_body, aria: { label: :welcome_notification_body } %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/organization_external_domain_allowlist/_external_domain.html.erb

@@ -5,17 +5,19 @@
       <span><%= t(".external_domain") %></span>
 
       <div class="flex items-center ml-auto gap-x-4">
-        <button class="button button__sm button__transparent-secondary small alert move-up-question button--title">
-          <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
+        <button class="button button__xs button__transparent-secondary small alert move-up-question button--title">
+          <%= icon("arrow-up-line") %>
+          <span class="hidden md:block"><%= t(".up") %></span>
         </button>
 
-        <button class="button button__sm button__transparent-secondary small alert move-down-question button--title">
-          <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
+        <button class="button button__xs button__transparent-secondary small alert move-down-question button--title">
+          <%= icon("arrow-down-line") %>
+          <span class="hidden md:block"><%= t(".down") %></span>
         </button>
 
-        <button class="button button__sm button__transparent-secondary small alert remove-external-domain button--title">
+        <button class="button button__xs button__transparent-secondary small alert remove-external-domain button--title">
           <%= icon("delete-bin-line") %>
-          <%= t(".remove") %>
+          <span class="hidden md:block"><%= t(".remove") %></span>
         </button>
       </div>
     </h2>