Return-Path: 
 <allura-commits-return-6142-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 C4B7E1029C
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Fri,  6 Sep 2013 21:05:39 +0000 (UTC)
Received: (qmail 61388 invoked by uid 500); 6 Sep 2013 21:05:39 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 61344 invoked by uid 500); 6 Sep 2013 21:05:39 -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 61222 invoked by uid 99); 6 Sep 2013 21:05:39 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Sep 2013 21:05:39 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2D4DF902CA6; Fri,  6 Sep 2013 21:05:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: brondsem@apache.org
To: allura-commits@incubator.apache.org
Date: Fri, 06 Sep 2013 21:05:43 -0000
Message-Id: <6e4ee85de29b4f3f8c9d4bdf0df69f20@git.apache.org>
In-Reply-To: <a69f26b47c5e4929a286a183bbb134b7@git.apache.org>
References: <a69f26b47c5e4929a286a183bbb134b7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/10] git commit: [#6545] ignore query string when checking for
 active sidebar item

[#6545] ignore query string when checking for active sidebar item


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

Branch: refs/heads/db/6545
Commit: f66411014598f23683e88992ca32655b80baa95b
Parents: 3a75d47
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Sep 6 20:33:41 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 6 20:34:28 2013 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/sidebar_menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f6641101/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index f8b9c8e..08beed2 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -23,7 +23,7 @@
       <ul class="sidebarmenu">
       {% do ul_active.append(True) %}
     {% endif %}
-    <li{% if request.url.find(s.url,-s.url.__len__()) != -1 %} class="active"{% endif %}>
+    <li{% if request.path.find(s.url,-s.url.__len__()) != -1 %} class="active"{% endif %}>
       <a href="{{s.url}}"{% if s.className %} class="{{s.className or ''}}"{% endif %}>{% if s.ui_icon %}<b data-icon="{{s.ui_icon.char}}" class="ico {{s.ui_icon.css}}"></b> {% endif %}<span{% if s.small != None %} class="has_small"{% endif %}>{{h.really_unicode(s.label)}}</span>{% if s.small != None %}<small>{{s.small}}</small>{% endif %}</a>
     </li>
   {% else %}