incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject git commit: [#5913] Don't link entire project header
Date Tue, 21 May 2013 19:57:25 GMT
Updated Branches:
  refs/heads/cj/5913 829e726b1 -> 8c41b1371


[#5913] Don't link entire project header

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8c41b137
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8c41b137
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8c41b137

Branch: refs/heads/cj/5913
Commit: 8c41b13718bb086da249ea0646dbb0900c68c010
Parents: 829e726
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Tue May 21 19:53:17 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Tue May 21 19:56:53 2013 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/nav_menu.html |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8c41b137/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index 67c44ab..15f7fac 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -35,21 +35,17 @@
          {% endif %}
       </div>
   {% endif %}
-  <a href="{{c.project.url()}}" class="project_link">
     {% if c.project.user_project_of %}
       {{lib.gravatar(c.project.user_project_of, size=48, className='project_icon')}}
     {% elif c.project.icon %}
       <img src="{{c.project.url()}}/icon?{{c.project.icon._id.generation_time}}" class="project_icon"
alt="Project Logo">
     {% endif %}
-	<h1 class="project_title">
-      {% if c.project.is_nbhd_project %}
-        {{c.project.neighborhood.name}}
-      {% else %}
-        {{c.project.name}}
-      {% endif %}
-	</h1>
+    <h1 class="project_title">
+      <a href="{{c.project.url()}}" class="project_link">{{ c.project.neighborhood.name
if c.project.is_nbhd_project else c.project.name }}</a>
+    </h1>
+    <h2>
         {{c.project.summary}}
-    </a>
+    </h2>
     <div class="brought-by{% if c.project.icon %} with-icon{% endif %}">
         Brought to you by:
         {% set admins = c.project.admins()|sort(attribute='username') %}


Mime
View raw message