Permalink
Browse files

Accomodate contour template gems like contour-minimalist

  • Loading branch information...
1 parent 42a4e88 commit a618bc645ff9cd3033bd5d52e42376fbfb6f9733 @remomueller committed Feb 13, 2012
View
@@ -13,5 +13,6 @@ pkg/
test/dummy/db/*.sqlite3
test/dummy/log/*.log
test/dummy/tmp/
+test/dummy/.sass-cache
-coverage/*
+coverage/*
View
@@ -1,5 +1,8 @@
== 0.10.0
+* Enhancements
+ * Changes made to accomodate contour template gems like contour-minimalist
+
== 0.9.4
* Enhancements
View
@@ -46,7 +46,7 @@ Make sure you have Rails 3.2.1
Modify Gemfile and add
- gem 'contour', '~> 0.9.0' # Basic Layout and Assets
+ gem 'contour', '~> 0.10.0' # Basic Layout and Assets
Run Bundle install
@@ -4,18 +4,18 @@ jQuery ->
$(this).css( left: $("#header").offset().left )
event.stopPropagation()
)
-
+
$('#menu').find("li").each( () ->
if $(this).find("ul").length > 0
# $("<span>").text("^").appendTo($(this).children(":first"))
-
+
# show subnav on hover
$(this).mouseenter( () ->
$(this).find("ul").stop(true, true).show() #slideDown()
)
-
+
# hide submenus on exit
$(this).mouseleave( () ->
$(this).find("ul").stop(true, true).hide() #slideUp()
)
- )
+ )
@@ -8,14 +8,11 @@
<%= csrf_meta_tags %>
</head>
<body>
- <%#= javascript_tag "var root_url='#{Contour.application_site_url + '/'}';var auth_token='#{form_authenticity_token}';" %>
<%= javascript_tag "var root_url='#{request.script_name + '/'}';var auth_token='#{form_authenticity_token}';" %>
<div id="header" class="container" <%= "style='background-image: url(#{request.script_name}/assets/#{Contour.header_background_image});'" unless Contour.header_background_image.blank? %>>
- <div id="version" style="position:relative;display:none">
- <span style="position:absolute;top:-15px;left:82px;font-size:0.5em;font-variant:normal" class="quiet"><%= Contour.application_version %></span>
- </div>
<%= image_tag(Contour.header_title_image, alt: '', style: 'vertical-align:middle') unless Contour.header_title_image.blank? %>
- <%= link_to (Contour.application_name_html.blank? ? Contour.application_name : Contour.application_name_html.html_safe), root_path, style: 'text-decoration:none;color:#404040;', onmouseover: "$('#version').show();", onmouseout: "$('#version').hide();" %>
+ <%= link_to (Contour.application_name_html.blank? ? Contour.application_name : Contour.application_name_html.html_safe), root_path, style: 'text-decoration:none;', onmouseover: "$('#version').show();", onmouseout: "$('#version').hide();" %>
+ <span id="version" style="display:none;font-size:0.5em;font-variant:normal" class="quiet"><%= Contour.application_version %></span>
</div>
<div class="container" style="position:relative">
@@ -24,8 +21,10 @@
</div>
</div>
- <div id="menu" class="container shadow">
- <%= render partial: 'contour/layouts/menu' %>
+ <div style="height:29px">
+ <div id="menu" class="container shadow">
+ <%= render partial: 'contour/layouts/menu' %>
+ </div>
</div>
<div id="content" class="container">
@@ -43,4 +42,4 @@
<div id="background_popup"></div>
</body>
-</html>
+</html>
View
@@ -6,7 +6,7 @@ module Contour
# Default Application Name
mattr_accessor :application_name
@@application_name = 'Application Name'
-
+
mattr_accessor :application_name_html
@@application_name_html = nil
@@ -18,14 +18,14 @@ module Contour
# mattr_accessor :application_site_url
# @@application_site_url = 'http://localhost'
- # Default Application Version
+ # Default Header Background Image (Logo)
mattr_accessor :header_background_image
@@header_background_image = 'rails.png'
-
+
# Default Application Version
mattr_accessor :header_title_image
@@header_title_image = nil
-
+
# Default Menu Items
mattr_accessor :menu_items
@@menu_items = [
@@ -45,15 +45,15 @@ module Contour
links: []
}
]
-
+
# Default news feed
mattr_accessor :news_feed
@@news_feed = nil
-
+
# Default max number of items displayed in the news feed
mattr_accessor :news_feed_items
@@news_feed_items = 5
-
+
def self.setup
yield self
end

0 comments on commit a618bc6

Please sign in to comment.