decidim 0.0.6 → 0.0.7

data/decidim-admin/app/assets/stylesheets/decidim/admin/utils/_toggle-expand.scss

@@ -0,0 +1,8 @@
+//Generic toggle expand
+
+.toggle-show{
+  display: none;
+  &.is-expanded{
+    display: block;
+  }
+}

data/decidim-admin/app/commands/decidim/admin/create_attachment.rb

@@ -22,16 +22,25 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        create_attachment
-        broadcast(:ok)
+        build_attachment
+
+        if @attachment.valid?
+          @attachment.save!
+          broadcast(:ok)
+        else
+          if @attachment.errors.has_key? :file
+            @form.errors.add :file, @attachment.errors[:file]
+          end
+          broadcast(:invalid)
+        end
       end
 
       private
 
       attr_reader :form
 
-      def create_attachment
-        Attachment.create!(
+      def build_attachment
+        @attachment = Attachment.new(
           title: form.title,
           description: form.description,
           file: form.file,

data/decidim-admin/app/commands/decidim/admin/update_participatory_process.rb

@@ -34,7 +34,7 @@ module Decidim
 
       private
 
-      attr_reader :form
+      attr_reader :form, :participatory_process
 
       def update_participatory_process
         @participatory_process.assign_attributes(attributes)
@@ -47,8 +47,8 @@ module Decidim
           subtitle: form.subtitle,
           slug: form.slug,
           hashtag: form.hashtag,
-          hero_image: form.hero_image,
-          banner_image: form.banner_image,
+          hero_image: form.hero_image || participatory_process.hero_image,
+          banner_image: form.banner_image || participatory_process.banner_image,
           promoted: form.promoted,
           description: form.description,
           short_description: form.short_description,

data/decidim-admin/app/commands/decidim/admin/update_participatory_process_admin.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    # A command with all the business logic when updated a participatory
+    # process admin in the system.
+    class UpdateParticipatoryProcessAdmin < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form - A form object with the params.
+      # participatory_process - The ParticipatoryProcess that will hold the
+      #   user role
+      def initialize(form, user_role)
+        @form = form
+        @user_role = user_role
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+        return broadcast(:invalid) unless user_role
+
+        update_role!
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :form, :user_role
+
+      def update_role!
+        user_role.update_attributes!(role: form.role)
+      end
+    end
+  end
+end

data/decidim-admin/app/controllers/decidim/admin/application_controller.rb

@@ -2,12 +2,18 @@
 module Decidim
   module Admin
     # The main application controller that inherits from Rails.
-    class ApplicationController < ActionController::Base
+    class ApplicationController < ::DecidimController
       include NeedsOrganization
       include NeedsAuthorization
       include FormFactory
       include LocaleSwitcher
       include PayloadInfo
+      helper Decidim::Admin::ApplicationHelper
+      helper Decidim::Admin::AttributesDisplayHelper
+      helper Decidim::Admin::FeatureSettingsHelper
+      helper Decidim::Admin::ProcessGroupsForSelectHelper
+      helper Decidim::Admin::ProcessesForSelectHelper
+      helper Decidim::Admin::IconLinkHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::OrganizationScopesHelper

data/decidim-admin/app/controllers/decidim/admin/newsletters_controller.rb

@@ -28,7 +28,7 @@ module Decidim
         email = NewsletterMailer.newsletter(current_user, @newsletter)
         Premailer::Rails::Hook.perform(email)
 
-        render text: email.html_part.body.decoded
+        render html: email.html_part.body.decoded
       end
 
       def create

data/decidim-admin/app/controllers/decidim/admin/organization_controller.rb

@@ -6,6 +6,8 @@ module Decidim
     # Controller that allows managing the user organization.
     #
     class OrganizationController < ApplicationController
+      layout "decidim/admin/settings"
+
       def edit
         authorize! :update, current_organization
         @form = form(OrganizationForm).from_model(current_organization)

data/decidim-admin/app/controllers/decidim/admin/participatory_process_user_roles_controller.rb

@@ -14,6 +14,11 @@ module Decidim
         authorize! :read, Decidim::Admin::ParticipatoryProcessUserRole
       end
 
+      def new
+        authorize! :create, Decidim::Admin::ParticipatoryProcessUserRole
+        @form = form(ParticipatoryProcessUserRoleForm).instance
+      end
+
       def create
         authorize! :create, Decidim::Admin::ParticipatoryProcessUserRole
         @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
@@ -30,6 +35,30 @@ module Decidim
         end
       end
 
+      def edit
+        @user_role = collection.find(params[:id])
+        authorize! :update, @user_role
+        @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user, current_process: participatory_process)
+      end
+
+      def update
+        @user_role = collection.find(params[:id])
+        authorize! :update, @user_role
+        @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
+
+        UpdateParticipatoryProcessAdmin.call(@form, @user_role) do
+          on(:ok) do
+            flash[:notice] = I18n.t("participatory_process_user_roles.update.success", scope: "decidim.admin")
+            redirect_to participatory_process_user_roles_path(participatory_process)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("participatory_process_user_roles.update.error", scope: "decidim.admin")
+            render :edit
+          end
+        end
+      end
+
       def destroy
         @participatory_process_user_role = collection.find(params[:id])
         authorize! :destroy, @participatory_process_user_role

data/decidim-admin/app/controllers/decidim/admin/participatory_processes_controller.rb

@@ -8,7 +8,6 @@ module Decidim
     class ParticipatoryProcessesController < ApplicationController
       helper_method :participatory_process
       helper Decidim::OrganizationScopesHelper
-      layout "decidim/admin/participatory_process", only: [:show, :edit, :update]
 
       def index
         authorize! :index, Decidim::ParticipatoryProcess
@@ -41,6 +40,7 @@ module Decidim
         @participatory_process = collection.find(params[:id])
         authorize! :update, @participatory_process
         @form = form(ParticipatoryProcessForm).from_model(@participatory_process)
+        render layout: "decidim/admin/participatory_process"
       end
 
       def update
@@ -51,7 +51,7 @@ module Decidim
         UpdateParticipatoryProcess.call(@participatory_process, @form) do
           on(:ok) do |participatory_process|
             flash[:notice] = I18n.t("participatory_processes.update.success", scope: "decidim.admin")
-            redirect_to participatory_process_path(participatory_process)
+            redirect_to edit_participatory_process_path(participatory_process)
           end
 
           on(:invalid) do

data/decidim-admin/app/controllers/decidim/admin/scopes_controller.rb

@@ -6,6 +6,8 @@ module Decidim
     # Controller that allows managing all scopes at the admin panel.
     #
     class ScopesController < ApplicationController
+      layout "decidim/admin/settings"
+
       def index
         authorize! :index, Scope
         @scopes = collection

data/decidim-admin/app/controllers/decidim/admin/static_pages_controller.rb

@@ -6,6 +6,8 @@ module Decidim
     # Controller that allows managing all pages at the admin panel.
     #
     class StaticPagesController < ApplicationController
+      layout "decidim/admin/pages"
+
       def index
         authorize! :index, StaticPage
         @pages = collection

data/decidim-admin/app/controllers/decidim/admin/user_groups_controller.rb

@@ -5,9 +5,11 @@ module Decidim
     # Controller that allows managing user groups at the admin panel.
     #
     class UserGroupsController < ApplicationController
+      layout "decidim/admin/users"
+
       def index
         authorize! :index, UserGroup
-        @user_groups = collection
+        @user_groups = collection.page(params[:page]).per(15)
       end
 
       def verify

data/decidim-admin/app/controllers/decidim/admin/users_controller.rb

@@ -8,7 +8,7 @@ module Decidim
     class UsersController < Admin::ApplicationController
       def index
         authorize! :index, :admin_users
-        @users = collection
+        @users = collection.page(params[:page]).per(15)
       end
 
       def new

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

@@ -14,6 +14,14 @@ module Decidim
       def title
         current_organization.name
       end
+
+      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")
+          end
+        end
+      end
     end
   end
 end

data/decidim-admin/app/helpers/decidim/admin/icon_link_helper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+module Decidim
+  module Admin
+    module IconLinkHelper
+      # This helper adds the necessary boilerplate for the admin icon links.
+      #
+      # icon_name - A String representing the icon name from Iconic
+      #             http://useiconic.com/open
+      # link      - The path or url where the link should point to.
+      # title     - A String that will be shown when hovering the icon.
+      # options   - An optional Hash containing extra data for the link:
+      #             method - Symbol of HTTP verb. Supported verbs are :post, :get, :delete, :patch, and :put.
+      #             class  - Any extra class that will be added to the link.
+      #             data   - This option can be used to add custom data attributes.
+      #
+      def icon_link_to(icon_name, link, title, options = {})
+        link_to(link,
+                method: options[:method],
+                class: "action-icon #{options[:class]}",
+                data: { tooltip: true, disable_hover: false }.merge(options[:data] || {}),
+                tooltip: true,
+                disable_hover: false,
+                title: title,
+                target: options[:target]) do
+          icon(icon_name)
+        end
+      end
+    end
+  end
+end

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

@@ -25,7 +25,7 @@ module Decidim
       private
 
       def recipients
-        @recipients ||= User.where(newsletter_notifications: true).where.not(email: nil)
+        @recipients ||= User.where(newsletter_notifications: true).where.not(email: nil, confirmed_at: nil)
       end
     end
   end

data/decidim-admin/app/queries/decidim/admin/process_admin_roles_for_process.rb

@@ -24,7 +24,7 @@ module Decidim
       # Returns an ActiveRecord::Relation.
       def query
         ParticipatoryProcessUserRole
-          .where(participatory_process: process, role: :admin)
+          .where(participatory_process: process, role: [:admin, :collaborator])
       end
 
       private

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

@@ -1,11 +1,32 @@
-<div class="field">
-  <%= form.translated :text_field, :title, autofocus: true %>
-</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= title %>
+    </h2>
+  </div>
 
-<div class="field">
-  <%= form.translated :text_field, :description %>
-</div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_field, :description %>
+    </div>
+
+    <div class="row column">
+      <%= form.file_field :file %>
+    </div>
 
-<div class="field">
-  <%= form.file_field :file %>
+    <% 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/decidim-admin/app/views/decidim/admin/attachments/edit.html.erb

@@ -1,9 +1,7 @@
-<h3><%= t ".title" %></h3>
+<%= decidim_form_for(@form, url: url_for([@attachment.attached_to, @attachment]), html: { class: "form edit_participatory_process_attachment" }) do |f| %>
+  <%= render partial: 'decidim/admin/attachments/form', object: f, locals: { title: t(".title") } %>
 
-<%= decidim_form_for(@form, url: url_for([@attachment.attached_to, @attachment])) do |f| %>
-  <%= render partial: 'decidim/admin/attachments/form', object: f %>
-
-  <div class="actions">
+  <div class="button--double form-general-submit">
     <%= f.submit t(".update") %>
   </div>
 <% end %>

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

@@ -1,37 +1,47 @@
-<section id="attachments">
-  <h4><%= t(".attachments_title", scope: "decidim.admin") %></h4>
+<div class='card' id="attachments">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".attachments_title", scope: "decidim.admin") %>
+      <% 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 %>
+    </h2>
+  </div>
 
