decidim-admin 0.21.0 → 0.23.2

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

@@ -0,0 +1,2 @@
+<%= link_to user.email, "mailto:#{user.email}" %>
+<script>$("#show-email-modal button[data-open=user_email]").hide()</script>

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

@@ -54,6 +54,27 @@
   </div>
 </div>
 
+<% if Decidim.config.enable_machine_translations %>
+  <div class="row">
+    <div class="columns xlarge-6">
+      <%= form.check_box :enable_machine_translations %>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="columns xlarge-6">
+      <%= 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>
+  </div>
+<% end %>
+
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.text_field :comments_max_length %>
+  </div>
+</div>
+
 <div class="row">
   <div class="columns xlarge-6">
     <%= form.check_box :rich_text_editor_in_public_views, help_text: t(".rich_text_editor_in_public_views_help") %>

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

@@ -87,75 +87,5 @@
   </div>
 </div>
 
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".layout_appearance_title" %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.upload :logo %>
-      </div>
-
-      <div class="columns xlarge-6">
-        <%= form.upload :favicon %>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.upload :official_img_header %>
-      </div>
-
-      <div class="columns xlarge-6">
-        <%= form.upload :official_img_footer %>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.text_field :official_url %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".colors_title" %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.color_field :primary_color, value: current_organization.colors["primary"] %>
-      </div>
-
-      <div class="columns xlarge-6">
-        <%= form.color_field :secondary_color, value: current_organization.colors["secondary"] %>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.color_field :success_color, value: current_organization.colors["success"] %>
-      </div>
-
-      <div class="columns xlarge-6">
-        <%= form.color_field :warning_color, value: current_organization.colors["warning"] %>
-      </div>
-    </div>
-
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.color_field :alert_color, value: current_organization.colors["alert"] %>
-      </div>
-    </div>
-
-    <% if Decidim.enable_html_header_snippets %>
-      <div class="row column">
-        <%= form.text_area :header_snippets %>
-        <p class="help-text"><%= t(".header_snippets_help") %></p>
-      </div>
-    <% end %>
-  </div>
-</div>
+<%= render partial: "decidim/admin/organization_appearance/form/images", locals: { form: form } %>
+<%= render partial: "decidim/admin/organization_appearance/form/colors", locals: { form: form } %>

data/app/views/decidim/admin/organization_appearance/form/_colors.html.erb

@@ -0,0 +1,23 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".colors_title" %></h2>
+  </div>
+  <div class="card-section">
+    <div class="organization-colors">
+      <%= form.color_field :primary_color, value: current_organization.colors["primary"] %>
+      <%= form.color_field :secondary_color, value: current_organization.colors["secondary"] %>
+      <%= form.color_field :success_color, value: current_organization.colors["success"] %>
+      <%= form.color_field :warning_color, value: current_organization.colors["warning"] %>
+      <%= form.color_field :alert_color, value: current_organization.colors["alert"] %>
+      <%= form.color_field :highlight_color, value: current_organization.colors["highlight"] %>
+      <%= form.color_field :highlight_alternative_color, value: current_organization.colors["highlight-alternative"] %>
+    </div>
+
+    <% if true %>
+      <div class="row column">
+        <%= form.text_area :header_snippets %>
+        <p class="help-text"><%= t(".header_snippets_help") %></p>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/admin/organization_appearance/form/_images.html.erb

@@ -0,0 +1,38 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".layout_appearance_title" %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="minimap">
+      <label for="minimap"><%= t(".preview") %></label>
+      <%= render "decidim/admin/organization_appearance/form/minimap" %>
+    </div>
+
+    <div class="organization-images">
+      <div class="preview">
+        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+      </div>
+
+      <div class="preview">
+        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+      </div>
+
+      <div class="preview">
+        <%= form.upload :official_img_header, dimensions_info: current_organization.official_img_header.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+      </div>
+
+      <div class="preview">
+        <%= form.upload :official_img_footer, dimensions_info: current_organization.official_img_footer.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+      </div>
+    </div>
+  </div>
+
+  <div class="card-section">
+    <div class="row" style="display: grid; grid-template-columns: 1fr 1fr;">
+      <div class="preview-official_url">
+        <%= form.text_field :official_url %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/organization_appearance/form/_minimap.html.erb

