--- a/src/pyams_content/features/redirect/zmi/container.py Thu Jul 19 22:15:29 2018 +0200
+++ b/src/pyams_content/features/redirect/zmi/container.py Thu Jul 19 22:15:47 2018 +0200
@@ -9,16 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyams_form.form import ajax_config, AJAXAddForm
-from pyams_form.interfaces.form import IWidgetsSuffixViewletsManager
-from pyams_form.schema import CloseButton
-from pyams_skin.help import ContentHelp
-from pyams_skin.interfaces.viewlet import IToolbarViewletManager
-from pyams_skin.skin import apply_skin
-from pyams_skin.viewlet.toolbar import ToolbarAction
-from pyams_template.template import template_config
-from pyams_utils.request import copy_request
-from pyams_zmi.form import AdminDialogAddForm
__docformat__ = 'restructuredtext'
@@ -29,9 +19,11 @@
# import interfaces
from pyams_content.features.redirect.interfaces import IRedirectionManagerTarget, IRedirectionManager
from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION
+from pyams_form.interfaces.form import IWidgetsSuffixViewletsManager
from pyams_i18n.interfaces import II18n
from pyams_sequence.interfaces import ISequentialIdInfo
from pyams_skin.interfaces import IPageHeader, IUserSkinnable, IContentHelp
+from pyams_skin.interfaces.viewlet import IToolbarViewletManager
from pyams_skin.layer import IPyAMSLayer
from pyams_zmi.interfaces.menu import ISiteManagementMenu
from pyams_zmi.layer import IAdminLayer
@@ -39,14 +31,22 @@
# import packages
from pyams_content.skin import pyams_content
+from pyams_form.form import AJAXAddForm
+from pyams_form.schema import CloseButton
from pyams_pagelet.pagelet import pagelet_config
+from pyams_skin.help import ContentHelp
from pyams_skin.page import DefaultPageHeaderAdapter
+from pyams_skin.skin import apply_skin
from pyams_skin.table import BaseTable, SorterColumn, VisibilitySwitcherColumn, TrashColumn, I18nColumn
from pyams_skin.viewlet.menu import MenuItem
+from pyams_skin.viewlet.toolbar import ToolbarAction
+from pyams_template.template import template_config
from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter
from pyams_utils.fanstatic import get_resource_path
+from pyams_utils.request import copy_request
from pyams_utils.url import absolute_url
from pyams_viewlet.viewlet import viewlet_config, Viewlet
+from pyams_zmi.form import AdminDialogAddForm
from pyams_zmi.view import ContainerAdminView
from pyramid.decorator import reify
from pyramid.exceptions import NotFound
@@ -362,11 +362,11 @@
translate = self.request.localizer.translate
for rule, source_url, target_url in changes:
if not message:
- message.append('{:<40} {:<40} => {:<40}'.format(translate(_("URL pattern")),
- translate(_("Input URL")),
- translate(_("Output URL"))))
- message.append('{:<40} {:<40} => {:<40}'.format('-' * 40, '-' * 40, '-' * 40))
- message.append('{:<40} {:<40} => {:<40}'.format(rule.url_pattern, source_url, target_url))
+ message.append('{:<40} | {:<40} | {:<40}'.format(translate(_("Input URL")),
+ translate(_("URL pattern")),
+ translate(_("Output URL"))))
+ message.append('{:<40}-|-{:<40}-|-{:<40}'.format('-' * 40, '-' * 40, '-' * 40))
+ message.append('{:<40} | {:<40} | {:<40}'.format(source_url, rule.url_pattern, target_url))
if not message:
message.append(translate(_("No matching rule!")))
return {