You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/05/08 00:29:38 UTC
[08/50] [abbrv] git commit: [#5913] Updated to use new nav style
[#5913] Updated to use new nav style
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/833aa4a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/833aa4a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/833aa4a9
Branch: refs/heads/tv/2053
Commit: 833aa4a9823103697228eca014c5d7213ef0571a
Parents: 404b152
Author: Jenny Steele <js...@geek.net>
Authored: Tue Mar 19 19:01:48 2013 -0700
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed May 1 20:38:36 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/master.html | 2 +-
Allura/allura/templates/jinja_master/top_nav.html | 36 +++++++++-------
2 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/833aa4a9/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 11482a7..00052c1 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -82,7 +82,7 @@
{% include g.theme.nav_menu %}
{% endblock %}
</div>
- <div id="top_nav" class="">
+ <div id="main_nav" class="">
{% block top_nav %}
{% include g.theme.top_nav %}
{% endblock %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/833aa4a9/Allura/allura/templates/jinja_master/top_nav.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html
index 1e4f54a..7304f4c 100644
--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -17,24 +17,28 @@
under the License.
-#}
{% if c.project %}
+ <div><ul>
{% for s in c.project.grouped_navbar_entries() %}
- <a href="{{s.url}}" class="ui-icon-{{s.ui_icon or 'admin'}}">
- {{s.label}}
- {% if s.label == 'Home' %}
- {% set url_length = s.url|length %}
- {% if request.url.rfind(s.url, -url_length) != -1 %}
- <span class="diamond"></span>
- {% endif %}
- {% else %}
- {% if s.matches_url(request) or c.project.neighborhood.url()+'_admin' in request.upath_info %}
- <span class="diamond"></span>
- {% endif %}
+ {% set selected = False %}
+ {% if s.label == 'Home' %}
+ {% set url_length = s.url|length %}
+ {% if request.url.rfind(s.url, -url_length) != -1 %}
+ {% set selected = True %}
{% endif %}
- {% set grouped_tool_count = s.matching_urls|length %}
- {% if grouped_tool_count %}
- <span class="tool-count">{{grouped_tool_count}}</span>
+ {% else %}
+ {% if s.matches_url(request) or c.project.neighborhood.url()+'_admin' in request.upath_info %}
+ {% set selected = True %}
{% endif %}
- </a>
+ {% endif %}
+ <li{% if selected %} class="selected"{% endif %}>
+ <a href="{{s.url}}">
+ {{s.label}}
+ {% set grouped_tool_count = s.matching_urls|length %}
+ {% if grouped_tool_count %}
+ <span class="tool-count">{{grouped_tool_count}}</span>
+ {% endif %}
+ </a>
+ </li>
{% endfor %}
- <div style="clear:both"></div>
+ </div></ul>
{% endif %}