awesome_admin_layout 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0b95e7a057d181985063308b2927ba1864942e4
-  data.tar.gz: 1b3521038679f1da6fd005248a83fd1cb73517df
+  metadata.gz: a87bb0e26832f381231cda7d2feecbfd0291a4b3
+  data.tar.gz: 026e65ecdc919f9470c2d6ea83b5a38f23e8a323
 SHA512:
-  metadata.gz: 55672011710af67346e2d12f50ae4c2dd842a66106c3b81d2e38425781b32ca8e313353e67c16ebbfb66b873b5b3863ece632a384054840dca794e7266db8360
-  data.tar.gz: 80b8b6f75f2c5a4e4cad4dbc3eadf4eda0d28ea9aabe164d353d55b979d3c96d0725f561cab5d9855c30935f679ec00068446ae533f79783f2c6b115654f4541
+  metadata.gz: c024eda385110fc2be6c26b0ba245af9e190a99cbe7226238b342d99450f08c55e326f543b7d08f91dcd98594c1b85121a6728f8544d1bce33efa5b69fae1b1f
+  data.tar.gz: a65fbcf3394de53784fcfc1279f513a3b70aacd9531498365e3f9c2ce91fe592a87bd5840b16d6fcd1b606351ae295b82a6603193c09d2b3c0c76f9a525a4703

data/CHANGELOG.md

@@ -1,8 +1,13 @@
-## AwesomeAdminLayout 0.1.1 (June 08, 2015) ##
+## 0.1.2 (June 17, 2015) ##
+
+*   Implement the functionality for the brand image.
+
+
+## 0.1.1 (June 09, 2015) ##
 
 *   Support Rails 3.2, 4.0 and 4.1.
 
 
-## AwesomeAdminLayout 0.1.0 (June 08, 2015) ##
+## 0.1.0 (June 08, 2015) ##
 
 *   Initialize this gem.

data/README.md

@@ -1,5 +1,8 @@
 # AwesomeAdminLayout
 
