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 EF55BEA9E for ; Thu, 28 Feb 2013 22:38:16 +0000 (UTC) Received: (qmail 63442 invoked by uid 500); 28 Feb 2013 22:38:16 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 63419 invoked by uid 500); 28 Feb 2013 22:38:16 -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 63354 invoked by uid 99); 28 Feb 2013 22:38:16 -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, 28 Feb 2013 22:38:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A2BC1C1DD; Thu, 28 Feb 2013 22:38:16 +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 X-Mailer: ASF-Git Admin Mailer Subject: [17/20] git commit: [#5845] ticket:280 Wrapped project_admins and download_button macros output with

tag Message-Id: <20130228223816.9A2BC1C1DD@tyr.zones.apache.org> Date: Thu, 28 Feb 2013 22:38:16 +0000 (UTC) [#5845] ticket:280 Wrapped project_admins and download_button macros output with

tag Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e514f37f Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e514f37f Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e514f37f Branch: refs/heads/cj/5788 Commit: e514f37f09575322a0d1aab1ebecfba988a63ef6 Parents: adaf637 Author: Aleksey 'LXj' Alekseyev Authored: Thu Feb 21 17:32:31 2013 +0200 Committer: Dave Brondsema Committed: Thu Feb 28 22:17:19 2013 +0000 ---------------------------------------------------------------------- Allura/allura/lib/macro.py | 2 +- .../allura/templates/widgets/download_button.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e514f37f/Allura/allura/lib/macro.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py index 44ebf2c..bfc7d11 100644 --- a/Allura/allura/lib/macro.py +++ b/Allura/allura/lib/macro.py @@ -332,4 +332,4 @@ def project_admins(): url=user_role.user.url(), name=user_role.user.display_name)) for user_role in admin_role.users_with_role()) - return output + return '

{}

'.format(output) http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e514f37f/Allura/allura/templates/widgets/download_button.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/widgets/download_button.html b/Allura/allura/templates/widgets/download_button.html index b9a98da..0bbc0df 100644 --- a/Allura/allura/templates/widgets/download_button.html +++ b/Allura/allura/templates/widgets/download_button.html @@ -1 +1 @@ - +