decidim-admin 0.1.0 → 0.2.0

data/config/locales/fi.yml

@@ -377,9 +377,6 @@ fi:
         static_pages: Sivut
         user_groups: Käyttäjäryhmät
         users: Käyttäjät
-      user_groups:
-        verify:
-          success: Käyttäjäryhmä vahvistettu onnistuneesti.
       users:
         create:
           error: Tämän käyttäjän kutsumisessa tapahtui virhe.

data/config/locales/fr.yml

@@ -468,9 +468,6 @@ fr:
         static_pages: Pages
         user_groups: Groupes d'utilisateurs
         users: Utilisateurs
-      user_groups:
-        verify:
-          success: Le groupe d'utilisateurs a été vérifié avec succès.
       users:
         create:
           error: Une erreur s'est produite lors de l'invitation de cet utilisateur.

data/config/routes.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 Decidim::Admin::Engine.routes.draw do
   constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
     resource :organization, only: [:edit, :update], controller: "organization"
     resources :participatory_process_groups
     resources :participatory_processes do
       resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
+      resources :copies, controller: "participatory_process_copies", only: [:new, :create]
 
       resources :categories
 
@@ -23,6 +25,7 @@ Decidim::Admin::Engine.routes.draw do
           put :publish
           put :unpublish
         end
+        resources :exports, only: :create
       end
 
       resources :moderations do
@@ -63,6 +66,7 @@ Decidim::Admin::Engine.routes.draw do
     resources :user_groups, only: [:index] do
       member do
         put :verify
+        put :reject
       end
     end
 

data/db/seeds.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 if !Rails.env.production? || ENV["SEED"]
   staging_organization = Decidim::Organization.order(id: :asc).first
 

data/lib/decidim/admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "decidim/admin/engine"
 
 module Decidim

data/lib/decidim/admin/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 require "active_support/all"
 
@@ -37,6 +38,56 @@ module Decidim
           config.abilities += ["Decidim::Admin::Abilities::CollaboratorUser"]
         end
       end
+
+      initializer "decidim_admin.menu" do
+        Decidim.menu :admin_menu do |menu|
+          menu.item I18n.t("menu.dashboard", scope: "decidim.admin"),
+                    decidim_admin.root_path,
+                    icon_name: "dashboard",
+                    position: 1,
+                    active: ["decidim/admin/dashboard" => :show]
+
+          menu.item I18n.t("menu.participatory_processes", scope: "decidim.admin"),
+                    decidim_admin.participatory_processes_path,
+                    icon_name: "target",
+                    position: 2,
+                    active: :inclusive
+
+          menu.item I18n.t("menu.participatory_process_groups", scope: "decidim.admin"),
+                    decidim_admin.participatory_process_groups_path,
+                    icon_name: "layers",
+                    position: 3,
+                    active: :inclusive
+
+          menu.item I18n.t("menu.static_pages", scope: "decidim.admin"),
+                    decidim_admin.static_pages_path,
+                    icon_name: "book",
+                    position: 4,
+                    active: :inclusive,
+                    if: can?(:read, Decidim::StaticPage)
+
+          menu.item I18n.t("menu.users", scope: "decidim.admin"),
+                    decidim_admin.users_path,
+                    icon_name: "person",
+                    position: 5,
+                    active: [%w(decidim/admin/user_groups decidim/admin/users), []],
+                    if: can?(:read, :admin_users)
+
+          menu.item I18n.t("menu.newsletters", scope: "decidim.admin"),
+                    decidim_admin.newsletters_path,
+                    icon_name: "envelope-closed",
+                    position: 6,
+                    active: :inclusive,
+                    if: can?(:index, Decidim::Newsletter)
+
+          menu.item I18n.t("menu.settings", scope: "decidim.admin"),
+                    decidim_admin.edit_organization_path,
+                    icon_name: "wrench",
+                    position: 7,
+                    active: [%w(decidim/admin/organization decidim/admin/scopes), []],
+                    if: can?(:read, current_organization)
+        end
+      end
     end
   end
 end