@@ -0,0 +1,46 @@
+<% size_factor = 0.2 %>
+<div id="minimap-wrapper">
+  <div id="minimap">
+    <div class="minimap-tab">
+      <% if current_organization.favicon.present? %>
+        <%= image_tag current_organization.favicon.url, class: "minimap-favicon" %>
+      <% else %>
+        <%= content_tag :div, nil, { class: "minimap-favicon placeholder", style: "width: #{image_width(current_organization, :favicon) * size_factor }px; height: #{image_height(current_organization, :favicon) * size_factor }px;" } do %>
+        <% end %>
+      <% end %>
+
+      <span> &lt; <%= t("favicon", scope: "activemodel.attributes.organization") %></span>
+    </div>
+
+    <div class="minimap-header">
+      <% if current_organization.logo.present? %>
+        <%= image_tag current_organization.logo.url, class: "minimap-logo" %>
+      <% else %>
+        <%= content_tag :div, nil, { class: "minimap-logo placeholder", style: "width: #{image_width(current_organization, :logo) * size_factor }px; height: #{image_height(current_organization, :logo) * size_factor }px;" } do %>
+          <span><%= t("logo", scope: "activemodel.attributes.organization") %></span>
+        <% end %>
+      <% end %>
+
+      <% if current_organization.official_img_header.present? %>
+        <%= image_tag current_organization.official_img_header.url, class: "minimap-official_img_header" %>
+      <% else %>
+        <span class="float-right"><%= t("official_img_header", scope: "activemodel.attributes.organization") %> &gt; </span>
+        <%= content_tag :div, nil, { class: "minimap-official_img_header placeholder float-right", style: "width: #{image_width(current_organization, :official_img_header) * size_factor }px; height: #{image_height(current_organization, :official_img_header) * size_factor }px;" } %>
+      <% end %>
+
+    </div>
+
+    <div class="minimap-navbar"></div>
+    <div class="minimap-body"></div>
+
+    <div class="minimap-footer">
+      <% if current_organization.official_img_footer.present? %>
+        <%= image_tag current_organization.official_img_footer.url, class: "minimap-official_img_footer" %>
+      <% else %>
+        <%= content_tag :div, nil, { class: "minimap-official_img_footer placeholder", style: "width: #{image_width(current_organization, :official_img_footer) * size_factor }px; height: #{image_height(current_organization, :official_img_footer) * size_factor }px;" } do %>
+        <span><%= t("official_img_footer", scope: "activemodel.attributes.organization") %></span>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -11,7 +11,7 @@
             attribute_options_form,
             attribute,
             name,
-            label: t("authorization_handlers.#{handler_name}.fields.#{name}", scope: "decidim"),
+            "decidim.authorization_handlers.#{handler_name}.fields",
             tabs_prefix: "#{name}_tabs_prefix"
           ) %>
     <% end %>

data/app/views/decidim/admin/share_tokens/_share_tokens.html.erb

