tida_template 0.2.8 → 0.2.9

data/lib/generators/tida_template/install_generator.rb

@@ -45,8 +45,7 @@ module TidaTemplate #:nodoc:
         copy_file 'app/views/shared/components/_toolbar.html.erb', 'app/views/shared/components/_toolbar.html.erb'
 
         # copy renders
-        copy_file 'renderers/sub_navigation_bar_renderer.rb', 'lib/tida/renderers/sub_navigation_bar_renderer.rb'
-        copy_file 'renderers/top_navigation_bar_renderer.rb', 'lib/tida/renderers/top_navigation_bar_renderer.rb'
+        copy_file 'renderers/navigation_bar_renderer.rb', 'lib/tida/renderers/navigation_bar_renderer.rb'
         copy_file 'renderers/component_renderer.rb', 'lib/tida/renderers/component_renderer.rb'
 
         # copy paperclip attachment access token

data/lib/generators/tida_template/templates/config/initializers/navigation_renderers.rb

@@ -1,2 +1 @@
-SimpleNavigation.register_renderer :top_navigation_bar => ::Tida::Renderers::TopNavigationBarRenderer
-SimpleNavigation.register_renderer :sub_navigation_bar => ::Tida::Renderers::SubNavigationBarRenderer
+SimpleNavigation.register_renderer :navigation_bar => ::Tida::Renderers::NavigationBarRenderer

data/lib/generators/tida_template/templates/renderers/{top_navigation_bar_renderer.rb → navigation_bar_renderer.rb}

@@ -1,6 +1,6 @@
 module Tida
   module Renderers
-    class TopNavigationBarRenderer < ::SimpleNavigation::Renderer::Base
+    class NavigationBarRenderer < ::SimpleNavigation::Renderer::Base
       def render(item_container)
         list_content = item_container.items.inject([]) do |list, item|
           list << item_content(item)
@@ -51,10 +51,11 @@ module Tida
         content = []
         content << content_tag(:i, nil, class: icon) if icon
         content << content_tag(:span, item.name)
-        content << content_tag(:i, nil, class: 'arrow icon-angle-left')
         if options[:class] && options[:class].include?('active')
-          options[:class] = [options[:class], 'accordion-toggle'].flatten.compact.join(' ')
+          content << content_tag(:i, nil, class: 'arrow icon-angle-down')
+          options[:class] = [options[:class].delete('active'), 'accordion-toggle open'].flatten.compact.join(' ')
         else
+          content << content_tag(:i, nil, class: 'arrow icon-angle-left')
           options[:class] = [options[:class], 'accordion-toggle collapsed'].flatten.compact.join(' ')
         end
         options = options.merge('data-toggle' => "collapse", 'data-parent' => "#accordion_#{item.key}")
@@ -71,7 +72,12 @@ module Tida
           content << content_tag(:i, nil, class: icon) if icon
           content << content_tag(:span, sub_item.name)
           li_content = link_to(content.join(' '), sub_item.url, options)
-          list << content_tag(:li, li_content)
+
+          if include_sub_navigation?(sub_item)
+            list << render_sub_navigation(sub_item)
+          else
+            list << content_tag(:li, li_content)
+          end
         end.join
         sub_list = content_tag(:ul, sub_list_content)
         inner_container = content_tag(:div, sub_list, class: 'accordion-inner')

data/lib/tida_template/version.rb

@@ -1,3 +1,3 @@
 module TidaTemplate
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/vendor/assets/stylesheets/_menus.scss

@@ -94,7 +94,7 @@ $caret-size: 4px;
     }
   }
 
-  .accordion .accordion {
+  .accordion .accordion .accordion-body {
     background: darken($topNavigationBackgroundColor, 10%);
   }
 
@@ -102,6 +102,18 @@ $caret-size: 4px;
     background: darken($topNavigationBackgroundColor, 5%);
   }
 
+  .accordion .accordion .accordion-heading, .accordion .accordion-inner {
+    a {
+      padding-left: 15px;
+    }
+  }
+
+  .accordion .accordion .accordion-inner {
+    a {
+      padding-left: 30px;
+    }
+  }
+
   .arrow {
     position: absolute;
     right: 10px;
@@ -120,125 +132,3 @@ $caret-size: 4px;
     }
   }
 }
