contour 1.0.0.beta8 → 1.0.0.beta9

data/app/views/contour/layouts/_menu.html.erb

@@ -11,8 +11,8 @@
       <% Contour.menu_items.group_by{|i| i[:position]}.each do |position, items| %>
         <ul class="nav <%= 'pull-right' if position == 'right' %>">
           <% items.each_with_index do |menu_item, index| %>
-            <% has_submenu = (menu_item[:links] || []).collect{|link| link[:condition].blank? or eval(link[:condition])}.include?(true) %>
             <% if display.include?(menu_item[:display]) and (menu_item[:condition].blank? or eval(menu_item[:condition])) %>
+              <% has_submenu = (menu_item[:links] || []).collect{|link| link[:condition].blank? or eval(link[:condition])}.include?(true) %>
               <li class="<%= 'dropdown' if has_submenu %>" id="menu<%= position %><%= index %>">
                 <%= link_to(
                     (menu_item[:eval] ? eval(menu_item[:name]) : menu_item[:name].html_safe + (menu_item[:image].blank? ? '' : image_tag(menu_item[:image], menu_item[:image_options]))),

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta8" # nil, "pre", "rc", "rc2"
+    BUILD = "beta9" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70353680606440 !ruby/object:Gem::Requirement
+  requirement: &70156906703140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70353680606440
+  version_requirements: *70156906703140
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70353680605940 !ruby/object:Gem::Requirement
+  requirement: &70156906702640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70353680605940
+  version_requirements: *70156906702640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70353680605480 !ruby/object:Gem::Requirement
+  requirement: &70156906702180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70353680605480
+  version_requirements: *70156906702180
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70353680605020 !ruby/object:Gem::Requirement
+  requirement: &70156906701720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70353680605020
+  version_requirements: *70156906701720
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70353680604560 !ruby/object:Gem::Requirement
+  requirement: &70156906701260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70353680604560
+  version_requirements: *70156906701260
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70353680604100 !ruby/object:Gem::Requirement
+  requirement: &70156906700800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70353680604100
+  version_requirements: *70156906700800
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70353680603640 !ruby/object:Gem::Requirement
+  requirement: &70156906700340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70353680603640
+  version_requirements: *70156906700340
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70353680603180 !ruby/object:Gem::Requirement
+  requirement: &70156906699880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70353680603180
+  version_requirements: *70156906699880
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70353680622940 !ruby/object:Gem::Requirement
+  requirement: &70156906699400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70353680622940
+  version_requirements: *70156906699400
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70353680622480 !ruby/object:Gem::Requirement
+  requirement: &70156906698940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70353680622480
+  version_requirements: *70156906698940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70353680622100 !ruby/object:Gem::Requirement
+  requirement: &70156906698560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353680622100
+  version_requirements: *70156906698560
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []