moved error_page function to common and added a 'back' link

wcs/admin/bounces.ptl

@@ -5,11 +5,10 @@ import email.Parser
 from quixote import get_response, get_request, get_session, redirect
 from quixote.directory import Directory
 
-from menu import *
-
 from qommon import errors
 from qommon import misc
 from qommon.bounces import Bounce
+from qommon.admin.menu import html_top, command_icon, error_page
 
 from qommon.form import *
 

wcs/admin/categories.ptl

@@ -1,11 +1,10 @@
 from quixote import redirect
 from quixote.directory import Directory
 
-from menu import *
-
 from qommon import misc
 from wcs.categories import Category
 from qommon.form import *
+from qommon.admin.menu import html_top, command_icon, error_page
 
 class CategoryUI:
     def __init__(self, category):

wcs/admin/fields.ptl

@@ -7,13 +7,13 @@ from quixote import redirect, get_publisher
 from quixote.directory import Directory
 
 from qommon.form import *
-from menu import *
 from qommon import errors
+from qommon.admin.menu import html_top, command_icon, error_page
+
 from wcs import fields
 from wcs.formdef import FormDef
 from wcs.fields import get_field_types
 
-
 class FieldWidget(CompositeWidget):
     large = False
 

wcs/admin/forms.ptl

@@ -12,11 +12,11 @@ from cStringIO import StringIO
 from quixote import get_response, redirect
 from quixote.directory import Directory
 
-from menu import *
-
 from qommon import misc
 from qommon.errors import *
 from qommon.form import *
+from qommon.admin.menu import html_top, command_icon, error_page
+
 from wcs.formdata import FormData
 from wcs.formdef import FormDef, FormField
 from wcs.users import User
@@ -26,7 +26,6 @@ from wcs.workflows import Workflow
 
 from fields import FieldWidget, FieldDefPage, FieldsDirectory
 
-
 def ellipsize(s, length = 30):
     if not s or len(s) < length:
         return s

wcs/admin/logger.ptl

@@ -3,15 +3,14 @@ import random
 from quixote import get_publisher, get_request, get_response, redirect
 from quixote.directory import Directory
 
-from menu import *
-
-import wcs
 from qommon import logger
 from qommon import misc
 from qommon.form import *
-from wcs.users import User
 from qommon import template
+from qommon.admin.menu import html_top, command_icon, error_page
 
+import wcs
+from wcs.users import User
 
 class ByUserDirectory(Directory):
     def _q_lookup(self, component):

wcs/admin/menu.ptl

@@ -1,9 +1 @@
 from qommon.admin.menu import html_top, command_icon
-
-def error_page [html] (section, error):
-    html_top(section, title = _('Error'))
-    '<div id="error-page">'
-    '<h2>%s</h2>' % _('Error')
-    '<p>%s</p>' % error
-    '</div>'
-

wcs/admin/roles.ptl

@@ -4,9 +4,9 @@ from quixote.directory import Directory
 from qommon import misc
 from qommon.form import *
 
-from menu import *
-
 from qommon import errors
+from qommon.admin.menu import html_top, command_icon, error_page
+
 from wcs.roles import Role
 
 class RoleUI:

wcs/admin/settings.ptl

@@ -12,13 +12,12 @@ import base64
 from quixote import get_publisher, get_request, get_response, redirect
 from quixote.directory import Directory, AccessControlled
 
-from menu import *
-
 from qommon import misc, get_cfg
 from qommon.form import *
 
 from qommon.admin.emails import EmailsDirectory
 from qommon.admin.texts import TextsDirectory
+from qommon.admin.menu import html_top, command_icon, error_page
 import qommon.ident
 import qommon.template
 
@@ -652,12 +651,3 @@ class SettingsDirectory(AccessControlled, Directory):
 
         redirect('.')
 
-
-
-def error_page [html] (error_message):
-    html_top(_('Error'))
-    '<h1>%s</h1>' % _('Error')
-    '<div class="error-page">'
-    '<p>%s</p>' % error_message
-    '</div>'
-

wcs/admin/users.ptl

@@ -5,8 +5,6 @@ from cStringIO import StringIO
 from quixote import get_publisher, get_response, get_request, get_session, redirect
 from quixote.directory import Directory
 
-from menu import *
-
 from qommon import emails
 from qommon import errors
 from qommon import misc, get_cfg
@@ -16,7 +14,7 @@ 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, command_icon, error_page
 from qommon import ezt
 
 class UserUI:

wcs/admin/workflows.ptl

@@ -1,14 +1,12 @@
 from quixote import redirect, get_publisher
 from quixote.directory import Directory
 
-from menu import *
-
-
 from qommon import errors
 from qommon import misc
 from qommon.form import *
-from wcs.workflows import *
+from qommon.admin.menu import html_top, command_icon, error_page
 
+from wcs.workflows import *
 
 class WorkflowUI:
     def __init__(self, workflow):

wcs/backoffice/menu.ptl

@@ -4,14 +4,6 @@ from quixote.html import htmltext
 
 from qommon import get_cfg
 from qommon.backoffice.menu import html_top
-from qommon.admin.menu import command_icon
+from qommon.admin.menu import command_icon, error_page
 
 from wcs.users import User
-
-def error_page [html] (section, error):
-    html_top(section, title = _('Error'))
-    '<div id="error-page">'
-    '<h2>%s</h2>' % _('Error')
-    '<p>%s</p>' % error
-    '</div>'
-

wcs/qommon/admin/menu.ptl

@@ -128,3 +128,11 @@ def command_icon [html] (url, type, label = None, icon = None, popup = False):
   <input type="image" src="%(icon)s" alt="%(label)s" title="%(label)s" />
 </span>''' % locals()
 
+def error_page [html] (section, error):
+    html_top(section, title = _('Error'))
+    '<div id="error-page">'
+    '<h2>%s</h2>' % _('Error')
+    '<p>%s</p>' % error
+    '<a href="%s">%s</a>' % (get_request().get_url(), _('Back'))
+    '</div>'
+