-
-@mixin sub-navigation-active-state {
-  background: $pageMenuActiveBackgroundColor;
-  color: $pageMenuActiveForeColor;
-  font-weight: bold;
-}
-
-@mixin sub-navigation-hover-state {
-  background: $pageMenuHoverBackgroundColor;
-  color: $pageMenuHoverForeColor;
-  text-decoration: none !important;
-}
-
-#sub-navigation-bar {
-  display: none;
-  position: absolute;
-  top: 0px; bottom: 0px;
-  left: 0px; width: 199px;
-  @include no-space;
-  background: $pageMenuBackgroundColor;
-  border-right: 1px solid $pageMenuBorderColor;
-  z-index: 90;
-
-  [class*="accordion"] {
-    @include no-space;
-    border: none;
-    list-style: none;
-  }
-
-  .accordion {
-    ul {
-      list-style: none;
-      @include no-space;
-    }
-
-    a {
-      display: block;
-      line-height: 30px;
-      height: 30px;
-      border-bottom: 1px solid $pageMenuBorderColor;
-      padding: $smallPadding $bigPadding;
-      font: {
-        size: 12px;
-      }
-      color: $pageMenuForeColor;
-
-      &:hover {
-        @include sub-navigation-hover-state;
-
-        .caret {
-          @include caret-down($pageMenuHoverForeColor, $caret-size);
-        }
-
-        &.accordion-toggle.collapsed {
-          .caret {
-            @include caret-up($pageMenuHoverForeColor, $caret-size);
-          }
-        }
-      }
-
-      &.active {
-        @include sub-navigation-active-state;
-
-        &.in {
-          background: $pageMenuBackgroundColor;
-          color: $pageMenuForeColor;
-
-          &:hover {
-            background: $pageMenuHoverBackgroundColor;
-            color: $pageMenuHoverForeColor;
-
-            .caret {
-              @include caret-down($pageMenuHoverForeColor, $caret-size);
-            }
-
-            &.accordion-toggle.collapsed {
-              .caret {
-                @include caret-up($pageMenuHoverForeColor, $caret-size);
-              }
-            }
-          }
-        }
-
-        .caret {
-          @include caret-down;
-        }
-
-        &.accordion-toggle.collapsed {
-          .caret {
-            @include caret-up;
-          }
-        }
-      }
-
-      .caret {
-        position: relative;
-        top: $normalPadding;
-        @include caret-down;
-      }
-
-      &.accordion-toggle.collapsed {
-        .caret {
-          @include caret-up;
-        }
-      }
-    }
-  }
-
-  .accordion-body {
-    a {
-      padding: 0px $bigPadding * 2;
-      height: 35px;
-      line-height: 35px;
-
-      &.active {
-        background: $pageMenuActiveBackgroundColor;
-        color: $pageMenuActiveForeColor;
-        font-weight: bold;
-      }
-    }
-  }
-}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tida_template
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -301,8 +301,7 @@ files:
 - lib/generators/tida_template/templates/rails_templates/erb/scaffold/show.html.erb
 - lib/generators/tida_template/templates/rails_templates/rails/scaffold_controller/controller.rb
 - lib/generators/tida_template/templates/renderers/component_renderer.rb
-- lib/generators/tida_template/templates/renderers/sub_navigation_bar_renderer.rb
-- lib/generators/tida_template/templates/renderers/top_navigation_bar_renderer.rb
+- lib/generators/tida_template/templates/renderers/navigation_bar_renderer.rb
 - lib/generators/tida_template/templates/settingslogic/settings.rb
 - lib/tasks/tida_template_tasks.rake
 - lib/tida_template/engine.rb
@@ -379,7 +378,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1478045781893974252
+      hash: -1506053846429571818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -388,7 +387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1478045781893974252
+      hash: -1506053846429571818
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/generators/tida_template/templates/renderers/sub_navigation_bar_renderer.rb

@@ -1,70 +0,0 @@
-module Tida
-  module Renderers
-    class SubNavigationBarRenderer < ::SimpleNavigation::Renderer::Base
-      def render(item_container)
-        # header_content = content_tag :div, content_tag(:h3, item_container.selected_item ? item_container.selected_item.name : item_container.items.first.name), class: 'header'
-        list_content = []
-        if item_container.selected_item && include_sub_navigation?(item_container.selected_item)
-          list_content = item_container.selected_item.sub_navigation.items.inject([]) do |list, item|
-            Rails.logger.debug include_sub_navigation?(item)
-            content = []
-            content << tag_for_level_1(item)
-            content << tag_for_level_2(item) if include_sub_navigation?(item)
-            list << content_tag(:li, content_tag(:div, content.join, {class: 'accordion-group'}))
-          end
-        end
-        menu_content = content_tag(:ul, list_content.join, {class: 'accordion'})
-        div_content = []
-        content_tag(:div, menu_content, {id: 'sub-navigation-bar'})
-      end
-
-      protected
-
-      def tag_for_level_1(item)
-        item_content = nil
-        options = options_for(item)
-        icon = options.delete(:icon)
-        if suppress_link?(item)
-          content = []
-          content << content_tag(:i, nil, class: icon) if icon
-          content << content_tag(:span, item.name)
-          content << content_tag(:b, nil, class: 'caret')
-          if options[:class] && options[:class].include?('active')
-            options[:class] = [options[:class], 'accordion-toggle in'].flatten.compact.join(' ')
-          else
-            options[:class] = [options[:class], 'accordion-toggle collapsed'].flatten.compact.join(' ')
-          end
-          options = options.merge('data-toggle' => "collapse", 'data-parent' => "#page-menu")
-          item_content = link_to(content.join(' '), "#collapse_#{item.key}", options)
-        else
-          options[:class] = [options[:class], 'accordion-toggle'].flatten.compact.join(' ')
-          content = []
-          content << content_tag(:i, nil, class: icon) if icon
-          content << content_tag(:span, item.name)
-          item_content = link_to(content.join(' '), item.url, options)
-        end
-        li_content = content_tag :div, item_content, class: 'accordion-heading'
-      end
-
-      def tag_for_level_2(item)
-        Rails.logger.debug "sub_navigation"
-        sub_list_content = item.sub_navigation.items.inject([]) do |list, sub_item|
-          options = link_options_for(sub_item)
-          icon = options.delete(:icon)
-          content = []
-          content << content_tag(:i, nil, class: icon) if icon
-          content << content_tag(:span, sub_item.name)
-          li_content = link_to(content.join(' '), sub_item.url, options)
-          list << content_tag(:li, li_content)
-        end.join
-        sub_list = content_tag(:ul, sub_list_content)
-        inner_container = content_tag(:div, sub_list, class: 'accordion-inner')
-        if item.selected?
-          content_tag(:div, inner_container, {:class => 'accordion-body in collapse active', 'id' => "collapse_#{item.key}"})
-        else
-          content_tag(:div, inner_container, {:class => 'accordion-body collapse', 'id' => "collapse_#{item.key}"})
-        end
-      end
-    end
-  end
-end