You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/08/13 20:07:14 UTC
[47/50] allura git commit: [#7922] ticket:834 Don't show admin
options twice on sidebar when left bar is hidden
[#7922] ticket:834 Don't show admin options twice on sidebar when left bar is hidden
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/858c38f6
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/858c38f6
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/858c38f6
Branch: refs/heads/ib/7922
Commit: 858c38f6d66e2d51dbdb855df2799516b46b725c
Parents: e4b92c7
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Aug 13 19:12:47 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Aug 13 19:12:47 2015 +0300
----------------------------------------------------------------------
.../templates/jinja_master/sidebar_menu.html | 17 +++++++++++------
ForgeWiki/forgewiki/wiki_main.py | 4 ++--
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/858c38f6/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 4505804..64102fc 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -55,21 +55,26 @@
{% endif %}
{% if c.app %}
{% if h.has_access(c.app, 'admin')() %}
- {% if c.app.admin_menu() %}
+ {% if c.app.tool_label.lower() == 'wiki' %}
+ {% set admin_menu = c.app.admin_menu(skip_common_menu=True) %}
+ {% else %}
+ {% set admin_menu = c.app.admin_menu() %}
+ {% endif %}
+ {% if admin_menu %}
<a id='sidebar-admin-header' onclick='$("#sidebar-admin-menu").toggleClass("hidden");'>
{{sidebar_item(c.app.admin_menu_collapse_button)}}
</a>
<div id='sidebar-admin-menu' class='hidden'>
- {% for s in c.app.admin_menu() %}
+ {% for s in 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()}}
+ {{c.app.admin_modal.display()}}
+ {% if c.app.admin_menu_delete_button %}
+ {{c.app.admin_tool_delete_modal.display()}}
+ {% endif %}
{% endif %}
{% endif %}
{% for s in c.app.sidebar_menu() %}
http://git-wip-us.apache.org/repos/asf/allura/blob/858c38f6/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 513b1e2..ce99198 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -257,7 +257,7 @@ The wiki uses [Markdown](%s) syntax.
SitemapEntry('Formatting Help', self.url + 'markdown_syntax/')]
return links
- def admin_menu(self):
+ def admin_menu(self, skip_common_menu=False):
admin_url = c.project.url() + \
'admin/' + \
self.config.options.mount_point + '/'
@@ -265,7 +265,7 @@ The wiki uses [Markdown](%s) syntax.
admin_url + 'home',
className='admin_modal')]
- if not self.show_left_bar:
+ if not self.show_left_bar and not skip_common_menu:
links += self.create_common_wiki_menu(True,
admin_url +
'create_wiki_page',