Return-Path: 
 <allura-commits-return-2813-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 8C82FF9FD
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Thu,  4 Apr 2013 18:38:03 +0000 (UTC)
Received: (qmail 43215 invoked by uid 500); 4 Apr 2013 18:38:03 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 43155 invoked by uid 500); 4 Apr 2013 18:38:03 -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 42718 invoked by uid 99); 4 Apr 2013 18:38:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 18:38:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id BDD91837CB4; Thu,  4 Apr 2013 18:38:02 +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: Thu, 04 Apr 2013 18:38:24 -0000
Message-Id: <5cb3d8d9471f48cf92b26f6f969bdb44@git.apache.org>
In-Reply-To: <e0131e5af25f4ff986c6eca8cc92147b@git.apache.org>
References: <e0131e5af25f4ff986c6eca8cc92147b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [23/43] git commit: [5453] correct links in userstats

[5453] correct links in userstats


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

Branch: refs/heads/master
Commit: 3c59bd208c73b966bd734a2a65114d78fec079c1
Parents: 123a732
Author: Stefano Invernizzi <stefanoinve@apache.org>
Authored: Thu Jan 31 15:57:12 2013 +0100
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Thu Apr 4 18:37:35 2013 +0000

----------------------------------------------------------------------
 ForgeUserStats/forgeuserstats/templates/index.html |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3c59bd20/ForgeUserStats/forgeuserstats/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/index.html b/ForgeUserStats/forgeuserstats/templates/index.html
index abcb5de..37cd5da 100644
--- a/ForgeUserStats/forgeuserstats/templates/index.html
+++ b/ForgeUserStats/forgeuserstats/templates/index.html
@@ -13,6 +13,11 @@
 {% block content %}
   {% if user %}
 
+    {% if category %}
+       <ul>
+         <li><a href="/userstats/{{user.username}}">Go back to general statistics</a></li>
+       </ul>
+    {% endif %}
     <h2>General statistics</h2>
     <table>
       <thead>
@@ -352,7 +357,7 @@
           <tbody>
             {% for cat, count in categories %}
               <tr>
-                <td><a href="/userstats/{{user.username}}/category/{{cat.fullname}}">{{cat.fullname}}</a></td>
+                <td><a href="/userstats/{{user.username}}/category/{{cat.shortname}}">{{cat.fullname}}</a></td>
                 <td>{{count}}</td>
               </tr>
             {% endfor %}
@@ -368,9 +373,7 @@
           </p>
         {% endif %}
     {% endif %}
-    {% if category %}
-        <div class="grid-20"><a href="/userstats/{{user.username}}">Go back to general statistics</a></div>
-    {% else %}
+    {% if not category %}
       <h2>Overview</h2>
       <table>
         <thead>