allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [24/27] git commit: [#7657] more convenient links (profile link already in column 1)
Date Mon, 29 Sep 2014 16:17:55 GMT
[#7657] more convenient links (profile link already in column 1)


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

Branch: refs/heads/db/7657
Commit: 4869d52dcce01aceaf7c656041e3eceb2f9283a5
Parents: a719b44
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Sep 26 21:57:21 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Sep 26 21:57:42 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/plugin.py                          |  1 -
 Allura/allura/templates/site_admin_user_details.html | 10 +++++++++-
 Allura/allura/tests/functional/test_site_admin.py    |  6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/4869d52d/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 701f95b..52218d7 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -305,7 +305,6 @@ class AuthenticationProvider(object):
         Links will show up at admin user search page.
         '''
         return [
-           (user.url(), 'Public profile'),
            ('/nf/admin/user/%s' % user.username, 'Details/Edit'),
         ]
 

http://git-wip-us.apache.org/repos/asf/allura/blob/4869d52d/Allura/allura/templates/site_admin_user_details.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_user_details.html b/Allura/allura/templates/site_admin_user_details.html
index 18d2dff..0666b5c 100644
--- a/Allura/allura/templates/site_admin_user_details.html
+++ b/Allura/allura/templates/site_admin_user_details.html
@@ -24,6 +24,8 @@
 {% block header %}User Details{% endblock %}
 
 {% block content %}
+   <div class="grid-23"><p><a href="/nf/admin">Back to Site Admin Home</a></p></div>
+
   {% block general_info %}
     <div class="grid-23">
       <fieldset>
@@ -129,7 +131,10 @@
         <legend>Projects</legend>
         <ul>
           {% for p in projects %}
-            <li><a href="{{ p.url() }}">{{p.name}}</a></li>
+            <li><a href="{{ p.url() }}">{{p.name}}</a>
+                <span class="spacer">&ndash;</span>
+                <a href="{{ p.url() }}admin/">Admin</a>
+            </li>
           {% endfor %}
         </ul>
       </fieldset>
@@ -144,6 +149,9 @@
   width: 860px;
   margin-left: 0;
 }
+li .spacer {
+   margin: 0 0.5em;
+}
 </style>
 {% endblock %}
 

http://git-wip-us.apache.org/repos/asf/allura/blob/4869d52d/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index e24e734..197d058 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -307,9 +307,9 @@ class TestUserDetails(TestController):
         # list of projects
         projects = r.html.findAll('fieldset')[-1]
         projects = [e.getText() for e in projects.findAll('li')]
-        assert_in('Test 2', projects)
-        assert_in('Test Project', projects)
-        assert_in('Adobe project 1', projects)
+        assert_in('Test 2&ndash;Admin', projects)
+        assert_in('Test Project&ndash;Admin', projects)
+        assert_in('Adobe project 1&ndash;Admin', projects)
 
     @patch('allura.model.auth.request')
     @patch('allura.lib.helpers.request')


Mime
View raw message