From c5ead4f1623a7c0a8cf6e1ed44f04d8aea4d1e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 21 Aug 2016 10:28:19 +0200 Subject: [PATCH 1/2] trivial: fix minor issues in generated HTML (#12890) --- wcs/admin/settings.py | 8 ++++---- wcs/backoffice/management.py | 5 ++--- wcs/qommon/template.py | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/wcs/admin/settings.py b/wcs/admin/settings.py index 2d61c32..cd86b1e 100644 --- a/wcs/admin/settings.py +++ b/wcs/admin/settings.py @@ -427,18 +427,18 @@ class SettingsDirectory(QommonSettingsDirectory): except AttributeError: continue - r += htmltext('
%s
%s
') % ( + r += htmltext('
%s
%s
') % ( method, _(method_admin.title), _(method_admin.label)) - r += htmltext('
%s
%s
') % ( + r += htmltext('
%s
%s
') % ( _('Session'), _('Configure session management')) roles = list(Role.select()) if roles: - r += htmltext('
%s
%s
') % ( + r += htmltext('
%s
%s
') % ( _('Admin Permissions'), _('Configure access to the administration interface')) - r += htmltext('') + r += htmltext('
') r += htmltext('
') r += htmltext('

%s

') % _('Import / Export') diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py index 9835179..1271ef3 100644 --- a/wcs/backoffice/management.py +++ b/wcs/backoffice/management.py @@ -733,7 +733,7 @@ class ManagementDirectory(Directory): r = TemplateIO(html=True) r += htmltext('') - r += htmltext('') + r += htmltext('') if include_criticality_level: r += htmltext('') else: @@ -746,7 +746,7 @@ class ManagementDirectory(Directory): r += htmltext('') % _('Last Modified') r += htmltext('') % _('User') r += htmltext('') % _('Status') - r += htmltext('') + r += htmltext('') r += htmltext('') workflows = {} visited_objects = get_publisher().get_visited_objects(exclude_user=get_session().user) @@ -802,7 +802,6 @@ class ManagementDirectory(Directory): 'background-color: #%s !important; color: %s !important; }\n' % ( workflow_id, status_id, bg_colour, fg_colour)) r += htmltext('') - r += htmltext('
%s%s%s
') if (offset > 0) or (total_count > limit > 0): diff --git a/wcs/qommon/template.py b/wcs/qommon/template.py index d02a7b3..24a2d8b 100644 --- a/wcs/qommon/template.py +++ b/wcs/qommon/template.py @@ -190,7 +190,6 @@ ADMIN_TEMPLATE_EZT = """ [if-any breadcrumb]

[breadcrumb]

[end] -
[body] -- 2.9.3