From 8f2e98d54d0fbef68a9147e0c81b0c5c38182454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 3 Jun 2015 16:56:56 +0200 Subject: [PATCH] admin: evolve backoffice style (#7454) --- wcs/admin/categories.py | 3 + wcs/admin/forms.py | 4 +- wcs/admin/roles.py | 3 + wcs/admin/users.py | 10 +- wcs/admin/workflows.py | 6 +- wcs/backoffice/management.py | 17 +-- wcs/qommon/backoffice/listing.py | 29 +++-- wcs/qommon/static/css/dc2/admin.css | 118 ++++++++++++++++++--- wcs/qommon/static/css/dc2/adwaita-lock.jpg | Bin 0 -> 54417 bytes wcs/qommon/static/css/dc2/gadjo.css | 87 +++++++++------ 10 files changed, 201 insertions(+), 76 deletions(-) create mode 100644 wcs/qommon/static/css/dc2/adwaita-lock.jpg diff --git a/wcs/admin/categories.py b/wcs/admin/categories.py index e75f48b30..064b23fb3 100644 --- a/wcs/admin/categories.py +++ b/wcs/admin/categories.py @@ -175,6 +175,8 @@ class CategoriesDirectory(Directory): html_top('categories', title = _('Categories')) r = TemplateIO(html=True) + r += htmltext('
') + r += htmltext('

%s

') % _('Categories') r += htmltext('') + r += htmltext('
') return r.getvalue() def get_sidebar(self): diff --git a/wcs/admin/forms.py b/wcs/admin/forms.py index da7d9750f..7967746fc 100644 --- a/wcs/admin/forms.py +++ b/wcs/admin/forms.py @@ -1464,12 +1464,12 @@ class FormsDirectory(AccessControlled, Directory): else: r += htmltext('
  • ') r += htmltext('%s') % (formdef.id, formdef.name) - r += htmltext('

    ') if formdef.disabled and formdef.disabled_redirection: + r += htmltext('

    ') r += htmltext('(') % formdef.disabled_redirection r += _('redirection') r += htmltext(') ') - r += htmltext('

    ') + r += htmltext('

    ') r += htmltext('
  • ') r += htmltext('') r += htmltext('') diff --git a/wcs/admin/roles.py b/wcs/admin/roles.py index 982c451ac..e63bbd609 100644 --- a/wcs/admin/roles.py +++ b/wcs/admin/roles.py @@ -206,6 +206,8 @@ class RolesDirectory(Directory): html_top('roles', title = _('Roles')) r = TemplateIO(html=True) + r += htmltext('
    ') + r += htmltext('

    %s

    ') % _('Roles') r += htmltext('') + r += htmltext('
    ') return r.getvalue() def get_sidebar(self): diff --git a/wcs/admin/users.py b/wcs/admin/users.py index a11447bdb..87c63b17d 100644 --- a/wcs/admin/users.py +++ b/wcs/admin/users.py @@ -372,6 +372,8 @@ class UsersDirectory(Directory): r += htmltext('') + r += htmltext('
    ') + r += htmltext('

    %s

    ') % _('Users') r += htmltext('') r += pagination_links(offset, limit, filtered_count) + r += htmltext('
    ') r += htmltext('') diff --git a/wcs/admin/workflows.py b/wcs/admin/workflows.py index 4f4d5a958..ad830c15f 100644 --- a/wcs/admin/workflows.py +++ b/wcs/admin/workflows.py @@ -1023,13 +1023,15 @@ class WorkflowsDirectory(Directory): get_response().filter['sidebar'] = self.get_sidebar() + r += htmltext('
    ') + r += htmltext('

    %s

    ') % _('Workflows') r += htmltext('') + r += htmltext('
    ') # .bo-block return r.getvalue() def get_sidebar(self): diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py index 43beca40d..9c0115c45 100644 --- a/wcs/backoffice/management.py +++ b/wcs/backoffice/management.py @@ -219,7 +219,7 @@ class ManagementDirectory(Directory): def display_forms(self, forms_list): r = TemplateIO(html=True) - r += htmltext('