Mercurial > hg > soundsoftware-site

changeset 342:3564e1ae2ff7 cannam-pre-20110113-merge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 31 Mar 2011 11:13:21 +0100
parents 5410d82c12df (current diff) b6ec5451fd0d (diff)
children a0956f78f39c 1a514b9347d4 361602c5e6bb 712264d5d60a
files
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/layouts/base.rhtml	Thu Mar 31 10:37:04 2011 +0100
+++ b/app/views/layouts/base.rhtml	Thu Mar 31 11:13:21 2011 +0100
@@ -52,11 +52,16 @@
       <h3 id="project-ancestors-title"><%= page_header_title[1] %></h3>
     <% end %>  
 
-    <h1  id="project-title"
+    <h1 id="project-title"
       <% unless page_header_title[1].empty? %>
         style="margin-top: 0px; "
       <% end %>  
-    ><%= page_header_title[0] %></h1>
+    ><% if display_main_menu?(@project) %>
+       <%= link_to_project(@project) %>
+     <% else %> 
+       <%= page_header_title[0] %>
+     <% end %>
+    </h1>
     
     <% if display_main_menu?(@project) %>
     <div id="main-menu">
@@ -83,7 +88,7 @@
 	
 <div id="footer">
   <div class="bgl"><div class="bgr">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2010 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
   </div></div>
 </div>
 </div>
--- a/public/themes/soundsoftware/stylesheets/application.css	Thu Mar 31 10:37:04 2011 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Thu Mar 31 11:13:21 2011 +0100
@@ -116,13 +116,14 @@
 #header {  position: absolute; z-index: 0; top: 0; width: 100%; background: #fdfbf5; border-bottom: 2px solid #a9b680; /* height:80px; */ padding: 20px 0 0.5em 0; margin-bottom: 0; }
 #header a { color: #be5700; }
 #header h1 { color: #525a38; margin-top: 25px; font-size: 3em; font-weight: normal; margin-left: 10px; }
+#header #project-title a, #header #project-title a:hover { color: #525a38; text-decoration: none; }
 .header-general h1 {
   background: url('soundsoftware-logo-title-only-transparent-beta.png') no-repeat 0 0;
   text-indent: -9999px;
   width: 500px;
   height: 34px;
  }
- 
+
 #quick-search { margin-right: 6px; margin-top: 1em; color: #000; }
 #project-jump-box { float: right;  margin-right: 6px; margin-top: 5px; color: #000; }
 #project-ancestors-title {