decidim-admin 0.3.2 → 0.4.0

data/app/forms/decidim/admin/participatory_process_copy_form.rb

@@ -10,12 +10,11 @@ module Decidim
 
       translatable_attribute :title, String
 
+      mimic :participatory_process
+
       attribute :slug, String
       attribute :copy_steps, Boolean
       attribute :copy_categories, Boolean
-      attribute :copy_process_users, Boolean
-      attribute :copy_moderations, Boolean
-      attribute :copy_pages, Boolean
       attribute :copy_features, Boolean
 
       validates :slug, presence: true

data/app/forms/decidim/admin/participatory_process_form.rb

@@ -27,7 +27,9 @@ module Decidim
       attribute :promoted, Boolean
       attribute :scope_id, Integer
       attribute :hero_image
+      attribute :remove_hero_image
       attribute :banner_image
+      attribute :remove_banner_image
       attribute :participatory_process_group_id, Integer
 
       validates :slug, presence: true

data/app/forms/decidim/admin/static_page_form.rb

@@ -14,10 +14,16 @@ module Decidim
 
       validates :slug, presence: true
       validates :title, :content, translatable_presence: true
+      validates :slug, format: { with: /\A[a-z0-9-]+/ }
+
       validate :slug, :slug_uniqueness
 
       alias organization current_organization
 
+      def slug
+        super.to_s.downcase
+      end
+
       private
 
       def slug_uniqueness

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

@@ -6,7 +6,7 @@ module Decidim
     module MenuHelper
       # Public: Returns the main menu presenter object
       def main_menu