data/lib/decidim/admin/features.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module Admin
     # This module contains all logic related to Features and how they're handled

data/lib/decidim/admin/test/factories.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 FactoryGirl.define do
   factory :participatory_process_user_role, class: Decidim::Admin::ParticipatoryProcessUserRole do
     user

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
+
 RSpec.shared_examples "manage attachments examples" do
   let!(:attachment) do
     Decidim::AttachmentUploader.enable_processing = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -152,34 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -198,15 +184,15 @@ files:
 - app/assets/javascripts/decidim/admin/toggle_nav.js.es6
 - app/assets/stylesheets/decidim/admin/_decidim.scss
 - app/assets/stylesheets/decidim/admin/_variables.scss
-- app/assets/stylesheets/decidim/admin/application.scss
+- app/assets/stylesheets/decidim/admin/application.scss.erb
 - app/assets/stylesheets/decidim/admin/extra/_action-icon.scss
 - app/assets/stylesheets/decidim/admin/extra/_cards.scss
 - app/assets/stylesheets/decidim/admin/extra/_categories.scss
+- app/assets/stylesheets/decidim/admin/extra/_dropdown_inverted.scss
 - app/assets/stylesheets/decidim/admin/extra/_editor.scss
 - app/assets/stylesheets/decidim/admin/extra/_email_preview.scss
 - app/assets/stylesheets/decidim/admin/extra/_login.scss
 - app/assets/stylesheets/decidim/admin/extra/_select_multiple.scss
-- app/assets/stylesheets/decidim/admin/extra/_sidebar.scss
 - app/assets/stylesheets/decidim/admin/extra/_title_bar.scss
 - app/assets/stylesheets/decidim/admin/modules/_action-icon.scss
 - app/assets/stylesheets/decidim/admin/modules/_buttons.scss
@@ -257,6 +243,7 @@ files:
 - app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_strip-unit.scss
 - app/assets/stylesheets/decidim/admin/vendor/mathsass/helpers/_unitless-rad.scss
 - app/commands/decidim/admin/activate_participatory_process_step.rb
+- app/commands/decidim/admin/copy_participatory_process.rb
 - app/commands/decidim/admin/create_attachment.rb
 - app/commands/decidim/admin/create_category.rb
 - app/commands/decidim/admin/create_feature.rb
@@ -274,6 +261,7 @@ files:
 - app/commands/decidim/admin/destroy_participatory_process_step.rb
 - app/commands/decidim/admin/hide_resource.rb
 - app/commands/decidim/admin/publish_participatory_process.rb
+- app/commands/decidim/admin/reject_user_group.rb
 - app/commands/decidim/admin/reorder_participatory_process_steps.rb
 - app/commands/decidim/admin/unpublish_participatory_process.rb
 - app/commands/decidim/admin/unreport_resource.rb
@@ -289,12 +277,15 @@ files:
 - app/commands/decidim/admin/update_participatory_process_step.rb
 - app/commands/decidim/admin/update_scope.rb
 - app/commands/decidim/admin/update_static_page.rb
+- app/commands/decidim/admin/update_user_groups.rb
+- app/commands/decidim/admin/verify_user_group.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb
 - app/controllers/decidim/admin/application_controller.rb
 - app/controllers/decidim/admin/categories_controller.rb
 - app/controllers/decidim/admin/concerns/has_attachments.rb
 - app/controllers/decidim/admin/concerns/participatory_process_admin.rb
 - app/controllers/decidim/admin/dashboard_controller.rb
+- app/controllers/decidim/admin/exports_controller.rb
 - app/controllers/decidim/admin/feature_permissions_controller.rb
 - app/controllers/decidim/admin/features/base_controller.rb
 - app/controllers/decidim/admin/features_controller.rb
