decidim 0.4.3 → 0.4.4

data/decidim-admin/app/helpers/decidim/admin/{feature_settings_helper.rb → settings_helper.rb}

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # This class contains helpers needed in order for feature settings to
     # properly render.
-    module FeatureSettingsHelper
+    module SettingsHelper
       TYPES = {
         boolean: :check_box,
         integer: :number_field,
@@ -16,7 +16,7 @@ module Decidim
       # type.
       #
       # form      - The form in which to render the field.
-      # attribute - The FeatureSettings::Attribute instance with the
+      # attribute - The Settings::Attribute instance with the
       #             description of the attribute.
       # name      - The name of the field.
       # options   - Extra options to be passed to the field helper.

data/decidim-admin/app/models/decidim/admin/abilities/participatory_process_admin_ability.rb

@@ -5,8 +5,8 @@ module Decidim
     module Abilities
       # Defines the abilities for a participatory process admin in the admin
       # section. Intended to be used with `cancancan`. This is not intended to
-      # extend the base `Decidim::Ability` class, it should only be used in the
-      # Admin engine.
+      # extend the base `Decidim::Abilities::BaseAbility` class, it should only
+      # be used in the Admin engine.
       #
       # This ability will not apply to organization admins.
       class ParticipatoryProcessAdminAbility < Decidim::Abilities::ParticipatoryProcessAdminAbility

data/decidim-admin/app/views/decidim/admin/attachments/index.html.erb

@@ -1,7 +1,7 @@
 <div class='card' id="attachments">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".attachments_title", scope: "decidim.admin") %>
+      <%= t(".attachments_title") %>
       <% if can? :create, authorization_object %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment.name", scope: "decidim.admin")), url_for(action: :new), class: 'button tiny button--title new' %>
       <% end %>

data/decidim-admin/app/views/decidim/admin/categories/index.html.erb

@@ -1,7 +1,7 @@
 <div class="card" id="categories">
   <div class="card-divider">
     <h2 class='card-title'>
-      <%= t(".categories_title", scope: "decidim.admin") %>
+      <%= t(".categories_title") %>
       <% if can? :create, Decidim::Category %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_participatory_process_category_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>

data/decidim-admin/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -3,7 +3,7 @@
   <ul class="vertical menu add-features">
     <% feature.manifest.export_manifests.each do |manifest| %>
       <% %w{csv json}.each do |format| %>
-        <li class="exports--format--<%= format %> exports--<%= manifest.name %>"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{feature.manifest.name}.admin.exports.#{manifest.name}"), export_format: format.upcase), decidim_admin.participatory_process_feature_exports_path(feature_id: feature, participatory_process_id: feature.participatory_process, format: format, id: manifest.name), method: :post %></li>
+        <li class="exports--format--<%= format %> exports--<%= manifest.name %>"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{feature.manifest.name}.admin.exports.#{manifest.name}"), export_format: format.upcase), decidim_admin.feature_exports_path(feature_id: feature, participatory_process_id: feature.participatory_process, format: format, id: manifest.name), method: :post %></li>
       <% end %>
     <% end %>
   </ul>

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

@@ -1,6 +1,6 @@
 <tr class="feature-<%= feature.id %>">
   <td>
