decidim-admin 0.23.3 → 0.24.0.rc1

data/app/views/decidim/admin/moderated_users/_report.html.erb

@@ -0,0 +1,10 @@
+<% if report.details.blank? %>
+  <%= t(".reasons.#{report.reason}") %>
+<% else %>
+  <span
+    data-tooltip
+    aria-haspopup="true"
+    title="<%= report.details&.truncate(250) %>">
+      <%= t(".reasons.#{report.reason}") %>
+  </span>
+<% end %>

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

@@ -0,0 +1,78 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+    </h2>
+
+    <h2 class="card-title">
+      <div class="inline-block" style="float: right; text-align: right">
+        <table>
+          <tbody>
+          <tr>
+            <td>
+              <%= link_to moderated_users_path(blocked: false), class: "btn btn-small" do %>
+                <%= t("decidim.admin.moderated_users.tabs.unblocked") %>
+              <% end %>
+            </td>
+            <td>|</td>
+            <td>
+              <%= link_to moderated_users_path(blocked: true), class: "btn btn-small" do %>
+                <%= t("decidim.admin.moderated_users.tabs.blocked") %>
+              <% end %>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+        <tr>
+          <th><%= t(".name") %></th>
+          <th><%= t(".nickname") %></th>
+          <th><%= t(".reason") %></th>
+          <th><%= sort_link(query, :report_count, t(".reports"), default_order: :desc) %></th>
+          <th class="actions"><%= t(".actions.title") %></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% @moderated_users.each do |moderation| %>
+          <tr data-id="<%= moderation.id %>">
+            <% if moderation.user.nickname.present? %>
+              <td><%= link_to moderation.user.name, decidim.profile_path(moderation.user.nickname) %></td>
+              <td><%= link_to moderation.user.nickname, decidim.profile_path(moderation.user.nickname) %></td>
+            <% else %>
+              <td><%= moderation.user.name %></td>
+              <td><%= moderation.user.nickname %></td>
+            <% end %>
+            <td> <%#= moderation.reason %>
+              <% reports = moderation.reports.map { |report| render "report", report: report } %>
+              <%= safe_join(reports, ",") %>
+            </td>
+            <td>
+              <%= moderation.report_count %>
+            </td>
+
+            <td class="actions">
+              <% if allowed_to?(:unreport, :moderate_users) %>
+                <%= icon_link_to "action-undo",  ignore_moderated_user_path(id: moderation),  t(".actions.unreport"),  class: "action-icon--unreport",  method: :put %>
+              <% end %>
+              <% if allowed_to?(:block, :moderate_users) %>
+                <% if moderation.user.blocked? %>
+                  <%= icon_link_to "ban", user_block_path(user_id: moderation.user.id), t(".actions.unblock"), class: "action-icon action-icon--disabled", method: :delete %>
+                <% else %>
+                  <%= icon_link_to "ban", new_user_block_path(user_id: moderation.user.id), t(".actions.block"), class: "action-icon action-icon" %>
+                <% end %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/moderations/_report.html.erb

@@ -4,7 +4,7 @@
   <span
     data-tooltip
     aria-haspopup="true"
-    title="<%= report.details %>">
+    title="<%= report.details&.truncate(250) %>">
       <%= t(".reasons.#{report.reason}") %>
   </span>
 <% end %>

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

@@ -10,16 +10,21 @@
       </div>
     </h2>
   </div>
-
+  <%= admin_filter_selector(:moderations) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.moderation.fields.reportable", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></th>
+            <th><%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %></th>
+            <% if !respond_to?(:current_participatory_space) %>
+              <th><%= t("models.moderation.fields.participatory_space", scope: "decidim.moderations") %></th>
+            <% end %>
+            <th><%= sort_link(query, :report_count, t("models.moderation.fields.report_count", scope: "decidim.moderations")) %></th>
             <th><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></th>
             <th><%= t("models.moderation.fields.reports", scope: "decidim.moderations") %></th>
-            <th><%= t("models.moderation.fields.report_count", scope: "decidim.moderations") %></th>
+            <th><%= sort_link(query, :created_at, t("models.moderation.fields.created_at", scope: "decidim.moderations")) %></th>
             <% if params[:hidden] %>
               <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
             <% end %>
@@ -29,12 +34,21 @@
         <tbody>
           <% moderations.each do |moderation| %>
             <tr data-id="<%= moderation.id %>">
