conte_rails_template 0.0.33 → 0.0.34

data/lib/conte_rails_template/version.rb

@@ -1,3 +1,3 @@
 module ConteRailsTemplate
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

data/lib/navigation_renderer.rb

@@ -1,55 +1,55 @@
-module ConteRailsTemplate
-  class NavigationRenderer < SimpleNavigation::Renderer::Base
-    def render(item_container)
-      if options[:is_subnavigation]
-        ul_class = "child"
-      else
-        ul_class = "parent"
-      end
-
-      list_content = item_container.items.inject([]) do |list, item|
-        li_options = item.html_options.reject {|k, v| k == :link}
-        li_content = tag_for(item)
-        if include_sub_navigation?(item)
-          li_content << render_sub_navigation_for(item)
-        end
-        list << content_tag(:li, li_content, li_options)
-      end.join
-      if skip_if_empty? && item_container.empty?
-        ''
-      else
-        content_tag(:ul, list_content, { :id => item_container.dom_id, :class => [item_container.dom_class, ul_class].flatten.compact.join(' ') })
+class NavigationRenderer < SimpleNavigation::Renderer::Base
+  def render(item_container)
+    list_content = item_container.items.inject([]) do |list, item|
+      li_content = []
+      li_content << tag_for(item)
+      if include_sub_navigation?(item)
+        li_content << render_sub_navigation_for(item)
       end
+      list << content_tag(:div, li_content.join, class: 'accordion-group')
+    end.join
+    if skip_if_empty? && item_container.empty?
+      ''
+    else  
+      content_tag :div, list_content, {:class => 'accordion', "id" => 'navigation'}
     end
+  end
 
-    def render_sub_navigation_for(item)
-      item.sub_navigation.render(self.options.merge(:is_subnavigation => true))
-    end
-
-    protected
+  protected
 
-    def tag_for(item)
-      if item.url.nil?
-        content_tag('span', item.name, link_options_for(item).except(:method))
+  def tag_for(item)
+    item_content = nil
+    options = link_options_for(item)
+    if suppress_link?(item)
+      content = []
+      content << 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
-        link_content = item.name
-        if item.url == "javascript:void(0);"
-          link_content = "#{item.name}<b class=\"caret\"></b>"
-        end
-
-        link_to(link_content, item.url, link_options_for(item))
+        options[:class] = [options[:class], 'accordion-toggle collapsed'].flatten.compact.join(' ')
       end
+      options = options.merge('data-toggle' => "collapse", 'data-parent' => "#navigation")
+      item_content = link_to(content.join(' '), "#collapse_#{item.key}", options)
+    else
+      options[:class] = [options[:class], 'accordion-toggle'].flatten.compact.join(' ')
+      item_content = link_to(item.name, item.url, options)
     end
+    content_tag :div, item_content, class: 'accordion-heading'
+  end
 
-    # Extracts the options relevant for the generated link
-    #
-    def link_options_for(item)
-      special_options = {:method => item.method}.reject {|k, v| v.nil? }
-      link_options = item.html_options[:link] || {}
-      opts = special_options.merge(link_options)
-      opts[:class] = [link_options[:class], item.selected_class].flatten.compact.join(' ')
-      opts.delete(:class) if opts[:class].nil? || opts[:class] == ''
-      opts
+  def render_sub_navigation_for(item)
+    options = link_options_for(item)
+    sub_list_content = item.sub_navigation.items.inject([]) do |list, sub_item|
+      li_content = link_to(sub_item.name, sub_item.url, link_options_for(sub_item))
+      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 options[:class] && options[:class].include?('active')
+      content_tag(:div, inner_container, {:class => 'accordion-body in collapse', 'id' => "collapse_#{item.key}"})
+    else
+      content_tag(:div, inner_container, {:class => 'accordion-body collapse', 'id' => "collapse_#{item.key}"})
     end
   end
 end

data/vendor/assets/stylesheets/conte.css.scss

@@ -56,67 +56,78 @@ body {
         width: 100%;
         text-shadow: 0px 1px 0px rgba(0, 0, 0, 1);
         z-index: 1;
-        ul {
+
+        &.accordion {
           padding: 0px; margin: 0px;
-          width: 100%;
 
-          li {
-            width: 100%;
-            display: block;
-            background: #3B3D43;
+          a {
+            color: #ccc;
+            font-weight: bold;
+            font-size: 16px;
+            padding: 0px; margin: 0px;
+          }
 
-            & a:active, &.active a {
-              background: #824365;
-            }
+          .accordion-group {
+            border: none;
+            padding: 0px; margin: 0px;
 
-            a {
-              display: block;
-              padding: 15px;
-              color: #ccc;
-              font-weight: bold;
-              font-size: 16px;
-              text-decoration: none;
+            .accordion-toggle {
+              height: 50px;
+              line-height: 50px;
               border-top: 1px solid rgba(255, 255, 255, 0.1);
-              border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+              border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+              padding-left: 20px;
 
-              &:hover {
-                background: #484B51;
+              .caret {
+                border-top: none;
+                border-bottom: 6px solid #ccc;
+                border-left: 6px solid transparent;
+                border-right: 6px solid transparent;
+                margin-top: 20px;
               }
 
-              &:active {
+              &.collapsed {
+                .caret {
+                  border-bottom: none;
+                  border-top: 6px solid #ccc;
+                }
+              }
+
+              &.active {
                 background: #824365;
+                &:hover {
+                  background: #824365;
+                }
               }
 
-              .caret {
-                border-top: 6px solid #ccc;
-                border-right: 6px solid transparent;
-                border-left: 6px solid transparent;
-                margin: 7px 0px 0px 10px;
+              &:hover {
+                background: #484B51;
               }
             }
 
-            &.toggle .caret {
-              border-top: none;
-              border-bottom: 6px solid #ccc;
-              border-right: 6px solid transparent;
-              border-left: 6px solid transparent;
-            }
+            .accordion-inner {
+              border: none;
+              padding: 0px; margin: 0px;
 
-            ul {
-              background: #313237;
+              a {
+                border-top: none;
+                height: 50px;
+                padding: 0px;
+                line-height: 50px;
+                padding-left: 30px;
+
+                &.active {
+                  background: #61324b;
+                }
 
-              li {
-                a {
-                  padding-left: 35px;
+                &:hover {
+                  background: #484B51;
                 }
               }
             }
           }
-
-          li:first-child a {
-            border-top: none;
-          }
         }
+
       }
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conte_rails_template
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties