kadmin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee485f2570fded46ed64847e037d2b8badb31616
-  data.tar.gz: f809cef5643a84c3b3f5099413095b3ff918a258
+  metadata.gz: a0241b447c1ade90243b176fca16db25d1684b56
+  data.tar.gz: 52dea5a1fc7ae78699fc338fd975c33da17c65f2
 SHA512:
-  metadata.gz: 3aa5f39dff3d74a82b1620dff68f711e515d95d9ff0889ba2a0b3c25bb58f2d5a9497c0b076c7a33845c6e2a1b40d9fb5b4ee573858a3db7cd35d9888f0455a0
-  data.tar.gz: 1ad51a85fd14573048ec043191980c4ec6e2405d4dea4e2a0a914438ef759bc52df4419d0fd34e491f3099e22f88e619f55f7affca10ad4ab0c4ea6e96f639b5
+  metadata.gz: 9db000572405cbf09a0c7db3bab870eedfd69bf98fa968fb1095df3e057a6c6f192d7c3ec486b3d5e6f44993a95728f0244742de35192603c3e18305fabbd0bf
+  data.tar.gz: 551cd2cd24bf35ea39354288de01e5969516042059f2fcea50ad3e40e4895896760c49555780ab40c69c834566e6fa9632322e589b4578da94d1310b648b5aff

data/README.md

@@ -1,6 +1,6 @@
 # Kadmin
 
-[![GitHub release](https://img.shields.io/badge/release-0.4.0-blue.png)](https://github.com/barcoo/kadmin/releases/tag/0.4.0)
+[![GitHub release](https://img.shields.io/badge/release-0.4.1-blue.png)](https://github.com/barcoo/kadmin/releases/tag/0.4.1)
 
 Collection of utility, configuration, etc., for admin areas in different projects.
 Theme based on [Modular Admin](https://github.com/modularcode/modular-admin-html)

data/app/controllers/kadmin/application_controller.rb

@@ -15,15 +15,7 @@ module Kadmin
     # Each controller should specify which navbar section they
     # belong to, if any. By default, each controller is setup to
     # be its own section.
-    class << self
-      def navbar_section=(id)
-        @navbar_section = id.to_s.freeze
-      end
-
-      def navbar_section
-        return @navbar_section ||= self
-      end
-    end
+    class_attribute :navbar_section
 
     # @!group Error Handling
 

data/app/helpers/kadmin/bootstrap_helper.rb

@@ -1,10 +1,10 @@
 module Kadmin
   # Collection of Bootstrap helpers
   module BootstrapHelper
-    # @see http://getbootstrap.com/components/#glyphicons-glyphs
-    # @param [String] icon the part after glyphicon-
+    # @see Font-Awesome icons: http://fontawesome.io/icons/
+    # @param [String] the name of the icon you want
     def glyphicon(icon)
-      return "<span class='glyphicon glyphicon-#{icon}' aria-hidden='true'> </span>".html_safe
+      return "<i class='fa fa-#{icon}' aria-hidden='true'></i>".html_safe
     end
 
     # @param [Boolean] condition condition of evaluate

data/config/initializers/assets.rb

@@ -1,5 +1,5 @@
 # Load engine assets
 # While loading images by extensions seem to work, loading JS and (S)CSS by extension seems
 # to cause issues, although loading them by filename is fine. Go figure.
-Rails.application.config.assets.precompile += Dir.glob("#{Kadmin::Engine.root}/app/assets/**/*").reject { |fn| File.directory?(fn) }
-Rails.application.config.assets.precompile += Dir.glob("#{Kadmin::Engine.root}/vendor/assets/**/*").reject { |fn| File.directory?(fn) }
+Rails.application.config.assets.precompile << Dir.glob("#{Kadmin::Engine.root}/app/assets/**/*").reject { |fn| File.directory?(fn) }
+Rails.application.config.assets.precompile << Dir.glob("#{Kadmin::Engine.root}/vendor/assets/**/*").reject { |fn| File.directory?(fn) }

data/lib/kadmin/engine.rb

@@ -8,6 +8,16 @@ module Kadmin
 
     initializer 'kadmin.install', after: :finisher_hook do
       Kadmin.logger = Rails.logger
+      Kadmin::Engine.load_assets(config, 'app/assets')
+      Kadmin::Engine.load_assets(config, 'vendor/assets')
+    end
+
+    class << self
+      def load_assets(config, root)
+        folder = Kadmin::Engine.root.join(root).to_s
+        config.assets.paths << Dir.glob(folder).select { |path| File.directory?(path) }
+        config.assets.precompile << Dir.glob("#{folder}/**/*").select { |path| File.file?(path) }
+      end
     end
   end
 end

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end