+              <td><%= moderation.reportable.id %></td>
               <td>
                 <%= moderation.reportable.class.name.demodulize %>
               </td>
+              <% if !respond_to?(:current_participatory_space) %>
+                <td>
+                  <%= participatory_space_title_for(moderation.reportable) %>
+                </td>
+              <% end %>
+              <td>
+                <%= moderation.report_count %>
+              </td>
               <td>
                 <%=
-                  link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), moderation.reportable.reported_content_url
+                  link_to t("models.moderation.fields.visit_url", scope: "decidim.moderations"), moderation.reportable.reported_content_url, data: { tooltip: true }, aria: { haspopup: true }, title: strip_tags(reported_content_excerpt_for(moderation.reportable, limit: 250))
                 %>
               </td>
               <td>
@@ -42,7 +56,7 @@
                 <%= safe_join(reports, ",") %>
               </td>
               <td>
-                <%= moderation.report_count %>
+                <%= l(moderation.created_at, format: :long) %>
               </td>
               <% if params[:hidden] %>
                 <td>
@@ -50,22 +64,25 @@
                 </td>
               <% end %>
               <td class="actions">
-
-                <% if !moderation.reportable.hidden? && allowed_to?(:unreport, :moderation) %>
+                <%= icon_link_to "fullscreen-enter",
+                                  moderation_reports_path(moderation_id: moderation),
+                                  t("actions.expand", scope: "decidim.moderations"),
+                                  class: "action-icon--expand" %>
+                <% if !moderation.reportable.hidden? && allowed_to?(:unreport, permission_resource) %>
                   <%= icon_link_to "action-undo",
                                    unreport_moderation_path(id: moderation),
                                    t("actions.unreport", scope: "decidim.moderations"),
                                    class: "action-icon--unreport",
                                    method: :put %>
                 <% end %>
-                <% if !moderation.reportable.hidden? && allowed_to?(:hide, :moderation) %>
+                <% if !moderation.reportable.hidden? && allowed_to?(:hide, permission_resource) %>
                   <%= icon_link_to "eye",
                                    hide_moderation_path(id: moderation),
                                    t("actions.hide", scope: "decidim.moderations"),
                                    class: "action-icon--hide",
                                    method: :put %>
                 <% end %>
-                <% if moderation.reportable.hidden? && allowed_to?(:unhide, :moderation) %>
+                <% if moderation.reportable.hidden? && allowed_to?(:unhide, permission_resource) %>
                   <%= icon_link_to "eye",
                                    unhide_moderation_path(id: moderation),
                                    t("actions.unhide", scope: "decidim.moderations"),
@@ -77,6 +94,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate moderations, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/admin/moderations/reports/index.html.erb

