changeset 1201:9ad0d37a49c9 cannam

Merge from branch "live"
author Chris Cannam
date Wed, 23 Jan 2013 11:24:24 +0000
parents 6a7198536816 (current diff) fc5d582a25f9 (diff)
children 8675fa03326d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/layouts/base.html.erb	Wed Jan 23 11:08:10 2013 +0000
+++ b/app/views/layouts/base.html.erb	Wed Jan 23 11:24:24 2013 +0000
@@ -64,7 +64,7 @@
       <% unless page_header_title[1].empty? %>
         style="margin-top: 0px; "
       <% end %>  
-      <% if @project.name.length > 35 %>
+      <% if !@project.nil? and @project.name.length > 35 %>
         class="long-title"
       <% end %>
     ><% if display_main_menu?(@project) %>