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/17 21:38:15 UTC
[07/14] allura git commit: [#7922] ticket:834 Change menu header to
h3/link
[#7922] ticket:834 Change menu header to h3/link
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/43dcbc43
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/43dcbc43
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/43dcbc43
Branch: refs/heads/master
Commit: 43dcbc43e8f5f42774685079a80bf2a81f1fede6
Parents: 0ebdb9c
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Aug 13 18:37:58 2015 +0300
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Mon Aug 17 17:54:14 2015 +0000
----------------------------------------------------------------------
Allura/allura/app.py | 1 -
Allura/allura/nf/allura/css/allura.css | 4 ++-
.../templates/jinja_master/sidebar_menu.html | 35 ++++++--------------
3 files changed, 14 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/43dcbc43/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 5e19ed1..2829ab6 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -632,7 +632,6 @@ class Application(object):
"""Returns button for showing/hiding admin sidebar menu"""
return SitemapEntry(
label='Admin',
- url='#',
extra_html_attrs={
'id': 'sidebar-admin-menu-trigger',
})
http://git-wip-us.apache.org/repos/asf/allura/blob/43dcbc43/Allura/allura/nf/allura/css/allura.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css
index 17ee342..2fb97ed 100644
--- a/Allura/allura/nf/allura/css/allura.css
+++ b/Allura/allura/nf/allura/css/allura.css
@@ -86,4 +86,6 @@ tr.rev div.markdown_content p {
#phone_verification_overlay iframe {
height: 320px;
-}
\ No newline at end of file
+}
+
+#sidebar-admin-header { cursor: pointer; }
http://git-wip-us.apache.org/repos/asf/allura/blob/43dcbc43/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 752440c..4505804 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -55,35 +55,22 @@
{% endif %}
{% if c.app %}
{% if h.has_access(c.app, 'admin')() %}
- <style>
- #sidebar-admin-menu.hide ul li:not(:first-child) {
- display: none;
- }
- #sidebar-admin-menu.hide ul li:first-child {
- border-bottom: medium none;
- }
- </style>
- <div id='sidebar-admin-menu' class='hide'>
- {% for s in c.app.admin_menu() %}
- {% if loop.first %}
+ {% if c.app.admin_menu() %}
+ <a id='sidebar-admin-header' onclick='$("#sidebar-admin-menu").toggleClass("hidden");'>
{{sidebar_item(c.app.admin_menu_collapse_button)}}
- <script>
- $('#sidebar-admin-menu-trigger').click(function(e) {
- e.preventDefault();
- $(this).parents('li').toggleClass('active');
- $('#sidebar-admin-menu').toggleClass('hide');
- });
- </script>
- {% endif %}
- {{sidebar_item(s)}}
- {% endfor %}
- {{sidebar_item(c.app.admin_menu_delete_button)}}
- {{sidebar_item(None)}}
+ </a>
+ <div id='sidebar-admin-menu' class='hidden'>
+ {% for s in c.app.admin_menu() %}
+ {{sidebar_item(s)}}
+ {% endfor %}
+ {{sidebar_item(c.app.admin_menu_delete_button)}}
+ {{sidebar_item(None)}}
+ </div>
+ {% endif %}
{{c.app.admin_modal.display()}}
{% if c.app.admin_menu_delete_button %}
{{c.app.admin_tool_delete_modal.display()}}
{% endif %}
- </div>
{% endif %}
{% for s in c.app.sidebar_menu() %}
{{sidebar_item(s)}}