@@ -0,0 +1,102 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to "#{t("title", scope: "decidim.admin.moderations.index")} > ", moderations_path %>
+      <%= t(".title") %>
+    </h2>
+  </div>
+  <div class="card-section moderation-details">
+    <div class="callout warning">
+      <%= icon "info" %>
+      <span class="callout-text"><%= t(".callout_html", icon: icon("flag")) %></span>
+    </div>
+    <dl>
+      <dt><%= t("models.moderation.fields.reported_content_url", scope: "decidim.moderations") %></dt>
+      <dd><%= link_to moderation.reportable.reported_content_url, moderation.reportable.reported_content_url, target: "_blank" %></dd>
+
+      <dt><%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %></dt>
+      <dd><%= moderation.reportable.id %></dd>
+
+      <% if translatable_resource?(moderation.reportable) %>
+        <dt><%= t(".content_original_language") %></dt>
+        <dd><%= locale_name moderation.reportable.content_original_language %> </dd>
+      <% end %>
+
+      <dt>
+        <%= t(".reported_content") %>
+        <% if translatable_resource?(moderation.reportable) %>
+          <button
+            class="toggle-content"
+            data-see-original-button-label="<%= t(".see_original") %>"
+            data-see-current-button-label="<%= t(".see_current") %>">
+            <%= t(".see_original") %>
+          </button>
+        <% end %>
+      </dt>
+      <dd class="reported-content">
+        <div class="current">
+          <%= reported_content_for moderation.reportable %>
+        </div>
+        <% if translatable_resource?(moderation.reportable) %>
+          <div class="original">
+            <%= reported_content_for moderation.reportable, locale: moderation.reportable.content_original_language %>
+          </div>
+        <% end %>
+      </dd>
+
+      <dt><%= t(".author") %></dt>
+      <dd>
+        <%= reportable_author_name(moderation.reportable) %>
+      </dd>
+
+      <dt><%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %></dt>
+      <dd><%= moderation.reportable.class.name.demodulize %></dd>
+
+      <dt><%= t("models.moderation.fields.created_at", scope: "decidim.moderations") %></dt>
+      <dd><%= l(moderation.created_at, format: :long) %></dd>
+
+      <dt><%= t(".participatory_space") %></dt>
+      <dd><%= translated_attribute moderation.participatory_space.title %></dd>
+      </div>
+    </dl>
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.report.fields.reason", scope: "decidim.moderations") %></th>
+            <th><%= t("models.report.fields.locale", scope: "decidim.moderations") %></th>
+            <th><%= t("models.report.fields.details", scope: "decidim.moderations") %></th>
+            <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% reports.each do |report| %>
+            <tr data-id="<%= report.id %>">
+              <td><%= t("decidim.admin.moderations.report.reasons.#{report.reason}") %></td>
+              <td><%= report.locale.present? ? locale_name(report.locale) : "" %></td>
+              <td><%= report.details&.truncate(250) %></td>
+              <td class="actions">
+                <%= icon_link_to "fullscreen-enter",
+                                  moderation_report_path(moderation_id: moderation, id: report.id),
+                                  t("actions.expand", scope: "decidim.moderations"),
+                                  class: "action-icon--expand" %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+
+<div class="button--double form-general-submit">
+  <% if !moderation.reportable.hidden? && allowed_to?(:unreport, permission_resource) %>
+    <%= link_to t("actions.unreport", scope: "decidim.moderations"), unreport_moderation_path(id: moderation), method: :put, class: "button" %>
+  <% end %>
+  <% if !moderation.reportable.hidden? && allowed_to?(:hide, permission_resource) %>
+    <%= link_to t("actions.hide", scope: "decidim.moderations"), hide_moderation_path(id: moderation), method: :put, class: "button alert" %>
+  <% end %>
+  <% if moderation.reportable.hidden? && allowed_to?(:unhide, permission_resource) %>
+    <%= link_to t("actions.unhide", scope: "decidim.moderations"), unhide_moderation_path(id: moderation), method: :put, class: "button alert" %>
+  <% end %>
+</div>

data/app/views/decidim/admin/moderations/reports/show.html.erb

@@ -0,0 +1,62 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= link_to "#{t("title", scope: "decidim.admin.moderations.index")} > ", moderations_path %>
+      <%= link_to "#{t("title", scope: "decidim.admin.moderations.reports.index")} > ", moderation_reports_path %>
+      <%= t(".title") %>
+    </h2>
+  </div>
+
+  <div class="card-section moderation-details">
+    <dl>
+      <dt><%= t(".report_language") %></dt>
+      <dd><%= locale_name @report.locale %></dd>
+
+      <% if translatable_resource?(moderation.reportable) %>
+        <dt><%= t("content_original_language", scope: "decidim.admin.moderations.reports.index") %></dt>
+        <dd><%= locale_name moderation.reportable.content_original_language %> </dd>
+      <% end %>
+
+      <dt>
+        <%= t("reported_content", scope: "decidim.admin.moderations.reports.index") %>
+        <% if translatable_resource?(moderation.reportable) %>
+          <button
+            class="toggle-content"
+            data-see-original-button-label="<%= t("see_original", scope: "decidim.admin.moderations.reports.index") %>"
+            data-see-current-button-label="<%= t("see_current", scope: "decidim.admin.moderations.reports.index") %>">
+            <%= t("see_original", scope: "decidim.admin.moderations.reports.index") %>
+          </button>
+        <% end %>
+      </dt>
+      <dd class="reported-content">
+        <div class="current">
+          <%= reported_content_for moderation.reportable, locale: @report.locale %>
+        </div>
+        <% if translatable_resource?(moderation.reportable) %>
+          <div class="original">
+            <%= reported_content_for moderation.reportable, locale: moderation.reportable.content_original_language %>
+          </div>
+        <% end %>
+      </dd>
+
+      <dt><%= t(".report_reason") %></dt>
+      <dd><%= t("decidim.admin.moderations.report.reasons.#{@report.reason}") %></dd>
+
+      <dt><%= t(".report_details") %></dt>
+      <dd><%= @report.details %>
+      </div>
+    </dl>
+  </div>
+</div>
+
+<div class="button--double form-general-submit">
+  <% if !moderation.reportable.hidden? && allowed_to?(:unreport, permission_resource) %>
+    <%= link_to t("actions.unreport", scope: "decidim.moderations"), unreport_moderation_path(id: moderation), method: :put, class: "button" %>
+  <% end %>
+  <% if !moderation.reportable.hidden? && allowed_to?(:hide, permission_resource) %>
+    <%= link_to t("actions.hide", scope: "decidim.moderations"), hide_moderation_path(id: moderation), method: :put, class: "button alert" %>
+  <% end %>
+  <% if moderation.reportable.hidden? && allowed_to?(:unhide, permission_resource) %>
+    <%= link_to t("actions.unhide", scope: "decidim.moderations"), unhide_moderation_path(id: moderation), method: :put, class: "button alert" %>
+  <% end %>
+</div>

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), ["newsletter_templates"], class: "button tiny button--title new" %>
+          <%= link_to t("actions.newsletter.new", scope: "decidim.admin"), ["newsletter_templates"], class: "button tiny button--title new" %>
         <% end %>
       </div>
     </div>

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

