Merge branch 'feature.better-home' of projects.ceondo.com:indefero into feature.better-home

src/IDF/templates/idf/admin/summary.html

@@ -31,10 +31,10 @@
 </td>
 </tr>
 <tr>
-<th><strong>{trans 'Actual logo'}:</strong></th>
+<th><strong>{trans 'Current logo'}:</strong></th>
 <td>
 {if $logo}
-<img src="{$logo}" alt="project logo" />
+<img src="{url 'IDF_Views_Project::logo', array($project.shortname)}" alt="{trans 'project logo'}" />
 {else}
 {trans 'Your project do not have a logo configured yet.'}
 {/if}

src/IDF/templates/idf/index.html

@@ -12,17 +12,22 @@
 {foreach $projects as $p}
 <div class="p-list-img">
     <a href="{url 'IDF_Views_Project::home', array($p.shortname)}">
-    {if $logos[$p->shortname]}
-        <img src="{$logos[$p->shortname]}" alt="{trans 'Project logo'}" />
-    {else}
-        <img src="{media '/idf/img/no_logo.png'}" alt="{trans 'Project logo'}" />
-    {/if}
+    <img src="{url 'IDF_Views_Project::logo', array($p.shortname)}" alt="{trans 'Project logo'}" />
     </a>
-    {if $p.private}<div class="p-list-private"><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><img style="float:right" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" /></a></div>{/if}
+    {if $p.private}
+    <div class="p-list-private">
+        <a href="{url 'IDF_Views_Project::home', array($p.shortname)}">
+            <img style="float:right" src="{media '/idf/img/lock.png'}" alt="{trans 'Private project'}" />
+        </a>
+    </div>
+    {/if}
 </div>
 <div class="p-list-prj">
-    <p><a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><strong>{$p}</strong></a>{if $p.private} - {trans 'Private project'}</p>{/if}</p>
-    {if $p.shortdesc}<p>{$p.shortdesc}</p>{/if}
+    <p>
+        <a href="{url 'IDF_Views_Project::home', array($p.shortname)}"><strong>{$p}</strong></a>
+        {if $p.private} - {trans 'Private project'}{/if}
+    </p>
+    <p>{$p.shortdesc}</p>
 </div>
 <div style="clear: both"></div>
 {/foreach}