decidim-admin 0.20.0 → 0.23.1.rc1

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/newsletters/select_recipients_to_deliver.html.erb

@@ -1,13 +1,11 @@
-<%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form newsletter_deliver" }) do |f| %>
+<%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form newsletter_deliver" }, data: { "recipients-count-newsletter-path": recipients_count_newsletter_path(@newsletter) }) do |f| %>
   <div class="card">
 
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>
     </div>
     <div class="card-section">
-      <div class="callout warning">
-        <%= t(".warning").html_safe %>
-      </div>
+      <%= cell("decidim/announcement", newsletter_attention_callout_args) %>
 
       <div class="card">
         <div class="card-divider">
@@ -63,6 +61,8 @@
         </div>
       <% end %>
 
+      <%= cell("decidim/announcement", newsletter_recipients_count_callout_args) %>
+
       <div class="button--double form-general-submit">
         <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) && !@newsletter.sent? %>
           <%= link_to t("actions.edit", scope: "decidim.admin"), ["edit", @newsletter], class: "button" %>

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

@@ -1,44 +1,8 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
-        <li class="is-dropdown-submenu-parent">
-          <a href="#">
-          <% if @state.present? %>
-            <%= t(".filter.#{@state}") %>
-          <% else %>
-            <%= t(".filter.all") %>
-          <% end %>
-          </a>
-          <ul class="menu is-dropdown-submenu">
-            <li><%= link_to t(".filter.officialized"), url_for(state: "officialized", q: @query) %></li>
-            <li><%= link_to t(".filter.not_officialized"), url_for(state: "not_officialized", q: @query) %></li>
-            <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-          </ul>
-        </li>
-      </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-      <div class="filters__search">
-        <div class="input-group">
-          <%= 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>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="card" id='user-groups'>
+<div class="card with-overflow" id='user-groups'>
   <div class="card-divider">
     <h2 class="card-title"><%= t "decidim.admin.titles.participants" %></h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -67,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>
@@ -86,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/_form.html.erb

@@ -32,6 +32,10 @@
   <%= 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">
   <div class="columns xlarge-6">
     <%= form.text_field :reference_prefix %>
@@ -50,6 +54,33 @@
   </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") %>
+  </div>
+</div>
+
 <div class="row" id="welcome-notification-details">
   <div class="columns xlarge-6">
     <%= form.check_box :send_welcome_notification %>
@@ -64,4 +95,10 @@
   </div>
 </div>
 
+<div class="row">
+  <div class="columns xlarge-6">
+    <%= form.translated :editor, :admin_terms_of_use_body %>
+  </div>
+</div>
+
 <%= javascript_include_tag "decidim/admin/welcome_notification.js" %>

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>