decidim-system 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a8098156240f8a15c175512d4243dd8a4909be
-  data.tar.gz: bff59750de98b406404ba934ef9353d6b0312010
+  metadata.gz: 4ebed92d0fcbd3babd63a158cf85d60c7d8de921
+  data.tar.gz: 90051e8c3e59e98b76fb9eda79290e832f0c6bde
 SHA512:
-  metadata.gz: 7447dde949d9bd526368a18e203e5af69107b9f89b852b1c1003bdcc49654077787764e899d9c589ffa9733935862463848e94a0fd7196b922b91bd69aa913b1
-  data.tar.gz: 4780c476905b9324d6577e1d2a797409acdecfa685891e87d89d385cde271998ac5c36980e185eff97db4e939f29192888a8ce6c637e44755b3986a27bf15227
+  metadata.gz: 15d23f1cdee507abcee4ca68adf392f73ba3f74c6485980ec1fe7999fde3b2dca107d433e5e43a73772df366459492500d0a43a6b230669c4c8c3b84a646504b
+  data.tar.gz: ceb3f13d707089ca06e8000ff48fc0bb27cca912d5c38f92d95cc49c632409aee8a19284d60073c51cc11f0e0c8ac8da923f8152807e799581ad3ada00560a2a

data/Rakefile

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require "decidim/dev/common_rake"

data/app/assets/stylesheets/decidim/system/_sidebar.scss

@@ -31,13 +31,20 @@
     @include show-for(large);
   }
 
-  .main-menu{
+  .main-nav{
     border-top: 1px solid black;
     border-bottom: 1px solid black;
     a{
       padding: $global-padding;
       display: block;
       color: $light-gray;
+    }
+    ul{
+      list-style: none;
+      margin-left: 0;
+    }
+
+    li{
       text-transform: uppercase;
       font-weight: bold;
       font-size: 0.9em;
@@ -70,4 +77,4 @@
     }
     .sign-out{ @include grid-column(4); }
   }
-}
+}

data/app/commands/decidim/system/create_admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A command with all the business logic when creating a new admin in

data/app/commands/decidim/system/create_default_pages.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A command with all the business logic when creating a new organization in

data/app/commands/decidim/system/register_organization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A command with all the business logic when creating a new organization in

data/app/commands/decidim/system/update_admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A command with all the business logic when updating an admin in

data/app/commands/decidim/system/update_organization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A command with all the business logic when creating a new organization in

data/app/controllers/decidim/system/admins_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency "decidim/system/application_controller"
 
 module Decidim

data/app/controllers/decidim/system/application_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # The main application controller that inherits from Rails.
@@ -10,6 +11,8 @@ module Decidim
       helper Decidim::TranslationsHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
+
+      helper Decidim::System::MenuHelper
     end
   end
 end

data/app/controllers/decidim/system/dashboard_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency "decidim/system/application_controller"
 
 module Decidim

data/app/controllers/decidim/system/devise/passwords_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     module Devise

data/app/controllers/decidim/system/devise/sessions_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     module Devise

data/app/controllers/decidim/system/organizations_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_dependency "decidim/system/application_controller"
 
 module Decidim

data/app/forms/decidim/system/admin_form.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # A form object used to create organizations from the system dashboard.

data/app/forms/decidim/system/register_organization_form.rb

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

data/app/forms/decidim/system/update_organization_form.rb

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # Custom helpers, scoped to the system panel.

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

@@ -0,0 +1,14 @@
+# encoding: utf-8
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # This module includes helpers to manage menus in system layout
+    module MenuHelper
+      # Public: Returns the main menu presenter object
+      def main_menu
+        @main_menu ||= MenuPresenter.new(:system_menu, self)
+      end
+    end
+  end
+end

data/app/jobs/decidim/system/application_job.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # Custom ApplicationJob scoped to the system panel.

data/app/mailers/decidim/system/application_mailer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # Custom application mailer, scoped to the system mailer.

