allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [5/5] allura git commit: [#8046] Make nbhd nav_menu look cleaner and positioned to the left
Date Mon, 25 Jan 2016 22:45:03 GMT
[#8046] Make nbhd nav_menu look cleaner and positioned to the left


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

Branch: refs/heads/hs/8046
Commit: 0bfa491edd0bf908571cc8bdf11ba29e577048d3
Parents: 0749d84
Author: Heith Seewald <heiths@gmail.com>
Authored: Mon Jan 25 17:43:55 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Mon Jan 25 17:44:32 2016 -0500

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/master.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/0bfa491e/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index dbb6dae..f4ec78f 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -88,11 +88,16 @@
 {{ theme_macros.site_notification() }}
 {% set flash = tg.flash_obj.render('flash', use_js=False) %}
 <section id="page-body" class="{{ g.document_class(neighborhood) }}">
-    <div id="nav_menu_holder">
+<div id="nav_menu_holder">
+    {% if c.project and c.project.is_nbhd_project %}
+        {% set neighborhood=c.project.neighborhood %}
+            {% include 'allura:templates/jinja_master/neigh_nav_menu.html' with context %}
+    {% else %}
         {% block nav_menu %}
             {% include g.theme.nav_menu %}
         {% endblock %}
-    </div>
+    {% endif %}
+</div>
     <div id="top_nav" class="">
         {% block top_nav %}
             {% include g.theme.top_nav %}


Mime
View raw message