@@ -0,0 +1,57 @@
+<div class="card share_tokens">
+  <div class="card-divider">
+    <legend><%= t ".title" %></legend>
+  </div>
+  <div class="card-section">
+    <div class="help-text">
+      <p><%= t ".help" %></p>
+    </div>
+    <% if share_tokens.any? %>
+      <div class="table-scroll">
+        <table class="table-list">
+          <thead>
+            <tr>
+              <th><%= t("models.share_token.fields.token", scope: "decidim.admin") %></th>
+              <th><%= t("models.share_token.fields.user", scope: "decidim.admin") %></th>
+              <th><%= t("models.share_token.fields.times_used", scope: "decidim.admin") %></th>
+              <th><%= t("models.share_token.fields.last_used_at", scope: "decidim.admin") %></th>
+              <th><%= t("models.share_token.fields.created_at", scope: "decidim.admin") %></th>
+              <th><%= t("models.share_token.fields.expires_at", scope: "decidim.admin") %></th>
+              <th class="actions"></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% share_tokens.each do |share_token| %>
+              <tr>
+                <td><%= share_token.token %></td>
+                <td><%= share_token.user.name %></td>
+                <td><%= share_token.times_used %></td>
+                <td><%= l share_token.last_used_at, format: :short if share_token.last_used_at.present? %></td>
+                <td><%= l share_token.created_at, format: :short %></td>
+                <td><%= l share_token.expires_at, format: :short if share_token.expires_at.present? %></td>
+                <td class="table-list__actions">
+                  <%= icon_link_to "share",
+                                  share_token.url,
+                                  t("actions.share", scope: "decidim.admin.share_tokens"),
+                                  class: "action-icon--share",
+                                  target: "_blank" %>
+                  <%= icon_link_to "circle-x",
+                                  decidim_admin.share_token_path(
+                                    share_token,
+                                    url: request.fullpath
+                                  ),
+                                  t("actions.destroy", scope: "decidim.admin.share_tokens"),
+                                  class: "action-icon--remove",
+                                  method: :delete,
+                                  data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin.share_tokens") } %>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% else %>
+      <p><%= t ".empty" %></p>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/admin/shared/_filters.html.erb

@@ -5,7 +5,7 @@
         <a href="#" class="dropdown button">
           <%= t("filter_label", scope: "decidim.admin.filters") %>
         </a>
-        <%= dropdown_submenu(submenu_options_tree) %>
+        <%= dropdown_submenu(submenu_options_tree(i18n_ctx)) %>
       </li>
     </ul>
   </div>
@@ -22,7 +22,7 @@
                              scope: "decidim.admin.filters.search_placeholder")
             ) %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
+          <button type="submit" class="button">
             <%= icon "magnifying-glass", aria_label: t("search_label", scope: "decidim.admin.filters") %>
           </button>
         </div>
@@ -32,7 +32,7 @@
 </div>
 <div class="card-section fcell grid-x">
   <div class="cell medium-10 filter-status">
-    <%= applied_filters_tags %>
+    <%= applied_filters_tags(i18n_ctx) %>
   </div>
   <div class="cell auto text-right">
     <%= admin_filters_pagination %>

data/app/views/decidim/admin/shared/_gallery.html.erb

@@ -0,0 +1,21 @@
+<div class="row column gallery__container">
+  <fieldset>
+    <legend><%= t(".gallery_legend") %></legend>
+
+    <% if @form.photos.any? %>
+      <% @form.photos.each do |photo| %>
+        <div class="callout gallery__item" data-closable>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
+          <button class="close-button" aria-label="<%= t(".delete_image") %>" title="<%= t(".delete_image") %>" type="button" data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
+    </div>
+  </fieldset>
+</div>

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

@@ -6,7 +6,7 @@
   <%= javascript_include_tag "decidim/slug_form" %>
   <div class="row column slug">
     <%= form.text_field :slug %>
-    <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url("", form.object.slug)) %></p>
+    <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url("pages", form.object.slug)) %></p>
   </div>
 <% end %>
 

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

@@ -26,8 +26,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>
@@ -81,7 +81,7 @@
                   <% if !user_group.verified? %>
                     <%= icon_link_to "circle-check", decidim_admin.verify_user_group_path(user_group), t("actions.verify", scope: "decidim.admin"), method: :put, class: "action-icon--verify" %>
                   <% else %>
-                    <%= icon "circle-check", class: "action-icon action-icon--disabled" %>
+                    <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img" %>
                   <% end %>
                 <% end %>
 
@@ -89,7 +89,7 @@
                   <% if !user_group.rejected? %>
                     <%= icon_link_to "circle-x", decidim_admin.reject_user_group_path(user_group), t("actions.reject", scope: "decidim.admin"), method: :put, class: "action-icon--reject" %>
                   <% else %>
-                    <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                    <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                   <% end %>
                 <% end %>
               </td>

data/app/views/decidim/admin/users_statistics/_users_count.html.erb