@@ -5,7 +5,7 @@
       <h2 class="card-title"><%= t ".title" %></h2>
     </div>
     <div class="card-section">
-      <%= cell("decidim/announcement", newsletter_attention_callout_args) %>
+      <%= cell("decidim/announcement", newsletter_attention_callout_announcement, callout_class: "warning") %>
 
       <div class="card">
         <div class="card-divider">
@@ -61,7 +61,7 @@
         </div>
       <% end %>
 
-      <%= cell("decidim/announcement", newsletter_recipients_count_callout_args) %>
+      <%= cell("decidim/announcement", newsletter_recipients_count_callout_announcement, callout_class: "warning") %>
 
       <div class="button--double form-general-submit">
         <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) && !@newsletter.sent? %>

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

@@ -8,11 +8,12 @@
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t(".name") %></th>
-            <th><%= t(".nickname") %></th>
-            <th><%= t(".created_at") %></th>
-            <th><%= t(".status") %></th>
+            <th><%= sort_link(query, :name, t(".name"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :nickname, t(".nickname"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :created_at, t(".created_at"), default_order: :desc) %></th>
+            <th><%= sort_link(query, :officialized_at, t(".status"), default_order: :desc) %></th>
             <th><%= t(".badge") %></th>
+            <th><%= sort_link(query, :user_moderation_report_count, t(".reports"), default_order: :desc) %></th>
             <th><%= t(".actions") %></th>
           </tr>
         </thead>
@@ -29,8 +30,16 @@
               <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 class="table-list__actions">
+                <% if allowed_to?(:block, :admin_user) %>
+                  <% if user.blocked? %>
+                    <%= icon_link_to "ban", user_block_path(user_id: user.id), t(".unblock"), class: "action-icon action-icon--disabled", method: :delete %>
+                  <% else %>
+                    <%= icon_link_to "ban", 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 "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 %>

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

@@ -5,10 +5,6 @@
     <h2 class="card-title"><%= t ".homepage_appearance_title" %></h2>
   </div>
   <div class="card-section">
-    <div class="row column">
-      <%= form.check_box :show_statistics %>
-    </div>
-
     <div class="row column">
       <%= form.translated :editor, :description %>
     </div>

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

@@ -13,7 +13,7 @@
       <%= form.color_field :highlight_alternative_color, value: current_organization.colors["highlight-alternative"] %>
     </div>
 
-    <% if true %>
+    <% if Decidim.enable_html_header_snippets %>
       <div class="row column">
         <%= form.text_area :header_snippets %>
         <p class="help-text"><%= t(".header_snippets_help") %></p>

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

@@ -11,19 +11,19 @@
 
     <div class="organization-images">
       <div class="preview">
-        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :favicon, dimensions_info: current_organization.favicon.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
 
       <div class="preview">
-        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_whitelist: current_organization.favicon.extension_whitelist %>
+        <%= form.upload :logo, dimensions_info: current_organization.logo.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </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 %>
+        <%= form.upload :official_img_header, dimensions_info: current_organization.official_img_header.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </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 %>
+        <%= form.upload :official_img_footer, dimensions_info: current_organization.official_img_footer.dimensions_info, extension_allowlist: current_organization.favicon.extension_allowlist %>
       </div>
     </div>
   </div>