allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [1/6] git commit: [#5481] ticket:313 fixed Project Admins
Date Fri, 12 Apr 2013 21:16:31 GMT
Updated Branches:
  refs/heads/cj/5481 [created] 20b4e57fd


[#5481] ticket:313 fixed Project Admins


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

Branch: refs/heads/cj/5481
Commit: 3d4b710a4ab7b08aff62c98744dd27469d431a5a
Parents: c2b304c
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Tue Apr 9 19:07:34 2013 +0400
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Fri Apr 12 17:16:16 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/macro.py          |    2 +-
 Allura/allura/tests/test_globals.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3d4b710a/Allura/allura/lib/macro.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index 829897b..0f2c65f 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -345,7 +345,7 @@ def project_admins():
                 url=user_role.user.url(),
                 name=user_role.user.display_name))
             for user_role in admin_role.users_with_role())
-    return u'<h6>Project Admins:</h6><p>{}</p>'.format(output)
+    return u'<h6>Project Admins:</h6><div class="grid-10">{}</div><div
style="clear: both;"></div>'.format(output)
 
 template_members = string.Template('<a href="$url">Members</a><br/>')
 @macro()

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3d4b710a/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index e52c00c..44c6850 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -157,7 +157,7 @@ def test_macro_project_admins():
     user = M.User.by_username('test-admin')
     user.display_name = u'Test Ådmin'
     r = g.markdown_wiki.convert('[[project_admins]]')
-    assert_equal(r, u'<div class="markdown_content"><h6>Project Admins:</h6><p><a
href="/u/test-admin/">Test Ådmin</a><br /></p>\n</div>')
+    assert_equal(r, u'<div class="markdown_content"><h6>Project Admins:</h6><div
class="grid-10"><a href="/u/test-admin/">Test Ådmin</a><br /></div><div
style="clear: both;"></div>\n</div>')
 
 def test_macro_project_admins_one_br():
     p_nbhd = M.Neighborhood.query.get(name='Projects')


Mime
View raw message