@@ -0,0 +1,39 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("decidim.admin.titles.statistics") %>
+    </h2>
+  </div>
+  <div class="table-scroll">
+    <% if result.empty? %>
+    <div class="table">
+      <p class="users_count"><%= t(".no_users_count_statistics_yet") %></p>
+    </div>
+    <% else %>
+    <table class="table-list users_count">
+      <thead>
+        <tr>
+          <th></th>
+          <th><%= t(".last_month") %></th>
+          <th><%= t(".last_week") %></th>
+          <th><%= t(".last_day") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="title"><%= t(".participants") %></td>
+          <td><%= result[:total_participants_last_month] %></td>
+          <td><%= result[:total_participants_last_week] %></td>
+          <td><%= result[:total_participants_last_24] %></td>
+        </tr>
+        <tr>
+          <td class="title"><%= t(".admins") %></td>
+          <td><%= result[:total_admins_last_month] %></td>
+          <td><%= result[:total_admins_last_week] %></td>
+          <td><%= result[:total_admins_last_24] %></td>
+        </tr>
+      </tbody>
+    </table>
+    <% end %>
+  </div>
+</div>

data/app/views/layouts/decidim/admin/_application.html.erb

@@ -23,5 +23,6 @@
       </div>
     </div>
     <%= render partial: "layouts/decidim/admin/template_bottom" %>
+    <%= render partial: "decidim/shared/confirm_modal" %>
   </body>
 </html>

data/app/views/layouts/decidim/admin/_header.html.erb

@@ -1,4 +1,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag    "decidim/admin/application", media: "all" %>
+<%= javascript_include_tag "decidim/confirm" %>
 <%= javascript_include_tag "decidim/admin/application" %>
+<%= organization_colors %>
+<%= snippets.display(:head) %>

data/app/views/layouts/decidim/admin/_title_bar.html.erb

@@ -10,12 +10,17 @@
   <div class='tool-bar'>
     <% if available_locales.length > 1 %>
     <div class="topbar__dropmenu language-choose">
-        <ul class="dropdown menu" data-dropdown-menu>
-          <li class="is-dropdown-submenu-parent">
-            <%= link_to t("name", scope: "locale"), "#" %>
-            <ul class="menu is-dropdown-submenu">
+        <ul class="dropdown menu" data-dropdown-menu
+          data-autoclose="false"
+          data-disable-hover="true"
+          data-click-open="true"
+          data-close-on-click="true"
+          tabindex="-1">
+          <li class="is-dropdown-submenu-parent" tabindex="-1">
+            <%= link_to t("name", scope: "locale"), "#", id: "admin-user-menu-control", "aria-controls": "admin-user-menu", "aria-haspopup": "true" %>
+            <ul class="menu is-dropdown-submenu" id="admin-user-menu" role="menu" aria-labelledby="admin-user-menu-control" tabindex="-1">
               <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
-                <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post %></li>
+                <li><%= link_to(locale_name(locale), decidim.locale_path(locale: locale), method: :post, tabindex: "-1") %></li>
               <% end %>
             </ul>
           </li>
@@ -24,11 +29,16 @@
     <% end %>
 
     <div class="user-login">
-      <ul class="dropdown menu" data-dropdown-menu>
-        <li class="is-dropdown-submenu-parent">
-          <a href="#"><%= current_user.email %></a>
-          <ul class="menu is-dropdown-submenu">
-            <li><%= link_to(t("layouts.decidim.user_menu.sign_out"), decidim.destroy_user_session_path, method: :delete) %></li>
+      <ul class="dropdown menu" data-dropdown-menu
+        data-autoclose="false"
+        data-disable-hover="true"
+        data-click-open="true"
+        data-close-on-click="true"
+        tabindex="-1">
+        <li class="is-dropdown-submenu-parent" tabindex="-1">
+          <%= link_to current_user.email, "#", id: "admin-language-menu-control", "aria-controls": "admin-language-menu", "aria-haspopup": "true", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.email) %>
+          <ul class="menu is-dropdown-submenu" id="admin-language-menu" role="menu" aria-labelledby="admin-language-menu-control" tabindex="-1">
+            <li><%= link_to(t("layouts.decidim.user_menu.sign_out"), decidim.destroy_user_session_path, method: :delete, tabindex: "-1") %></li>
           </ul>
         </li>
       </ul>