Return-Path: 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 7E91CD104 for ; Tue, 12 Mar 2013 20:04:52 +0000 (UTC) Received: (qmail 99409 invoked by uid 500); 12 Mar 2013 20:04:52 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 99238 invoked by uid 500); 12 Mar 2013 20:04:51 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 98835 invoked by uid 99); 12 Mar 2013 20:04:51 -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, 12 Mar 2013 20:04:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1223BD178; Tue, 12 Mar 2013 20:04:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] git commit: [5453] Improved code Message-Id: <20130312200451.1223BD178@tyr.zones.apache.org> Date: Tue, 12 Mar 2013 20:04:51 +0000 (UTC) [5453] Improved code Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/edf3925a Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/edf3925a Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/edf3925a Branch: refs/heads/si/5453 Commit: edf3925a2e395fafbc897a2136a1e2f68d7083af Parents: f80141c Author: Stefano Invernizzi Authored: Sat Feb 16 14:33:22 2013 +0100 Committer: Tim Van Steenburgh Committed: Tue Mar 12 16:29:58 2013 +0000 ---------------------------------------------------------------------- Allura/allura/templates/user_preferences.html | 1 + .../forgeuserstats/templates/artifacts.html | 2 +- .../forgeuserstats/templates/commits.html | 2 +- ForgeUserStats/forgeuserstats/templates/index.html | 2 +- .../forgeuserstats/templates/tickets.html | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/edf3925a/Allura/allura/templates/user_preferences.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/user_preferences.html b/Allura/allura/templates/user_preferences.html index 9947eff..8d4a118 100644 --- a/Allura/allura/templates/user_preferences.html +++ b/Allura/allura/templates/user_preferences.html @@ -133,6 +133,7 @@

Contribution statistics

+ {{g.theme.statistics_form.display(user=c.user)}}
{% endif %} http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/edf3925a/ForgeUserStats/forgeuserstats/templates/artifacts.html ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/templates/artifacts.html b/ForgeUserStats/forgeuserstats/templates/artifacts.html index d6a01d6..013c108 100644 --- a/ForgeUserStats/forgeuserstats/templates/artifacts.html +++ b/ForgeUserStats/forgeuserstats/templates/artifacts.html @@ -48,7 +48,7 @@ {% endif %} {% else %} - {% if not user.stats.visible %} + {% if user %}

Statistics not available

This user has set his or her preferences so that personal statistics are not visible http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/edf3925a/ForgeUserStats/forgeuserstats/templates/commits.html ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/templates/commits.html b/ForgeUserStats/forgeuserstats/templates/commits.html index cec0ab7..10d1c67 100644 --- a/ForgeUserStats/forgeuserstats/templates/commits.html +++ b/ForgeUserStats/forgeuserstats/templates/commits.html @@ -38,7 +38,7 @@
{% endif %} {% else %} - {% if not user.stats.visible %} + {% if user %}

Statistics not available

This user has set his or her preferences so that personal statistics are not visible http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/edf3925a/ForgeUserStats/forgeuserstats/templates/index.html ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/templates/index.html b/ForgeUserStats/forgeuserstats/templates/index.html index 4a8f504..653cd31 100644 --- a/ForgeUserStats/forgeuserstats/templates/index.html +++ b/ForgeUserStats/forgeuserstats/templates/index.html @@ -418,7 +418,7 @@

{% endif %} {% else %} - {% if not user.stats.visible %} + {% if user %}

Statistics not available

This user has set his or her preferences so that personal statistics are not visible http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/edf3925a/ForgeUserStats/forgeuserstats/templates/tickets.html ---------------------------------------------------------------------- diff --git a/ForgeUserStats/forgeuserstats/templates/tickets.html b/ForgeUserStats/forgeuserstats/templates/tickets.html index 6ee66d4..a713b25 100644 --- a/ForgeUserStats/forgeuserstats/templates/tickets.html +++ b/ForgeUserStats/forgeuserstats/templates/tickets.html @@ -48,7 +48,7 @@
{% endif %} {% else %} - {% if not user.stats.visible %} + {% if user %}

Statistics not available

This user has set his or her preferences so that personal statistics are not visible