@@ -302,6 +293,7 @@ files:
 - app/controllers/decidim/admin/newsletters_controller.rb
 - app/controllers/decidim/admin/organization_controller.rb
 - app/controllers/decidim/admin/participatory_process_attachments_controller.rb
+- app/controllers/decidim/admin/participatory_process_copies_controller.rb
 - app/controllers/decidim/admin/participatory_process_groups_controller.rb
 - app/controllers/decidim/admin/participatory_process_publications_controller.rb
 - app/controllers/decidim/admin/participatory_process_step_activations_controller.rb
@@ -318,6 +310,7 @@ files:
 - app/forms/decidim/admin/feature_form.rb
 - app/forms/decidim/admin/newsletter_form.rb
 - app/forms/decidim/admin/organization_form.rb
+- app/forms/decidim/admin/participatory_process_copy_form.rb
 - app/forms/decidim/admin/participatory_process_form.rb
 - app/forms/decidim/admin/participatory_process_group_form.rb
 - app/forms/decidim/admin/participatory_process_step_form.rb
@@ -328,8 +321,10 @@ files:
 - app/forms/decidim/admin/static_page_form.rb
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/attributes_display_helper.rb
+- app/helpers/decidim/admin/exports_helper.rb
 - app/helpers/decidim/admin/feature_settings_helper.rb
 - app/helpers/decidim/admin/icon_link_helper.rb
+- app/helpers/decidim/admin/menu_helper.rb
 - app/helpers/decidim/admin/process_groups_for_select_helper.rb
 - app/helpers/decidim/admin/processes_for_select_helper.rb
 - app/jobs/decidim/admin/application_job.rb
@@ -345,6 +340,7 @@ files:
 - app/queries/decidim/admin/manageable_participatory_processes_for_user.rb
 - app/queries/decidim/admin/process_admin_roles_for_process.rb
 - app/queries/decidim/admin/process_admins.rb
+- app/queries/decidim/admin/user_groups_evaluation.rb
 - app/views/decidim/admin/attachments/_form.html.erb
 - app/views/decidim/admin/attachments/edit.html.erb
 - app/views/decidim/admin/attachments/index.html.erb
@@ -358,6 +354,7 @@ files:
 - app/views/decidim/admin/dashboard/show.html.erb
 - app/views/decidim/admin/devise/mailers/password_change.html.erb
 - app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+- app/views/decidim/admin/exports/_dropdown.html.erb
 - app/views/decidim/admin/feature_permissions/edit.html.erb
 - app/views/decidim/admin/features/_feature.html.erb
 - app/views/decidim/admin/features/_form.html.erb
@@ -374,6 +371,8 @@ files:
 - app/views/decidim/admin/newsletters/show.html.erb
 - app/views/decidim/admin/organization/_form.html.erb
 - app/views/decidim/admin/organization/edit.html.erb
+- app/views/decidim/admin/participatory_process_copies/_form.html.erb
+- app/views/decidim/admin/participatory_process_copies/new.html.erb
 - app/views/decidim/admin/participatory_process_groups/_form.html.erb
 - app/views/decidim/admin/participatory_process_groups/edit.html.erb
 - app/views/decidim/admin/participatory_process_groups/index.html.erb
@@ -409,8 +408,6 @@ files:
 - app/views/layouts/decidim/admin/_application.html.erb
 - app/views/layouts/decidim/admin/_callouts_full.html.erb
 - app/views/layouts/decidim/admin/_header.html.erb
-- app/views/layouts/decidim/admin/_language_chooser.html.erb
-- app/views/layouts/decidim/admin/_main_nav.html.erb
 - app/views/layouts/decidim/admin/_template_bottom.html.erb
 - app/views/layouts/decidim/admin/_template_top.html.erb
 - app/views/layouts/decidim/admin/_title_bar.html.erb

data/app/assets/stylesheets/decidim/admin/application.scss

@@ -1,2 +0,0 @@
-@import "decidim";
-@import "extra/*";

data/app/assets/stylesheets/decidim/admin/extra/_sidebar.scss

