startups 0.0.2 → 0.0.2.1

data/CHANGELOG

@@ -21,5 +21,8 @@
 * Added examples.
 * Running a single generator (startup) now generates all 3 startups and gets you a working example with 3 pages.
 
+0.0.2.1 (Oct 19th, 2009)
+
+* Cleaned up and streamlined some things.
 
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('startups', '0.0.2') do |p|
+Echoe.new('startups', '0.0.2.1') do |p|
   p.project        = "startups"
   p.description    = "A collection of Rails \"startups\" for features such as a standard layout, navigation and forms with customizable error handling."
   p.url            = "http://rubyforge.org/projects/startups"

data/rails_generators/startup_layout/templates/public/stylesheets/startup_layout.css

@@ -4,11 +4,8 @@ h1 {font-size: 18px; margin: 10px 0;}
 h2 {font-size: 14px; font-weight: bold;}
 h3 {font-size: 12px; font-weight: bold;}
 
-a         {color:#5d5e5e;text-decoration: none;}
-a:link    {color:#5d5e5e;}
-a:active, 
-a:hover   {color:#5d5e5e; text-decoration: underline;}
-a:visited {color:#5d5e5e;}
+a {color:#5d5e5e;text-decoration: none;}
+a:hover, a:active {color:#5d5e5e; text-decoration: underline;}
 
 #all {background-color:white;color:#5d5e5e;min-height:100%;position:relative;}
 
@@ -17,17 +14,10 @@ a:visited {color:#5d5e5e;}
 .crumbs span {font-size:12px;margin-left:5px;margin-right:5px;}
 
 #content {overflow:auto;padding:10px 20px 0px 55px;padding-bottom:30px;width:950px;} /* bottom padding needs to match footer height */
-#content_link {color:#5d5e5e;text-decoration:none;}
-#content_link_underline {color:#5d5e5e;text-decoration:underline;}
 
 #masthead {color:#a0a1a2;height:40px;padding-top:15px;width:100%;border-bottom:1px solid #e0e1e2;}
-#masthead a {}
-#masthead a:active {color:#5d5e5e;text-decoration:underline;}
-#masthead a:hover {color:#5d5e5e;text-decoration:underline;}
-#masthead a:link {color:#a0a1a2;text-decoration:none;}
-#masthead a:visited {color:#a0a1a2;text-decoration:none;}
-#masthead_link {color:#a0a1a2;text-decoration:none;}
-#masthead_link_underline {color:#5d5e5e;text-decoration:underline;}
+#masthead a:active, #masthead a:hover {color:#5d5e5e;text-decoration:underline;}
+#masthead a:link, #masthead a:visited {color:#a0a1a2;text-decoration:none;}
 
 #footer {bottom:0px;color:#a0a1a2;height:30px;position:absolute;width:100%;border-top:1px solid #e0e1e2;font-size:10px;}
 #footer_content {padding:5px 20px;padding-bottom:0px;width:950px;overflow:auto;}

data/rails_generators/startup_nav/templates/_nav.html.erb

@@ -1,8 +1,7 @@
-<%- css_id = (name.to_s == 'top') ? 'nav' : "#{name}_nav" -%>
-<ul id="<%= css_id %>">
-<%% layout_nav_items.each do |nav_item| 
-    next unless nav_item[:placement] == :<%= name %>
-%>
-  <li><%%= link_to(nav_item[:label], nav_item[:url], :id => "<%= css_id %>_#{nav_item[:id]}") %></li>
+<div id="<%= (name.to_s == 'top') ? 'nav' : "#{name}_nav" %>">
+  <ul>
+<%% layout_nav_items(:<%= name %>).each do |nav_item| %>
+    <li><%= link_to_nav_item(nav_item) %></li>
 <%% end %>
-</ul>
+  </ul>
+</div>

data/rails_generators/startup_nav/templates/nav.css

@@ -7,7 +7,8 @@
 <%= css_id.upcase %> STYLES
 ************/
 <% if name.to_s == 'footer' %>
-#footer_nav {list-style-type:none;float:right;}
+#footer_nav {float:right;}
+#footer_nav ul {list-style-type:none;}
 #footer_nav li {float:left;margin-right:20px;}
 #footer_nav a {display:block;position:relative;text-decoration:none;text-transform:uppercase;}
 #footer_nav a:visited {color:#a0a1a2;text-decoration:none;}
@@ -15,13 +16,14 @@
 #footer_nav a:hover {color:#5d5e5e;text-decoration:underline;}
 #footer_nav a:active {color:#5d5e5e;text-decoration:underline;}
 <% else %>
+#<%= css_id %> {margin-left:22px;}
+#<%= css_id %> ul {list-style-type:none;overflow:auto;}
+#<%= css_id %> li {float:left;}
 #<%= css_id %> a {display:block;height:20px;padding:5px 10px;position:relative;text-decoration:none;text-transform:uppercase;}
 #<%= css_id %> a:visited {color:#a0a1a2;text-decoration:none;}
 #<%= css_id %> a:link {color:#a0a1a2;text-decoration:none;}
 #<%= css_id %> a:hover {color:#5d5e5e;text-decoration:none;}
 #<%= css_id %> a:active {color:#5d5e5e;text-decoration:none;}
-#<%= css_id %> li {float:left;}
-#<%= css_id %> {list-style-type:none;margin-left:22px;overflow:auto;}
 <% end %>
 
 /* any additional menu items need to be added here for them to be styled correctly when selected. */

data/rails_generators/startup_nav/templates/nav_helper.rb

@@ -1,8 +1,8 @@
 module NavHelper
 
   #change the hash below to include the actual items you need in your navs. Use the :placement option to specify which nav an item goes in if there are multiple navs.
-  def layout_nav_items
-    @layout_nav_items ||= [
+  def configure_nav_items
+    [
 <%- names.each do |name| -%>
       #nav items for :<%= name %>
 <%- unless name.to_s == 'footer' %>
@@ -14,6 +14,34 @@ module NavHelper
     ]
   end
 
+  def layout_nav_items(placement=nil)
+    init_layout_nav_items
+    if placement.nil?
+      @layout_nav_items
+    else
+      layout_nav_items_by_placement(placement)
+    end
+  end
+
+  def init_layout_nav_items
+    unless @layout_nav_items
+      @layout_nav_items = configure_nav_items
+      @layout_nav_items.each do |nav_item|
+        nav_item[:label] ||= nav_item[:id].to_s.titleize
+      end
+    end
+  end
+
+  def layout_nav_items_by_placement(placement)
+    @layout_nav_items_by_placement ||= {}
+    unless @layout_nav_items_by_placement[placement]
+      @layout_nav_items_by_placement[placement] = []
+      @layout_nav_items.each do |nav_item| 
+        @layout_nav_items_by_placement[placement] << nav_item if nav_item[:placement] == placement
+      end
+    end
+    @layout_nav_items_by_placement[placement]
+  end
 
   attr_accessor :layout_nav
 
@@ -21,11 +49,11 @@ module NavHelper
     @layout_nav = value
     @selected_nav_title = (selected_nav_item ? selected_nav_item[:title] : nil)
   end
-  
+
   def layout_nav_ids
     @layout_nav_ids ||= layout_nav_items.collect{|nav_item|nav_item[:id]}
   end
-  
+
   def selected_nav_item
     @selected_nav_item ||= layout_nav_item(layout_nav)
   end
@@ -38,4 +66,11 @@ module NavHelper
     nil
   end
 
+  def link_to_nav_item(nav_item)
+    items = layout_nav_items(nav_item[:placement])
+    css_id = "#{nav_item[:placement]}_#{nav_item[:id]}"
+    css_class = (items.index(nav_item) == items.size-1) ? :last : nil
+    link_to(nav_item[:label], nav_item[:url], :id => css_id, :class => css_class )
+  end
+
 end    

data/startups.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{startups}
-  s.version = "0.0.2"
+  s.version = "0.0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Owens"]
-  s.date = %q{2009-10-16}
+  s.date = %q{2009-10-19}
   s.description = %q{A collection of Rails "startups" for features such as a standard layout, navigation and forms with customizable error handling.}
   s.email = %q{ryan (at) infoether (dot) com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/startups.rb", "LICENSE", "README", "TODO"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: startups
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors: 
 - Ryan Owens
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2009-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: []