You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/08/20 23:46:48 UTC
allura git commit: [#7972] auto-expand admin section of left sidebar,
when on admin page
Repository: allura
Updated Branches:
refs/heads/db/7972 [created] 66f68a227
[#7972] auto-expand admin section of left sidebar, when on admin page
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/66f68a22
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/66f68a22
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/66f68a22
Branch: refs/heads/db/7972
Commit: 66f68a227e2d89a2c53b256afcb7bda1d1a9fe16
Parents: 1cb99fa
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Thu Aug 20 21:46:37 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Aug 20 21:46:37 2015 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/sidebar_menu.html | 5 +++--
ForgeWiki/forgewiki/tests/functional/test_root.py | 8 +++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/66f68a22/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index af70a48..3d9ab06 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -61,10 +61,11 @@
{% set admin_menu = c.app.admin_menu() %}
{% endif %}
{% if admin_menu %}
- <a id='sidebar-admin-header' onclick='$("#sidebar-admin-menu").toggleClass("hidden");$("#sidebar-admin-header").toggleClass("expanded");return false;' href='#'>
+ <a id='sidebar-admin-header' onclick='$("#sidebar-admin-menu").toggleClass("hidden");$("#sidebar-admin-header").toggleClass("expanded");return false;'
+ href='#' {% if request.path.startswith(c.app.admin_url) %}class="expanded"{% endif %}>
{{sidebar_item(c.app.admin_menu_collapse_button)}}
</a>
- <div id='sidebar-admin-menu' class='hidden'>
+ <div id='sidebar-admin-menu' {% if not request.path.startswith(c.app.admin_url) %}class='hidden'{% endif %}>
{% for s in admin_menu %}
{{sidebar_item(s)}}
{% endfor %}
http://git-wip-us.apache.org/repos/asf/allura/blob/66f68a22/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index a42bce6..608045b 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -23,7 +23,7 @@ import allura
import json
import PIL
-from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal
+from nose.tools import assert_true, assert_equal, assert_in, assert_not_equal, assert_not_in
from ming.orm.ormsession import ThreadLocalORMSession
from mock import patch
from tg import config
@@ -823,11 +823,17 @@ class TestRootController(TestController):
def test_sidebar_admin_menu(self):
r = self.app.get('/p/test/wiki/Home/')
menu = r.html.find('div', {'id': 'sidebar-admin-menu'})
+ assert_equal(menu.attrMap['class'], 'hidden') # (not expanded)
menu = [li.find('span').getText() for li in menu.findAll('li')]
assert_equal(
menu,
['Set Home', 'Permissions', 'Options', 'Label', 'Delete'])
+ def test_sidebar_admin_menu_is_expanded(self):
+ r = self.app.get('/p/test/admin/wiki/permissions')
+ menu = r.html.find('div', {'id': 'sidebar-admin-menu'})
+ assert_not_in('hidden', menu.attrMap.get('class', '')) # expanded
+
def test_sidebar_admin_menu_invisible_to_not_admin(self):
def assert_invisible_for(username):
env = {'username': username}