-        @main_menu ||= MenuPresenter.new(
+        @main_menu ||= ::Decidim::MenuPresenter.new(
           :admin_menu,
           self,
           active_class: "is-active"

data/app/jobs/decidim/admin/newsletter_job.rb

@@ -8,10 +8,12 @@ module Decidim
       queue_as :newsletter
 
       def perform(newsletter)
-        newsletter.with_lock do
-          raise "Newsletter already sent" if newsletter.sent?
+        @newsletter = newsletter
 
-          newsletter.update_attributes!(
+        @newsletter.with_lock do
+          raise "Newsletter already sent" if @newsletter.sent?
+
+          @newsletter.update_attributes!(
             sent_at: Time.current,
             total_recipients: recipients.count,
             total_deliveries: 0
@@ -19,14 +21,16 @@ module Decidim
         end
 
         recipients.find_each do |user|
-          NewsletterDeliveryJob.perform_later(user, newsletter)
+          NewsletterDeliveryJob.perform_later(user, @newsletter)
         end
       end
 
       private
 
       def recipients
-        @recipients ||= User.where(newsletter_notifications: true).where.not(email: nil, confirmed_at: nil)
+        @recipients ||= User.where(newsletter_notifications: true, organization: @newsletter.organization)
+                            .where.not(email: nil, confirmed_at: nil)
+                            .not_deleted
       end
     end
   end

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

@@ -15,18 +15,7 @@
     </div>
 
     <div class="row column">
-      <%= form.file_field :file %>
+      <%= form.upload :file, optional: false %>
     </div>
-
-    <% if @attachment && @attachment.file.present? %>
-      <div class="row column">
-        <label><%= t('.current_file') %></label>
-        <% if @attachment.photo? %>
-          <%= image_tag form.object.file.url(:thumbnail) %>
-        <% end %>
-        <label><%= t('.url') %></label>
-        <%= link_to @attachment.file.url, @attachment.file.url, target: "_blank" %>
-      </div>
-    <% end %>
   </div>
 </div>

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

@@ -1,6 +1,6 @@
 <tr class="feature-<%= feature.id %>">
   <td>
-    <%= link_to decidim.feature_path(participatory_process, feature), target: "_blank" do %>
+    <%= link_to feature_path(feature), target: "_blank" do %>
       <%= translated_attribute feature.name %>
     <% end %>
   </td>
@@ -9,7 +9,7 @@
   </td>
   <td class="table-list__actions">
     <% if feature.manifest.admin_engine %>
-      <%= icon_link_to "pencil", manage_feature_path(participatory_process, feature), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+      <%= icon_link_to "pencil", manage_feature_path(feature), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
     <% end %>
 
     <% if can?(:update, feature) %>

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

@@ -55,6 +55,24 @@
             </div>
           </div>
         </fieldset>
+      <% elsif form.object.default_step_settings? %>
+        <fieldset class="default-step-settings">
+          <div class="card">
+            <div class="card-divider">
+              <legend><%= t ".default_step_settings" %></legend>
+            </div>
+            <div class="card-section">
+              <%= form.fields_for :default_step_settings, form.object.default_step_settings do |settings_fields| %>
+                <%= render partial: "decidim/admin/features/settings_fields",
+                          locals: {
+                            form: settings_fields,
+                            feature: @feature,
+                            settings_name: "step"
+                          } %>
+              <% end %>
+            </div>
+          </div>
+        </fieldset>
       <% end %>
     </div>
   </div>

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

@@ -1,11 +1,11 @@
 <% if report.details.blank? %>
-  <%= report.reason %>
+  <%= t(".reasons.#{report.reason}") %>
 <% else %>
   <span
     data-tooltip
     aria-haspopup="true"
     class="has-tip"
     title="<%= report.details %>">
-      <%= report.reason %>
+      <%= t(".reasons.#{report.reason}") %>
   </span>
 <% end %>

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

@@ -42,55 +42,25 @@
 
 <div class="row">
   <div class="columns xlarge-4">
-    <%= form.file_field :homepage_image %>
-    <% if current_organization.homepage_image.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.homepage_image.big.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.homepage_image.file.filename, current_organization.homepage_image.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :homepage_image %>
   </div>
 
   <div class="columns xlarge-4">
-    <%= form.file_field :logo %>
-    <% if current_organization.logo.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.logo.medium.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.logo.file.filename, current_organization.logo.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :logo %>
   </div>
 
   <div class="columns xlarge-4">
-    <%= form.file_field :favicon %>
-    <% if current_organization.favicon.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.favicon.big.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.favicon.file.filename, current_organization.favicon.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :favicon %>
   </div>
 </div>
 
 <div class="row">
   <div class="columns xlarge-6">
-    <%= form.file_field :official_img_header %>
-    <% if current_organization.official_img_header.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.official_img_header.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.official_img_header.file.filename, current_organization.official_img_header.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :official_img_header %>
   </div>
 
   <div class="columns xlarge-6">
-    <%= form.file_field :official_img_footer %>
-    <% if current_organization.official_img_footer.present? %>
-      <label><%= t('.current_image') %></label>
-      <%= image_tag current_organization.official_img_footer.url %>
-      <label><%= t('.url') %></label>
-      <%= link_to current_organization.official_img_footer.file.filename, current_organization.official_img_footer.url, target: "_blank" %>
-    <% end %>
+    <%= form.upload :official_img_footer %>
   </div>
 </div>
 

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

@@ -13,5 +13,5 @@
 </div>
 
 <div class="row column">
-  <%= form.file_field :hero_image %>
+  <%= form.upload :hero_image %>
 </div>

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

@@ -15,6 +15,8 @@
           <tr>
             <th><%= t("models.participatory_process_user_role.fields.name", scope: "decidim.admin") %></th>
             <th><%= t("models.participatory_process_user_role.fields.email", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_sent_at", scope: "decidim.admin") %></th>
+            <th><%= t("models.user.fields.invitation_accepted_at", scope: "decidim.admin") %></th>
             <th><%= t("models.participatory_process_user_role.fields.role", scope: "decidim.admin") %></th>
             <th class="actions"></th>
           </tr>
@@ -28,10 +30,24 @@
               <td>
                 <%= role.user.email %><br />
               </td>
+              <td>
+                <% if role.user.invitation_sent_at %>
+                  <%= l role.user.invitation_sent_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if role.user.invitation_accepted_at %>
+                  <%= l role.user.invitation_accepted_at, format: :short %>
+                <% end %>
+              </td>
               <td>
                 <%= t("#{role.role}", scope: "decidim.admin.models.participatory_process_user_role.roles") %><br />
               </td>
               <td class="table-list__actions">
+                <% if can?(:invite, role) && role.user.invited_to_sign_up? %>
+                  <%= icon_link_to "reload", resend_invitation_participatory_process_user_role_path(participatory_process, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% end %>
+
                 <% if can? :update, role %>
                   <%= icon_link_to "pencil", edit_participatory_process_user_role_path(participatory_process, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
                 <% end %>

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

@@ -36,23 +36,11 @@
 
     <div class="row">
       <div class="columns xlarge-6">
-        <%= form.file_field :hero_image %>
-        <% if @participatory_process && @participatory_process.hero_image.present? %>
-          <label><%= t('.current_image') %></label>
-          <%= image_tag @participatory_process.hero_image.url %>
-          <label><%= t('.url') %></label>
-          <%= link_to @participatory_process.hero_image.url, @participatory_process.hero_image.url, target: "_blank" %>
-        <% end %>
+        <%= form.upload :hero_image %>
       </div>
 
       <div class="columns xlarge-6">
-        <%= form.file_field :banner_image %>
-        <% if @participatory_process && @participatory_process.banner_image.present? %>
-          <label><%= t('.current_image') %></label>
-          <%= image_tag @participatory_process.banner_image.url %>
-          <label><%= t('.url') %></label>
-          <%= link_to @participatory_process.banner_image.url, @participatory_process.banner_image.url, target: "_blank" %>
-        <% end %>
+        <%= form.upload :banner_image %>
       </div>
     </div>
 

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

@@ -1,30 +1,37 @@
 <div class="title-bar">
   <a href="#menu" class="menu-trigger"><%= icon "menu" %></a>
-  <%= link_to root_path, class: "logo" do %>
+  <%= link_to decidim.root_path, class: "logo", target: "_blank" do %>
     <% if current_organization.logo.present? %>
       <%= image_tag current_organization.logo.url, alt: title %>
     <% else %>
       <%= title %>
     <% end %>
   <% end %>
-  <div class="user-login">
-  <ul class="dropdown menu language-chooser" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <%= link_to t("name", scope: "locale") %>
-        <ul class="menu is-dropdown-submenu">
-          <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
-            <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
-          <% end %>
+  <div class='tool-bar'>
+    <% if available_locales.length > 1 %>
+    <div class="topbar__dropmenu language-choose">
+        <ul class="dropdown menu" data-dropdown-menu>
+          <li class="is-dropdown-submenu-parent">
+            <%= link_to t("name", scope: "locale") %>
+            <ul class="menu is-dropdown-submenu">
+              <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
+                <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post%></li>
+              <% end %>
+            </ul>
+          </li>
         </ul>
-      </li>
-    </ul>
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a href="#"><%= current_user.email %></a>
-        <ul class="menu is-dropdown-submenu">
-          <li><%= link_to('Logout', decidim.destroy_user_session_path, method: :delete) %></li>
-        </ul>
-      </li>
-    </ul>
+      </div>
+    <% end %>
+
+    <div class="user-login">
+      <ul class="dropdown menu" data-dropdown-menu>
+        <li class="is-dropdown-submenu-parent">
+          <a href="#"><%= current_user.email %></a>
+          <ul class="menu is-dropdown-submenu">
+            <li><%= link_to('Logout', decidim.destroy_user_session_path, method: :delete) %></li>
+          </ul>
+        </li>
+      </ul>
+    </div>
   </div>
 </div>

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

@@ -17,8 +17,8 @@
           <ul>
             <% participatory_process.features.each do |feature| %>
               <% if feature.manifest.admin_engine %>
-                <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 %>
+                <li <% if is_active_link?(manage_feature_path(feature)) %> class="is-active" <% end %>>
+                  <%= link_to manage_feature_path(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>

data/config/i18n-tasks.yml

@@ -88,6 +88,7 @@ ignore_missing:
 # - '{devise,simple_form}.*'
  - decidim.participatory_processes.scopes.global
  - locale.name
+ - forms.required
 
 ## Consider these keys used:
 ignore_unused:
@@ -98,6 +99,7 @@ ignore_unused:
  - actions.confirm_destroy
  - time.formats.*
  - date.formats.*
+ - forms.*
 
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/locales/ca.yml

@@ -32,6 +32,9 @@ ca:
         welcome_text: Text de benvinguda
       participatory_process:
         banner_image: Imatge de bandera
+        copy_categories: Copiar categories
+        copy_features: Copiar funcionalitats
+        copy_steps: Copiar fases
         description: Descripció
         developer_group: Grup promotor
         domain: Àrees municipals
@@ -136,9 +139,6 @@ ca:
         edit:
           title: Edita arxiu adjunt
           update: Actualitzar
-        form:
-          current_file: Fitxer actual
-          url: URL
         new:
           create: Crea arxiu adjunt
           title: Nou arxiu adjunt
@@ -201,6 +201,7 @@ ca:
           title: Editar funcionalitat
           update: Actualitza
         form:
+          default_step_settings: Configuració per defecte
           global_settings: Configuració global
           step_settings: Configuració de fase
         index:
@@ -309,6 +310,11 @@ ca:
       moderations:
         index:
           title: Moderacions
+        report:
+          reasons:
+            does_not_belong: No pertany
+            offensive: Ofensiu
+            spam: Contingut brossa
       newsletters:
         create:
           error: S'ha produït un error en crear aquest butlletí.
@@ -427,9 +433,7 @@ ca:
         edit:
           update: Actualitzar
         form:
-          current_image: imatge actual
           title: Informació general
-          url: URL
         index:
           not_published: No publicat
           published: Publicat

data/config/locales/en.yml

@@ -33,6 +33,9 @@ en:
         welcome_text: Welcome text
       participatory_process:
         banner_image: Banner image
+        copy_categories: Copy categories
+        copy_features: Copy features
+        copy_steps: Copy steps
         description: Description
         developer_group: Developer group
         domain: Domain
@@ -137,9 +140,6 @@ en:
         edit:
           title: Edit attachment
           update: Update
-        form:
-          current_file: Current file
-          url: Url
         new:
           create: Create attachment
           title: New attachment
@@ -202,6 +202,7 @@ en:
           title: Edit feature
           update: Update
         form:
+          default_step_settings: Default step settings
           global_settings: Global settings
           step_settings: Step settings
         index:
@@ -310,6 +311,11 @@ en:
       moderations:
         index:
           title: Moderations
+        report:
+          reasons:
+            does_not_belong: Does not belong
+            offensive: Offensive
+            spam: Spam
       newsletters:
         create:
           error: There's been an error creating this newsletter.
@@ -428,9 +434,7 @@ en:
         edit:
           update: Update
         form:
-          current_image: Current image
           title: General Information
-          url: Url
         index:
           not_published: Not published
           published: Published