Return-Path: 
 <allura-commits-return-3867-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 41066DAFF
	for <apmail-incubator-allura-commits-archive@minotaur.apache.org>;
 Tue, 14 May 2013 18:03:31 +0000 (UTC)
Received: (qmail 48145 invoked by uid 500); 14 May 2013 18:03:31 -0000
Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org
Received: (qmail 48028 invoked by uid 500); 14 May 2013 18:03:30 -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 48013 invoked by uid 99); 14 May 2013 18:03:30 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 18:03:30 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 8B4B287A8; Tue, 14 May 2013 18:03:30 +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: Tue, 14 May 2013 18:03:30 -0000
Message-Id: <31394a6013ab49e8b402fc710f7ba99e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/13] git commit: [#6212] omit LOC data from templates,
 when disabled

Updated Branches:
  refs/heads/cj/5571 d27706e61 -> aacd198d1 (forced update)


[#6212] omit LOC data from templates, when disabled


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

Branch: refs/heads/cj/5571
Commit: b20122df3e5b2ef6040fcaf62571b205eab3b47e
Parents: c7d03b3
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Mon May 13 21:56:02 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Mon May 13 21:56:19 2013 +0000

----------------------------------------------------------------------
 .../forgeuserstats/templates/commits.html          |   14 +++++++++-----
 ForgeUserStats/forgeuserstats/templates/index.html |    2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b20122df/ForgeUserStats/forgeuserstats/templates/commits.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/commits.html b/ForgeUserStats/forgeuserstats/templates/commits.html
index 6f8c2b1..b7ee786 100644
--- a/ForgeUserStats/forgeuserstats/templates/commits.html
+++ b/ForgeUserStats/forgeuserstats/templates/commits.html
@@ -40,15 +40,19 @@
           <tr>
             <th>Category</th>
             <th>Number of commits</th>
-            <th>Lines of code</th>
+            {% if h.asbool(config.get('userstats.count_lines_of_code', True)) %}
+                <th>Lines of code</th>
+            {% endif %}
           </tr>
         </thead>
-        <tbody> 
+        <tbody>
           {% for cat, el in data.items() %}
             <tr>
               <td>{% if cat %}{{cat.fullname}}{% else %}All categories{% endif %}</td>
               <td>{{el.number}}</td>
-              <td>{{el.lines}}</td>
+              {% if h.asbool(config.get('userstats.count_lines_of_code', True)) %}
+                <td>{{el.lines}}</td>
+              {% endif %}
             {% endfor %}
           </tr>
         </tbody>
@@ -58,13 +62,13 @@
   {% else %}
     {% if user %}
       <h2>Statistics not available</h2>
-      <div class="grid-20"> 
+      <div class="grid-20">
         This user has set his or her preferences so that personal statistics are not visible
         to other users of the forge.
       </div>
     {% else %}
       <h2>Invalid user</h2>
-      <div class="grid-20"> 
+      <div class="grid-20">
         You are looking for personal statistics of a user which doesn't exist on this forge. Check your url.
       </div>
     {% endif %}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b20122df/ForgeUserStats/forgeuserstats/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/templates/index.html b/ForgeUserStats/forgeuserstats/templates/index.html
index d171677..08fd14c 100644
--- a/ForgeUserStats/forgeuserstats/templates/index.html
+++ b/ForgeUserStats/forgeuserstats/templates/index.html
@@ -118,6 +118,7 @@
             </td>
           {% endif %}
         </tr>
+        {% if h.asbool(config.get('userstats.count_lines_of_code', True)) %}
         <tr>
           <td>
             {% if totcommits.lines > 0 %}
@@ -141,6 +142,7 @@
             </td>
           {% endif %}
         </tr>
+        {% endif %}
         <tr>
           <td>
             {% if totartifacts.created > 0 %}