+[![Build Status](https://img.shields.io/travis/appirits/awesome_admin_layout.svg?style=flat-square)](http://travis-ci.org/appirits/awesome_admin_layout)
+[![Gem Version](https://img.shields.io/gem/v/awesome_admin_layout.svg?style=flat-square)](https://rubygems.org/gems/awesome_admin_layout)
+
 AwesomeAdminLayout provides a simple way to add admin panel layout to your application.
 
 ## Installation

data/app/assets/javascripts/awesome_admin_layout.coffee

@@ -11,12 +11,12 @@ $(document).ready(->
   #
   $navigation.on('click', 'li:not(.nested)', ->
     $navigation.find('.open').removeClass('open')
-    $navigation.find('.expanded').removeClass('expanded')
+    $navigation.removeClass('expanded')
   )
 
   $navigation.on('click', 'li.nested', (event) ->
     $navigation.find('.open').removeClass('open')
-    $(this).closest('ul').addClass('expanded')
+    $navigation.addClass('expanded')
     $(this).find('.awesome_admin_layout-nested-navigation').addClass('open')
   )
 

data/app/assets/stylesheets/awesome_admin_layout.scss

@@ -137,6 +137,16 @@ $awesome_admin_layout-notice-size: 10px !default;
 
   span {
     margin: 0 20px;
+
+    &.awesome_admin_layout-image {
+      margin-right: 1em;
+      position: relative;
+      top: -1px;
+    }
+
+    &.awesome_admin_layout-image + span {
+      margin-left: 0;
+    }
   }
 
   a:link, a:visited, a:hover, a:active {
@@ -182,6 +192,40 @@ $awesome_admin_layout-notice-size: 10px !default;
 }
 
 .awesome_admin_layout-navigation {
+  &.expanded {
+    background-color: $awesome_admin_layout-navigation-expanded-bg;
+
+    .awesome_admin_layout-navigation-brand .awesome_admin_layout-image + .awesome_admin_layout-text {
+      display: none;
+    }
+
+    & > * > ul > li {
+      & > .awesome_admin_layout-text,
+      & > a > .awesome_admin_layout-text {
+        display: none;
+      }
+
+      &.active > a {
+        background-color: transparent;
+      }
+    }
+
+    .awesome_admin_layout-notice,
+    .awesome_admin_layout-badge {
+      height: $awesome_admin_layout-notice-size / 2;
+      width: $awesome_admin_layout-notice-size / 2;
+    }
+
+    .awesome_admin_layout-badge {
+      padding: 0;
+      text-indent: -99999px;
+    }
+
+    li.nested i.fa-angle-right {
+      display: none;
+    }
+  }
+
   ul {
     @include awesome_admin_layout-display-flex;
     @include awesome_admin_layout-flex-direction(column);
@@ -194,33 +238,6 @@ $awesome_admin_layout-notice-size: 10px !default;
     bottom: 0;
     left: 0;
     right: 0;
-
-    &.expanded {
-      background-color: $awesome_admin_layout-navigation-expanded-bg;
-
-      & > li > a > .awesome_admin_layout-text {
-        display: none;
-      }
-
-      .awesome_admin_layout-notice,
-      .awesome_admin_layout-badge {
-        height: $awesome_admin_layout-notice-size / 2;
-        width: $awesome_admin_layout-notice-size / 2;
-      }
-
-      .awesome_admin_layout-badge {
-        padding: 0;
-        text-indent: -99999px;
-      }
-
-      li.nested i.fa-angle-right {
-        display: none;
-      }
-
-      & > li.active > a {
-        background-color: transparent;
-      }
-    }
   }
 
   li {

data/lib/awesome_admin_layout/helpers.rb

@@ -9,11 +9,7 @@ module AwesomeAdminLayout
     def render_admin_layout(&block)
       <<-HTML
         <div id="awesome_admin_layout">
-          <nav class="awesome_admin_layout-navigation">
-            <div class="awesome_admin_layout-wrapper">
-              #{AwesomeAdminLayout.script.to_html}
-            </div>
-          </nav>
+          #{AwesomeAdminLayout.script.to_html}
 
           <main class="awesome_admin_layout-main">
             <div class="awesome_admin_layout-navigation-toggle">

data/lib/awesome_admin_layout/navigation.rb

@@ -5,6 +5,8 @@ require 'awesome_admin_layout/navigation/flex_divider'
 
 module AwesomeAdminLayout
   class Navigation
+    attr_accessor :parent
+
     @@collection = {}
 
     class << self
@@ -30,7 +32,7 @@ module AwesomeAdminLayout
     end
 
     def item(name, &block)
-      item = Item.new(name)
+      item = Item.new(name, parent: self)
       item.instance_eval(&block) if block_given?
       @tree << item
     end
@@ -43,12 +45,10 @@ module AwesomeAdminLayout
       @tree << FlexDivider.new
     end
 
-    def nest(key)
-      @tree << Navigation.find(key)
-    end
-
     def to_s
-      __convert
+      __wrapper do
+        "#{@brand}<ul>#{__convered_nodes}</ul>"
+      end
     end
 
     def __has_active_item?
@@ -65,12 +65,19 @@ module AwesomeAdminLayout
       @@collection[key] = { object: self, code: block }
     end
 
-    def __convert
-      "#{@brand}<ul#{' class="expanded"' if __has_active_nested_item?}>#{__convert_items}</ul>"
+    def __wrapper
+      return yield if parent
+      <<-WRAPPER
+        <nav class="awesome_admin_layout-navigation #{'expanded' if __has_active_nested_item?}">
+          <div class="awesome_admin_layout-wrapper">
+            #{yield}
+          </div>
+        </nav>
+      WRAPPER
     end
 
-    def __convert_items
-      @tree.map(&:to_s).join
+    def __convered_nodes
+      @tree.join
     end
 
     def __items

data/lib/awesome_admin_layout/navigation/brand.rb

@@ -17,8 +17,12 @@ module AwesomeAdminLayout
         @item[:external_link] = link
       end
 
+      def image(src, option = {})
+        @item[:image] = option.merge(src: src)
+      end
+
       def to_s
-        %Q{<div class="#{__css_class}">#{__link_to("#{__name}")}#{__enternal_link}</div>}
+        %Q{<div class="#{__css_class}">#{__link_to("#{__image}#{__name}")}#{__enternal_link}</div>}
       end
 
       private
@@ -28,7 +32,7 @@ module AwesomeAdminLayout
       end
 
       def __name
-        "<span>#{@item[:name].is_a?(Proc) ? @item[:name].call : @item[:name]}</span>"
+        %Q{<span class="awesome_admin_layout-text">#{@item[:name].is_a?(Proc) ? @item[:name].call : @item[:name]}</span>}
       end
 
       def __link_to(name)
@@ -41,6 +45,18 @@ module AwesomeAdminLayout
         %Q{<a href="#{@item[:external_link]}" target="_blank" class="awesome_admin_layout-external-link">#{__external_link_icon}</a>}
       end
 
+      def __image
+        image_tag = __image_tag
+        return unless image_tag
+        %Q{<span class="awesome_admin_layout-image">#{image_tag}</span>}
+      end
+
+      def __image_tag
+        return unless @item[:image]
+        return ActionController::Base.helpers.image_tag(@item[:image][:src], @item[:image]) if defined? Rails
+        %Q{<img src="#{@item[:image][:src]}" />}
+      end
+
       def __external_link_icon
         '<i class="fa fa-external-link"></i>'
       end

data/lib/awesome_admin_layout/navigation/item.rb

@@ -1,8 +1,11 @@
 module AwesomeAdminLayout
   class Navigation
     class Item
-      def initialize(name = nil)
+      attr_reader :parent
+
+      def initialize(name = nil, options = {})
         @item = { name: name }
+        @parent = options[:parent]
       end
 
       def name(name = nil, &block)
@@ -27,6 +30,7 @@ module AwesomeAdminLayout
 
       def nest(key)
         @item[:nest] = Navigation.find(key)
+        @item[:nest].parent = parent
       end
 
       def to_s

data/lib/awesome_admin_layout/tasks/release.rake

@@ -24,6 +24,7 @@ namespace :awesome_admin_layout do
   end
 
   task :push => :build do
+    sh 'git push'
     sh "gem push pkg/#{gem}"
   end
 

data/lib/awesome_admin_layout/version.rb

@@ -1,3 +1,3 @@
 module AwesomeAdminLayout
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_admin_layout
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim