incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [17/20] git commit: [#5845] ticket:280 Wrapped project_admins and download_button macros output with <p> tag
Date Thu, 28 Feb 2013 22:38:16 GMT
[#5845] ticket:280 Wrapped project_admins and download_button macros output with <p>
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 <gotletter@gmail.com>
Authored: Thu Feb 21 17:32:31 2013 +0200
Committer: Dave Brondsema <dbrondsema@geek.net>
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 '<p>{}</p>'.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 @@
-<span class="download-button-{{project._id}}" style="margin-bottom: 1em; display: block;"></span>
+<p><span class="download-button-{{project._id}}" style="margin-bottom: 1em; display:
block;"></span></p>


Mime
View raw message