adminsite 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf15ecd660a816dfa0edb596afbfa21dcb78c9e9
-  data.tar.gz: 77d371ea28878b46464ec84370bda25c03a30d09
+  metadata.gz: ec1dc6526cbc7a4b7a922dc006ef7734a5c4a70c
+  data.tar.gz: 5c2a69196c00a6671a393a933a67cfefc5c3b9e0
 SHA512:
-  metadata.gz: 2cb4dcb90da3ab9402ca59e2ac6a55fa482f510a25f3fd1cf3ee897e06d3352da4220aa38926b87d4bdfed9f20346e709dc0be8df156f0bd42b798245b38190c
-  data.tar.gz: 82f4d6780486145da3496641e360d2c405d71bca52d50bf297f0ec6383a0bcdc25aa5eb0753f4e2410acca4f9a5ba7176eac1a5bbb5d0fc5da6af7fff72496fa
+  metadata.gz: 24c934899bfe48ca079c7959256f4d3168bcca77bbca7a0dfb0b302259c5fa9b1a3c0f192df62a957f85f4793348194c1ae9b99b1a86bd0f83aa4ae0a5e0d11d
+  data.tar.gz: 1ba60ed0f8ea560901cc4695303b51d588694ccf95a7d63c3d9fcb564bf1cc967dec647d102aa6c0485a431d334dc4b61192337b1ff4d9c3f52a1b0a10797f9a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (3.2.3)
+    adminsite (3.2.4)
       actionpack-page_caching
       cancancan (~> 1.10)
       codemirror-rails (>= 4.8)

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -135,6 +135,9 @@ body.adminsite {
       li {
         border-left: 1px solid black;
         padding: 0 0.3em 0 0.5em;
+        &.active a {
+          font-weight: bold;
+        }
         &:first-child {
           border-left: 0;
           padding-left: 0;

data/app/controllers/adminsite/admin/resources_controller.rb

@@ -119,8 +119,10 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
   end
 
   def filter_scopes
-    return [] if params[:scope].blank?
-    resource_admin_config.scopes & params[:scope].split(',').collect{|s| s.to_sym }
+    @scopes ||= []
+    return @scopes if params[:scope].blank?
+    scopes = params[:scope].split(',').collect(&:to_sym)
+    @scopes = resource_admin_config.scopes.collect(&:to_sym) & scopes
   end
 
   def order_params
@@ -133,7 +135,6 @@ class Adminsite::Admin::ResourcesController < Adminsite::Admin::CrudController
     @resource_admin_config
   end
 
-
   class << self
 
     def content_menu_label

data/app/views/adminsite/admin/resources/_filters.html.haml

@@ -7,7 +7,12 @@
         - resource_admin_config.scopes.each do |scope|
           - scope_label = "#{scope.to_s.titlecase} <span class=\"count\">(#{resource_class.send(scope).ransack(params[:q]).result.count})</span>".html_safe
           - scope_path = "#{admin_resource_path(nil,nil,@ransack_params )}&scope=#{scope}"
-          %li #{link_to scope_label, scope_path}
+          - if @scopes.try(:include?, scope.to_sym) || scope.to_sym == (params[:scope].try(:to_sym) || :all)
+            - li_class = 'active'
+          - else
+            - li_class = nil
+          - @scopes
+          %li{class: li_class} #{link_to scope_label, scope_path}
   - if resource_admin_config.attributes_search.any?
     #search_filters
       %label |

data/app/views/layouts/adminsite/admin.html.haml

@@ -6,7 +6,7 @@
     = stylesheet_link_tag 'adminsite'
     = javascript_include_tag 'adminsite'
   %body.adminsite
-    %h1
+    %h1= Adminsite.config.title
     = render :partial => 'adminsite/admin/shared/admin_menu' if current_adminsite_admin_user.present?
     = render :partial => 'adminsite/admin/shared/content_menu' if current_adminsite_admin_user.present?
 

data/lib/adminsite/configuration.rb

@@ -4,8 +4,11 @@ module Adminsite
 
     attr_accessor :admin_namespace # :admin
 
+    attr_accessor :title
+
     # Configuration defaults
     def initialize
+      @title                                  = Rails.application.class.parent_name.titleize
       @admin_namespace                        = :admin
     end
 

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "3.2.3" unless defined?(Adminsite::VERSION)
+  VERSION = "3.2.4" unless defined?(Adminsite::VERSION)
 end

data/lib/generators/adminsite/add_dashboard/add_dashboard_generator.rb

@@ -15,6 +15,8 @@ module Adminsite
 
         template  "views/index.html.haml", "app/views/adminsite/admin/dashboard/index.html.haml"
 
+        template  "views/index.html.haml", "app/views/adminsite/admin/dashboard/index.html.haml"
+
         # Content-Menu
         inject_into_file "app/views/adminsite/admin/shared/_admin_menu.html.haml", :after => /\= yield :admin_menu\n/ do\
         # "\n    = menu_item 'IFrameMgt', admin_#Dashboard_index_path, ['#{@file_name}']\n"

data/lib/generators/adminsite/install/install_generator.rb

@@ -35,6 +35,9 @@ module Adminsite
         puts "Setting up CanCan"
         copy_file "#{Adminsite::Engine.root}/app/models/adminsite/ability.rb", 'app/models/adminsite/ability.rb'
 
+        # initializers
+        template 'config/initializers/adminsite.rb', 'config/initializers/adminsite.rb'
+
         # Locales
         copy_file "config/locales/adminsite.da.yml", 'config/locales/adminsite.da.yml'
         copy_file "config/locales/adminsite.en.yml", 'config/locales/adminsite.en.yml'

data/lib/generators/adminsite/install/templates/config/initializers/adminsite.rb

@@ -0,0 +1,3 @@
+Adminsite.configure do |config|
+  # config.title = Rails.application.class.parent_name.titleize
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -362,6 +362,7 @@ files:
 - lib/generators/adminsite/install/install_generator.rb
 - lib/generators/adminsite/install/templates/assets/adminsite.js
 - lib/generators/adminsite/install/templates/assets/adminsite.scss
+- lib/generators/adminsite/install/templates/config/initializers/adminsite.rb
 - lib/generators/adminsite/install/templates/config/locales/adminsite.da.yml
 - lib/generators/adminsite/install/templates/config/locales/adminsite.en.yml
 - lib/generators/adminsite/install/templates/recipes/application.rb