@@ -1,102 +0,0 @@
-@mixin menu-title{
-  text-transform: uppercase;
-  letter-spacing: 5px;
-}
-
-.title-bar-title{
-  @include menu-title;
-}
-
-.sidebar{
-  color: $light-gray;
-
-  .title{
-    background-color: black;
-    background-color: map-get($foundation-palette, primary);
-
-    h1{
-      margin: 0;
-      padding: 0;
-      font-size: rem-calc(18);
-      font-weight: bold;
-    }
-
-    a{
-      display: block;
-      color: inherit;
-      padding: rem-calc(20) $global-padding;
-      @include menu-title;
-    }
-
-    @include show-for(large);
-  }
-
-  .main-menu{
-    border-top: 1px solid black;
-    border-bottom: 1px solid black;
-    a{
-      padding: $global-padding;
-      display: block;
-      color: $light-gray;
-      text-transform: uppercase;
-      font-weight: bold;
-      font-size: 0.9em;
-      border-left: 2px solid transparent;
-
-      transition: all 0.3s;
-
-      &.active {
-        border-color: map-get($foundation-palette, primary);
-        &, &:hover{
-          background-color: #101010;
-        }
-      }
-
-      &:hover {
-        background-color: #1a1a1a;
-      }
-    }
-  }
-
-  .session-box {
-    padding: $global-padding 0;
-    border-bottom: 1px solid black;
-
-    @include grid-row;
-
-    .admin-email {
-      @include grid-column(8);
-      text-overflow: ellipsis;
-      overflow: hidden;
-    }
-    .sign-out{ @include grid-column(4); }
-
-  }
-}
-
-.dropdown > li > a{
-  padding-left: 0;
-}
-.dropdown{
-  display: inline-block;
-  vertical-align: middle;
-}
-
-.is-dropdown-submenu{
-  z-index: 2;
-  text-align: left;
-  background: lighten($black, 5) !important;
-  border: none !important;
-  box-shadow: 0 3px 5px rgba(0, 0, 0, .3) !important;;
-  min-width: 250px !important;
-  a{
-    color: $light-gray;
-    padding: .5rem;
-  }
-  a:hover{
-    color: lighten($light-gray, 20);
-  }
-  li:hover{
-    background: lighten($black, 10);
-  }
-}

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

@@ -1,14 +0,0 @@
-<% if available_locales.length > 1 %>
-  <div class="session-box">
-    <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
-      <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>
-  </div>
-<% end %>

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

@@ -1,11 +0,0 @@
-<div class="main-nav">
-  <ul>
-    <%= admin_menu_item_to "dashboard", decidim_admin.root_path, active: :exact %>
-    <%= admin_menu_item_to "participatory_processes", decidim_admin.participatory_processes_path, icon_name: "target", active: :inclusive %>
-    <%= admin_menu_item_to "participatory_process_groups", decidim_admin.participatory_process_groups_path, icon_name: "layers", active: :inclusive %>
-    <%= admin_menu_item_to "static_pages", decidim_admin.static_pages_path, icon_name: "book", active: :inclusive if can? :read, Decidim::StaticPage %>
-    <%= admin_menu_item_to "users", decidim_admin.users_path, icon_name: "person", active: :inclusive, active_class: is_active_link?(decidim_admin.users_path) || is_active_link?(decidim_admin.user_groups_path) ? "is-active" : "" if can? :read, :admin_users %>
-    <%= admin_menu_item_to "newsletters", decidim_admin.newsletters_path, icon_name: "envelope-closed", active: :inclusive if can? :index, Decidim::Newsletter %>
-    <%= admin_menu_item_to "settings", decidim_admin.edit_organization_path, icon_name: "wrench", active: :inclusive, active_class: is_active_link?(decidim_admin.edit_organization_path) || is_active_link?(decidim_admin.scopes_path) ? "is-active" : "" if can? :read, current_organization %>
-  </ul>
-</div>