data/app/models/decidim/system/admin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # Admins are the users in charge of managing a Decidim installation.

data/app/models/decidim/system/application_record.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Decidim
   module System
     # Custom ApplicationRecord scoped to the system panel.

data/app/views/layouts/decidim/system/_sidebar.html.erb

@@ -6,10 +6,6 @@
   </h1>
 </div>
 
-<nav class="main-menu">
-  <%= active_link_to t("menu.dashboard", scope: "decidim.system"), root_path, active: :exact %>
-  <%= active_link_to t("menu.organizations", scope: "decidim.system"), organizations_path, active: :inclusive %>
-  <%= active_link_to t("menu.admins", scope: "decidim.system"), admins_path, active: :inclusive %>
-</nav>
+<%= main_menu.render %>
 
 <%= render partial: 'layouts/decidim/system/login_items' %>

data/config/i18n-tasks.yml

@@ -2,8 +2,7 @@
 
 # The "main" locale.
 base_locale: en
-## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-locales: [en]
+
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 
@@ -48,9 +47,10 @@ data:
 
 # Find translate calls
 search:
-  ## Paths or `File.find` patterns to search in:
-  # paths:
-  #  - app/
+  # Paths or `File.find` patterns to search in:
+  paths:
+   - app/
+   - lib/
 
   ## Root directories for relative keys resolution.
   # relative_roots:
@@ -71,7 +71,7 @@ search:
   # only: ["*.rb", "*.html.slim"]
 
   ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
-  # strict: true
+  strict: false
 
   ## Multiple scanners can be used. Their results are merged.
   ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.

data/config/locales/eu.yml

@@ -5,6 +5,7 @@ eu:
         confirm_destroy: Ziur hau ezabatu nahi duzula?
         destroy: Ezabatu
         edit: Editatu
+        new: Berria
         save: Gorde
         title: Ekintzak
       admins:
@@ -15,9 +16,11 @@ eu:
           success: Administratzailea zuzen sortu da
         edit:
           title: Editatu administratzailea
+          update: Eguneratu
         index:
           title: Administratzaileak
         new:
+          create: Sortu
           title: Administratzaile berria
         update:
           error: Errorea gertatu da administratzaile hau eguneratzean.

data/config/routes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Decidim::System::Engine.routes.draw do
   devise_for :admins,
              class_name: "Decidim::System::Admin",

data/db/seeds.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 if !Rails.env.production? || ENV["SEED"]
   Decidim::System::Admin.create!(
     email: "system@example.org",

data/lib/decidim/system.rb

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

data/lib/decidim/system/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 require "active_support/all"
 
@@ -27,6 +28,25 @@ module Decidim
       initializer "decidim_system.assets" do |app|
         app.config.assets.precompile += %w(decidim_system_manifest.js)
       end
+
+      initializer "decidim_system.menu" do
+        Decidim.menu :system_menu do |menu|
+          menu.item I18n.t("menu.dashboard", scope: "decidim.system"),
+                    decidim_system.root_path,
+                    position: 1,
+                    active: ["decidim/system/dashboard" => :show]
+
+          menu.item I18n.t("menu.organizations", scope: "decidim.system"),
+                    decidim_system.organizations_path,
+                    position: 2,
+                    active: :inclusive
+
+          menu.item I18n.t("menu.admins", scope: "decidim.system"),
+                    decidim_system.admins_path,
+                    position: 3,
+                    active: :inclusive
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-system
 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
@@ -158,14 +158,14 @@ dependencies:
     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: System administration to create new organization in an installation.
 email:
 - josepjaume@gmail.com
@@ -202,6 +202,7 @@ files:
 - app/forms/decidim/system/register_organization_form.rb
 - app/forms/decidim/system/update_organization_form.rb
 - app/helpers/decidim/system/application_helper.rb
+- app/helpers/decidim/system/menu_helper.rb
 - app/jobs/decidim/system/application_job.rb
 - app/mailers/decidim/system/application_mailer.rb
 - app/models/decidim/system/admin.rb