application.html.erb in voluntary-0.2.2

- old
+ new

@@ -1,17 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= t('layout.title') %></title>
+  <title><%= (yield(:title).blank? ? '' : yield(:title) + ' - ') + t('layout.title') %></title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= stylesheet_link_tag 'voluntary/application', media: 'all' %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= stylesheet_link_tag *voluntary_application_stylesheets, media: 'all' %>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
+  <div id="bootstrap_modal" class="modal hide fade"></div>
+  
   <%= render 'layouts/shared/navigation' %>
   
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>
     <div id="dialog_body"/>
@@ -24,22 +25,36 @@
         <%= render 'layouts/shared/flash_messages' %>
       </div>
     </div>
 <% end %>    
     <div class="row-fluid">
-<% if sidenav(@sidenav_links_count).present? %>
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
       <div class="span9">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
       <div class="span3">
+        <%= yield :search %>
+        
         <%= sidenav(@sidenav_links_count) %>
       </div>
 <% else %>
       <div class="span12">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
 <% end %>
     </div>
@@ -49,11 +64,10 @@
       <div class="span12">
         <%= footer_navigation %>
       </div>
     </div>
   </div>
-  <%= javascript_include_tag 'voluntary/application' %>
-  <%= javascript_include_tag 'application' %>
+  <%= javascript_include_tag *voluntary_application_javascripts %>
   <%= yield :javascript_includes %>
   <%= csrf_meta_tags %>
   <%= javascript_tag do %>
     <%= yield :top_javascript %>
     
\ No newline at end of file