From be9f6a4915a80b5f5b533fa628d50f935641fb7b Mon Sep 17 00:00:00 2001
From: andrew <andrew@0f7b21a7-9e3a-4941-bbeb-ce5c7c368fa7>
Date: Sun, 20 Jan 2008 01:32:08 +0000
Subject: [PATCH] no secondary title unless given

git-svn-id: http://svn.barleysodas.com/barleysodas/trunk@96 0f7b21a7-9e3a-4941-bbeb-ce5c7c368fa7
---
 app/helpers/application_helper.rb   | 4 +---
 app/views/layouts/application.rhtml | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 319a220..5482a33 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,9 +20,7 @@ module ApplicationHelper
   #
   def secondary_title
     return h(@secondary_title) if @secondary_title
-    params[:action].to_s.capitalize.gsub(/_/) do |x|
-      $1.capitalize
-    end
+    ''
   end
   
   ##
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 13a69a8..1c326cf 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -6,10 +6,10 @@
   <%= stylesheet_link_tag 'application', :media => 'all' %>
   <%= javascript_include_tag :defaults %>
   <script type="text/javascript">
-  <%= @content_for_script %>
+  <%= yield :script %>
   </script>
   <style type="text/css">
-  <%= @content_for_stylesheet %>
+  <%= yield :stylesheet %>
   </style>
 </head>
 
@@ -37,6 +37,7 @@
     <%= link_to_unless_current 'Beverage Styles', styles_path -%><br />
     <%= link_to_unless_current 'Browse Breweries', breweries_path -%><br />
     <%= link_to_unless_current 'BarleySodas People', peoples_path -%><br />
+    <%= link_to_unless_current 'Gallery', galleries_path -%><br />
     <% if has_permission_for_action?(:index, :roles) -%><%= link_to_unless_current 'Roles', roles_path -%><br /><% end -%>
     <% unless logged_in? -%><%= link_to_unless_current 'Login', new_session_path -%><% else -%><%= link_to "Logout #{session[:people_title]}", session_path(:id => session[:people_title]), :method => :delete -%><% end %>
     <hr />