decidim-admin 0.21.0 → 0.22.0

data/app/views/decidim/admin/metrics/_metrics.html.erb

@@ -0,0 +1,21 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.metrics" %>
+    </h2>
+  </div>
+
+<div class="grid-y grid-padding-y">
+  <div class="cell grid-x grid-padding-x">
+    <%= metrics_presenter.highlighted %>
+  </div>
+
+  <div class="cell grid-x grid-padding-x">
+    <%= metrics_presenter.not_highlighted %>
+  </div>
+</div>
+</div>
+
+<% if show_link_to_more %>
+  <div class="text-center"><%= link_to t(".see_more_metrics"), metrics_path %></div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%= render(
+  partial: "decidim/admin/metrics/metrics",
+  locals: {
+    metrics_presenter: metrics_presenter,
+    show_link_to_more: false
+  }
+) %>

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

@@ -0,0 +1,28 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t ".title" %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="grid-x grid-margin-x card-grid">
+    <% templates.each do |newsletter_template| %>
+      <div class="cell small-6">
+        <div class="card card--mini" id="<%= newsletter_template.name %>">
+          <iframe src="<%= preview_newsletter_template_path(newsletter_template.name) %>" class="email-preview newsletter-template-preview">
+          </iframe>
+
+          <div class="card-footer">
+            <h2 class="card-title">
+              <%= t newsletter_template.public_name_key %>
+              <%= link_to(t(".preview_template"), newsletter_template_path(newsletter_template.name), class: "button tiny button--title") %>
+              <%= link_to(t(".use_template"), new_newsletter_template_newsletter_path(newsletter_template.name), class: "button tiny button--title") %>
+            </h2>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/newsletter_templates/show.html.erb

@@ -0,0 +1,12 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".preview", template_name: t(template_manifest.public_name_key) %></h2>
+  </div>
+  <div class="card-section">
+    <iframe src="<%= preview_newsletter_template_path(template_manifest.name) %>" class="email-preview">
+    </iframe>
+  </div>
+</div>
+<div class="button--double form-general-submit">
+  <%= link_to(t(".use_template"), new_newsletter_template_newsletter_path(template_manifest.name), class: "button") %>
+</div>

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

@@ -2,10 +2,4 @@
   <%= form.translated :text_field, :subject %>
 </div>
 
-<div class="row column">
-  <%= form.translated :editor, :body, toolbar: "basic-no-video" %>
-</div>
-
-<div class="row column">
-  <%= t(".interpolations_hint") %>
-</div>
+<%= cell content_block.settings_form_cell, form, content_block: content_block %>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form edit_newsletter" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form edit_newsletter" }, url: newsletter_path(newsletter)) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

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

@@ -8,7 +8,7 @@
         <strong class="subscribed_title"><%= t("newsletters.index.subscribed_count", scope: "decidim.admin") %></strong>
         <span class="subscribed_count"><%= recipients_count_query %></span>
         <% if allowed_to? :create, :newsletter %>
-          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ["new", "newsletter"], class: "button tiny button--title new" %>
+          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ["newsletter_templates"], class: "button tiny button--title new" %>
         <% end %>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form new_newsletter" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form new_newsletter" }, url: newsletter_template_newsletters_path(newsletter_template_id: params[:newsletter_template_id])) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

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

@@ -0,0 +1,31 @@
+<div class="reveal" id="show-email-modal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <div class="columns medium-4 medium-centered">
+      <p><%= t(".description") %></p>
+
+      <div class="show_email">
+        <h4><%= t(".full_name") %></h4>
+        <div><p id="user_full_name"></p></div>
+        <h4><%= t(".email_address") %></h4>
+        <div>
+          <p id="user_email"></p>
+          <p><%= t(".hidden") %></p>
+        </div>
+      </div>
+
+      <div class="button--double form-general-submit">
+        <button class="button" data-open="user_email" data-open-url="">
+          <%= t(".show") %>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -31,15 +31,18 @@
               <td><%= translated_attribute(user.officialized_as) %></td>
 
               <td class="table-list__actions">
+                <% if allowed_to? :show_email, :user, user: user %>
+                  <%= icon_link_to "envelope-open", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %>
+                <% end %>
                 <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(user), t("decidim.contact"), class:"action-icon--new" %>
                 <% if user.officialized? %>
-                  <%= icon "circle-check", class: "action-icon action-icon--disabled" %>
+                  <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img" %>
                   <%= icon_link_to "pencil", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
                   <%= icon_link_to "circle-x", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
                 <% else %>
                   <%= icon_link_to "circle-check", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled" %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
               </td>
             </tr>
@@ -50,3 +53,4 @@
     </div>
   </div>
 </div>
+<%= render "show_email_modal" %>

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_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/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: false, label: t(".add_images") %>
+    </div>
+  </fieldset>
+</div>

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>