decidim-admin 0.0.8.1 → 0.1.0

data/app/helpers/decidim/admin/application_helper.rb

@@ -15,7 +15,7 @@ module Decidim
         current_organization.name
       end
 
-      def admin_menu_item_to(name, url, options={})
+      def admin_menu_item_to(name, url, options = {})
         content_tag :li, class: options[:active_class] || active_link_to_class(url, active: options[:active], class_active: "is-active") do
           active_link_to url, active: options[:active], class_active: "is-active" do
             icon(options[:icon_name] || name) + I18n.t("menu.#{name}", scope: "decidim.admin")

data/app/helpers/decidim/admin/attributes_display_helper.rb

@@ -6,7 +6,7 @@ module Decidim
     module AttributesDisplayHelper
       # Displays the given attributes list in a list. This is a simple
       # `show_for` alternative, so there's no way to modify how an attribute is
-      # shown and there is no intention on adding this. It is intnded to be
+      # shown and there is no intention on adding this. It is intended to be
       # used inside a `dl` HTML tag, so you can customize how a specific
       # attribute has to be shown directly:
       #

data/app/views/decidim/admin/features/_feature.html.erb

@@ -25,7 +25,11 @@
     <% end %>
 
     <% if can? :update, feature %>
-      <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+      <% if feature.manifest.actions.empty? %>
+        <%= icon "key", class: "action-icon action-icon--disabled" %>
+      <% else %>
+        <%= icon_link_to "key", edit_participatory_process_feature_permissions_path(feature_id: feature), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+      <% end %>
     <% end %>
 
     <%= icon_link_to "circle-x", url_for(action: :destroy, id: feature, controller: "features"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>

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

@@ -0,0 +1,11 @@
+<% if report.details.blank? %>
+  <%= report.reason %>
+<% else %>
+  <span
+    data-tooltip
+    aria-haspopup="true"
+    class="has-tip"
+    title="<%= report.details %>">
+      <%= report.reason %>
+  </span>
+<% end %>

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

@@ -20,7 +20,9 @@
             <th><%= t("models.moderation.fields.reported_content", 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><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+            <% if params[:hidden] %>
+              <th><%= t("models.moderation.fields.hidden_at", scope: "decidim.moderations") %></th>
+            <% end %>
             <th class="actions"><%= t("actions.title", scope: "decidim.moderations") %></th>
           </tr>
         </thead>
@@ -28,42 +30,38 @@
           <% moderations.each do |moderation| %>
             <tr data-id="<%= moderation.id %>">
               <td>
-                <%= moderation.reportable.class.name %>
+                <%= moderation.reportable.class.name.demodulize %>
               </td>
               <td>
                 <%= moderation.reportable.reported_content %>
               </td>
               <td>
-                <ul>
-                  <% moderation.reports.each do |report| %>
-                    <li>
-                      <% if report.details.blank? %>
-                        <%= report.reason %>
-                      <% else %>
-                        <span
-                          data-tooltip
-                          aria-haspopup="true"
-                          class="has-tip"
-                          title="<%= report.details %>">
-                            <%= report.reason %>
-                        </span>
-                      <% end %>
-                    </li>
-                  <% end %>
-                </ul>
+                <% reports = moderation.reports.map { |report| render 'report', report: report } %>
+                <%= safe_join(reports, ',') %>
               </td>
               <td>
                 <%= moderation.report_count %>
               </td>
-              <td>
-                <%= l moderation.hidden_at if moderation.hidden_at.present? %>
-              </td>
+              <% if params[:hidden] %>
+                <td>
+                  <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %>
+                </td>
+              <% end %>
               <td class="actions">
+
                 <% if can? :unreport, moderation %>
-                  <%= link_to t("actions.unreport", scope: "decidim.moderations"), decidim_admin.unreport_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                  <%= icon_link_to "action-undo",
+                                   decidim_admin.unreport_participatory_process_moderation_path(id: moderation),
+                                   t("actions.unreport", scope: "decidim.moderations"),
+                                   class: "action-icon--unreport",
+                                   method: :put %>
                 <% end %>
                 <% if !moderation.reportable.hidden? && can?(:hide, moderation) %>
-                  | <%= link_to t("actions.hide", scope: "decidim.moderations"), decidim_admin.hide_participatory_process_moderation_path(id: moderation), method: :put, class: "button" %>
+                  <%= icon_link_to "eye",
+                                   decidim_admin.hide_participatory_process_moderation_path(id: moderation),
+                                   t("actions.hide", scope: "decidim.moderations"),
+                                   class: "action-icon--hide",
+                                   method: :put %>
                 <% end %>
               </td>
             </tr>

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

@@ -20,6 +20,9 @@
                 <li <% if is_active_link?(decidim_admin.manage_feature_path(participatory_process, feature)) %> class="is-active" <% end %>>
                   <%= link_to decidim_admin.manage_feature_path(participatory_process, feature) do %>
                     <%= translated_attribute feature.name %>
+                    <% if feature.primary_stat.present? %>
+                      <span class="component-counter <%= "component-counter--off" if feature.primary_stat.zero? %>"><%= feature.primary_stat %></span>
+                    <% end %>
                   <% end %>
                 </li>
               <% end %>

data/config/i18n-tasks.yml

@@ -97,6 +97,7 @@ ignore_unused:
  - activemodel.errors.messages.*
  - actions.confirm_destroy
  - time.formats.*
+ - date.formats.*
 
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/ca.yml

@@ -104,6 +104,9 @@ ca:
         content: Contingut
         slug: Nom curt d'URL
         title: Títol
+  date:
+    formats:
+      datepicker: "%m/%d/%Y"
   decidim:
     admin:
       actions:
@@ -489,7 +492,7 @@ ca:
         hidden: Ocults
         hide: Amagar
         not_hidden: No ocult
-        title: Moderacions
+        title: Accions
         unreport: Desfer denúncia
       admin:
         reportable:
@@ -503,7 +506,7 @@ ca:
         moderation:
           fields:
             hidden_at: Data d'ocultació
-            report_count: Número de denúncies
+            report_count: Recompte
             reportable: Tipus
             reported_content: Contingut
             reports: Denúncies
@@ -521,4 +524,5 @@ ca:
           title: Usuaris
   time:
     formats:
-      timepicker: "%d / %m / %Y %H:%M"
+      datepicker: "%m/%d/%Y"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/en.yml

@@ -105,6 +105,9 @@ en:
         content: Content
         slug: URL slug
         title: Title
+  date:
+    formats:
+      datepicker: "%m/%d/%Y"
   decidim:
     admin:
       actions:
@@ -490,7 +493,7 @@ en:
         hidden: Hidden
         hide: Hide
         not_hidden: Not hidden
-        title: Moderations
+        title: Actions
         unreport: Unreport
       admin:
         reportable:
@@ -504,7 +507,7 @@ en:
         moderation:
           fields:
             hidden_at: Hidden at
-            report_count: Report count
+            report_count: Count
             reportable: Reportable
             reported_content: Reported content
             reports: Reports
@@ -522,4 +525,5 @@ en:
           title: Users
   time:
     formats:
+      datepicker: "%m/%d/%Y"
       timepicker: "%m/%d/%Y %H:%M"

data/config/locales/es.yml

@@ -104,6 +104,9 @@ es:
         content: Contenido
         slug: Texto corto de URL
         title: Título
+  date:
+    formats:
+      datepicker: "%m/%d/%Y"
   decidim:
     admin:
       actions:
@@ -489,7 +492,7 @@ es:
         hidden: Ocultas
         hide: Esconder
         not_hidden: No ocultas
-        title: Denuncias
+        title: Acciones
         unreport: Cancelar denuncia
       admin:
         reportable:
@@ -503,7 +506,7 @@ es:
         moderation:
           fields:
             hidden_at: Fecha de ocultación
-            report_count: Número de denuncias
+            report_count: Recuento
             reportable: Tipo
             reported_content: Contenido
             reports: Denuncias
@@ -521,4 +524,5 @@ es:
           title: Usuarios
   time:
     formats:
-      timepicker: "%d / %m / %Y %H:%M"
+      datepicker: "%m/%d/%Y"
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/eu.yml

@@ -468,7 +468,6 @@ eu:
         hidden: ' Ezkutatuta'
         hide: Ezkutatu
         not_hidden: Ezkutatu gabe
-        title: ' Salaketak'
         unreport: Ezeztatu salaketa
       admin:
         reportable:
@@ -482,7 +481,6 @@ eu:
         moderation:
           fields:
             hidden_at: Ezkutatze-data
-            report_count: Salaketa-kopurua
             reportable: Mota
             reported_content: Edukia
             reports: Salaketak
@@ -497,4 +495,7 @@ eu:
         settings:
           title: Ezarpenak
         users:
-          title: Erabiltzaileak
+          title: Erabiltzaileak
+  time:
+    formats:
+      timepicker: "%d/%m/%Y %H:%M"

data/config/locales/fi.yml

@@ -398,7 +398,6 @@ fi:
         hidden: Piilotettu
         hide: Piilota
         not_hidden: Näkyvillä
-        title: Moderoinnit
         unreport: Poista raportointi
       admin:
         reportable:
@@ -412,10 +411,12 @@ fi:
         moderation:
           fields:
             hidden_at: Piilotuksen ajankohta
-            report_count: Raportointimäärä
             reportable: Raportoitava
             reported_content: Raportoitava sisältö
             reports: Raportit
     participatory_processes:
       participatory_process_groups:
-        none: Ei ryhmää
+        none: Ei ryhmää
+  time:
+    formats:
+      timepicker: "%d/%m/%Y %H:%M"