From c0ffc092d0bc4652c98dc10e61e58bcea0d76c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 22 Apr 2015 10:09:38 +0200 Subject: [PATCH 03/11] admin: use backoffice (now unified) menu items in header (#6726) --- wcs/admin/bounces.py | 3 ++- wcs/admin/categories.py | 2 +- wcs/admin/fields.py | 3 ++- wcs/admin/forms.py | 2 +- wcs/admin/menu.py | 3 ++- wcs/admin/roles.py | 2 +- wcs/admin/settings.py | 3 ++- wcs/admin/users.py | 3 ++- wcs/admin/workflows.py | 3 ++- wcs/qommon/admin/emails.py | 2 +- wcs/qommon/admin/logger.py | 3 ++- wcs/qommon/admin/menu.py | 59 -------------------------------------------- wcs/qommon/admin/settings.py | 2 +- wcs/qommon/admin/texts.py | 3 ++- wcs/qommon/ident/idp.py | 22 ++++++++--------- wcs/qommon/ident/password.py | 32 +++++++++--------------- 16 files changed, 43 insertions(+), 104 deletions(-) diff --git a/wcs/admin/bounces.py b/wcs/admin/bounces.py index a73c549..56a26d4 100644 --- a/wcs/admin/bounces.py +++ b/wcs/admin/bounces.py @@ -24,7 +24,8 @@ from quixote.html import htmltext, TemplateIO from qommon import errors from qommon import misc from qommon.bounces import Bounce -from qommon.admin.menu import html_top, command_icon +from qommon.backoffice.menu import html_top +from qommon.admin.menu import command_icon from qommon.form import * diff --git a/wcs/admin/categories.py b/wcs/admin/categories.py index 725b16a..e75f48b 100644 --- a/wcs/admin/categories.py +++ b/wcs/admin/categories.py @@ -20,7 +20,7 @@ from quixote.html import TemplateIO, htmltext from wcs.categories import Category from qommon.form import * -from qommon.admin.menu import html_top +from qommon.backoffice.menu import html_top from wcs.formdef import FormDef diff --git a/wcs/admin/fields.py b/wcs/admin/fields.py index 89f958d..f65e877 100644 --- a/wcs/admin/fields.py +++ b/wcs/admin/fields.py @@ -20,7 +20,8 @@ from quixote.html import TemplateIO, htmltext from qommon.form import * from qommon import errors, misc -from qommon.admin.menu import html_top, command_icon +from qommon.backoffice.menu import html_top +from qommon.admin.menu import command_icon from wcs import fields from wcs.formdef import FormDef diff --git a/wcs/admin/forms.py b/wcs/admin/forms.py index e3bbc92..9bdff97 100644 --- a/wcs/admin/forms.py +++ b/wcs/admin/forms.py @@ -29,7 +29,7 @@ from quixote.html import TemplateIO, htmltext from qommon import misc from qommon.errors import * from qommon.form import * -from qommon.admin.menu import html_top +from qommon.backoffice.menu import html_top from qommon import get_logger from qommon import tokens diff --git a/wcs/admin/menu.py b/wcs/admin/menu.py index a17eb2b..774c21a 100644 --- a/wcs/admin/menu.py +++ b/wcs/admin/menu.py @@ -14,4 +14,5 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, see . -from qommon.admin.menu import html_top, command_icon, error_page, get_vc_version +from qommon.backoffice.menu import html_top +from qommon.admin.menu import command_icon, error_page, get_vc_version diff --git a/wcs/admin/roles.py b/wcs/admin/roles.py index efd4b08..982c451 100644 --- a/wcs/admin/roles.py +++ b/wcs/admin/roles.py @@ -20,7 +20,7 @@ from quixote.html import TemplateIO, htmltext from qommon.form import * -from qommon.admin.menu import html_top +from qommon.backoffice.menu import html_top from wcs.roles import Role from wcs.formdef import FormDef diff --git a/wcs/admin/settings.py b/wcs/admin/settings.py index c24b739..b687b48 100644 --- a/wcs/admin/settings.py +++ b/wcs/admin/settings.py @@ -38,7 +38,8 @@ from qommon import errors from qommon.form import * from qommon.sms import SMS -from qommon.admin.menu import html_top, error_page +from qommon.backoffice.menu import html_top +from qommon.admin.menu import error_page from qommon.admin.cfg import cfg_submit from qommon.admin.emails import EmailsDirectory from qommon.admin.texts import TextsDirectory diff --git a/wcs/admin/users.py b/wcs/admin/users.py index 5b39db9..3666c59 100644 --- a/wcs/admin/users.py +++ b/wcs/admin/users.py @@ -27,7 +27,8 @@ from wcs.roles import Role import qommon.ident from qommon.form import * from qommon.admin.emails import EmailsDirectory -from qommon.admin.menu import html_top, error_page +from qommon.backoffice.menu import html_top +from qommon.admin.menu import error_page class UserUI(object): def __init__(self, user): diff --git a/wcs/admin/workflows.py b/wcs/admin/workflows.py index 705fc34..4f4d5a9 100644 --- a/wcs/admin/workflows.py +++ b/wcs/admin/workflows.py @@ -29,7 +29,8 @@ from quixote.html import TemplateIO, htmltext from qommon import errors from qommon import misc from qommon.form import * -from qommon.admin.menu import html_top, command_icon +from qommon.backoffice.menu import html_top +from qommon.admin.menu import command_icon from qommon import get_logger from wcs.workflows import * diff --git a/wcs/qommon/admin/emails.py b/wcs/qommon/admin/emails.py index 9a5aa97..6ee675f 100644 --- a/wcs/qommon/admin/emails.py +++ b/wcs/qommon/admin/emails.py @@ -20,7 +20,7 @@ from quixote.html import htmltext, TemplateIO from qommon.form import * from qommon import misc, get_cfg -from qommon.admin.menu import html_top +from qommon.backoffice.menu import html_top from qommon.admin.cfg import cfg_submit class EmailsDirectory(Directory): diff --git a/wcs/qommon/admin/logger.py b/wcs/qommon/admin/logger.py index bdc77ac..23ccfee 100644 --- a/wcs/qommon/admin/logger.py +++ b/wcs/qommon/admin/logger.py @@ -22,7 +22,8 @@ from quixote.html import htmltext, TemplateIO from quixote.directory import Directory from qommon import logger, errors -from qommon.admin.menu import html_top, error_page +from qommon.backoffice.menu import html_top +from qommon.admin.menu import error_page class ByUserDirectory(Directory): def _q_lookup(self, component): diff --git a/wcs/qommon/admin/menu.py b/wcs/qommon/admin/menu.py index d9527a6..dbcf458 100644 --- a/wcs/qommon/admin/menu.py +++ b/wcs/qommon/admin/menu.py @@ -122,65 +122,6 @@ vc_version = _find_vc_version() def get_vc_version(): return vc_version -def generate_header_menu(selected = None): - return get_publisher().get_admin_root().generate_header_menu(selected=selected) - -def generate_user_info(): - if not get_request().user: - return '' - - try: - username = get_session().get_user_object().display_name - except: - username = None - raise - - r = TemplateIO(html=True) - logout_url = get_publisher().get_root_url() + 'logout' - r += htmltext('') - return r.getvalue() - - -def html_top(section, title = None, scripts = None): - header_menu = generate_header_menu(section) - user_info = generate_user_info() - subtitle = '' - for s in get_publisher().get_admin_root().menu_items: - if s[0] == section or s[0] == '%s/' % section: - subtitle = _(s[1]) - if not title: - title = '' - if not scripts: - script = '' - else: - script = '\n'.join(['' % x for x in scripts]) - - org_name = get_cfg('sp', {}).get('organization_name', get_publisher().APP_NAME) - site_name = get_cfg('misc', {}).get('sitename', org_name) - if site_name: - sitetitle = _('Administration of %s') % site_name - else: - sitetitle = _('Administration') - if title: - sitetitle += ' - ' - - admin_ezt = True - get_response().filter.update(locals()) - def command_icon(url, type, label = None, icon = None, popup = False): icons = { 'edit': 'stock_edit_16.png', diff --git a/wcs/qommon/admin/settings.py b/wcs/qommon/admin/settings.py index 73940d5..b882469 100644 --- a/wcs/qommon/admin/settings.py +++ b/wcs/qommon/admin/settings.py @@ -20,7 +20,7 @@ from quixote.html import TemplateIO, htmltext from qommon.form import * from qommon.admin.cfg import cfg_submit -from qommon.admin.menu import html_top +from qommon.backoffice.menu import html_top class SettingsDirectory(AccessControlled, Directory): def _q_access(self): diff --git a/wcs/qommon/admin/texts.py b/wcs/qommon/admin/texts.py index ce7ab72..adaf522 100644 --- a/wcs/qommon/admin/texts.py +++ b/wcs/qommon/admin/texts.py @@ -23,7 +23,8 @@ from quixote.directory import Directory from qommon.form import * from qommon import misc, get_cfg, ezt -from qommon.admin.menu import html_top, is_accessible +from qommon.backoffice.menu import html_top +from qommon.admin.menu import is_accessible class TextsDirectory(Directory): diff --git a/wcs/qommon/ident/idp.py b/wcs/qommon/ident/idp.py index a5ca463..23fa465 100644 --- a/wcs/qommon/ident/idp.py +++ b/wcs/qommon/ident/idp.py @@ -38,7 +38,7 @@ from qommon import emails from qommon import template from qommon import errors -from qommon.admin.menu import html_top as admin_html_top +from qommon.backoffice.menu import html_top from qommon.admin.menu import command_icon from base import AuthMethod @@ -226,7 +226,7 @@ class AdminIDPDir(Directory): return Directory._q_traverse(self, path) def _q_index(self): - admin_html_top('settings', title = _(self.title)) + html_top('settings', title = _(self.title)) r = TemplateIO(html=True) r += htmltext('

%s

') % _('Identity Providers') r += htmltext('