Return-Path: 
 <allura-commits-return-3442-apmail-incubator-allura-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2133610554
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Wed,  1 May 2013 00:25:39 +0000 (UTC)
Received: (qmail 34936 invoked by uid 500); 1 May 2013 00:25:38 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 34885 invoked by uid 500); 1 May 2013 00:25:38 -0000
Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:allura-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:allura-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:allura-commits@incubator.apache.org>
List-Id: <allura-commits.incubator.apache.org>
Reply-To: allura-dev@incubator.apache.org
Delivered-To: mailing list allura-commits@incubator.apache.org
Received: (qmail 34744 invoked by uid 99); 1 May 2013 00:25:38 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 00:25:38 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 3EF74884BC6; Wed,  1 May 2013 00:25:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: johnsca@apache.org
To: allura-commits@incubator.apache.org
Date: Wed, 01 May 2013 00:25:39 -0000
Message-Id: <3c0237f82db743dabfcdcbe7de35504e@git.apache.org>
In-Reply-To: <3b5820fa902c43589c1299ae1c2895db@git.apache.org>
References: <3b5820fa902c43589c1299ae1c2895db@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/6] 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/e811d58e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e811d58e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e811d58e

Branch: refs/heads/cj/5599
Commit: e811d58e2e3a85c16746dc1b344c581c4a73d0eb
Parents: d34331e
Author: Jenny Steele <jsteele@geek.net>
Authored: Tue Mar 19 19:01:48 2013 -0700
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Tue Apr 30 23:28:07 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/e811d58e/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/e811d58e/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 %}