Merge branch 'feature.better-home' into develop

2011-04-27 00:07:40 +02:00
parent df6ffdf420 b36b8e3afb
commit 45d53e8d21
13 changed files with 464 additions and 27 deletions
--- a/src/IDF/templates/idf/base.html
+++ b/src/IDF/templates/idf/base.html
@@ -37,7 +37,7 @@
 <body>
 <div id="{block docid}doc3{/block}" class="{block docclass}yui-t3{/block}">
  <div id="hd">
-    {if $project}<h1 class="project-title">{$project}</h1>{/if}
+    {if $project}<h1 class="project-title">{$project}<img class="logo" src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'Project logo'}" />{if $project.private}<img class="lock" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />{/if}{$p}</h1>{/if}
    {include 'idf/main-menu.html'}
 <div id="header">
 <div id="main-tabs">