-  <% if can? :create, authorization_object %>
-    <div class="actions title">
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment.name", scope: "decidim.admin")), url_for(action: :new), class: 'new' %>
-    </div>
-  <% end %>
+  <div class="card-section">
+    <% if attached_to.attachments.any? %>
+      <div class="table-scroll">
+        <table class="table-list">
+          <thead>
+            <tr>
+              <th><%= t("models.attachment.fields.title", scope: "decidim.admin") %></th>
+              <th><%= t("models.attachment.fields.content_type", scope: "decidim.admin") %></th>
+              <th class="actions"></th>
+            </tr>
+          </thead>
+          <tbody>
+            <% attached_to.attachments.each do |attachment| %>
+              <tr data-id="<%= attachment.id %>">
+                <td>
+                  <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br />
+                </td>
+                <td>
+                  <%= attachment.file_type %>
+                </td>
+                <td class="table-list__actions">
+                  <% if can? :update, authorization_object %>
+                    <%= icon_link_to "pencil", edit_polymorphic_path([attached_to, attachment]), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                  <% end %>
 
-  <% if attached_to.attachments.any? %>
-    <table class="stack">
-      <thead>
-        <tr>
-          <th><%= t("models.attachment.fields.title", scope: "decidim.admin") %></th>
-          <th><%= t("models.attachment.fields.content_type", scope: "decidim.admin") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.admin") %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% attached_to.attachments.each do |attachment| %>
-          <tr data-id="<%= attachment.id %>">
-            <td>
-              <%= link_to translated_attribute(attachment.title), polymorphic_path([attached_to, attachment]) %><br />
-            </td>
-            <td>
-              <%= attachment.file_type %>
-            </td>
-            <td class="actions">
-              <%= link_to t("actions.edit", scope: "decidim.admin"), edit_polymorphic_path([attached_to, attachment]) if can? :update, authorization_object %>
-              <%= link_to t("actions.destroy", scope: "decidim.admin"), polymorphic_path([attached_to, attachment]), method: :delete, class: "small alert button", data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } if can? :destroy, authorization_object %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  <% end %>
-</section>
+                  <% if can? :destroy, authorization_object %>
+                    <%= icon_link_to "circle-x", polymorphic_path([attached_to, attachment]), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                  <% end %>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    <% end %>
+  </div>
+</div>