-    <%= link_to feature_path(feature), target: "_blank" do %>
+    <%= link_to main_feature_path(feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
     <% end %>
   </td>
@@ -28,7 +28,7 @@
       <% 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" %>
+        <%= icon_link_to "key", url_for(action: :edit, feature_id: feature, controller: "feature_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
       <% end %>
     <% end %>
 

data/decidim-admin/app/views/decidim/admin/features/edit.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_feature_path(current_participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @form], url: feature_path(current_participatory_process, @feature), method: "put", html: { class: "form edit_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{@feature.manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

data/decidim-admin/app/views/decidim/admin/features/index.html.erb

@@ -6,7 +6,7 @@
       <div class="dropdown-pane" id="add-feature-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
         <ul class="vertical menu add-features">
           <% @manifests.each do |manifest| %>
-            <li><%= link_to t("#{manifest.name}.name", scope: "decidim.features"), new_participatory_process_feature_path(type: manifest.name), class: manifest.name %></li>
+            <li><%= link_to t("#{manifest.name}.name", scope: "decidim.features"), new_feature_path(type: manifest.name), class: manifest.name %></li>
           <% end %>
         </ul>
       </div>

data/decidim-admin/app/views/decidim/admin/features/new.html.erb

@@ -1,5 +1,5 @@
 
-<%= decidim_form_for([current_participatory_process, @form], url: participatory_process_features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
+<%= decidim_form_for([current_participatory_process, @form], url: features_path(type: params[:type]), method: "post", html: { class: "form new_feature" }) do |form| %>
   <%= render partial: 'form', object: form, locals: { feature: @feature, title: t(".title", name: t("#{manifest.name}.name", scope: "decidim.features"))} %>
 
   <div class="button--double form-general-submit">

data/decidim-admin/app/views/decidim/admin/participatory_process_groups/show.html.erb

@@ -3,7 +3,7 @@
     :name,
     :description
   %>
- 
+
   <dt><%= display_label(participatory_process_group, :participatory_processes) %></dt>
   <% if participatory_process_group.participatory_processes.any? %>
     <dd>

data/decidim-admin/app/views/decidim/admin/participatory_process_steps/index.html.erb

@@ -1,7 +1,7 @@
 <div class="card" id="steps">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".steps_title", scope: "decidim.admin") %>
+      <%= t(".steps_title") %>
       <% if can? :create, Decidim::ParticipatoryProcessStep %>
         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_step.name", scope: "decidim.admin")), new_participatory_process_step_path(current_participatory_process), class: 'button tiny button--title' %>
       <% end %>
@@ -60,4 +60,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

data/decidim-admin/app/views/decidim/admin/participatory_process_steps/new.html.erb

@@ -5,4 +5,3 @@
     <%= f.submit t(".create") %>
   </div>
 <% end %>
- 

data/decidim-admin/app/views/decidim/admin/participatory_process_user_roles/index.html.erb

@@ -1,7 +1,7 @@
 <div class='card' id="process_admins">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".process_admins_title", scope: "decidim.admin") %>
+      <%= t(".process_admins_title") %>
       <% if can? :create, Decidim::ParticipatoryProcessUserRole %>
          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.participatory_process_user_role.name", scope: "decidim.admin")), new_participatory_process_user_role_path(current_participatory_process), class: 'button tiny button--title new' %>
       <% end %>

data/decidim-admin/app/views/decidim/admin/participatory_process_user_roles/new.html.erb

@@ -1,7 +1,7 @@
-  <%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
-    <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
+<%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
+  <%= render partial: 'form', object: f, locals: { title: t('.title') } %>
 
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-    </div>
-  <% end %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".create") %>
+  </div>
+<% end %>

data/decidim-admin/app/views/decidim/admin/participatory_processes/new.html.erb

@@ -9,4 +9,3 @@
     <%= f.submit t(".create") %>
   </div>
 <% end %>
- 

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

@@ -12,8 +12,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Feature %>
-        <li <% if is_active_link?(decidim_admin.participatory_process_features_path(current_participatory_process)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.participatory_process_features_path(current_participatory_process) %>
+        <li <% if is_active_link?(decidim_admin.features_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("features", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin.features_path(current_participatory_process) %>
           <ul>
             <% current_participatory_process.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>

data/decidim-admin/config/locales/ca.yml

@@ -139,6 +139,8 @@ ca:
         edit:
           title: Edita arxiu adjunt
           update: Actualitzar
+        index:
+          attachments_title: Adjunts
         new:
           create: Crea arxiu adjunt
           title: Nou arxiu adjunt
@@ -156,6 +158,7 @@ ca:
           title: Edita categoria
           update: Actualitzar
         index:
+          categories_title: Categories
           category_used: Aquesta categoria no es pot suprimir perquè és en ús.
         new:
           create: Crea una categoria
@@ -166,20 +169,6 @@ ca:
       dashboard:
         show:
           welcome: Benvingut al nou panell d'administració de Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Adjunts
-          categories:
-            index:
-              categories_title: Categories
-          participatory_process_steps:
-            index:
-              steps_title: Fases
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Usuaris del procés participatiu
       exports:
         export_as: "%{name} com a %{export_format}"
         notice: La teva exportació està actualment en curs. Rebràs un correu electrònic quan hagi finalitzat.
@@ -402,6 +391,8 @@ ca:
         edit:
           title: Editar fase de procés participatiu
           update: Actualitzar
+        index:
+          steps_title: Fases del procés
         new:
           create: Crear
           title: Nova fase de procés participatiu
@@ -419,6 +410,8 @@ ca:
         edit:
           title: Editar usuari de procés participatiu.
           update: Actualitzar
+        index:
+          process_admins_title: Usuaris del procés participatiu
         new:
           create: Crear
           title: Nou usuari de procés participatiu.

data/decidim-admin/config/locales/en.yml

@@ -140,6 +140,8 @@ en:
         edit:
           title: Edit attachment
           update: Update
+        index:
+          attachments_title: Attachments
         new:
           create: Create attachment
           title: New attachment
@@ -157,6 +159,7 @@ en:
           title: Edit category
           update: Update
         index:
+          categories_title: Categories
           category_used: This category cannot be removed because it is in use.
         new:
           create: Create category
@@ -167,20 +170,6 @@ en:
       dashboard:
         show:
           welcome: Welcome to the new Decidim Panel Admin.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Attachments
-          categories:
-            index:
-              categories_title: Categories
-          participatory_process_steps:
-            index:
-              steps_title: Steps
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Participatory process users
       exports:
         export_as: "%{name} as %{export_format}"
         notice: Your export is currently in progress. You'll receive an email when it's complete.
@@ -403,6 +392,8 @@ en:
         edit:
           title: Edit participatory process step
           update: Update
+        index:
+          steps_title: Steps
         new:
           create: Create
           title: New participatory process step
@@ -420,6 +411,8 @@ en:
         edit:
           title: Update participatory process user.
           update: Update
+        index:
+          process_admins_title: Participatory process users
         new:
           create: Create
           title: New participatory process user.

data/decidim-admin/config/locales/es.yml

@@ -139,6 +139,8 @@ es:
         edit:
           title: Editar archivo adjunto
           update: Actualizar
+        index:
+          attachments_title: Archivos adjuntos
         new:
           create: Crear archivo adjunto
           title: Nuevo archivo adjunto
@@ -156,6 +158,7 @@ es:
           title: Editar categoría
           update: Actualizar
         index:
+          categories_title: Categorías
           category_used: Esta categoría no se puede eliminar porque está en uso.
         new:
           create: Crear categoría
@@ -166,20 +169,6 @@ es:
       dashboard:
         show:
           welcome: Bienvenido al nuevo panel de administración de Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Archivos adjuntos
-          categories:
-            index:
-              categories_title: Categorías
-          participatory_process_steps:
-            index:
-              steps_title: Fases
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Usuarios del proceso
       exports:
         export_as: "%{name} como %{export_format}"
         notice: Su exportación está actualmente en curso. Recibirá un correo electrónico cuando esté completo.
@@ -402,6 +391,8 @@ es:
         edit:
           title: Editar fase de proceso participativo
           update: Actualizar
+        index:
+          steps_title: Fases del proceso
         new:
           create: Crear
           title: Nuevo fase de proceso participativo
@@ -419,6 +410,8 @@ es:
         edit:
           title: Editar usuario del proceso
           update: Actualizar
+        index:
+          process_admins_title: Usuarios del proceso
         new:
           create: Crear
           title: Nuevo usuario del proceso

data/decidim-admin/config/locales/eu.yml

@@ -135,6 +135,8 @@ eu:
         edit:
           title: Editatu fitxategi erantsia
           update: Eguneratu
+        index:
+          attachments_title: Fitxategi erantsiak
         new:
           create: Sortu fitxategi erantsia
           title: Fitxategi erantsi berria
@@ -151,6 +153,8 @@ eu:
         edit:
           title: Editatu kategoria
           update: Eguneratu
+        index:
+          categories_title: Kategoriak
         new:
           create: Sortu kategoria
           title: Kategoria berria
@@ -160,20 +164,6 @@ eu:
       dashboard:
         show:
           welcome: Ongi etorri Decidim administrazio-panel berrira.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Fitxategi erantsiak
-          categories:
-            index:
-              categories_title: Kategoriak
-          participatory_process_steps:
-            index:
-              steps_title: Faseak
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Prozesu partizipatiboko erabiltzaileak
       exports:
         export_as: "%{name} honako hau gisa: %{export_format}"
         notice: Zure esportazioa bidean da. Mezu elektroniko bat jasoko duzu bukatutakoan.
@@ -387,6 +377,8 @@ eu:
         edit:
           title: Editatu prozesu partizipatiboaren fasea
           update: Eguneratu
+        index:
+          steps_title: Faseak
         new:
           create: Sortu
           title: Prozesu partizipatiboaren fase berria
@@ -404,6 +396,8 @@ eu:
         edit:
           title: Prozesu partizipatiboko erabiltzailea eguneratzea.
           update: Eguneratu
+        index:
+          process_admins_title: Prozesu partizipatiboko erabiltzaileak
         new:
           create: Sortu
           title: Partaidetza-prozesu berriko erabiltzailea.
@@ -530,4 +524,4 @@ eu:
   time:
     formats:
       datepicker: "%Y / %m / %d"
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

data/decidim-admin/config/locales/fi.yml

@@ -111,6 +111,8 @@ fi:
           success: Liite tuhottu onnistuneesti.
         edit:
           title: Muokkaa liitettä
+        index:
+          attachments_title: Liitteet
         new:
           create: Luo liite
           title: Uusi liite
@@ -126,23 +128,14 @@ fi:
           success: Kategoria poistettu onnistuneesti.
         edit:
           title: Muokkaa kategoriaa
+        index:
+          categories_title: Kategoriat
         new:
           create: Luo kategoria
           title: Uusi kategoria
         update:
           error: Tämän kategorian luonnissa tapahtui virhe.
           success: Kategoria päivitetty onnistuneesti.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Liitteet
-          categories:
-            index:
-              categories_title: Kategoriat
-          participatory_process_steps:
-            index:
-              steps_title: Vaihe
       feature_permissions:
         edit:
           everyone: Kaikki
@@ -320,6 +313,8 @@ fi:
           success: Osallistumisprosessin vaihe tuhottu onnistuneesti.
         edit:
           title: Muokkaa osallistumisprosessin vaihetta
+        index:
+          steps_title: Vaihe
         new:
           title: Uusi osallistumisprosessin vaihe
         ordering:
@@ -415,4 +410,4 @@ fi:
         none: Ei ryhmää
   time:
     formats:
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"