[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./conga.spec.in.in luci/plone-custom/bas ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic sourceware org	2006-07-26 18:03:57

Modified files:
	.              : conga.spec.in.in 
	luci/plone-custom: base.css custom.xml failsafe_login_form 
	                   login_form login_form_validate login_password 
	                   login_success portlet_login 
	luci/site/luci/var: Data.fs 
	make           : version.in 
Added files:
	luci/plone-custom: join_form_validate logged_out 
Removed files:
	luci/plone-custom: login_initial login_next registered 

Log message:
	Update Luci to Plone 2.5
	New build: conga-0.8-9

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/join_form_validate.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/logged_out.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/base.css.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/custom.xml.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/failsafe_login_form.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_form.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_form_validate.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_password.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_success.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/portlet_login.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_initial.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/login_next.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/registered.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- conga/conga.spec.in.in	2006/07/25 21:00:40	1.19
+++ conga/conga.spec.in.in	2006/07/26 18:03:55	1.20
@@ -119,7 +119,7 @@
 %else
 Requires: python
 Requires: zope
-Requires: plone
+Requires: plone >= 2.5
 %endif
 Requires: openssl mailcap stunnel 
 Requires: sed util-linux
@@ -472,6 +472,8 @@
 
 
 %changelog
+* Wed Jul 26 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-9
+- Update Luci to Plone 2.5
 * Tue Jul 25 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-8
 - New build with a lot of implementation details on Luci
 - Last build with plone 2.1.2
/cvs/cluster/conga/luci/plone-custom/join_form_validate,v  -->  standard output
revision 1.1
--- conga/luci/plone-custom/join_form_validate
+++ -	2006-07-26 18:03:58.840615000 +0000
@@ -0,0 +1,57 @@
+## Controller Validator "join_form_validate"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind state=state
+##bind subpath=traverse_subpath
+##parameters=username='',email='',password='',password_confirm=''
+##title=validates the Registration of a User
+##
+from Products.CMFPlone import PloneMessageFactory as _
+
+return state.set(status='failure')
+
+reg_tool=context.portal_registration
+def missing(field):
+    state.setError(field, _(u'This field is required, please provide some information.'), 'input_required')
+def nomatch(field):
+    state.setError(field, _(u'Passwords do not match.'), 'nomatch_password')
+def minlimit(field):
+    state.setError(field, _(u'Passwords must contain at least 5 letters.'), 'min_password')
+def notallowed(field):
+    state.setError(field, _(u'This username is reserved. Please choose a different name.'), 'not_allowed')
+
+if not username:
+    missing('username')
+if not email:
+    missing('email')
+if username and username == context.portal_url.getPortalObject().getId():
+    notallowed('username')
+
+properties = context.portal_properties.site_properties
+if not properties.validate_email:
+     if password!=password_confirm:
+         nomatch('password')
+         nomatch('password_confirm')
+
+     if not password:
+         missing('password')
+     if not password_confirm:
+         missing('password_confirm')
+
+     if not state.getError('password') and len(password) < 5:
+         minlimit('password')
+         minlimit('password_confirm')
+
+if not state.getError('username') and not reg_tool.isMemberIdAllowed(username):
+    state.setError('username',
+                   _(u'The login name you selected is already in use or is not valid. Please choose another.'),
+                   'username_invalid' )
+
+if state.getErrors():
+    context.plone_utils.addPortalMessage(_(u'Please correct the indicated errors.'))
+    return state.set(status='failure')
+else:
+    context.plone_utils.addPortalMessage(_(u'You have been registered.'))
+    return state
/cvs/cluster/conga/luci/plone-custom/logged_out,v  -->  standard output
revision 1.1
--- conga/luci/plone-custom/logged_out
+++ -	2006-07-26 18:03:58.932797000 +0000
@@ -0,0 +1,35 @@
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"
+      lang="en"
+      metal:use-macro="here/main_template/macros/master"
+      i18n:domain="plone">
+
+    <metal:block fill-slot="top_slot"
+                 tal:define="dummy python:request.set('disable_border',1)" />
+
+<div metal:fill-slot="main">
+
+<tal:reallyloggedout condition="isAnon">
+  <h1 i18n:translate="heading_signed_out">You are now logged out</h1>
+
+  <div i18n:translate="description_logged_out" tal:omit-tag="">
+    <p>We hope you enjoyed using our services. We look forward to seeing you again.</p>
+
+    <p>Best Regards from the
+      <strong tal:content="python:container.portal_url.getPortalObject().Title()" i18n:name="portal_title">portal title</strong>
+      team.
+    </p>
+  </div>
+</tal:reallyloggedout>
+
+<tal:notloggedoutafterall tal:condition="not: isAnon">
+    <h1 i18n:translate="heading_quit_to_log_out">Quit your web browser to log out</h1>
+    
+    <p i18n:translate="description_quit_to_log_out">
+    Because you are logged in via HTTP authentication, the only
+    way to log out is to quit your web browser.
+    </p>
+</tal:notloggedoutafterall>
+
+</div>
+
+</html>
--- conga/luci/plone-custom/base.css	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/base.css	2006/07/26 18:03:55	1.2
@@ -235,5 +235,37 @@
     display: none;
 }
 
+/* Accessibility and visual enhancement elements */
+
+.hiddenStructure {
+    display: block;
+    background: transparent;
+    background-image: none; /* safari bug */
+    border: none;
+    height: 1px;
+    overflow: hidden;
+    padding: 0;
+    margin: -1px 0 0 -1px;
+    width: 1px;
+}
+
+.contentViews .hiddenStructure,
+.contentActions .hiddenStructure {
+    position: absolute;
+    top: -200px;
+    left: -200px;
+}
+
+.hiddenLabel {
+    display: block;
+    background: transparent;
+    background-image: none; /* safari bug */
+    border: none;
+    height: 1px;
+    overflow: hidden;
+    padding: 0;
+    margin: -1px 0 0 -1px;
+    width: 1px;
+}
 
 /* </dtml-with> */
--- conga/luci/plone-custom/custom.xml	2006/07/26 11:24:02	1.2
+++ conga/luci/plone-custom/custom.xml	2006/07/26 18:03:55	1.3
@@ -1,358 +1,390 @@
 <?xml version="1.0"?>
 <ZopeData>
-  <record id="25074" aka="AAAAAAAAYfI=">
+  <record id="25054" aka="AAAAAAAAYd4=">
     <pickle>
-      <tuple id="25074.2">
-          <global id="25074.1" name="Folder" module="OFS.Folder"/>
+      <tuple id="25054.2">
+          <global id="25054.1" name="Folder" module="OFS.Folder"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25074.3">
+      <dictionary id="25054.3">
         <item>
-            <key> <string id="25074.4" encoding="repr">colophon</string> </key>
+            <key> <string id="25054.4" encoding="repr">colophon</string> </key>
             <value>
-              <persistent> <string id="25074.5" encoding="base64">AAAAAAAAYfM=</string> </persistent>
+              <persistent> <string id="25054.5" encoding="base64">AAAAAAAAYd8=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.6" encoding="repr">login_form</string> </key>
+            <key> <string id="25054.6" encoding="repr">default_error_message_CUSTOM</string> </key>
             <value>
-              <persistent> <string id="25074.7" encoding="base64">AAAAAAAAYfQ=</string> </persistent>
+              <persistent> <string id="25054.7" encoding="base64">AAAAAAAAYeE=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.8" encoding="repr">id</string> </key>
-            <value> <string id="25074.9" encoding="repr">custom</string> </value>
+            <key> <string id="25054.8" encoding="repr">logged_out</string> </key>
+            <value>
+              <persistent> <string id="25054.9" encoding="base64">AAAAAAAAYkA=</string> </persistent>
+            </value>
         </item>
         <item>
-            <key> <string id="25074.10" encoding="repr">default_error_message</string> </key>
+            <key> <string id="25054.10" encoding="repr">login_form</string> </key>
             <value>
-              <persistent> <string id="25074.11" encoding="base64">AAAAAAAAYfU=</string> </persistent>
+              <persistent> <string id="25054.11" encoding="base64">AAAAAAAAYkM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.12" encoding="repr">title</string> </key>
+            <key> <string id="25054.12" encoding="repr">id</string> </key>
+            <value> <string id="25054.13" encoding="repr">custom</string> </value>
+        </item>
+        <item>
+            <key> <string id="25054.14" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25074.13" encoding="repr">document_edit_form_TEST</string> </key>
+            <key> <string id="25054.15" encoding="repr">document_edit_form_TEST</string> </key>
             <value>
-              <persistent> <string id="25074.14" encoding="base64">AAAAAAAAYfY=</string> </persistent>
+              <persistent> <string id="25054.16" encoding="base64">AAAAAAAAYeI=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.15" encoding="repr">failsafe_login_form</string> </key>
+            <key> <string id="25054.17" encoding="repr">failsafe_login_form</string> </key>
             <value>
-              <persistent> <string id="25074.16" encoding="base64">AAAAAAAAYfc=</string> </persistent>
+              <persistent> <string id="25054.18" encoding="base64">AAAAAAAAYeM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.17" encoding="repr">logo.jpg</string> </key>
+            <key> <string id="25054.19" encoding="repr">logo.jpg</string> </key>
             <value>
-              <persistent> <string id="25074.18" encoding="base64">AAAAAAAAYfg=</string> </persistent>
+              <persistent> <string id="25054.20" encoding="base64">AAAAAAAAYeQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.19" encoding="repr">_objects</string> </key>
+            <key> <string id="25054.21" encoding="repr">_objects</string> </key>
             <value>
-              <tuple id="25074.88">
-                  <dictionary id="25074.20">
+              <tuple id="25054.101">
+                  <dictionary id="25054.22">
+                    <item>
+                        <key> <string id="25054.23" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.24" encoding="repr">Controller Page Template</string> </value>
+                    </item>
+                    <item>
+                        <key> <string id="25054.25" encoding="repr">id</string> </key>
+                        <value> <reference id="25054.15"/> </value>
+                    </item>
+                  </dictionary>
+                  <dictionary id="25054.26">
+                    <item>
+                        <key> <reference id="25054.23"/> </key>
+                        <value> <string id="25054.27" encoding="repr">File</string> </value>
+                    </item>
+                    <item>
+                        <key> <reference id="25054.25"/> </key>
+                        <value> <string id="25054.28" encoding="repr">dropdown.js_TEST</string> </value>
+                    </item>
+                  </dictionary>
+                  <dictionary id="25054.29">
                     <item>
-                        <key> <string id="25074.21" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.22" encoding="repr">Controller Page Template</string> </value>
+                        <key> <reference id="25054.23"/> </key>
+                        <value> <reference id="25054.27"/> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.23" encoding="repr">id</string> </key>
-                        <value> <reference id="25074.13"/> </value>
+                        <key> <reference id="25054.25"/> </key>
+                        <value> <string id="25054.30" encoding="repr">highlightsearchterms.js_TEST</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.24">
+                  <dictionary id="25054.31">
                     <item>
-                        <key> <reference id="25074.21"/> </key>
-                        <value> <string id="25074.25" encoding="repr">File</string> </value>
+                        <key> <reference id="25054.23"/> </key>
+                        <value> <reference id="25054.27"/> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.23"/> </key>
-                        <value> <string id="25074.26" encoding="repr">dropdown.js_TEST</string> </value>
+                        <key> <reference id="25054.25"/> </key>
+                        <value> <string id="25054.32" encoding="repr">login.js_TEST</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.27">
+                  <dictionary id="25054.33">
                     <item>
-                        <key> <reference id="25074.21"/> </key>
-                        <value> <reference id="25074.25"/> </value>
+                        <key> <reference id="25054.23"/> </key>
+                        <value> <reference id="25054.24"/> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.23"/> </key>
-                        <value> <string id="25074.28" encoding="repr">highlightsearchterms.js_TEST</string> </value>
+                        <key> <reference id="25054.25"/> </key>
+                        <value> <string id="25054.34" encoding="repr">login_form_TEST</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.29">
+                  <dictionary id="25054.35">
                     <item>
-                        <key> <reference id="25074.21"/> </key>
-                        <value> <reference id="25074.25"/> </value>
+                        <key> <string id="25054.36" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.37" encoding="repr">Image</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.23"/> </key>
-                        <value> <string id="25074.30" encoding="repr">login.js_TEST</string> </value>
+                        <key> <string id="25054.38" encoding="repr">id</string> </key>
+                        <value> <reference id="25054.19"/> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.31">
+                  <dictionary id="25054.39">
                     <item>
-                        <key> <reference id="25074.21"/> </key>
-                        <value> <reference id="25074.22"/> </value>
+                        <key> <string id="25054.40" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.41" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.23"/> </key>
-                        <value> <string id="25074.32" encoding="repr">login_form_TEST</string> </value>
+                        <key> <string id="25054.42" encoding="repr">id</string> </key>
+                        <value> <string id="25054.43" encoding="repr">footer</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.33">
+                  <dictionary id="25054.44">
                     <item>
-                        <key> <string id="25074.34" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.35" encoding="repr">Image</string> </value>
+                        <key> <string id="25054.45" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.46" encoding="repr">External Method</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.36" encoding="repr">id</string> </key>
-                        <value> <reference id="25074.17"/> </value>
+                        <key> <string id="25054.47" encoding="repr">id</string> </key>
+                        <value> <string id="25054.48" encoding="repr">siteIsSetup</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.37">
+                  <dictionary id="25054.49">
                     <item>
-                        <key> <string id="25074.38" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.39" encoding="repr">Page Template</string> </value>
+                        <key> <string id="25054.50" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.51" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.40" encoding="repr">id</string> </key>
-                        <value> <string id="25074.41" encoding="repr">footer</string> </value>
+                        <key> <string id="25054.52" encoding="repr">id</string> </key>
+                        <value> <reference id="25054.4"/> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.42">
+                  <dictionary id="25054.53">
                     <item>
-                        <key> <string id="25074.43" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.44" encoding="repr">External Method</string> </value>
+                        <key> <string id="25054.54" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.55" encoding="repr">Controller Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.45" encoding="repr">id</string> </key>
-                        <value> <string id="25074.46" encoding="repr">siteIsSetup</string> </value>
+                        <key> <string id="25054.56" encoding="repr">id</string> </key>
+                        <value> <string id="25054.57" encoding="repr">failsafe_login_form</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.47">
+                  <dictionary id="25054.58">
                     <item>
-                        <key> <string id="25074.48" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.49" encoding="repr">Page Template</string> </value>
+                        <key> <reference id="25054.54"/> </key>
+                        <value> <reference id="25054.55"/> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.50" encoding="repr">id</string> </key>
-                        <value> <reference id="25074.10"/> </value>
+                        <key> <reference id="25054.56"/> </key>
+                        <value> <string id="25054.59" encoding="repr">login_password</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.51">
+                  <dictionary id="25054.60">
                     <item>
-                        <key> <string id="25074.52" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.53" encoding="repr">Page Template</string> </value>
+                        <key> <string id="25054.61" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.62" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.54" encoding="repr">id</string> </key>
-                        <value> <reference id="25074.4"/> </value>
+                        <key> <string id="25054.63" encoding="repr">id</string> </key>
+                        <value> <string id="25054.64" encoding="repr">login_success</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.55">
+                  <dictionary id="25054.65">
                     <item>
-                        <key> <string id="25074.56" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.57" encoding="repr">Controller Page Template</string> </value>
+                        <key> <reference id="25054.61"/> </key>
+                        <value> <string id="25054.66" encoding="repr">Controller Validator</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.58" encoding="repr">id</string> </key>
-                        <value> <string id="25074.59" encoding="repr">failsafe_login_form</string> </value>
+                        <key> <reference id="25054.63"/> </key>
+                        <value> <string id="25054.67" encoding="repr">login_form_validate</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.60">
+                  <dictionary id="25054.68">
                     <item>
-                        <key> <reference id="25074.56"/> </key>
-                        <value> <reference id="25074.57"/> </value>
+                        <key> <reference id="25054.61"/> </key>
+                        <value> <reference id="25054.66"/> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.58"/> </key>
-                        <value> <string id="25074.61" encoding="repr">login_form</string> </value>
+                        <key> <reference id="25054.63"/> </key>
+                        <value> <string id="25054.69" encoding="repr">join_form_validate</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.62">
+                  <dictionary id="25054.70">
                     <item>
-                        <key> <reference id="25074.56"/> </key>
-                        <value> <reference id="25074.57"/> </value>
+                        <key> <string id="25054.71" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.72" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.58"/> </key>
-                        <value> <string id="25074.63" encoding="repr">login_password</string> </value>
+                        <key> <string id="25054.73" encoding="repr">id</string> </key>
+                        <value> <string id="25054.74" encoding="repr">global_searchbox</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.64">
+                  <dictionary id="25054.75">
                     <item>
-                        <key> <string id="25074.65" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.66" encoding="repr">Page Template</string> </value>
+                        <key> <reference id="25054.71"/> </key>
+                        <value> <reference id="25054.72"/> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.67" encoding="repr">id</string> </key>
-                        <value> <string id="25074.68" encoding="repr">login_success</string> </value>
+                        <key> <reference id="25054.73"/> </key>
+                        <value> <string id="25054.76" encoding="repr">main_template</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.69">
+                  <dictionary id="25054.77">
                     <item>
-                        <key> <reference id="25074.65"/> </key>
-                        <value> <string id="25074.70" encoding="repr">Controller Validator</string> </value>
+                        <key> <string id="25054.78" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.79" encoding="repr">DTML Method</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.67"/> </key>
-                        <value> <string id="25074.71" encoding="repr">login_form_validate</string> </value>
+                        <key> <string id="25054.80" encoding="repr">id</string> </key>
+                        <value> <string id="25054.81" encoding="repr">base.css</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.72">
+                  <dictionary id="25054.82">
                     <item>
-                        <key> <reference id="25074.65"/> </key>
-                        <value> <reference id="25074.70"/> </value>
+                        <key> <string id="25054.83" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.84" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.67"/> </key>
-                        <value> <string id="25074.73" encoding="repr">join_form_validate</string> </value>
+                        <key> <string id="25054.85" encoding="repr">id</string> </key>
+                        <value> <string id="25054.86" encoding="repr">logged_out</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.74">
+                  <dictionary id="25054.87">
                     <item>
-                        <key> <reference id="25074.65"/> </key>
-                        <value> <reference id="25074.66"/> </value>
+                        <key> <string id="25054.88" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.89" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.67"/> </key>
-                        <value> <string id="25074.75" encoding="repr">login_failed</string> </value>
+                        <key> <string id="25054.90" encoding="repr">id</string> </key>
+                        <value> <string id="25054.91" encoding="repr">portlet_login</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.76">
+                  <dictionary id="25054.92">
                     <item>
-                        <key> <string id="25074.77" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.78" encoding="repr">Page Template</string> </value>
+                        <key> <reference id="25054.88"/> </key>
+                        <value> <reference id="25054.89"/> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.79" encoding="repr">id</string> </key>
-                        <value> <string id="25074.80" encoding="repr">global_searchbox</string> </value>
+                        <key> <reference id="25054.90"/> </key>
+                        <value> <string id="25054.93" encoding="repr">login_failed</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.81">
+                  <dictionary id="25054.94">
                     <item>
-                        <key> <reference id="25074.77"/> </key>
-                        <value> <reference id="25074.78"/> </value>
+                        <key> <reference id="25054.88"/> </key>
+                        <value> <string id="25054.95" encoding="repr">Controller Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <reference id="25074.79"/> </key>
-                        <value> <string id="25074.82" encoding="repr">main_template</string> </value>
+                        <key> <reference id="25054.90"/> </key>
+                        <value> <string id="25054.96" encoding="repr">login_form</string> </value>
                     </item>
                   </dictionary>
-                  <dictionary id="25074.83">
+                  <dictionary id="25054.97">
                     <item>
-                        <key> <string id="25074.84" encoding="repr">meta_type</string> </key>
-                        <value> <string id="25074.85" encoding="repr">DTML Method</string> </value>
+                        <key> <string id="25054.98" encoding="repr">meta_type</string> </key>
+                        <value> <string id="25054.99" encoding="repr">Page Template</string> </value>
                     </item>
                     <item>
-                        <key> <string id="25074.86" encoding="repr">id</string> </key>
-                        <value> <string id="25074.87" encoding="repr">base.css</string> </value>
+                        <key> <string id="25054.100" encoding="repr">id</string> </key>
+                        <value> <reference id="25054.6"/> </value>
                     </item>
                   </dictionary>
               </tuple>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.28"/> </key>
+            <key> <reference id="25054.30"/> </key>
+            <value>
+              <persistent> <string id="25054.102" encoding="base64">AAAAAAAAYeU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25054.103" encoding="repr">global_searchbox</string> </key>
             <value>
-              <persistent> <string id="25074.89" encoding="base64">AAAAAAAAYfk=</string> </persistent>
+              <persistent> <string id="25054.104" encoding="base64">AAAAAAAAYeY=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.90" encoding="repr">global_searchbox</string> </key>
+            <key> <reference id="25054.69"/> </key>
             <value>
-              <persistent> <string id="25074.91" encoding="base64">AAAAAAAAYfo=</string> </persistent>
+              <persistent> <string id="25054.105" encoding="base64">AAAAAAAAYec=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.73"/> </key>
+            <key> <string id="25054.106" encoding="repr">login_form_validate</string> </key>
             <value>
-              <persistent> <string id="25074.92" encoding="base64">AAAAAAAAYfs=</string> </persistent>
+              <persistent> <string id="25054.107" encoding="base64">AAAAAAAAYeg=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.93" encoding="repr">login_form_validate</string> </key>
+            <key> <reference id="25054.81"/> </key>
             <value>
-              <persistent> <string id="25074.94" encoding="base64">AAAAAAAAYfw=</string> </persistent>
+              <persistent> <string id="25054.108" encoding="base64">AAAAAAAAYek=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.87"/> </key>
+            <key> <reference id="25054.28"/> </key>
             <value>
-              <persistent> <string id="25074.95" encoding="base64">AAAAAAAAYf0=</string> </persistent>
+              <persistent> <string id="25054.109" encoding="base64">AAAAAAAAYeo=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.26"/> </key>
+            <key> <string id="25054.110" encoding="repr">login_success</string> </key>
             <value>
-              <persistent> <string id="25074.96" encoding="base64">AAAAAAAAYf4=</string> </persistent>
+              <persistent> <string id="25054.111" encoding="base64">AAAAAAAAYes=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.97" encoding="repr">login_success</string> </key>
+            <key> <string id="25054.112" encoding="repr">login_password</string> </key>
             <value>
-              <persistent> <string id="25074.98" encoding="base64">AAAAAAAAYf8=</string> </persistent>
+              <persistent> <string id="25054.113" encoding="base64">AAAAAAAAYew=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.99" encoding="repr">login_password</string> </key>
+            <key> <reference id="25054.32"/> </key>
             <value>
-              <persistent> <string id="25074.100" encoding="base64">AAAAAAAAYgA=</string> </persistent>
+              <persistent> <string id="25054.114" encoding="base64">AAAAAAAAYe0=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.30"/> </key>
+            <key> <string id="25054.115" encoding="repr">footer</string> </key>
             <value>
-              <persistent> <string id="25074.101" encoding="base64">AAAAAAAAYgE=</string> </persistent>
+              <persistent> <string id="25054.116" encoding="base64">AAAAAAAAYe4=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.102" encoding="repr">footer</string> </key>
+            <key> <reference id="25054.91"/> </key>
             <value>
-              <persistent> <string id="25074.103" encoding="base64">AAAAAAAAYgI=</string> </persistent>
+              <persistent> <string id="25054.117" encoding="base64">AAAAAAAAYkE=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <reference id="25074.32"/> </key>
+            <key> <reference id="25054.34"/> </key>
             <value>
-              <persistent> <string id="25074.104" encoding="base64">AAAAAAAAYgM=</string> </persistent>
+              <persistent> <string id="25054.118" encoding="base64">AAAAAAAAYe8=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.105" encoding="repr">login_failed</string> </key>
+            <key> <string id="25054.119" encoding="repr">login_failed</string> </key>
             <value>
-              <persistent> <string id="25074.106" encoding="base64">AAAAAAAAYgQ=</string> </persistent>
+              <persistent> <string id="25054.120" encoding="base64">AAAAAAAAYkI=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.107" encoding="repr">main_template</string> </key>
+            <key> <string id="25054.121" encoding="repr">main_template</string> </key>
             <value>
-              <persistent> <string id="25074.108" encoding="base64">AAAAAAAAYgU=</string> </persistent>
+              <persistent> <string id="25054.122" encoding="base64">AAAAAAAAYfE=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.109" encoding="repr">siteIsSetup</string> </key>
+            <key> <string id="25054.123" encoding="repr">siteIsSetup</string> </key>
             <value>
-              <persistent> <string id="25074.110" encoding="base64">AAAAAAAAYgY=</string> </persistent>
+              <persistent> <string id="25054.124" encoding="base64">AAAAAAAAYfI=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25074.111" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25054.125" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25074.112">
+              <dictionary id="25054.126">
                 <item>
-                    <key> <string id="25074.113" encoding="repr">admin</string> </key>
+                    <key> <string id="25054.127" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25074.114">
-                          <string id="25074.115" encoding="repr">Owner</string>
+                      <list id="25054.128">
+                          <string id="25054.129" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -362,86 +394,86 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25075" aka="AAAAAAAAYfM=">
+  <record id="25055" aka="AAAAAAAAYd8=">
     <pickle>
-      <tuple id="25075.2">
-          <global id="25075.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25055.2">
+          <global id="25055.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25075.3">
+      <dictionary id="25055.3">
         <item>
-            <key> <string id="25075.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25055.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25075.5">
-                  <string id="25075.6" encoding="repr">Manager</string>
+              <list id="25055.5">
+                  <string id="25055.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25055.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25075.8">
-                  <reference id="25075.6"/>
+              <list id="25055.8">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25055.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25075.10">
-                  <reference id="25075.6"/>
+              <list id="25055.10">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25055.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25075.12">
-                  <reference id="25075.6"/>
+              <list id="25055.12">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.13" encoding="repr">id</string> </key>
-            <value> <string id="25075.14" encoding="repr">colophon</string> </value>
+            <key> <string id="25055.13" encoding="repr">id</string> </key>
+            <value> <string id="25055.14" encoding="repr">colophon</string> </value>
         </item>
         <item>
-            <key> <string id="25075.15" encoding="repr">title</string> </key>
+            <key> <string id="25055.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25075.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25055.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25075.17">
-                  <reference id="25075.6"/>
+              <list id="25055.17">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25055.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25075.19">
-                  <reference id="25075.6"/>
+              <list id="25055.19">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25055.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25075.21">
-                  <reference id="25075.6"/>
+              <list id="25055.21">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25075.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25055.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25055.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25075.24" encoding="repr">_text</string> </key>
-            <value> <string id="25075.25" encoding="cdata"><![CDATA[
+            <key> <string id="25055.24" encoding="repr">_text</string> </key>
+            <value> <string id="25055.25" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"\n
       xml:lang="en" lang="en"\n
@@ -460,90 +492,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25075.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25055.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25075.27">
-                  <reference id="25075.6"/>
+              <list id="25055.27">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25055.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25075.29">
-                  <reference id="25075.6"/>
+              <list id="25055.29">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.30" encoding="repr">expand</string> </key>
+            <key> <string id="25055.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25075.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25055.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25075.32">
-                  <reference id="25075.6"/>
+              <list id="25055.32">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25055.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25075.34">
-                  <reference id="25075.6"/>
+              <list id="25055.34">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25055.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25075.36">
-                  <reference id="25075.6"/>
+              <list id="25055.36">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25055.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25075.38">
-                  <reference id="25075.6"/>
+              <list id="25055.38">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25055.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25075.40">
-                  <reference id="25075.6"/>
+              <list id="25055.40">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25055.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25075.42">
-                  <reference id="25075.6"/>
+              <list id="25055.42">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25055.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25075.45">
+              <object id="25055.45">
                   <klass>
-                    <global id="25075.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25055.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25075.46">
+                    <dictionary id="25055.46">
                       <item>
-                          <key> <string id="25075.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25055.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25075.48">
+                            <dictionary id="25055.48">
                               <item>
-                                  <key> <string id="25075.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25075.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25055.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25055.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -554,22 +586,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25075.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25055.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25075.52">
-                  <reference id="25075.6"/>
+              <list id="25055.52">
+                  <reference id="25055.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25075.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25055.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25075.54">
+              <dictionary id="25055.54">
                 <item>
-                    <key> <string id="25075.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25055.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25075.56">
-                          <string id="25075.57" encoding="repr">Owner</string>
+                      <list id="25055.56">
+                          <string id="25055.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -579,355 +611,181 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25076" aka="AAAAAAAAYfQ=">
+  <record id="25057" aka="AAAAAAAAYeE=">
     <pickle>
-      <tuple id="25076.2">
-          <global id="25076.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+      <tuple id="25057.2">
+          <global id="25057.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25076.3">
+      <dictionary id="25057.3">
         <item>
-            <key> <string id="25076.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25057.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25076.5">
-                  <string id="25076.6" encoding="repr">Manager</string>
+              <list id="25057.5">
+                  <string id="25057.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25057.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25076.8">
-                  <reference id="25076.6"/>
+              <list id="25057.8">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.9" encoding="repr">actions</string> </key>
-            <value>
-              <persistent> <string id="25076.10" encoding="base64">AAAAAAAAYgc=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string id="25076.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25057.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25076.12">
-                  <reference id="25076.6"/>
+              <list id="25057.10">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.13" encoding="repr">validators</string> </key>
-            <value>
-              <persistent> <string id="25076.14" encoding="base64">AAAAAAAAYgg=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string id="25076.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25057.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25076.16">
-                  <reference id="25076.6"/>
+              <list id="25057.12">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.17" encoding="repr">id</string> </key>
-            <value> <string id="25076.18" encoding="repr">login_form</string> </value>
+            <key> <string id="25057.13" encoding="repr">id</string> </key>
+            <value> <string id="25057.14" encoding="repr">default_error_message_CUSTOM</string> </value>
         </item>
         <item>
-            <key> <string id="25076.19" encoding="repr">title</string> </key>
+            <key> <string id="25057.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25076.20" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25057.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25076.21">
-                  <reference id="25076.6"/>
+              <list id="25057.17">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.22" encoding="repr">expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string id="25076.23" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25057.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25076.24">
-                  <reference id="25076.6"/>
+              <list id="25057.19">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25057.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25076.26">
-                  <reference id="25076.6"/>
+              <list id="25057.21">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.27" encoding="repr">content_type</string> </key>
-            <value> <string id="25076.28" encoding="repr">text/html</string> </value>
+            <key> <string id="25057.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25057.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25076.29" encoding="repr">_text</string> </key>
-            <value> <string id="25076.30" encoding="cdata"><![CDATA[
+            <key> <string id="25057.24" encoding="repr">_text</string> </key>
+            <value> <string id="25057.25" encoding="cdata"><![CDATA[
 
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"\n
-      metal:use-macro="here/main_template/macros/master"\n
-      i18n:domain="plone">\n
-\n
-<head>\n
-    <script type="text/javascript" metal:fill-slot="javascript_head_slot">\n
-    </script>\n
-    <metal:block fill-slot="top_slot"\n
-                 tal:define="dummy python:request.set(\'disable_border\',1)" />\n
-</head>\n
-\n
-<body>\n
-\n
-<div metal:fill-slot="main"\n
-     tal:define="auth nocall:here/acl_users/credentials_cookie_auth|nothing;\n
-                 came_from request/came_from|request/HTTP_REFERER|nothing;\n
-                 came_from python:test(utool.isURLInPortal(came_from), came_from, None);\n
-\t\t errors options/state/getErrors;\n
-\t\t ac_name auth/name_cookie|string:__ac_name;\n
-\t\t ac_password auth/pw_cookie|string:__ac_password;\n
-\t\t ac_persist auth/persist_cookie|nothing;\n
-\t\t login_name python:request.get(\'login_name\', request.get(ac_name, \'\'));">\n
-\n
-<h1 i18n:translate="heading_sign_in" tal:condition="python:here.siteIsSetup()">Please log in</h1>\n
-\n
-<div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">\n
-  Cookies are not enabled. You must <span i18n:name="enable_cookies">\n
-  <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.\n
-</div>\n
-\n
-<div tal:condition="python: not auth" i18n:translate="login_form_disabled">\n
-    While cookie authentication is disabled, cookie-based login is not available.\n
-</div>\n
-\n
-<div tal:omit-tag="" tal:condition="python: not here.siteIsSetup()">\n
-<h1>This site has not yet been initialized.</h1>\n
-<p>Please login to the server as root and run the command <code>luci_admin init</code> to initialize it.\n
-</div>\n
-\n
-<div style="margin-top:1em"\n
-  tal:condition="python:errors and login_name == \'admin\'" >\n
-If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.\n
-</div> \n
-\n
-<form tal:attributes="action python:context.absolute_url()+\'/\'+template.id"\n
-      method="post"\n
-      id="login_form"\n
-      tal:condition="python:auth and here.siteIsSetup()">\n
-\n
-    <fieldset>\n
-\n
-        <legend i18n:translate="legend_account_details">Account details</legend>\n
-\n
-        <input type="hidden"\n
-            name="came_from"\n
-            value=""\n
-        tal:attributes="value came_from" />\n
-\n
-        <input type="hidden" name="form.submitted" value="1" />\n
-        <input type="hidden" name="js_enabled" id="js_enabled" value="0" />\n
-        <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />\n
-        <input type="hidden" name="login_name" id="login_name" value="" />\n
-        <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />\n
-\n
-        <div class="field"\n
-             tal:define="error python:errors.get(ac_name, None);"\n
-             tal:attributes="class python:test(error, \'field error\', \'field\')">\n
-\n
-            <label i18n:translate="label_login_name"\n
-                   tal:attributes="for ac_name">Login Name</label>\n
-\n
-            <div i18n:translate="help_login_name_caps"\n
-                 class="formHelp">\n
-            Login names are case sensitive, make sure the caps lock key is not enabled.\n
-            </div>\n
-\n
-            <div tal:content="error">Validation error output</div>\n
-\n
-            <input type="text"\n
-                   size="15"\n
-                   tabindex=""\n
-                   tal:attributes="name ac_name;\n
-                                   id ac_name;\n
-                                   value login_name;\n
-                                   tabindex tabindex/next;"\n
-                   />\n
-\n
-    </div>\n
-\n
-    <div class="field"\n
-             tal:define="error python:errors.get(ac_password, None);"\n
-             tal:attributes="class python:test(error, \'field error\', \'field\')">\n
-\n
-            <label i18n:translate="label_password"\n
-                   tal:attributes="for ac_password">Password</label>\n
-\n
-            <div class="formHelp">\n
-                <div i18n:translate="help_capslock_password">\n
-                    Case sensitive, make sure caps lock is not enabled.\n
-                </div>\n
-            </div>\n
-\n
-            <div tal:content="error">Validation error output</div>\n
-\n
-            <input type="password"\n
-                   size="15"\n
-                   tabindex=""\n
-                   tal:attributes="name ac_password;\n
-                                   id ac_password;\n
-                                   tabindex tabindex/next;"\n
-                   />\n
-    </div>\n
-\n
-        <div class="field" tal:condition="ac_persist">\n
-\n
-            <input type="checkbox"\n
-                   class="noborder formRememberName"\n
-                   value="1"\n
-                   checked="checked"\n
-                   id="cb_remember"\n
-                   tabindex=""\n
-                   tal:attributes="name ac_persist;\n
-                                   tabindex tabindex/next;\n
-                                   checked python:request.get(ac_name, \'\') and \'checked\' or None;"\n
-                   />\n
-\n
-            <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>\n
-\n
-            <div i18n:translate="help_remember_my_name"\n
-                 class="formHelp">\n
-                Check this to have your user name filled in automatically when you log in later.\n
-            </div>\n
-\n
-        </div>\n
-\n
-        <div class="formControls">\n
-\n
-            <input class="context"\n
-                   tabindex=""\n
-                   type="submit"\n
-                   name="submit"\n
-                   value="Log in"\n
-                   i18n:attributes="value label_log_in;"\n
-                   tal:attributes="tabindex tabindex/next;\n
-                               onclick string:javascript:return setLoginVars(\'$ac_name\',\'login_name\',\'$ac_password\',\'pwd_empty\',\'js_enabled\',\'cookies_enabled\');"\n
-                   />\n
-\n
-        </div>\n
-\n
-        <p i18n:translate="remember_to_log_out">\n
-            Please log out or exit your browser when you\'re done.\n
-        </p>\n
-\n
-    </fieldset>\n
+<html>\n
 \n
-</form>\n
-</div>\n
+Sorry, some internal error has occured :(\n
 \n
-</body>\n
-</html>
+</html>\n
+
 
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25076.31" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25057.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25076.32">
-                  <reference id="25076.6"/>
+              <list id="25057.27">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25057.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25076.34">
-                  <reference id="25076.6"/>
+              <list id="25057.29">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.35" encoding="repr">_View_Permission</string> </key>
-            <value>
-              <list id="25076.36">
-                  <reference id="25076.6"/>
-              </list>
-            </value>
+            <key> <string id="25057.30" encoding="repr">expand</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25076.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25057.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25076.38">
-                  <reference id="25076.6"/>
+              <list id="25057.32">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.39" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25057.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25076.40">
-                  <reference id="25076.6"/>
+              <list id="25057.34">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25057.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25076.42">
-                  <reference id="25076.6"/>
+              <list id="25057.36">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.43" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25057.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25076.44">
-                  <reference id="25076.6"/>
+              <list id="25057.38">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.45" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25057.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25076.46">
-                  <reference id="25076.6"/>
+              <list id="25057.40">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25057.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25076.48">
-                  <reference id="25076.6"/>
+              <list id="25057.42">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.49" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25057.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25076.51">
+              <object id="25057.45">
                   <klass>
-                    <global id="25076.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25057.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25076.52">
+                    <dictionary id="25057.46">
                       <item>
-                          <key> <string id="25076.53" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25057.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25076.54">
+                            <dictionary id="25057.48">
                               <item>
-                                  <key> <string id="25076.55" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25076.56" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25057.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25057.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -938,22 +796,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25076.57" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25057.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25076.58">
-                  <reference id="25076.6"/>
+              <list id="25057.52">
+                  <reference id="25057.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25076.59" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25057.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25076.60">
+              <dictionary id="25057.54">
                 <item>
-                    <key> <string id="25076.61" encoding="repr">admin</string> </key>
+                    <key> <string id="25057.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25076.62">
-                          <string id="25076.63" encoding="repr">Owner</string>
+                      <list id="25057.56">
+                          <string id="25057.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -963,90 +821,120 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25077" aka="AAAAAAAAYfU=">
+  <record id="25152" aka="AAAAAAAAYkA=">
     <pickle>
-      <tuple id="25077.2">
-          <global id="25077.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25152.2">
+          <global id="25152.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25077.3">
+      <dictionary id="25152.3">
         <item>
-            <key> <string id="25077.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25152.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25077.5">
-                  <string id="25077.6" encoding="repr">Manager</string>
+              <list id="25152.5">
+                  <string id="25152.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25152.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25077.8">
-                  <reference id="25077.6"/>
+              <list id="25152.8">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25152.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25077.10">
-                  <reference id="25077.6"/>
+              <list id="25152.10">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25152.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25077.12">
-                  <reference id="25077.6"/>
+              <list id="25152.12">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.13" encoding="repr">id</string> </key>
-            <value> <string id="25077.14" encoding="repr">default_error_message</string> </value>
+            <key> <string id="25152.13" encoding="repr">id</string> </key>
+            <value> <string id="25152.14" encoding="repr">logged_out</string> </value>
         </item>
         <item>
-            <key> <string id="25077.15" encoding="repr">title</string> </key>
+            <key> <string id="25152.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25077.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25152.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25077.17">
-                  <reference id="25077.6"/>
+              <list id="25152.17">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25152.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25077.19">
-                  <reference id="25077.6"/>
+              <list id="25152.19">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25152.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25077.21">
-                  <reference id="25077.6"/>
+              <list id="25152.21">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25077.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25152.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25152.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25077.24" encoding="repr">_text</string> </key>
-            <value> <string id="25077.25" encoding="cdata"><![CDATA[
+            <key> <string id="25152.24" encoding="repr">_text</string> </key>
+            <value> <string id="25152.25" encoding="cdata"><![CDATA[
 
-<html>\n
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
+      lang="en"\n
+      metal:use-macro="here/main_template/macros/master"\n
+      i18n:domain="plone">\n
 \n
-Sorry, some internal error has occured :(\n
+    <metal:block fill-slot="top_slot"\n
+                 tal:define="dummy python:request.set(\'disable_border\',1)" />\n
+\n
+<div metal:fill-slot="main">\n
+\n
+<tal:reallyloggedout condition="isAnon">\n
+  <h1 i18n:translate="heading_signed_out">You are now logged out</h1>\n
+\n
+  <div i18n:translate="description_logged_out" tal:omit-tag="">\n
+    <p>We hope you enjoyed using our services. We look forward to seeing you again.</p>\n
+\n
+    <p>Best Regards from the\n
+      <strong tal:content="python:container.portal_url.getPortalObject().Title()" i18n:name="portal_title">portal title</strong>\n
+      team.\n
+    </p>\n
+  </div>\n
+</tal:reallyloggedout>\n
+\n
+<tal:notloggedoutafterall tal:condition="not: isAnon">\n
+    <h1 i18n:translate="heading_quit_to_log_out">Quit your web browser to log out</h1>\n
+    \n
+    <p i18n:translate="description_quit_to_log_out">\n
+    Because you are logged in via HTTP authentication, the only\n
+    way to log out is to quit your web browser.\n
+    </p>\n
+</tal:notloggedoutafterall>\n
+\n
+</div>\n
 \n
 </html>\n
 
@@ -1054,90 +942,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25077.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25152.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25077.27">
-                  <reference id="25077.6"/>
+              <list id="25152.27">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25152.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25077.29">
-                  <reference id="25077.6"/>
+              <list id="25152.29">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.30" encoding="repr">expand</string> </key>
+            <key> <string id="25152.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25077.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25152.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25077.32">
-                  <reference id="25077.6"/>
+              <list id="25152.32">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25152.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25077.34">
-                  <reference id="25077.6"/>
+              <list id="25152.34">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25152.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25077.36">
-                  <reference id="25077.6"/>
+              <list id="25152.36">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25152.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25077.38">
-                  <reference id="25077.6"/>
+              <list id="25152.38">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25152.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25077.40">
-                  <reference id="25077.6"/>
+              <list id="25152.40">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25152.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25077.42">
-                  <reference id="25077.6"/>
+              <list id="25152.42">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25152.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25077.45">
+              <object id="25152.45">
                   <klass>
-                    <global id="25077.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25152.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25077.46">
+                    <dictionary id="25152.46">
                       <item>
-                          <key> <string id="25077.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25152.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25077.48">
+                            <dictionary id="25152.48">
                               <item>
-                                  <key> <string id="25077.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25077.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25152.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25152.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -1148,22 +1036,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25077.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25152.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25077.52">
-                  <reference id="25077.6"/>
+              <list id="25152.52">
+                  <reference id="25152.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25077.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25152.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25077.54">
+              <dictionary id="25152.54">
                 <item>
-                    <key> <string id="25077.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25152.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25077.56">
-                          <string id="25077.57" encoding="repr">Owner</string>
+                      <list id="25152.56">
+                          <string id="25152.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -1173,122 +1061,525 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25078" aka="AAAAAAAAYfY=">
+  <record id="25155" aka="AAAAAAAAYkM=">
     <pickle>
-      <tuple id="25078.2">
-          <global id="25078.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+      <tuple id="25155.2">
+          <global id="25155.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25078.3">
+      <dictionary id="25155.3">
         <item>
-            <key> <string id="25078.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25155.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25078.5">
-                  <string id="25078.6" encoding="repr">Manager</string>
+              <list id="25155.5">
+                  <string id="25155.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25155.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25078.8">
-                  <reference id="25078.6"/>
+              <list id="25155.8">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.9" encoding="repr">actions</string> </key>
+            <key> <string id="25155.9" encoding="repr">actions</string> </key>
             <value>
-              <persistent> <string id="25078.10" encoding="base64">AAAAAAAAYgk=</string> </persistent>
+              <persistent> <string id="25155.10" encoding="base64">AAAAAAAAYkQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25078.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25155.11" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25078.12">
-                  <reference id="25078.6"/>
+              <list id="25155.12">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.13" encoding="repr">validators</string> </key>
+            <key> <string id="25155.13" encoding="repr">validators</string> </key>
             <value>
-              <persistent> <string id="25078.14" encoding="base64">AAAAAAAAYgo=</string> </persistent>
+              <persistent> <string id="25155.14" encoding="base64">AAAAAAAAYkU=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25078.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25155.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25078.16">
-                  <reference id="25078.6"/>
+              <list id="25155.16">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.17" encoding="repr">id</string> </key>
-            <value> <string id="25078.18" encoding="repr">document_edit_form_TEST</string> </value>
+            <key> <string id="25155.17" encoding="repr">id</string> </key>
+            <value> <string id="25155.18" encoding="repr">login_form</string> </value>
+        </item>
+        <item>
+            <key> <string id="25155.19" encoding="repr">title</string> </key>
+            <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25078.19" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25155.20" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25078.20">
-                  <reference id="25078.6"/>
+              <list id="25155.21">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.21" encoding="repr">_View_Permission</string> </key>
-            <value>
-              <tuple id="25078.23">
-                  <string id="25078.22" encoding="repr">Authenticated</string>
-              </tuple>
-            </value>
+            <key> <string id="25155.22" encoding="repr">expand</string> </key>
+            <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25078.24" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25155.23" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25078.25">
-                  <reference id="25078.6"/>
+              <list id="25155.24">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.26" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25155.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25078.27">
-                  <reference id="25078.6"/>
+              <list id="25155.26">
+                  <reference id="25155.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.28" encoding="repr">content_type</string> </key>
-            <value> <string id="25078.29" encoding="repr">text/html</string> </value>
+            <key> <string id="25155.27" encoding="repr">content_type</string> </key>
+            <value> <string id="25155.28" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25078.30" encoding="repr">_text</string> </key>
-            <value> <string id="25078.31" encoding="cdata"><![CDATA[
+            <key> <string id="25155.29" encoding="repr">_text</string> </key>
+            <value> <string id="25155.30" encoding="cdata"><![CDATA[
 
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
-      lang="en"\n
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"\n
       metal:use-macro="here/main_template/macros/master"\n
       i18n:domain="plone">\n
 \n
-  <body>\n
+<head>\n
+    <script type="text/javascript" metal:fill-slot="javascript_head_slot">\n
+    </script>\n
+    <metal:block fill-slot="top_slot"\n
+                 tal:define="dummy python:request.set(\'disable_border\',1)" />\n
+</head>\n
 \n
-    <div metal:fill-slot="main"\n
-         tal:define="errors options/state/getErrors;\n
-                     editor python:member.getProperty(\'wysiwyg_editor\',\'None\');\n
-                     wysiwyg python:test(editor and editor!=\'None\', editor, \'None\');\n
-                     lockable python:hasattr(here, \'wl_isLocked\');\n
-                     isLocked python:lockable and here.wl_isLocked();">\n
+<body>\n
 \n
-      <h1 i18n:translate="heading_edit_item">\n
-        Edit\n
-        <span i18n:name="itemtype">\n
-          <span i18n:translate=""\n
-                tal:content="python:here.getTypeInfo().Title()"\n
+<div metal:fill-slot="main"\n
+     tal:define="auth nocall:here/acl_users/credentials_cookie_auth|nothing;\n
+                 came_from request/came_from|request/HTTP_REFERER|nothing;\n
+                 came_from python:test(utool.isURLInPortal(came_from), came_from, None);\n
+\t\t errors options/state/getErrors;\n
+\t\t ac_name auth/name_cookie|string:__ac_name;\n
+\t\t ac_password auth/pw_cookie|string:__ac_password;\n
+\t\t ac_persist auth/persist_cookie|nothing;\n
+\t\t login_name python:request.get(\'login_name\', request.get(ac_name, \'\'));">\n
+\n
+<div tal:omit-tag="" tal:condition="python: not here.siteIsSetup()">\n
+<h1>This site has not yet been initialized.</h1>\n
+<p>Please login to the server as root and run the command <code>luci_admin init</code> to initialize it.\n
+</div>\n
+\n
+<div tal:omit-tag="" tal:condition="python: here.siteIsSetup()">\n
+<h1 i18n:translate="heading_sign_in">Please log in</h1>\n
+\n
+<p i18n:translate="description_sign_in">\n
+To access this part of the site, you need to log in with your user name and password.\n
+</p>\n
+\n
+<p i18n:translate="description_no_account"\n
+   tal:define="join python:[a[\'url\'] for a in actions[\'user\'] if a[\'id\']==\'join\']"\n
+   tal:condition="python: join and checkPermission(\'Add portal member\', here)">\n
+\n
+If you do not have an account here, head over to the\n
+\n
+<span i18n:name="registration_form">\n
+    <a href=""\n
+       tal:define="join python:join.pop();\n
+                   join join;\n
+                   join python:join+test(join.find(\'?\')==-1, \'?\', \'&amp;\')+ztu.make_query(came_from=came_from);"\n
+       tal:attributes="href join"\n
+       i18n:translate="description_no_account_registration_linktext">\n
+        registration form</a></span>.\n
+\n
+</p>\n
+\n
+<div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">\n
+  Cookies are not enabled. You must <span i18n:name="enable_cookies">\n
+  <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.\n
+</div>\n
+\n
+<div tal:condition="python: not auth" i18n:translate="login_form_disabled">\n
+    While cookie authentication is disabled, cookie-based login is not available.\n
+</div>\n
+\n
+<form tal:attributes="action python:context.absolute_url()+\'/\'+template.id"\n
+      method="post"\n
+      id="login_form"\n
+      tal:condition="python:auth">\n
+\n
+    <fieldset>\n
+\n
+        <legend i18n:translate="legend_account_details">Account details</legend>\n
+\n
+        <input type="hidden"\n
+            name="came_from"\n
+            value=""\n
+        tal:attributes="value came_from" />\n
+\n
+        <input type="hidden" name="form.submitted" value="1" />\n
+        <input type="hidden" name="js_enabled" id="js_enabled" value="0" />\n
+        <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />\n
+        <input type="hidden" name="login_name" id="login_name" value="" />\n
+        <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />\n
+\n
+        <div class="field"\n
+             tal:define="error python:errors.get(ac_name, None);"\n
+             tal:attributes="class python:test(error, \'field error\', \'field\')">\n
+\n
+            <label i18n:translate="label_login_name"\n
+                   tal:attributes="for ac_name">Login Name</label>\n
+\n
+            <div i18n:translate="help_login_name_caps"\n
+                 class="formHelp">\n
+            Login names are case sensitive, make sure the caps lock key is not enabled.\n
+            </div>\n
+\n
+            <div tal:content="error">Validation error output</div>\n
+\n
+            <input type="text"\n
+                   size="15"\n
+                   tabindex=""\n
+                   tal:attributes="name ac_name;\n
+                                   id ac_name;\n
+                                   value login_name;\n
+                                   tabindex tabindex/next;"\n
+                   />\n
+\n
+    </div>\n
+\n
+    <div class="field"\n
+             tal:define="error python:errors.get(ac_password, None);"\n
+             tal:attributes="class python:test(error, \'field error\', \'field\')">\n
+\n
+            <label i18n:translate="label_password"\n
+                   tal:attributes="for ac_password">Password</label>\n
+\n
+            <div class="formHelp">\n
+                <div i18n:translate="help_capslock_password">\n
+                    Case sensitive, make sure caps lock is not enabled.\n
+                </div>\n
+            </div>\n
+\n
+            <div tal:content="error">Validation error output</div>\n
+\n
+            <input type="password"\n
+                   size="15"\n
+                   tabindex=""\n
+                   tal:attributes="name ac_password;\n
+                                   id ac_password;\n
+                                   tabindex tabindex/next;"\n
+                   />\n
+    </div>\n
+\n
+        <div class="field" tal:condition="ac_persist">\n
+\n
+            <input type="checkbox"\n
+                   class="noborder formRememberName"\n
+                   value="1"\n
+                   checked="checked"\n
+                   id="cb_remember"\n
+                   tabindex=""\n
+                   tal:attributes="name ac_persist;\n
+                                   tabindex tabindex/next;\n
+                                   checked python:request.get(ac_name, \'\') and \'checked\' or None;"\n
+                   />\n
+\n
+            <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>\n
+\n
+            <div i18n:translate="help_remember_my_name"\n
+                 class="formHelp">\n
+                Check this to have your user name filled in automatically when you log in later.\n
+            </div>\n
+\n
+        </div>\n
+\n
+        <div class="formControls">\n
+\n
+            <input class="context"\n
+                   tabindex=""\n
+                   type="submit"\n
+                   name="submit"\n
+                   value="Log in"\n
+                   i18n:attributes="value label_log_in;"\n
+                   tal:attributes="tabindex tabindex/next;\n
+                               onclick string:javascript:return setLoginVars(\'$ac_name\',\'login_name\',\'$ac_password\',\'pwd_empty\',\'js_enabled\',\'cookies_enabled\');"\n
+                   />\n
+\n
+        </div>\n
+\n
+        <p i18n:translate="remember_to_log_out">\n
+            Please log out or exit your browser when you\'re done.\n
+        </p>\n
+\n
+    </fieldset>\n
+\n
+</form>\n
+</div>\n
+</div>\n
+\n
+</body>\n
+</html>\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string id="25155.31" encoding="repr">_View_management_screens_Permission</string> </key>
+            <value>
+              <list id="25155.32">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <value>
+              <list id="25155.34">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.35" encoding="repr">_View_Permission</string> </key>
+            <value>
+              <list id="25155.36">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <value>
+              <list id="25155.38">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.39" encoding="repr">_Manage_properties_Permission</string> </key>
+            <value>
+              <list id="25155.40">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <value>
+              <list id="25155.42">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.43" encoding="repr">_Undo_changes_Permission</string> </key>
+            <value>
+              <list id="25155.44">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.45" encoding="repr">_FTP_access_Permission</string> </key>
+            <value>
+              <list id="25155.46">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <value>
+              <list id="25155.48">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.49" encoding="repr">_bind_names</string> </key>
+            <value>
+              <object id="25155.51">
+                  <klass>
+                    <global id="25155.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                  </klass>
+                  <tuple/>
+                  <state>
+                    <dictionary id="25155.52">
+                      <item>
+                          <key> <string id="25155.53" encoding="repr">_asgns</string> </key>
+                          <value>
+                            <dictionary id="25155.54">
+                              <item>
+                                  <key> <string id="25155.55" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25155.56" encoding="repr">traverse_subpath</string> </value>
+                              </item>
+                            </dictionary>
+                          </value>
+                      </item>
+                    </dictionary>
+                  </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.57" encoding="repr">_Change_permissions_Permission</string> </key>
+            <value>
+              <list id="25155.58">
+                  <reference id="25155.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25155.59" encoding="repr">__ac_local_roles__</string> </key>
+            <value>
+              <dictionary id="25155.60">
+                <item>
+                    <key> <string id="25155.61" encoding="repr">admin</string> </key>
+                    <value>
+                      <list id="25155.62">
+                          <string id="25155.63" encoding="repr">Owner</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="25058" aka="AAAAAAAAYeI=">
+    <pickle>
+      <tuple id="25058.2">
+          <global id="25058.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+          <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary id="25058.3">
+        <item>
+            <key> <string id="25058.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <value>
+              <list id="25058.5">
+                  <string id="25058.6" encoding="repr">Manager</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <value>
+              <list id="25058.8">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.9" encoding="repr">actions</string> </key>
+            <value>
+              <persistent> <string id="25058.10" encoding="base64">AAAAAAAAYfU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <value>
+              <list id="25058.12">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.13" encoding="repr">validators</string> </key>
+            <value>
+              <persistent> <string id="25058.14" encoding="base64">AAAAAAAAYfY=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <value>
+              <list id="25058.16">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.17" encoding="repr">id</string> </key>
+            <value> <string id="25058.18" encoding="repr">document_edit_form_TEST</string> </value>
+        </item>
+        <item>
+            <key> <string id="25058.19" encoding="repr">_Delete_objects_Permission</string> </key>
+            <value>
+              <list id="25058.20">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.21" encoding="repr">_View_Permission</string> </key>
+            <value>
+              <tuple id="25058.23">
+                  <string id="25058.22" encoding="repr">Authenticated</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.24" encoding="repr">_Manage_portal_Permission</string> </key>
+            <value>
+              <list id="25058.25">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.26" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list id="25058.27">
+                  <reference id="25058.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25058.28" encoding="repr">content_type</string> </key>
+            <value> <string id="25058.29" encoding="repr">text/html</string> </value>
+        </item>
+        <item>
+            <key> <string id="25058.30" encoding="repr">_text</string> </key>
+            <value> <string id="25058.31" encoding="cdata"><![CDATA[
+
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
+      lang="en"\n
+      metal:use-macro="here/main_template/macros/master"\n
+      i18n:domain="plone">\n
+\n
+  <body>\n
+\n
+    <div metal:fill-slot="main"\n
+         tal:define="errors options/state/getErrors;\n
+                     editor python:member.getProperty(\'wysiwyg_editor\',\'None\');\n
+                     wysiwyg python:test(editor and editor!=\'None\', editor, \'None\');\n
+                     lockable python:hasattr(here, \'wl_isLocked\');\n
+                     isLocked python:lockable and here.wl_isLocked();">\n
+\n
+      <h1 i18n:translate="heading_edit_item">\n
+        Edit\n
+        <span i18n:name="itemtype">\n
+          <span i18n:translate=""\n
+                tal:content="python:here.getTypeInfo().Title()"\n
                 tal:omit-tag="">Item type</span>\n
         </span>\n
       </h1>\n
@@ -1460,90 +1751,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25078.32" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25058.32" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25078.33">
-                  <reference id="25078.6"/>
+              <list id="25058.33">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.34" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25058.34" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25078.35">
-                  <reference id="25078.6"/>
+              <list id="25058.35">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.36" encoding="repr">expand</string> </key>
+            <key> <string id="25058.36" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25078.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25058.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25078.38">
-                  <reference id="25078.6"/>
+              <list id="25058.38">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.39" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25058.39" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25078.40">
-                  <reference id="25078.6"/>
+              <list id="25058.40">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25058.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25078.42">
-                  <reference id="25078.6"/>
+              <list id="25058.42">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.43" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25058.43" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25078.44">
-                  <reference id="25078.6"/>
+              <list id="25058.44">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.45" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25058.45" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25078.46">
-                  <reference id="25078.6"/>
+              <list id="25058.46">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25058.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25078.48">
-                  <reference id="25078.6"/>
+              <list id="25058.48">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.49" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25058.49" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25078.51">
+              <object id="25058.51">
                   <klass>
-                    <global id="25078.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25058.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25078.52">
+                    <dictionary id="25058.52">
                       <item>
-                          <key> <string id="25078.53" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25058.53" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25078.54">
+                            <dictionary id="25058.54">
                               <item>
-                                  <key> <string id="25078.55" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25078.56" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25058.55" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25058.56" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -1554,22 +1845,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25078.57" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25058.57" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25078.58">
-                  <reference id="25078.6"/>
+              <list id="25058.58">
+                  <reference id="25058.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25078.59" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25058.59" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25078.60">
+              <dictionary id="25058.60">
                 <item>
-                    <key> <string id="25078.61" encoding="repr">admin</string> </key>
+                    <key> <string id="25058.61" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25078.62">
-                          <string id="25078.63" encoding="repr">Owner</string>
+                      <list id="25058.62">
+                          <string id="25058.63" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -1579,102 +1870,102 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25079" aka="AAAAAAAAYfc=">
+  <record id="25059" aka="AAAAAAAAYeM=">
     <pickle>
-      <tuple id="25079.2">
-          <global id="25079.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+      <tuple id="25059.2">
+          <global id="25059.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25079.3">
+      <dictionary id="25059.3">
         <item>
-            <key> <string id="25079.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25059.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25079.5">
-                  <string id="25079.6" encoding="repr">Manager</string>
+              <list id="25059.5">
+                  <string id="25059.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25059.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25079.8">
-                  <reference id="25079.6"/>
+              <list id="25059.8">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.9" encoding="repr">actions</string> </key>
+            <key> <string id="25059.9" encoding="repr">actions</string> </key>
             <value>
-              <persistent> <string id="25079.10" encoding="base64">AAAAAAAAYgs=</string> </persistent>
+              <persistent> <string id="25059.10" encoding="base64">AAAAAAAAYfc=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25079.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25059.11" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25079.12">
-                  <reference id="25079.6"/>
+              <list id="25059.12">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.13" encoding="repr">validators</string> </key>
+            <key> <string id="25059.13" encoding="repr">validators</string> </key>
             <value>
-              <persistent> <string id="25079.14" encoding="base64">AAAAAAAAYgw=</string> </persistent>
+              <persistent> <string id="25059.14" encoding="base64">AAAAAAAAYfg=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25079.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25059.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25079.16">
-                  <reference id="25079.6"/>
+              <list id="25059.16">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.17" encoding="repr">id</string> </key>
-            <value> <string id="25079.18" encoding="repr">failsafe_login_form</string> </value>
+            <key> <string id="25059.17" encoding="repr">id</string> </key>
+            <value> <string id="25059.18" encoding="repr">failsafe_login_form</string> </value>
         </item>
         <item>
-            <key> <string id="25079.19" encoding="repr">title</string> </key>
+            <key> <string id="25059.19" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25079.20" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25059.20" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25079.21">
-                  <reference id="25079.6"/>
+              <list id="25059.21">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.22" encoding="repr">expand</string> </key>
+            <key> <string id="25059.22" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25079.23" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25059.23" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25079.24">
-                  <reference id="25079.6"/>
+              <list id="25059.24">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25059.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25079.26">
-                  <reference id="25079.6"/>
+              <list id="25059.26">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.27" encoding="repr">content_type</string> </key>
-            <value> <string id="25079.28" encoding="repr">text/html</string> </value>
+            <key> <string id="25059.27" encoding="repr">content_type</string> </key>
+            <value> <string id="25059.28" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25079.29" encoding="repr">_text</string> </key>
-            <value> <string id="25079.30" encoding="cdata"><![CDATA[
+            <key> <string id="25059.29" encoding="repr">_text</string> </key>
+            <value> <string id="25059.30" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"\n
       i18n:domain="plone">\n
@@ -1694,7 +1985,7 @@
                  ztutils modules/ZTUtils;\n
                  errors options/state/getErrors;">\n
 \n
-<h1 i18n:translate="heading_sign_in">Please log in</h1>\n
+<h1 i18n:translate="heading_sign_in">Log in</h1>\n
 \n
 <p i18n:translate="description_sign_in">\n
 To access this part of the site, you need to log in with your user name and password.\n
@@ -1709,6 +2000,11 @@
     While cookie authentication is disabled, cookie-based login is not available.\n
 </div>\n
 \n
+<div style="margin-top:1em"\n
+  tal:condition="python:not auth and (login_name == \'admin\' or ac_name == \'admin\')" >\n
+If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.\n
+</div>\n
+\n
 <form tal:attributes="action python:context.absolute_url()+\'/\'+template.id"\n
       method="post"\n
       id="login_form"\n
@@ -1831,94 +2127,94 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25079.31" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25059.31" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25079.32">
-                  <reference id="25079.6"/>
+              <list id="25059.32">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25059.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25079.34">
-                  <reference id="25079.6"/>
+              <list id="25059.34">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.35" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25059.35" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25079.36">
-                  <reference id="25079.6"/>
+              <list id="25059.36">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25059.37" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25079.38">
-                  <reference id="25079.6"/>
+              <list id="25059.38">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.39" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25059.39" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25079.40">
-                  <reference id="25079.6"/>
+              <list id="25059.40">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25059.41" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25079.42">
-                  <reference id="25079.6"/>
+              <list id="25059.42">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.43" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25059.43" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25079.44">
-                  <reference id="25079.6"/>
+              <list id="25059.44">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.45" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25059.45" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25079.46">
-                  <reference id="25079.6"/>
+              <list id="25059.46">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25059.47" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25079.48">
-                  <reference id="25079.6"/>
+              <list id="25059.48">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.49" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25059.49" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25079.51">
+              <object id="25059.51">
                   <klass>
-                    <global id="25079.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25059.50" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25079.52">
+                    <dictionary id="25059.52">
                       <item>
-                          <key> <string id="25079.53" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25059.53" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25079.54">
+                            <dictionary id="25059.54">
                               <item>
-                                  <key> <string id="25079.55" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25079.56" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25059.55" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25059.56" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -1929,22 +2225,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25079.57" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25059.57" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25079.58">
-                  <reference id="25079.6"/>
+              <list id="25059.58">
+                  <reference id="25059.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25079.59" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25059.59" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25079.60">
+              <dictionary id="25059.60">
                 <item>
-                    <key> <string id="25079.61" encoding="repr">admin</string> </key>
+                    <key> <string id="25059.61" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25079.62">
-                          <string id="25079.63" encoding="repr">Owner</string>
+                      <list id="25059.62">
+                          <string id="25059.63" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -1954,102 +2250,102 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25080" aka="AAAAAAAAYfg=">
+  <record id="25060" aka="AAAAAAAAYeQ=">
     <pickle>
-      <tuple id="25080.2">
-          <global id="25080.1" name="Image" module="OFS.Image"/>
+      <tuple id="25060.2">
+          <global id="25060.1" name="Image" module="OFS.Image"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25080.3">
+      <dictionary id="25060.3">
         <item>
-            <key> <string id="25080.4" encoding="repr">precondition</string> </key>
+            <key> <string id="25060.4" encoding="repr">precondition</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25080.5" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25060.5" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25080.6">
-                  <string id="25080.7" encoding="repr">Manager</string>
+              <list id="25060.6">
+                  <string id="25060.7" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.8" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25060.8" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25080.9">
-                  <reference id="25080.7"/>
+              <list id="25060.9">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.10" encoding="repr">height</string> </key>
+            <key> <string id="25060.10" encoding="repr">height</string> </key>
             <value> <int>50</int> </value>
         </item>
         <item>
-            <key> <string id="25080.11" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25060.11" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25080.12">
-                  <reference id="25080.7"/>
+              <list id="25060.12">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.13" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25060.13" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25080.14">
-                  <reference id="25080.7"/>
+              <list id="25060.14">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.15" encoding="repr">size</string> </key>
+            <key> <string id="25060.15" encoding="repr">size</string> </key>
             <value> <long>21557</long> </value>
         </item>
         <item>
-            <key> <string id="25080.16" encoding="repr">title</string> </key>
-            <value> <string id="25080.17" encoding="repr">clusterbanner</string> </value>
+            <key> <string id="25060.16" encoding="repr">title</string> </key>
+            <value> <string id="25060.17" encoding="repr">clusterbanner</string> </value>
         </item>
         <item>
-            <key> <string id="25080.18" encoding="repr">_Cacheable__manager_id</string> </key>
-            <value> <string id="25080.19" encoding="repr">HTTPCache</string> </value>
+            <key> <string id="25060.18" encoding="repr">_Cacheable__manager_id</string> </key>
+            <value> <string id="25060.19" encoding="repr">HTTPCache</string> </value>
         </item>
         <item>
-            <key> <string id="25080.20" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25060.20" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25080.21">
-                  <reference id="25080.7"/>
+              <list id="25060.21">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.22" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25060.22" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25080.23">
-                  <reference id="25080.7"/>
+              <list id="25060.23">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.24" encoding="repr">content_type</string> </key>
-            <value> <string id="25080.25" encoding="repr">image/png</string> </value>
+            <key> <string id="25060.24" encoding="repr">content_type</string> </key>
+            <value> <string id="25060.25" encoding="repr">image/png</string> </value>
         </item>
         <item>
-            <key> <string id="25080.26" encoding="repr">__name__</string> </key>
-            <value> <string id="25080.27" encoding="repr">logo.jpg</string> </value>
+            <key> <string id="25060.26" encoding="repr">__name__</string> </key>
+            <value> <string id="25060.27" encoding="repr">logo.jpg</string> </value>
         </item>
         <item>
-            <key> <string id="25080.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25060.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25080.29">
-                  <reference id="25080.7"/>
+              <list id="25060.29">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.30" encoding="repr">data</string> </key>
-            <value> <string id="25080.31" encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAcIAAAAyCAIAAABAn0y/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
+            <key> <string id="25060.30" encoding="repr">data</string> </key>
+            <value> <string id="25060.31" encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAcIAAAAyCAIAAABAn0y/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
 B3RJTUUH1gMUDyQAatxJEQAAIABJREFUeF7tnQdgHcW1sO/u3q7eiyVbknuvGGMb22A6pobyEiAk
 5L0k/wshPS9/ykuBhEB6ISHkpUEIoYbfEAjNBuNece+SLcnqvd2++39n9kq6kiVshxKSp0Vc7907
 O3PmzMyZ00ezLMvxr34l9vFM7x0OnVfstxIxlViPaZqDUDhEK+qR1DAQ4YNfHVisv13esn/SNYFG
@@ -2430,78 +2726,78 @@
 AAAASUVORK5CYII=</string> </value>
         </item>
         <item>
-            <key> <string id="25080.32" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25060.32" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25080.33">
-                  <reference id="25080.7"/>
+              <list id="25060.33">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.34" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25060.34" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25080.35">
-                  <reference id="25080.7"/>
+              <list id="25060.35">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.36" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25060.36" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25080.37">
-                  <reference id="25080.7"/>
+              <list id="25060.37">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.38" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25060.38" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25080.39">
-                  <reference id="25080.7"/>
+              <list id="25060.39">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.40" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25060.40" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25080.41">
-                  <reference id="25080.7"/>
+              <list id="25060.41">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.42" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25060.42" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25080.43">
-                  <reference id="25080.7"/>
+              <list id="25060.43">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.44" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25060.44" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25080.45">
-                  <reference id="25080.7"/>
+              <list id="25060.45">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.46" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25060.46" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25080.47">
-                  <reference id="25080.7"/>
+              <list id="25060.47">
+                  <reference id="25060.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25080.48" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25060.48" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25080.49">
+              <dictionary id="25060.49">
                 <item>
-                    <key> <string id="25080.50" encoding="repr">admin</string> </key>
+                    <key> <string id="25060.50" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25080.51">
-                          <string id="25080.52" encoding="repr">Owner</string>
+                      <list id="25060.51">
+                          <string id="25060.52" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -2509,104 +2805,104 @@
             </value>
         </item>
         <item>
-            <key> <string id="25080.53" encoding="repr">width</string> </key>
+            <key> <string id="25060.53" encoding="repr">width</string> </key>
             <value> <int>450</int> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25081" aka="AAAAAAAAYfk=">
+  <record id="25061" aka="AAAAAAAAYeU=">
     <pickle>
-      <tuple id="25081.2">
-          <global id="25081.1" name="File" module="OFS.Image"/>
+      <tuple id="25061.2">
+          <global id="25061.1" name="File" module="OFS.Image"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25081.3">
+      <dictionary id="25061.3">
         <item>
-            <key> <string id="25081.4" encoding="repr">precondition</string> </key>
+            <key> <string id="25061.4" encoding="repr">precondition</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25081.5" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25061.5" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25081.6">
-                  <string id="25081.7" encoding="repr">Manager</string>
+              <list id="25061.6">
+                  <string id="25061.7" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.8" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25061.8" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25081.9">
-                  <reference id="25081.7"/>
+              <list id="25061.9">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.10" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25061.10" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25081.11">
-                  <reference id="25081.7"/>
+              <list id="25061.11">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.12" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25061.12" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25081.13">
-                  <reference id="25081.7"/>
+              <list id="25061.13">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.14" encoding="repr">size</string> </key>
+            <key> <string id="25061.14" encoding="repr">size</string> </key>
             <value> <int>2841</int> </value>
         </item>
         <item>
-            <key> <string id="25081.15" encoding="repr">title</string> </key>
+            <key> <string id="25061.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25081.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25061.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25081.17">
-                  <reference id="25081.7"/>
+              <list id="25061.17">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.18" encoding="repr">_EtagSupport__etag</string> </key>
-            <value> <string id="25081.19" encoding="repr">ts48383847.59</string> </value>
+            <key> <string id="25061.18" encoding="repr">_EtagSupport__etag</string> </key>
+            <value> <string id="25061.19" encoding="repr">ts48383847.59</string> </value>
         </item>
         <item>
-            <key> <string id="25081.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25061.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25081.21">
-                  <reference id="25081.7"/>
+              <list id="25061.21">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25081.23" encoding="repr">application/x-javascript</string> </value>
+            <key> <string id="25061.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25061.23" encoding="repr">application/x-javascript</string> </value>
         </item>
         <item>
-            <key> <string id="25081.24" encoding="repr">__name__</string> </key>
-            <value> <string id="25081.25" encoding="repr">highlightsearchterms.js_TEST</string> </value>
+            <key> <string id="25061.24" encoding="repr">__name__</string> </key>
+            <value> <string id="25061.25" encoding="repr">highlightsearchterms.js_TEST</string> </value>
         </item>
         <item>
-            <key> <string id="25081.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25061.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25081.27">
-                  <reference id="25081.7"/>
+              <list id="25061.27">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.28" encoding="repr">data</string> </key>
-            <value> <string id="25081.29" encoding="cdata"><![CDATA[
+            <key> <string id="25061.28" encoding="repr">data</string> </key>
+            <value> <string id="25061.29" encoding="cdata"><![CDATA[
 
 function highlightTermInNode(node, word) {\n
     var contents = node.nodeValue;\n
@@ -2692,78 +2988,78 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25081.30" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25061.30" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25081.31">
-                  <reference id="25081.7"/>
+              <list id="25061.31">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25061.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25081.33">
-                  <reference id="25081.7"/>
+              <list id="25061.33">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.34" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25061.34" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25081.35">
-                  <reference id="25081.7"/>
+              <list id="25061.35">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25061.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25081.37">
-                  <reference id="25081.7"/>
+              <list id="25061.37">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.38" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25061.38" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25081.39">
-                  <reference id="25081.7"/>
+              <list id="25061.39">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.40" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25061.40" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25081.41">
-                  <reference id="25081.7"/>
+              <list id="25061.41">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25061.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25081.43">
-                  <reference id="25081.7"/>
+              <list id="25061.43">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.44" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25061.44" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25081.45">
-                  <reference id="25081.7"/>
+              <list id="25061.45">
+                  <reference id="25061.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25081.46" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25061.46" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25081.47">
+              <dictionary id="25061.47">
                 <item>
-                    <key> <string id="25081.48" encoding="repr">admin</string> </key>
+                    <key> <string id="25061.48" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25081.49">
-                          <string id="25081.50" encoding="repr">Owner</string>
+                      <list id="25061.49">
+                          <string id="25061.50" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -2773,86 +3069,86 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25082" aka="AAAAAAAAYfo=">
+  <record id="25062" aka="AAAAAAAAYeY=">
     <pickle>
-      <tuple id="25082.2">
-          <global id="25082.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25062.2">
+          <global id="25062.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25082.3">
+      <dictionary id="25062.3">
         <item>
-            <key> <string id="25082.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25062.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25082.5">
-                  <string id="25082.6" encoding="repr">Manager</string>
+              <list id="25062.5">
+                  <string id="25062.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25062.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25082.8">
-                  <reference id="25082.6"/>
+              <list id="25062.8">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25062.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25082.10">
-                  <reference id="25082.6"/>
+              <list id="25062.10">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25062.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25082.12">
-                  <reference id="25082.6"/>
+              <list id="25062.12">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.13" encoding="repr">id</string> </key>
-            <value> <string id="25082.14" encoding="repr">global_searchbox</string> </value>
+            <key> <string id="25062.13" encoding="repr">id</string> </key>
+            <value> <string id="25062.14" encoding="repr">global_searchbox</string> </value>
         </item>
         <item>
-            <key> <string id="25082.15" encoding="repr">title</string> </key>
+            <key> <string id="25062.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25082.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25062.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25082.17">
-                  <reference id="25082.6"/>
+              <list id="25062.17">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25062.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25082.19">
-                  <reference id="25082.6"/>
+              <list id="25062.19">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25062.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25082.21">
-                  <reference id="25082.6"/>
+              <list id="25062.21">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25082.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25062.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25062.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25082.24" encoding="repr">_text</string> </key>
-            <value> <string id="25082.25" encoding="cdata"><![CDATA[
+            <key> <string id="25062.24" encoding="repr">_text</string> </key>
+            <value> <string id="25062.25" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"\n
       i18n:domain="plone">\n
@@ -2915,90 +3211,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25082.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25062.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25082.27">
-                  <reference id="25082.6"/>
+              <list id="25062.27">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25062.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25082.29">
-                  <reference id="25082.6"/>
+              <list id="25062.29">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.30" encoding="repr">expand</string> </key>
+            <key> <string id="25062.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25082.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25062.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25082.32">
-                  <reference id="25082.6"/>
+              <list id="25062.32">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25062.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25082.34">
-                  <reference id="25082.6"/>
+              <list id="25062.34">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25062.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25082.36">
-                  <reference id="25082.6"/>
+              <list id="25062.36">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25062.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25082.38">
-                  <reference id="25082.6"/>
+              <list id="25062.38">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25062.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25082.40">
-                  <reference id="25082.6"/>
+              <list id="25062.40">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25062.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25082.42">
-                  <reference id="25082.6"/>
+              <list id="25062.42">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25062.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25082.45">
+              <object id="25062.45">
                   <klass>
-                    <global id="25082.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25062.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25082.46">
+                    <dictionary id="25062.46">
                       <item>
-                          <key> <string id="25082.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25062.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25082.48">
+                            <dictionary id="25062.48">
                               <item>
-                                  <key> <string id="25082.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25082.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25062.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25062.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -3009,22 +3305,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25082.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25062.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25082.52">
-                  <reference id="25082.6"/>
+              <list id="25062.52">
+                  <reference id="25062.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25082.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25062.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25082.54">
+              <dictionary id="25062.54">
                 <item>
-                    <key> <string id="25082.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25062.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25082.56">
-                          <string id="25082.57" encoding="repr">Owner</string>
+                      <list id="25062.56">
+                          <string id="25062.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -3034,26 +3330,26 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25083" aka="AAAAAAAAYfs=">
+  <record id="25063" aka="AAAAAAAAYec=">
     <pickle>
-      <tuple id="25083.2">
-          <global id="25083.1" name="ControllerValidator" module="Products.CMFFormController.ControllerValidator"/>
+      <tuple id="25063.2">
+          <global id="25063.1" name="ControllerValidator" module="Products.CMFFormController.ControllerValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25083.3">
+      <dictionary id="25063.3">
         <item>
-            <key> <string id="25083.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25063.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25083.5">
-                  <string id="25083.6" encoding="repr">Manager</string>
+              <list id="25063.5">
+                  <string id="25063.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.7" encoding="repr">_body</string> </key>
-            <value> <string id="25083.8" encoding="cdata"><![CDATA[
+            <key> <string id="25063.7" encoding="repr">_body</string> </key>
+            <value> <string id="25063.8" encoding="cdata"><![CDATA[
 
 from Products.CMFPlone import PloneMessageFactory as _\n
 \n
@@ -3107,76 +3403,76 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25083.9" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25063.9" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25083.10">
-                  <reference id="25083.6"/>
+              <list id="25063.10">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.11" encoding="repr">_View_History_Permission</string> </key>
+            <key> <string id="25063.11" encoding="repr">_View_History_Permission</string> </key>
             <value>
-              <list id="25083.12">
-                  <reference id="25083.6"/>
+              <list id="25063.12">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.13" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25063.13" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25083.14">
-                  <reference id="25083.6"/>
+              <list id="25063.14">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25063.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25083.16">
-                  <reference id="25083.6"/>
+              <list id="25063.16">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.17" encoding="repr">id</string> </key>
-            <value> <string id="25083.18" encoding="repr">join_form_validate</string> </value>
+            <key> <string id="25063.17" encoding="repr">id</string> </key>
+            <value> <string id="25063.18" encoding="repr">join_form_validate</string> </value>
         </item>
         <item>
-            <key> <string id="25083.19" encoding="repr">func_code</string> </key>
+            <key> <string id="25063.19" encoding="repr">func_code</string> </key>
             <value>
-              <object id="25083.21">
+              <object id="25063.21">
                   <klass>
-                    <global id="25083.20" name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                    <global id="25063.20" name="FuncCode" module="Shared.DC.Scripts.Signature"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25083.22">
+                    <dictionary id="25063.22">
                       <item>
-                          <key> <string id="25083.23" encoding="repr">co_argcount</string> </key>
+                          <key> <string id="25063.23" encoding="repr">co_argcount</string> </key>
                           <value> <int>4</int> </value>
                       </item>
                       <item>
-                          <key> <string id="25083.24" encoding="repr">co_varnames</string> </key>
+                          <key> <string id="25063.24" encoding="repr">co_varnames</string> </key>
                           <value>
-                            <tuple id="25083.41">
-                                <string id="25083.25" encoding="repr">username</string>
-                                <string id="25083.26" encoding="repr">email</string>
-                                <string id="25083.27" encoding="repr">password</string>
-                                <string id="25083.28" encoding="repr">password_confirm</string>
-                                <string id="25083.29" encoding="repr">Products.CMFPlone</string>
-                                <string id="25083.30" encoding="repr">PloneMessageFactory</string>
+                            <tuple id="25063.41">
+                                <string id="25063.25" encoding="repr">username</string>
+                                <string id="25063.26" encoding="repr">email</string>
+                                <string id="25063.27" encoding="repr">password</string>
+                                <string id="25063.28" encoding="repr">password_confirm</string>
+                                <string id="25063.29" encoding="repr">Products.CMFPlone</string>
+                                <string id="25063.30" encoding="repr">PloneMessageFactory</string>
                                 <string encoding="repr">_</string>
-                                <string id="25083.31" encoding="repr">_getattr_</string>
-                                <string id="25083.32" encoding="repr">state</string>
-                                <string id="25083.33" encoding="repr">context</string>
-                                <string id="25083.34" encoding="repr">reg_tool</string>
-                                <string id="25083.35" encoding="repr">missing</string>
-                                <string id="25083.36" encoding="repr">nomatch</string>
-                                <string id="25083.37" encoding="repr">minlimit</string>
-                                <string id="25083.38" encoding="repr">notallowed</string>
-                                <string id="25083.39" encoding="repr">properties</string>
-                                <string id="25083.40" encoding="repr">len</string>
+                                <string id="25063.31" encoding="repr">_getattr_</string>
+                                <string id="25063.32" encoding="repr">state</string>
+                                <string id="25063.33" encoding="repr">context</string>
+                                <string id="25063.34" encoding="repr">reg_tool</string>
+                                <string id="25063.35" encoding="repr">missing</string>
+                                <string id="25063.36" encoding="repr">nomatch</string>
+                                <string id="25063.37" encoding="repr">minlimit</string>
+                                <string id="25063.38" encoding="repr">notallowed</string>
+                                <string id="25063.39" encoding="repr">properties</string>
+                                <string id="25063.40" encoding="repr">len</string>
                             </tuple>
                           </value>
                       </item>
@@ -3186,38 +3482,38 @@
             </value>
         </item>
         <item>
-            <key> <string id="25083.42" encoding="repr">_Change_Python_Scripts_Permission</string> </key>
+            <key> <string id="25063.42" encoding="repr">_Change_Python_Scripts_Permission</string> </key>
             <value>
-              <list id="25083.43">
-                  <reference id="25083.6"/>
+              <list id="25063.43">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.44" encoding="repr">errors</string> </key>
+            <key> <string id="25063.44" encoding="repr">errors</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25083.45" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25063.45" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25083.46">
-                  <reference id="25083.6"/>
+              <list id="25063.46">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.47" encoding="repr">title</string> </key>
-            <value> <string id="25083.48" encoding="repr">validates the Registration of a User</string> </value>
+            <key> <string id="25063.47" encoding="repr">title</string> </key>
+            <value> <string id="25063.48" encoding="repr">validates the Registration of a User</string> </value>
         </item>
         <item>
-            <key> <string id="25083.49" encoding="repr">Script_magic</string> </key>
+            <key> <string id="25063.49" encoding="repr">Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
         <item>
-            <key> <string id="25083.50" encoding="repr">_code</string> </key>
-            <value> <string id="25083.51" encoding="base64">YwAAAAAAAAAABQAAAEAAAABzGQAAAGQBAGQBAGQBAGQBAGQCAIQEAFoAAGQAAFMoAwAAAE50AAAA
+            <key> <string id="25063.50" encoding="repr">_code</string> </key>
+            <value> <string id="25063.51" encoding="base64">YwAAAAAAAAAABQAAAEAAAABzGQAAAGQBAGQBAGQBAGQBAGQCAIQEAFoAAGQAAFMoAwAAAE50AAAA
 AGMEAAAAEQAAABUAAAADAAAAc1sCAABkAQBrAABsAQCJAAABdAMAdAQAZAIAgwIAZAMAZAQAgwAB
 U3QDAHQFAGQFAIMCAH0KAIcAAGQGAIYAAH0LAIcAAGQHAIYAAH0MAIcAAGQIAIYAAH0NAIcAAGQJ
 AIYAAH0OAHwAAAxvDgABfAsAZAoAgwEAAW4BAAF8AQAMbw4AAXwLAGQLAIMBAAFuAQABfAAAbysA
@@ -3267,113 +3563,113 @@
 KAAAAABzFAAAAENvbnRyb2xsZXIgVmFsaWRhdG9ycwgAAAA8bW9kdWxlPgEAAABSAAAAAA==</string> </value>
         </item>
         <item>
-            <key> <string id="25083.52" encoding="repr">_View_Permission</string> </key>
-            <value>
-              <list id="25083.53">
-                  <reference id="25083.6"/>
-              </list>
-            </value>
+            <key> <string id="25063.52" encoding="repr">_params</string> </key>
+            <value> <string id="25063.53" encoding="repr">username=\'\',email=\'\',password=\'\',password_confirm=\'\'</string> </value>
         </item>
         <item>
-            <key> <string id="25083.54" encoding="repr">Python_magic</string> </key>
-            <value> <string id="25083.55" encoding="base64">bfINCg==</string> </value>
+            <key> <string id="25063.54" encoding="repr">Python_magic</string> </key>
+            <value> <string id="25063.55" encoding="base64">bfINCg==</string> </value>
         </item>
         <item>
-            <key> <string id="25083.56" encoding="repr">_proxy_roles</string> </key>
+            <key> <string id="25063.56" encoding="repr">_proxy_roles</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25083.57" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25063.57" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25083.58">
-                  <reference id="25083.6"/>
+              <list id="25063.58">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.59" encoding="repr">warnings</string> </key>
+            <key> <string id="25063.59" encoding="repr">warnings</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25083.60" encoding="repr">_Change_proxy_roles_Permission</string> </key>
+            <key> <string id="25063.60" encoding="repr">_Change_proxy_roles_Permission</string> </key>
             <value>
-              <list id="25083.61">
-                  <reference id="25083.6"/>
+              <list id="25063.61">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.62" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25063.62" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25083.63">
-                  <reference id="25083.6"/>
+              <list id="25063.63">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.64" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25063.64" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25083.65">
-                  <reference id="25083.6"/>
+              <list id="25063.65">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.66" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25063.66" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25083.67">
-                  <reference id="25083.6"/>
+              <list id="25063.67">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.68" encoding="repr">_filepath</string> </key>
-            <value> <string id="25083.69" encoding="repr">Controller Validator:/luci/portal_skins/custom/join_form_validate</string> </value>
+            <key> <string id="25063.68" encoding="repr">_filepath</string> </key>
+            <value> <string id="25063.69" encoding="repr">Controller Validator:/luci/portal_skins/custom/join_form_validate</string> </value>
         </item>
         <item>
-            <key> <string id="25083.70" encoding="repr">_params</string> </key>
-            <value> <string id="25083.71" encoding="repr">username=\'\',email=\'\',password=\'\',password_confirm=\'\'</string> </value>
+            <key> <string id="25063.70" encoding="repr">_View_Permission</string> </key>
+            <value>
+              <list id="25063.71">
+                  <reference id="25063.6"/>
+              </list>
+            </value>
         </item>
         <item>
-            <key> <string id="25083.72" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25063.72" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25083.73">
-                  <reference id="25083.6"/>
+              <list id="25063.73">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.74" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25063.74" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25083.75">
-                  <reference id="25083.6"/>
+              <list id="25063.75">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.76" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25063.76" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25083.77">
-                  <reference id="25083.6"/>
+              <list id="25063.77">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.78" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25063.78" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25083.79">
-                  <reference id="25083.6"/>
+              <list id="25063.79">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.80" encoding="repr">func_defaults</string> </key>
+            <key> <string id="25063.80" encoding="repr">func_defaults</string> </key>
             <value>
-              <tuple id="25083.81">
+              <tuple id="25063.81">
                   <string encoding="repr"></string>
                   <string encoding="repr"></string>
                   <string encoding="repr"></string>
@@ -3382,46 +3678,46 @@
             </value>
         </item>
         <item>
-            <key> <string id="25083.82" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25063.82" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25083.83">
-                  <reference id="25083.6"/>
+              <list id="25063.83">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.84" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25063.84" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25083.86">
+              <object id="25063.86">
                   <klass>
-                    <global id="25083.85" name="NameAssignments" module="Products.CMFFormController.Script"/>
+                    <global id="25063.85" name="NameAssignments" module="Products.CMFFormController.Script"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25083.87">
+                    <dictionary id="25063.87">
                       <item>
-                          <key> <string id="25083.88" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25063.88" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25083.89">
+                            <dictionary id="25063.89">
                               <item>
-                                  <key> <string id="25083.90" encoding="repr">name_container</string> </key>
-                                  <value> <string id="25083.91" encoding="repr">container</string> </value>
+                                  <key> <string id="25063.90" encoding="repr">name_context</string> </key>
+                                  <value> <reference id="25063.33"/> </value>
                               </item>
                               <item>
-                                  <key> <string id="25083.92" encoding="repr">name_context</string> </key>
-                                  <value> <reference id="25083.33"/> </value>
+                                  <key> <string id="25063.91" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25063.92" encoding="repr">traverse_subpath</string> </value>
                               </item>
                               <item>
-                                  <key> <string id="25083.93" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25083.94" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25063.93" encoding="repr">name_state</string> </key>
+                                  <value> <reference id="25063.32"/> </value>
                               </item>
                               <item>
-                                  <key> <string id="25083.95" encoding="repr">name_m_self</string> </key>
-                                  <value> <string id="25083.96" encoding="repr">script</string> </value>
+                                  <key> <string id="25063.94" encoding="repr">name_m_self</string> </key>
+                                  <value> <string id="25063.95" encoding="repr">script</string> </value>
                               </item>
                               <item>
-                                  <key> <string id="25083.97" encoding="repr">name_state</string> </key>
-                                  <value> <reference id="25083.32"/> </value>
+                                  <key> <string id="25063.96" encoding="repr">name_container</string> </key>
+                                  <value> <string id="25063.97" encoding="repr">container</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -3432,22 +3728,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25083.98" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25063.98" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25083.99">
-                  <reference id="25083.6"/>
+              <list id="25063.99">
+                  <reference id="25063.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25083.100" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25063.100" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25083.101">
+              <dictionary id="25063.101">
                 <item>
-                    <key> <string id="25083.102" encoding="repr">admin</string> </key>
+                    <key> <string id="25063.102" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25083.103">
-                          <string id="25083.104" encoding="repr">Owner</string>
+                      <list id="25063.103">
+                          <string id="25063.104" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -3457,26 +3753,26 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25084" aka="AAAAAAAAYfw=">
+  <record id="25064" aka="AAAAAAAAYeg=">
     <pickle>
-      <tuple id="25084.2">
-          <global id="25084.1" name="ControllerValidator" module="Products.CMFFormController.ControllerValidator"/>
+      <tuple id="25064.2">
+          <global id="25064.1" name="ControllerValidator" module="Products.CMFFormController.ControllerValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25084.3">
+      <dictionary id="25064.3">
         <item>
-            <key> <string id="25084.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25064.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25084.5">
-                  <string id="25084.6" encoding="repr">Manager</string>
+              <list id="25064.5">
+                  <string id="25064.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.7" encoding="repr">_body</string> </key>
-            <value> <string id="25084.8" encoding="repr">from Products.CMFPlone import PloneMessageFactory as _\n
+            <key> <string id="25064.7" encoding="repr">_body</string> </key>
+            <value> <string id="25064.8" encoding="repr">from Products.CMFPlone import PloneMessageFactory as _\n
 \n
 LOGIN_FAILED_MESSAGE = _(u\'Login failed\')\n
 \n
@@ -3523,78 +3819,78 @@
 </string> </value>
         </item>
         <item>
-            <key> <string id="25084.9" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25064.9" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25084.10">
-                  <reference id="25084.6"/>
+              <list id="25064.10">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.11" encoding="repr">_View_History_Permission</string> </key>
+            <key> <string id="25064.11" encoding="repr">_View_History_Permission</string> </key>
             <value>
-              <list id="25084.12">
-                  <reference id="25084.6"/>
+              <list id="25064.12">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.13" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25064.13" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25084.14">
-                  <reference id="25084.6"/>
+              <list id="25064.14">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25064.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25084.16">
-                  <reference id="25084.6"/>
+              <list id="25064.16">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.17" encoding="repr">id</string> </key>
-            <value> <string id="25084.18" encoding="repr">login_form_validate</string> </value>
+            <key> <string id="25064.17" encoding="repr">id</string> </key>
+            <value> <string id="25064.18" encoding="repr">login_form_validate</string> </value>
         </item>
         <item>
-            <key> <string id="25084.19" encoding="repr">func_code</string> </key>
+            <key> <string id="25064.19" encoding="repr">func_code</string> </key>
             <value>
-              <object id="25084.21">
+              <object id="25064.21">
                   <klass>
-                    <global id="25084.20" name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                    <global id="25064.20" name="FuncCode" module="Shared.DC.Scripts.Signature"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25084.22">
+                    <dictionary id="25064.22">
                       <item>
-                          <key> <string id="25084.23" encoding="repr">co_argcount</string> </key>
+                          <key> <string id="25064.23" encoding="repr">co_argcount</string> </key>
                           <value> <int>0</int> </value>
                       </item>
                       <item>
-                          <key> <string id="25084.24" encoding="repr">co_varnames</string> </key>
+                          <key> <string id="25064.24" encoding="repr">co_varnames</string> </key>
                           <value>
-                            <tuple id="25084.43">
-                                <string id="25084.25" encoding="repr">Products.CMFPlone</string>
-                                <string id="25084.26" encoding="repr">PloneMessageFactory</string>
+                            <tuple id="25064.43">
+                                <string id="25064.25" encoding="repr">Products.CMFPlone</string>
+                                <string id="25064.26" encoding="repr">PloneMessageFactory</string>
                                 <string encoding="repr">_</string>
-                                <string id="25084.27" encoding="repr">LOGIN_FAILED_MESSAGE</string>
-                                <string id="25084.28" encoding="repr">_getattr_</string>
-                                <string id="25084.29" encoding="repr">context</string>
-                                <string id="25084.30" encoding="repr">request</string>
-                                <string id="25084.31" encoding="repr">js_enabled</string>
-                                <string id="25084.32" encoding="repr">cookies_enabled</string>
-                                <string id="25084.33" encoding="repr">state</string>
-                                <string id="25084.34" encoding="repr">mt</string>
-                                <string id="25084.35" encoding="repr">getattr</string>
-                                <string id="25084.36" encoding="repr">None</string>
-                                <string id="25084.37" encoding="repr">auth</string>
-                                <string id="25084.38" encoding="repr">user_name</string>
-                                <string id="25084.39" encoding="repr">password_empty</string>
-                                <string id="25084.40" encoding="repr">ac_name</string>
-                                <string id="25084.41" encoding="repr">ac_password</string>
-                                <string id="25084.42" encoding="repr">verify_login_name</string>
+                                <string id="25064.27" encoding="repr">LOGIN_FAILED_MESSAGE</string>
+                                <string id="25064.28" encoding="repr">_getattr_</string>
+                                <string id="25064.29" encoding="repr">context</string>
+                                <string id="25064.30" encoding="repr">request</string>
+                                <string id="25064.31" encoding="repr">js_enabled</string>
+                                <string id="25064.32" encoding="repr">cookies_enabled</string>
+                                <string id="25064.33" encoding="repr">state</string>
+                                <string id="25064.34" encoding="repr">mt</string>
+                                <string id="25064.35" encoding="repr">getattr</string>
+                                <string id="25064.36" encoding="repr">None</string>
+                                <string id="25064.37" encoding="repr">auth</string>
+                                <string id="25064.38" encoding="repr">user_name</string>
+                                <string id="25064.39" encoding="repr">password_empty</string>
+                                <string id="25064.40" encoding="repr">ac_name</string>
+                                <string id="25064.41" encoding="repr">ac_password</string>
+                                <string id="25064.42" encoding="repr">verify_login_name</string>
                             </tuple>
                           </value>
                       </item>
@@ -3604,38 +3900,38 @@
             </value>
         </item>
         <item>
-            <key> <string id="25084.44" encoding="repr">_Change_Python_Scripts_Permission</string> </key>
+            <key> <string id="25064.44" encoding="repr">_Change_Python_Scripts_Permission</string> </key>
             <value>
-              <list id="25084.45">
-                  <reference id="25084.6"/>
+              <list id="25064.45">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.46" encoding="repr">errors</string> </key>
+            <key> <string id="25064.46" encoding="repr">errors</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25084.47" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25064.47" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25084.48">
-                  <reference id="25084.6"/>
+              <list id="25064.48">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.49" encoding="repr">title</string> </key>
-            <value> <string id="25084.50" encoding="repr">Validate login</string> </value>
+            <key> <string id="25064.49" encoding="repr">title</string> </key>
+            <value> <string id="25064.50" encoding="repr">Validate login</string> </value>
         </item>
         <item>
-            <key> <string id="25084.51" encoding="repr">Script_magic</string> </key>
+            <key> <string id="25064.51" encoding="repr">Script_magic</string> </key>
             <value> <int>3</int> </value>
         </item>
         <item>
-            <key> <string id="25084.52" encoding="repr">_code</string> </key>
-            <value> <string id="25084.53" encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABMAAAAYAAAAQwAA
+            <key> <string id="25064.52" encoding="repr">_code</string> </key>
+            <value> <string id="25064.53" encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABMAAAAYAAAAQwAA
 AHPWAgAAZAEAawAAbAEAfQIAAXwCAGQCAIMBAH0DAHQEAHQFAGQDAIMCAH0GAHQEAHwGAGQEAIMC
 AGQFAGQGAIMCAH0HAHwHAGQHAGoCAHAKAAF8BwBkCABqAgB9BwB0BAB8BgBkBACDAgBkCQBkBgCD
 AgB9CAB8CABkBwBqAgBwCgABfAgAZAgAagIAfQgAfAcAbwUAAXwIAAxvQAABdAQAdAQAdAUAZAoA
@@ -3673,158 +3969,158 @@
 AAA8bW9kdWxlPgEAAAB0AAAAAA==</string> </value>
         </item>
         <item>
-            <key> <string id="25084.54" encoding="repr">_params</string> </key>
-            <value> <string encoding="repr"></string> </value>
+            <key> <string id="25064.54" encoding="repr">_View_Permission</string> </key>
+            <value>
+              <list id="25064.55">
+                  <reference id="25064.6"/>
+              </list>
+            </value>
         </item>
         <item>
-            <key> <string id="25084.55" encoding="repr">Python_magic</string> </key>
-            <value> <string id="25084.56" encoding="base64">bfINCg==</string> </value>
+            <key> <string id="25064.56" encoding="repr">Python_magic</string> </key>
+            <value> <string id="25064.57" encoding="base64">bfINCg==</string> </value>
         </item>
         <item>
-            <key> <string id="25084.57" encoding="repr">_proxy_roles</string> </key>
+            <key> <string id="25064.58" encoding="repr">_proxy_roles</string> </key>
             <value>
-              <tuple id="25084.59">
-                  <string id="25084.58" encoding="repr">Manager</string>
+              <tuple id="25064.60">
+                  <string id="25064.59" encoding="repr">Manager</string>
               </tuple>
             </value>
         </item>
         <item>
-            <key> <string id="25084.60" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25064.61" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25084.61">
-                  <reference id="25084.6"/>
+              <list id="25064.62">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.62" encoding="repr">warnings</string> </key>
+            <key> <string id="25064.63" encoding="repr">warnings</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25084.63" encoding="repr">_Change_proxy_roles_Permission</string> </key>
+            <key> <string id="25064.64" encoding="repr">_Change_proxy_roles_Permission</string> </key>
             <value>
-              <list id="25084.64">
-                  <reference id="25084.6"/>
+              <list id="25064.65">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.65" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25064.66" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25084.66">
-                  <reference id="25084.6"/>
+              <list id="25064.67">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.67" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25064.68" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25084.68">
-                  <reference id="25084.6"/>
+              <list id="25064.69">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.69" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25064.70" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25084.70">
-                  <reference id="25084.6"/>
+              <list id="25064.71">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.71" encoding="repr">_filepath</string> </key>
-            <value> <string id="25084.72" encoding="repr">Controller Validator:/luci/portal_skins/custom/login_form_validate</string> </value>
+            <key> <string id="25064.72" encoding="repr">_filepath</string> </key>
+            <value> <string id="25064.73" encoding="repr">Controller Validator:/luci/portal_skins/custom/login_form_validate</string> </value>
         </item>
         <item>
-            <key> <string id="25084.73" encoding="repr">_View_Permission</string> </key>
-            <value>
-              <list id="25084.74">
-                  <reference id="25084.6"/>
-              </list>
-            </value>
+            <key> <string id="25064.74" encoding="repr">_params</string> </key>
+            <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25084.75" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25064.75" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25084.76">
-                  <reference id="25084.6"/>
+              <list id="25064.76">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.77" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25064.77" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25084.78">
-                  <reference id="25084.6"/>
+              <list id="25064.78">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.79" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25064.79" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25084.80">
-                  <reference id="25084.6"/>
+              <list id="25064.80">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.81" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25064.81" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25084.82">
-                  <reference id="25084.6"/>
+              <list id="25064.82">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.83" encoding="repr">func_defaults</string> </key>
+            <key> <string id="25064.83" encoding="repr">func_defaults</string> </key>
             <value>
               <none/>
             </value>
         </item>
         <item>
-            <key> <string id="25084.84" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25064.84" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25084.85">
-                  <reference id="25084.6"/>
+              <list id="25064.85">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.86" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25064.86" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25084.88">
+              <object id="25064.88">
                   <klass>
-                    <global id="25084.87" name="NameAssignments" module="Products.CMFFormController.Script"/>
+                    <global id="25064.87" name="NameAssignments" module="Products.CMFFormController.Script"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25084.89">
+                    <dictionary id="25064.89">
                       <item>
-                          <key> <string id="25084.90" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25064.90" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25084.91">
+                            <dictionary id="25064.91">
                               <item>
-                                  <key> <string id="25084.92" encoding="repr">name_container</string> </key>
-                                  <value> <string id="25084.93" encoding="repr">container</string> </value>
+                                  <key> <string id="25064.92" encoding="repr">name_context</string> </key>
+                                  <value> <reference id="25064.29"/> </value>
                               </item>
                               <item>
-                                  <key> <string id="25084.94" encoding="repr">name_context</string> </key>
-                                  <value> <reference id="25084.29"/> </value>
+                                  <key> <string id="25064.93" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25064.94" encoding="repr">traverse_subpath</string> </value>
                               </item>
                               <item>
-                                  <key> <string id="25084.95" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25084.96" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25064.95" encoding="repr">name_state</string> </key>
+                                  <value> <reference id="25064.33"/> </value>
                               </item>
                               <item>
-                                  <key> <string id="25084.97" encoding="repr">name_m_self</string> </key>
-                                  <value> <string id="25084.98" encoding="repr">script</string> </value>
+                                  <key> <string id="25064.96" encoding="repr">name_m_self</string> </key>
+                                  <value> <string id="25064.97" encoding="repr">script</string> </value>
                               </item>
                               <item>
-                                  <key> <string id="25084.99" encoding="repr">name_state</string> </key>
-                                  <value> <reference id="25084.33"/> </value>
+                                  <key> <string id="25064.98" encoding="repr">name_container</string> </key>
+                                  <value> <string id="25064.99" encoding="repr">container</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -3835,22 +4131,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25084.100" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25064.100" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25084.101">
-                  <reference id="25084.6"/>
+              <list id="25064.101">
+                  <reference id="25064.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25084.102" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25064.102" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25084.103">
+              <dictionary id="25064.103">
                 <item>
-                    <key> <string id="25084.104" encoding="repr">admin</string> </key>
+                    <key> <string id="25064.104" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25084.105">
-                          <string id="25084.106" encoding="repr">Owner</string>
+                      <list id="25064.105">
+                          <string id="25064.106" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -3860,42 +4156,42 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25085" aka="AAAAAAAAYf0=">
+  <record id="25065" aka="AAAAAAAAYek=">
     <pickle>
-      <tuple id="25085.2">
-          <global id="25085.1" name="DTMLMethod" module="OFS.DTMLMethod"/>
+      <tuple id="25065.2">
+          <global id="25065.1" name="DTMLMethod" module="OFS.DTMLMethod"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25085.3">
+      <dictionary id="25065.3">
         <item>
-            <key> <string id="25085.4" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25065.4" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25085.5">
-                  <string id="25085.6" encoding="repr">Manager</string>
+              <list id="25065.5">
+                  <string id="25065.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25065.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25085.8">
-                  <reference id="25085.6"/>
+              <list id="25065.8">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.9" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25065.9" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25085.10">
-                  <reference id="25085.6"/>
+              <list id="25065.10">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.11" encoding="repr">raw</string> </key>
-            <value> <string id="25085.12" encoding="cdata"><![CDATA[
+            <key> <string id="25065.11" encoding="repr">raw</string> </key>
+            <value> <string id="25065.12" encoding="cdata"><![CDATA[
 
 /*\n
 ** Plone style sheet - Base Elements\n
@@ -4173,136 +4469,136 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25085.13" encoding="repr">globals</string> </key>
+            <key> <string id="25065.13" encoding="repr">globals</string> </key>
             <value>
-              <dictionary id="25085.14"/>
+              <dictionary id="25065.14"/>
             </value>
         </item>
         <item>
-            <key> <string id="25085.15" encoding="repr">__name__</string> </key>
-            <value> <string id="25085.16" encoding="repr">base.css</string> </value>
+            <key> <string id="25065.15" encoding="repr">__name__</string> </key>
+            <value> <string id="25065.16" encoding="repr">base.css</string> </value>
         </item>
         <item>
-            <key> <string id="25085.17" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25065.17" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25085.18">
-                  <reference id="25085.6"/>
+              <list id="25065.18">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.19" encoding="repr">title</string> </key>
+            <key> <string id="25065.19" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25085.20" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25065.20" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25085.21">
-                  <reference id="25085.6"/>
+              <list id="25065.21">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.22" encoding="repr">_vars</string> </key>
+            <key> <string id="25065.22" encoding="repr">_vars</string> </key>
             <value>
-              <dictionary id="25085.23"/>
+              <dictionary id="25065.23"/>
             </value>
         </item>
         <item>
-            <key> <string id="25085.24" encoding="repr">_proxy_roles</string> </key>
+            <key> <string id="25065.24" encoding="repr">_proxy_roles</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string id="25085.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25065.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25085.26">
-                  <reference id="25085.6"/>
+              <list id="25065.26">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.27" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25065.27" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25085.28">
-                  <reference id="25085.6"/>
+              <list id="25065.28">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.29" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25065.29" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25085.30">
-                  <reference id="25085.6"/>
+              <list id="25065.30">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.31" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25065.31" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25085.32">
-                  <reference id="25085.6"/>
+              <list id="25065.32">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.33" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25065.33" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25085.34">
-                  <reference id="25085.6"/>
+              <list id="25065.34">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.35" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25065.35" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25085.36">
-                  <reference id="25085.6"/>
+              <list id="25065.36">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.37" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25065.37" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25085.38">
-                  <reference id="25085.6"/>
+              <list id="25065.38">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.39" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25065.39" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25085.40">
-                  <reference id="25085.6"/>
+              <list id="25065.40">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25065.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25085.42">
-                  <reference id="25085.6"/>
+              <list id="25065.42">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.43" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25065.43" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25085.44">
-                  <reference id="25085.6"/>
+              <list id="25065.44">
+                  <reference id="25065.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25085.45" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25065.45" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25085.46">
+              <dictionary id="25065.46">
                 <item>
-                    <key> <string id="25085.47" encoding="repr">admin</string> </key>
+                    <key> <string id="25065.47" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25085.48">
-                          <string id="25085.49" encoding="repr">Owner</string>
+                      <list id="25065.48">
+                          <string id="25065.49" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -4312,98 +4608,98 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25086" aka="AAAAAAAAYf4=">
+  <record id="25066" aka="AAAAAAAAYeo=">
     <pickle>
-      <tuple id="25086.2">
-          <global id="25086.1" name="File" module="OFS.Image"/>
+      <tuple id="25066.2">
+          <global id="25066.1" name="File" module="OFS.Image"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25086.3">
+      <dictionary id="25066.3">
         <item>
-            <key> <string id="25086.4" encoding="repr">precondition</string> </key>
+            <key> <string id="25066.4" encoding="repr">precondition</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25086.5" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25066.5" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25086.6">
-                  <string id="25086.7" encoding="repr">Manager</string>
+              <list id="25066.6">
+                  <string id="25066.7" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.8" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25066.8" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25086.9">
-                  <reference id="25086.7"/>
+              <list id="25066.9">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.10" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25066.10" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25086.11">
-                  <reference id="25086.7"/>
+              <list id="25066.11">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.12" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25066.12" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25086.13">
-                  <reference id="25086.7"/>
+              <list id="25066.13">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.14" encoding="repr">size</string> </key>
+            <key> <string id="25066.14" encoding="repr">size</string> </key>
             <value> <int>4826</int> </value>
         </item>
         <item>
-            <key> <string id="25086.15" encoding="repr">title</string> </key>
+            <key> <string id="25066.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25086.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25066.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25086.17">
-                  <reference id="25086.7"/>
+              <list id="25066.17">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.18" encoding="repr">_EtagSupport__etag</string> </key>
-            <value> <string id="25086.19" encoding="repr">ts48383879.63</string> </value>
+            <key> <string id="25066.18" encoding="repr">_EtagSupport__etag</string> </key>
+            <value> <string id="25066.19" encoding="repr">ts48383879.63</string> </value>
         </item>
         <item>
-            <key> <string id="25086.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25066.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25086.21">
-                  <reference id="25086.7"/>
+              <list id="25066.21">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25086.23" encoding="repr">application/x-javascript</string> </value>
+            <key> <string id="25066.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25066.23" encoding="repr">application/x-javascript</string> </value>
         </item>
         <item>
-            <key> <string id="25086.24" encoding="repr">__name__</string> </key>
-            <value> <string id="25086.25" encoding="repr">dropdown.js_TEST</string> </value>
+            <key> <string id="25066.24" encoding="repr">__name__</string> </key>
+            <value> <string id="25066.25" encoding="repr">dropdown.js_TEST</string> </value>
         </item>
         <item>
-            <key> <string id="25086.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25066.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25086.27">
-                  <reference id="25086.7"/>
+              <list id="25066.27">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.28" encoding="repr">data</string> </key>
-            <value> <string id="25086.29" encoding="cdata"><![CDATA[
+            <key> <string id="25066.28" encoding="repr">data</string> </key>
+            <value> <string id="25066.29" encoding="cdata"><![CDATA[
 
 /*\n
  * This is the code for the dropdown menus. It uses the following markup:\n
@@ -4580,78 +4876,78 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25086.30" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25066.30" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25086.31">
-                  <reference id="25086.7"/>
+              <list id="25066.31">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25066.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25086.33">
-                  <reference id="25086.7"/>
+              <list id="25066.33">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.34" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25066.34" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25086.35">
-                  <reference id="25086.7"/>
+              <list id="25066.35">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25066.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25086.37">
-                  <reference id="25086.7"/>
+              <list id="25066.37">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.38" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25066.38" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25086.39">
-                  <reference id="25086.7"/>
+              <list id="25066.39">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.40" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25066.40" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25086.41">
-                  <reference id="25086.7"/>
+              <list id="25066.41">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25066.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25086.43">
-                  <reference id="25086.7"/>
+              <list id="25066.43">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.44" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25066.44" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25086.45">
-                  <reference id="25086.7"/>
+              <list id="25066.45">
+                  <reference id="25066.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25086.46" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25066.46" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25086.47">
+              <dictionary id="25066.47">
                 <item>
-                    <key> <string id="25086.48" encoding="repr">admin</string> </key>
+                    <key> <string id="25066.48" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25086.49">
-                          <string id="25086.50" encoding="repr">Owner</string>
+                      <list id="25066.49">
+                          <string id="25066.50" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -4661,86 +4957,86 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25087" aka="AAAAAAAAYf8=">
+  <record id="25067" aka="AAAAAAAAYes=">
     <pickle>
-      <tuple id="25087.2">
-          <global id="25087.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25067.2">
+          <global id="25067.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25087.3">
+      <dictionary id="25067.3">
         <item>
-            <key> <string id="25087.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25067.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25087.5">
-                  <string id="25087.6" encoding="repr">Manager</string>
+              <list id="25067.5">
+                  <string id="25067.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25067.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25087.8">
-                  <reference id="25087.6"/>
+              <list id="25067.8">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25067.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25087.10">
-                  <reference id="25087.6"/>
+              <list id="25067.10">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25067.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25087.12">
-                  <reference id="25087.6"/>
+              <list id="25067.12">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.13" encoding="repr">id</string> </key>
-            <value> <string id="25087.14" encoding="repr">login_success</string> </value>
+            <key> <string id="25067.13" encoding="repr">id</string> </key>
+            <value> <string id="25067.14" encoding="repr">login_success</string> </value>
         </item>
         <item>
-            <key> <string id="25087.15" encoding="repr">title</string> </key>
+            <key> <string id="25067.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25087.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25067.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25087.17">
-                  <reference id="25087.6"/>
+              <list id="25067.17">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25067.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25087.19">
-                  <reference id="25087.6"/>
+              <list id="25067.19">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25067.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25087.21">
-                  <reference id="25087.6"/>
+              <list id="25067.21">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25087.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25067.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25067.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25087.24" encoding="repr">_text</string> </key>
-            <value> <string id="25087.25" encoding="cdata"><![CDATA[
+            <key> <string id="25067.24" encoding="repr">_text</string> </key>
+            <value> <string id="25067.25" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
       lang="en"\n
@@ -4820,90 +5116,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25087.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25067.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25087.27">
-                  <reference id="25087.6"/>
+              <list id="25067.27">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25067.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25087.29">
-                  <reference id="25087.6"/>
+              <list id="25067.29">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.30" encoding="repr">expand</string> </key>
+            <key> <string id="25067.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25087.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25067.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25087.32">
-                  <reference id="25087.6"/>
+              <list id="25067.32">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25067.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25087.34">
-                  <reference id="25087.6"/>
+              <list id="25067.34">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25067.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25087.36">
-                  <reference id="25087.6"/>
+              <list id="25067.36">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25067.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25087.38">
-                  <reference id="25087.6"/>
+              <list id="25067.38">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25067.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25087.40">
-                  <reference id="25087.6"/>
+              <list id="25067.40">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25067.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25087.42">
-                  <reference id="25087.6"/>
+              <list id="25067.42">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25067.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25087.45">
+              <object id="25067.45">
                   <klass>
-                    <global id="25087.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25067.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25087.46">
+                    <dictionary id="25067.46">
                       <item>
-                          <key> <string id="25087.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25067.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25087.48">
+                            <dictionary id="25067.48">
                               <item>
-                                  <key> <string id="25087.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25087.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25067.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25067.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -4914,22 +5210,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25087.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25067.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25087.52">
-                  <reference id="25087.6"/>
+              <list id="25067.52">
+                  <reference id="25067.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25087.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25067.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25087.54">
+              <dictionary id="25067.54">
                 <item>
-                    <key> <string id="25087.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25067.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25087.56">
-                          <string id="25087.57" encoding="repr">Owner</string>
+                      <list id="25067.56">
+                          <string id="25067.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -4939,102 +5235,102 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25088" aka="AAAAAAAAYgA=">
+  <record id="25068" aka="AAAAAAAAYew=">
     <pickle>
-      <tuple id="25088.2">
-          <global id="25088.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+      <tuple id="25068.2">
+          <global id="25068.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25088.3">
+      <dictionary id="25068.3">
         <item>
-            <key> <string id="25088.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25068.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25088.5">
-                  <string id="25088.6" encoding="repr">Manager</string>
+              <list id="25068.5">
+                  <string id="25068.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25068.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25088.8">
-                  <reference id="25088.6"/>
+              <list id="25068.8">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.9" encoding="repr">actions</string> </key>
+            <key> <string id="25068.9" encoding="repr">actions</string> </key>
             <value>
-              <persistent> <string id="25088.10" encoding="base64">AAAAAAAAYg0=</string> </persistent>
+              <persistent> <string id="25068.10" encoding="base64">AAAAAAAAYfk=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25088.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25068.11" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25088.12">
-                  <reference id="25088.6"/>
+              <list id="25068.12">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.13" encoding="repr">validators</string> </key>
+            <key> <string id="25068.13" encoding="repr">validators</string> </key>
             <value>
-              <persistent> <string id="25088.14" encoding="base64">AAAAAAAAYg4=</string> </persistent>
+              <persistent> <string id="25068.14" encoding="base64">AAAAAAAAYfo=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25088.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25068.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25088.16">
-                  <reference id="25088.6"/>
+              <list id="25068.16">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.17" encoding="repr">id</string> </key>
-            <value> <string id="25088.18" encoding="repr">login_password</string> </value>
+            <key> <string id="25068.17" encoding="repr">id</string> </key>
+            <value> <string id="25068.18" encoding="repr">login_password</string> </value>
         </item>
         <item>
-            <key> <string id="25088.19" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25068.19" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25088.20">
-                  <reference id="25088.6"/>
+              <list id="25068.20">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.21" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25068.21" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25088.22">
-                  <reference id="25088.6"/>
+              <list id="25068.22">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.23" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25068.23" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25088.24">
-                  <reference id="25088.6"/>
+              <list id="25068.24">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25068.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25088.26">
-                  <reference id="25088.6"/>
+              <list id="25068.26">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.27" encoding="repr">content_type</string> </key>
-            <value> <string id="25088.28" encoding="repr">text/html</string> </value>
+            <key> <string id="25068.27" encoding="repr">content_type</string> </key>
+            <value> <string id="25068.28" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25088.29" encoding="repr">_text</string> </key>
-            <value> <string id="25088.30" encoding="cdata"><![CDATA[
+            <key> <string id="25068.29" encoding="repr">_text</string> </key>
+            <value> <string id="25068.30" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
       lang="en"\n
@@ -5158,90 +5454,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25088.31" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25068.31" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25088.32">
-                  <reference id="25088.6"/>
+              <list id="25068.32">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25068.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25088.34">
-                  <reference id="25088.6"/>
+              <list id="25068.34">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.35" encoding="repr">expand</string> </key>
+            <key> <string id="25068.35" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25088.36" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25068.36" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25088.37">
-                  <reference id="25088.6"/>
+              <list id="25068.37">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.38" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25068.38" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25088.39">
-                  <reference id="25088.6"/>
+              <list id="25068.39">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.40" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25068.40" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25088.41">
-                  <reference id="25088.6"/>
+              <list id="25068.41">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.42" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25068.42" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25088.43">
-                  <reference id="25088.6"/>
+              <list id="25068.43">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.44" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25068.44" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25088.45">
-                  <reference id="25088.6"/>
+              <list id="25068.45">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.46" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25068.46" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25088.47">
-                  <reference id="25088.6"/>
+              <list id="25068.47">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.48" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25068.48" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25088.50">
+              <object id="25068.50">
                   <klass>
-                    <global id="25088.49" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25068.49" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25088.51">
+                    <dictionary id="25068.51">
                       <item>
-                          <key> <string id="25088.52" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25068.52" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25088.53">
+                            <dictionary id="25068.53">
                               <item>
-                                  <key> <string id="25088.54" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25088.55" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25068.54" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25068.55" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -5252,22 +5548,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25088.56" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25068.56" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25088.57">
-                  <reference id="25088.6"/>
+              <list id="25068.57">
+                  <reference id="25068.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25088.58" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25068.58" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25088.59">
+              <dictionary id="25068.59">
                 <item>
-                    <key> <string id="25088.60" encoding="repr">admin</string> </key>
+                    <key> <string id="25068.60" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25088.61">
-                          <string id="25088.62" encoding="repr">Owner</string>
+                      <list id="25068.61">
+                          <string id="25068.62" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -5277,98 +5573,98 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25089" aka="AAAAAAAAYgE=">
+  <record id="25069" aka="AAAAAAAAYe0=">
     <pickle>
-      <tuple id="25089.2">
-          <global id="25089.1" name="File" module="OFS.Image"/>
+      <tuple id="25069.2">
+          <global id="25069.1" name="File" module="OFS.Image"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25089.3">
+      <dictionary id="25069.3">
         <item>
-            <key> <string id="25089.4" encoding="repr">precondition</string> </key>
+            <key> <string id="25069.4" encoding="repr">precondition</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25089.5" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25069.5" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25089.6">
-                  <string id="25089.7" encoding="repr">Manager</string>
+              <list id="25069.6">
+                  <string id="25069.7" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.8" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25069.8" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25089.9">
-                  <reference id="25089.7"/>
+              <list id="25069.9">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.10" encoding="repr">__name__</string> </key>
-            <value> <string id="25089.11" encoding="repr">login.js_TEST</string> </value>
+            <key> <string id="25069.10" encoding="repr">__name__</string> </key>
+            <value> <string id="25069.11" encoding="repr">login.js_TEST</string> </value>
         </item>
         <item>
-            <key> <string id="25089.12" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25069.12" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25089.13">
-                  <reference id="25089.7"/>
+              <list id="25069.13">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.14" encoding="repr">size</string> </key>
+            <key> <string id="25069.14" encoding="repr">size</string> </key>
             <value> <int>2629</int> </value>
         </item>
         <item>
-            <key> <string id="25089.15" encoding="repr">title</string> </key>
+            <key> <string id="25069.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25089.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25069.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25089.17">
-                  <reference id="25089.7"/>
+              <list id="25069.17">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.18" encoding="repr">_EtagSupport__etag</string> </key>
-            <value> <string id="25089.19" encoding="repr">ts48383820.12</string> </value>
+            <key> <string id="25069.18" encoding="repr">_EtagSupport__etag</string> </key>
+            <value> <string id="25069.19" encoding="repr">ts48383820.12</string> </value>
         </item>
         <item>
-            <key> <string id="25089.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25069.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25089.21">
-                  <reference id="25089.7"/>
+              <list id="25069.21">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25089.23" encoding="repr">application/x-javascript</string> </value>
+            <key> <string id="25069.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25069.23" encoding="repr">application/x-javascript</string> </value>
         </item>
         <item>
-            <key> <string id="25089.24" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25069.24" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25089.25">
-                  <reference id="25089.7"/>
+              <list id="25069.25">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25069.26" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25089.27">
-                  <reference id="25089.7"/>
+              <list id="25069.27">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.28" encoding="repr">data</string> </key>
-            <value> <string id="25089.29" encoding="cdata"><![CDATA[
+            <key> <string id="25069.28" encoding="repr">data</string> </key>
+            <value> <string id="25069.29" encoding="cdata"><![CDATA[
 
 // Functions used by login pages\r\n
 \r\n
@@ -5449,78 +5745,78 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25089.30" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25069.30" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25089.31">
-                  <reference id="25089.7"/>
+              <list id="25069.31">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25069.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25089.33">
-                  <reference id="25089.7"/>
+              <list id="25069.33">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.34" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25069.34" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25089.35">
-                  <reference id="25089.7"/>
+              <list id="25069.35">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25069.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25089.37">
-                  <reference id="25089.7"/>
+              <list id="25069.37">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.38" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25069.38" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25089.39">
-                  <reference id="25089.7"/>
+              <list id="25069.39">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.40" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25069.40" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25089.41">
-                  <reference id="25089.7"/>
+              <list id="25069.41">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25069.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25089.43">
-                  <reference id="25089.7"/>
+              <list id="25069.43">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.44" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25069.44" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25089.45">
-                  <reference id="25089.7"/>
+              <list id="25069.45">
+                  <reference id="25069.7"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25089.46" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25069.46" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25089.47">
+              <dictionary id="25069.47">
                 <item>
-                    <key> <string id="25089.48" encoding="repr">admin</string> </key>
+                    <key> <string id="25069.48" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25089.49">
-                          <string id="25089.50" encoding="repr">Owner</string>
+                      <list id="25069.49">
+                          <string id="25069.50" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -5530,86 +5826,86 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25090" aka="AAAAAAAAYgI=">
+  <record id="25070" aka="AAAAAAAAYe4=">
     <pickle>
-      <tuple id="25090.2">
-          <global id="25090.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25070.2">
+          <global id="25070.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25090.3">
+      <dictionary id="25070.3">
         <item>
-            <key> <string id="25090.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25070.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25090.5">
-                  <string id="25090.6" encoding="repr">Manager</string>
+              <list id="25070.5">
+                  <string id="25070.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25070.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25090.8">
-                  <reference id="25090.6"/>
+              <list id="25070.8">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25070.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25090.10">
-                  <reference id="25090.6"/>
+              <list id="25070.10">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25070.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25090.12">
-                  <reference id="25090.6"/>
+              <list id="25070.12">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.13" encoding="repr">id</string> </key>
-            <value> <string id="25090.14" encoding="repr">footer</string> </value>
+            <key> <string id="25070.13" encoding="repr">id</string> </key>
+            <value> <string id="25070.14" encoding="repr">footer</string> </value>
         </item>
         <item>
-            <key> <string id="25090.15" encoding="repr">title</string> </key>
+            <key> <string id="25070.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25090.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25070.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25090.17">
-                  <reference id="25090.6"/>
+              <list id="25070.17">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25070.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25090.19">
-                  <reference id="25090.6"/>
+              <list id="25070.19">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25070.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25090.21">
-                  <reference id="25090.6"/>
+              <list id="25070.21">
+                  <reference id="25070.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25090.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25070.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25070.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25090.24" encoding="repr">_text</string> </key>
-            <value> <string id="25090.25" encoding="cdata"><![CDATA[
+            <key> <string id="25070.24" encoding="repr">_text</string> </key>
+            <value> <string id="25070.25" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">\n
 <body>\n
@@ -5646,90 +5942,429 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25090.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25070.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <value>
+              <list id="25070.27">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <value>
+              <list id="25070.29">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.30" encoding="repr">expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string id="25070.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <value>
+              <list id="25070.32">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <value>
+              <list id="25070.34">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <value>
+              <list id="25070.36">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <value>
+              <list id="25070.38">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <value>
+              <list id="25070.40">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <value>
+              <list id="25070.42">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.43" encoding="repr">_bind_names</string> </key>
+            <value>
+              <object id="25070.45">
+                  <klass>
+                    <global id="25070.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                  </klass>
+                  <tuple/>
+                  <state>
+                    <dictionary id="25070.46">
+                      <item>
+                          <key> <string id="25070.47" encoding="repr">_asgns</string> </key>
+                          <value>
+                            <dictionary id="25070.48">
+                              <item>
+                                  <key> <string id="25070.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25070.50" encoding="repr">traverse_subpath</string> </value>
+                              </item>
+                            </dictionary>
+                          </value>
+                      </item>
+                    </dictionary>
+                  </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <value>
+              <list id="25070.52">
+                  <reference id="25070.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25070.53" encoding="repr">__ac_local_roles__</string> </key>
+            <value>
+              <dictionary id="25070.54">
+                <item>
+                    <key> <string id="25070.55" encoding="repr">admin</string> </key>
+                    <value>
+                      <list id="25070.56">
+                          <string id="25070.57" encoding="repr">Owner</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="25153" aka="AAAAAAAAYkE=">
+    <pickle>
+      <tuple id="25153.2">
+          <global id="25153.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+          <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary id="25153.3">
+        <item>
+            <key> <string id="25153.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <value>
+              <list id="25153.5">
+                  <string id="25153.6" encoding="repr">Manager</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <value>
+              <list id="25153.8">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <value>
+              <list id="25153.10">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <value>
+              <list id="25153.12">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.13" encoding="repr">id</string> </key>
+            <value> <string id="25153.14" encoding="repr">portlet_login</string> </value>
+        </item>
+        <item>
+            <key> <string id="25153.15" encoding="repr">title</string> </key>
+            <value> <string encoding="repr"></string> </value>
+        </item>
+        <item>
+            <key> <string id="25153.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <value>
+              <list id="25153.17">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.18" encoding="repr">_View_Permission</string> </key>
+            <value>
+              <list id="25153.19">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <value>
+              <list id="25153.21">
+                  <reference id="25153.6"/>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string id="25153.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25153.23" encoding="repr">text/html</string> </value>
+        </item>
+        <item>
+            <key> <string id="25153.24" encoding="repr">_text</string> </key>
+            <value> <string id="25153.25" encoding="cdata"><![CDATA[
+
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+      xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+      i18n:domain="plone">\n
+<body tal:define="Iterator python:modules[\'Products.CMFPlone\'].IndexIterator;\n
+                  tabindex python:Iterator(mainSlot=False)">\n
+<div metal:define-macro="portlet"\n
+     tal:omit-tag=""\n
+     tal:define="pageloc python: request.URL.split(\'/\')[-1];\n
+                 okToShowHere python: not pageloc in (\'login_form\', \'join_form\');\n
+                 auth nocall:here/acl_users/credentials_cookie_auth|nothing"\n
+     tal:condition="python: isAnon and okToShowHere">\n
+\n
+<div style="margin-top:1em"\n
+  tal:define="ac_name auth/name_cookie|string:__ac_name"\n
+  tal:condition="python:errors and ac_name == \'admin\'" >\n
+If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.\n
+</div> \n
+\n
+<dl class="portlet"\n
+    id="portlet-login"\n
+    tal:define="ac_name auth/name_cookie|string:__ac_name;\n
+                ac_password auth/pw_cookie|string:__ac_password;\n
+                ac_persist auth/persist_cookie|nothing;\n
+                join python:[a[\'url\'] for a in actions[\'user\'] if a[\'id\']==\'join\'];\n
+                canRegister python:test(join and hasattr(here,\'portal_registration\') and checkPermission(\'Add portal member\', here), 1, 0);\n
+                canRequestPassword python:checkPermission(\'Mail forgotten password\', here)"\n
+    tal:condition="python: auth">\n
+\n
+    <dt class="portletHeader">\n
+        <span class="portletTopLeft"></span>\n
+        <a href="#" \n
+           class="tile"\n
+           tal:attributes="href string:$portal_url/login_form"\n
+           i18n:translate="box_sign_in">Log in</a>\n
+        <span class="portletTopRight"></span>\n
+    </dt>\n
+\n
+    <dd class="portletItem odd">\n
+        <form action="login_form"\n
+              name="loginform"\n
+              method="post"\n
+              tal:attributes="action string:${portal_url}/login_form">\n
+\n
+            <input type="hidden" name="form.submitted" value="1" />\n
+            <input type="hidden" name="came_from" value=""\n
+                   tal:attributes="value context/@@plone/getCurrentUrl" />\n
+            <input type="hidden" name="js_enabled" id="js_enabled" value="0" />\n
+            <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />\n
+            <input type="hidden" name="login_name" id="login_name" value="" />\n
+            <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />\n
+\n
+            <div class="field">\n
+                <label for=""\n
+                       tal:attributes="for ac_name"\n
+                       i18n:translate="label_login_name">Login Name</label>\n
+                <br />\n
+                <input type="text"\n
+                       size="10"\n
+                       alt="Login Name"\n
+                       onclick="showCookieMessage(\'cookies_message\')"\n
+                       tal:attributes="name ac_name; id ac_name;\n
+                                       value python:request.get(ac_name, \'\');\n
+                                       tabindex tabindex/next"\n
+                       i18n:attributes="alt label_login_name;"/>\n
+            </div>\n
+            \n
+            <div class="field">\n
+                <label for=""\n
+                       tal:attributes="for ac_password"\n
+                       i18n:translate="label_password">Password</label>\n
+                <br />\n
+                <input type="password"\n
+                       size="10"\n
+                       alt="Password"\n
+                       onclick="showCookieMessage(\'cookies_message\')"\n
+                       tal:attributes="name ac_password; id ac_password;\n
+                                       tabindex tabindex/next;"\n
+                       i18n:attributes="alt label_password;"/>\n
+            </div>\n
+\n
+            <div id="cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">\n
+                Cookies are not enabled. You must <span i18n:name="enable_cookies">\n
+                <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.\n
+            </div>\n
+            \n
+            <div class="formControls">\n
+            \n
+                <input class="context"\n
+                       type="submit"\n
+                       name="submit"\n
+                       value="Log in"\n
+                       alt="Log in"\n
+                       tal:attributes="tabindex tabindex/next;\n
+                                  onclick string:javascript:return setLoginVars(\'$ac_name\',\'login_name\',\'$ac_password\',\'pwd_empty\',\'js_enabled\',\'cookies_enabled\');"\n
+                       i18n:attributes="value label_log_in; alt label_log_in;"/>\n
+            </div>\n
+        </form>\n
+    </dd>\n
+    \n
+    <dd class="portletItem even" tal:condition="canRequestPassword">\n
+        <a href="mail_password_form"\n
+           class="tile"\n
+           tal:attributes="href string:${portal_url}/mail_password_form">\n
+           <tal:block replace="structure portal/info_icon.gif"/>\n
+           <span tal:omit-tag="" i18n:translate="box_forgot_password_option">Forgot your password?</span>\n
+        </a>\n
+    </dd>\n
+    </dl>\n
+\n
+\n
+<dl class="portlet"\n
+    id="portlet-login"\n
+    tal:condition="python: not auth">\n
+\n
+    <dt class="portletHeader">\n
+        <a href="#" \n
+           class="tile"\n
+           i18n:translate="box_sign_in">Log in</a>\n
+    </dt>\n
+\n
+    <dd class="portletItem"\n
+        tal:condition="python: not auth"\n
+        i18n:translate="login_portlet_disabled">\n
+        Cookie authentication is disabled. \n
+        Login portlet not available.\n
+    </dd>\n
+\n
+</dl>\n
+\n
+\n
+\n
+</div>\n
+</body>\n
+</html>\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string id="25153.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25090.27">
-                  <reference id="25090.6"/>
+              <list id="25153.27">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25153.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25090.29">
-                  <reference id="25090.6"/>
+              <list id="25153.29">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.30" encoding="repr">expand</string> </key>
+            <key> <string id="25153.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25090.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25153.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25090.32">
-                  <reference id="25090.6"/>
+              <list id="25153.32">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25153.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25090.34">
-                  <reference id="25090.6"/>
+              <list id="25153.34">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25153.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25090.36">
-                  <reference id="25090.6"/>
+              <list id="25153.36">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25153.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25090.38">
-                  <reference id="25090.6"/>
+              <list id="25153.38">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25153.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25090.40">
-                  <reference id="25090.6"/>
+              <list id="25153.40">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25153.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25090.42">
-                  <reference id="25090.6"/>
+              <list id="25153.42">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25153.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25090.45">
+              <object id="25153.45">
                   <klass>
-                    <global id="25090.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25153.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25090.46">
+                    <dictionary id="25153.46">
                       <item>
-                          <key> <string id="25090.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25153.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25090.48">
+                            <dictionary id="25153.48">
                               <item>
-                                  <key> <string id="25090.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25090.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25153.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25153.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -5740,22 +6375,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25090.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25153.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25090.52">
-                  <reference id="25090.6"/>
+              <list id="25153.52">
+                  <reference id="25153.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25090.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25153.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25090.54">
+              <dictionary id="25153.54">
                 <item>
-                    <key> <string id="25090.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25153.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25090.56">
-                          <string id="25090.57" encoding="repr">Owner</string>
+                      <list id="25153.56">
+                          <string id="25153.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -5765,102 +6400,102 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25091" aka="AAAAAAAAYgM=">
+  <record id="25071" aka="AAAAAAAAYe8=">
     <pickle>
-      <tuple id="25091.2">
-          <global id="25091.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
+      <tuple id="25071.2">
+          <global id="25071.1" name="ControllerPageTemplate" module="Products.CMFFormController.ControllerPageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25091.3">
+      <dictionary id="25071.3">
         <item>
-            <key> <string id="25091.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25071.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25091.5">
-                  <string id="25091.6" encoding="repr">Manager</string>
+              <list id="25071.5">
+                  <string id="25071.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25071.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25091.8">
-                  <reference id="25091.6"/>
+              <list id="25071.8">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.9" encoding="repr">actions</string> </key>
+            <key> <string id="25071.9" encoding="repr">actions</string> </key>
             <value>
-              <persistent> <string id="25091.10" encoding="base64">AAAAAAAAYg8=</string> </persistent>
+              <persistent> <string id="25071.10" encoding="base64">AAAAAAAAYfs=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25091.11" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25071.11" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25091.12">
-                  <reference id="25091.6"/>
+              <list id="25071.12">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.13" encoding="repr">validators</string> </key>
+            <key> <string id="25071.13" encoding="repr">validators</string> </key>
             <value>
-              <persistent> <string id="25091.14" encoding="base64">AAAAAAAAYhA=</string> </persistent>
+              <persistent> <string id="25071.14" encoding="base64">AAAAAAAAYfw=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25091.15" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25071.15" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25091.16">
-                  <reference id="25091.6"/>
+              <list id="25071.16">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.17" encoding="repr">id</string> </key>
-            <value> <string id="25091.18" encoding="repr">login_form_TEST</string> </value>
+            <key> <string id="25071.17" encoding="repr">id</string> </key>
+            <value> <string id="25071.18" encoding="repr">login_form_TEST</string> </value>
         </item>
         <item>
-            <key> <string id="25091.19" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25071.19" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25091.20">
-                  <reference id="25091.6"/>
+              <list id="25071.20">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.21" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25071.21" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25091.22">
-                  <reference id="25091.6"/>
+              <list id="25071.22">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.23" encoding="repr">_Manage_portal_Permission</string> </key>
+            <key> <string id="25071.23" encoding="repr">_Manage_portal_Permission</string> </key>
             <value>
-              <list id="25091.24">
-                  <reference id="25091.6"/>
+              <list id="25071.24">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25071.25" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25091.26">
-                  <reference id="25091.6"/>
+              <list id="25071.26">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.27" encoding="repr">content_type</string> </key>
-            <value> <string id="25091.28" encoding="repr">text/html</string> </value>
+            <key> <string id="25071.27" encoding="repr">content_type</string> </key>
+            <value> <string id="25071.28" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25091.29" encoding="repr">_text</string> </key>
-            <value> <string id="25091.30" encoding="cdata"><![CDATA[
+            <key> <string id="25071.29" encoding="repr">_text</string> </key>
+            <value> <string id="25071.30" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"\n
       metal:use-macro="here/main_template/macros/master"\n
@@ -6045,90 +6680,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25091.31" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25071.31" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25091.32">
-                  <reference id="25091.6"/>
+              <list id="25071.32">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25071.33" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25091.34">
-                  <reference id="25091.6"/>
+              <list id="25071.34">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.35" encoding="repr">expand</string> </key>
+            <key> <string id="25071.35" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25091.36" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25071.36" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25091.37">
-                  <reference id="25091.6"/>
+              <list id="25071.37">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.38" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25071.38" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25091.39">
-                  <reference id="25091.6"/>
+              <list id="25071.39">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.40" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25071.40" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25091.41">
-                  <reference id="25091.6"/>
+              <list id="25071.41">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.42" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25071.42" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25091.43">
-                  <reference id="25091.6"/>
+              <list id="25071.43">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.44" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25071.44" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25091.45">
-                  <reference id="25091.6"/>
+              <list id="25071.45">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.46" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25071.46" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25091.47">
-                  <reference id="25091.6"/>
+              <list id="25071.47">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.48" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25071.48" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25091.50">
+              <object id="25071.50">
                   <klass>
-                    <global id="25091.49" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25071.49" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25091.51">
+                    <dictionary id="25071.51">
                       <item>
-                          <key> <string id="25091.52" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25071.52" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25091.53">
+                            <dictionary id="25071.53">
                               <item>
-                                  <key> <string id="25091.54" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25091.55" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25071.54" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25071.55" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -6139,22 +6774,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25091.56" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25071.56" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25091.57">
-                  <reference id="25091.6"/>
+              <list id="25071.57">
+                  <reference id="25071.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25091.58" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25071.58" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25091.59">
+              <dictionary id="25071.59">
                 <item>
-                    <key> <string id="25091.60" encoding="repr">admin</string> </key>
+                    <key> <string id="25071.60" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25091.61">
-                          <string id="25091.62" encoding="repr">Owner</string>
+                      <list id="25071.61">
+                          <string id="25071.62" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -6164,86 +6799,86 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25092" aka="AAAAAAAAYgQ=">
+  <record id="25154" aka="AAAAAAAAYkI=">
     <pickle>
-      <tuple id="25092.2">
-          <global id="25092.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25154.2">
+          <global id="25154.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25092.3">
+      <dictionary id="25154.3">
         <item>
-            <key> <string id="25092.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25154.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25092.5">
-                  <string id="25092.6" encoding="repr">Manager</string>
+              <list id="25154.5">
+                  <string id="25154.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25154.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25092.8">
-                  <reference id="25092.6"/>
+              <list id="25154.8">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25154.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25092.10">
-                  <reference id="25092.6"/>
+              <list id="25154.10">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25154.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25092.12">
-                  <reference id="25092.6"/>
+              <list id="25154.12">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.13" encoding="repr">id</string> </key>
-            <value> <string id="25092.14" encoding="repr">login_failed</string> </value>
+            <key> <string id="25154.13" encoding="repr">id</string> </key>
+            <value> <string id="25154.14" encoding="repr">login_failed</string> </value>
         </item>
         <item>
-            <key> <string id="25092.15" encoding="repr">title</string> </key>
+            <key> <string id="25154.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25092.16" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25154.16" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25092.17">
-                  <reference id="25092.6"/>
+              <list id="25154.17">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.18" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25154.18" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25092.19">
-                  <reference id="25092.6"/>
+              <list id="25154.19">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25154.20" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25092.21">
-                  <reference id="25092.6"/>
+              <list id="25154.21">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.22" encoding="repr">content_type</string> </key>
-            <value> <string id="25092.23" encoding="repr">text/html</string> </value>
+            <key> <string id="25154.22" encoding="repr">content_type</string> </key>
+            <value> <string id="25154.23" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25092.24" encoding="repr">_text</string> </key>
-            <value> <string id="25092.25" encoding="cdata"><![CDATA[
+            <key> <string id="25154.24" encoding="repr">_text</string> </key>
+            <value> <string id="25154.25" encoding="cdata"><![CDATA[
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"\n
       lang="en"\n
@@ -6258,15 +6893,15 @@
 \n
     <h1 i18n:translate="heading_sign_in_failure_auth">Sign-in failure</h1>\n
 \n
-<div style="margin-top:1em" tal:condition="python:login_name == \'admin\'" >\n
-If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.\n
-</div> \n
-\n
     <p i18n:translate="description_not_logged_in_username_incorrect">\n
       You are not currently logged in. Your user name and/or password\n
       may be incorrect.\n
     </p>\n
 \n
+    <p tal:condition="python: login_name == \'admin\'">\n
+If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.\n
+    </p>\n
+\n
     <p i18n:translate="description_enable_cookies">\n
       If your user name and password are correct, the problem may be that\n
       your browser is not configured to <span i18n:name="link">\n
@@ -6305,90 +6940,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25092.26" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25154.26" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25092.27">
-                  <reference id="25092.6"/>
+              <list id="25154.27">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25154.28" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25092.29">
-                  <reference id="25092.6"/>
+              <list id="25154.29">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.30" encoding="repr">expand</string> </key>
+            <key> <string id="25154.30" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25092.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25154.31" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25092.32">
-                  <reference id="25092.6"/>
+              <list id="25154.32">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.33" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25154.33" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25092.34">
-                  <reference id="25092.6"/>
+              <list id="25154.34">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25154.35" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25092.36">
-                  <reference id="25092.6"/>
+              <list id="25154.36">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.37" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25154.37" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25092.38">
-                  <reference id="25092.6"/>
+              <list id="25154.38">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.39" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25154.39" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25092.40">
-                  <reference id="25092.6"/>
+              <list id="25154.40">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25154.41" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25092.42">
-                  <reference id="25092.6"/>
+              <list id="25154.42">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.43" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25154.43" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25092.45">
+              <object id="25154.45">
                   <klass>
-                    <global id="25092.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25154.44" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25092.46">
+                    <dictionary id="25154.46">
                       <item>
-                          <key> <string id="25092.47" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25154.47" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25092.48">
+                            <dictionary id="25154.48">
                               <item>
-                                  <key> <string id="25092.49" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25092.50" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25154.49" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25154.50" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -6399,22 +7034,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25092.51" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25154.51" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25092.52">
-                  <reference id="25092.6"/>
+              <list id="25154.52">
+                  <reference id="25154.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25092.53" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25154.53" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25092.54">
+              <dictionary id="25154.54">
                 <item>
-                    <key> <string id="25092.55" encoding="repr">admin</string> </key>
+                    <key> <string id="25154.55" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25092.56">
-                          <string id="25092.57" encoding="repr">Owner</string>
+                      <list id="25154.56">
+                          <string id="25154.57" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -6424,92 +7059,92 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25093" aka="AAAAAAAAYgU=">
+  <record id="25073" aka="AAAAAAAAYfE=">
     <pickle>
-      <tuple id="25093.2">
-          <global id="25093.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+      <tuple id="25073.2">
+          <global id="25073.1" name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25093.3">
+      <dictionary id="25073.3">
         <item>
-            <key> <string id="25093.4" encoding="repr">_Take_ownership_Permission</string> </key>
+            <key> <string id="25073.4" encoding="repr">_Take_ownership_Permission</string> </key>
             <value>
-              <list id="25093.5">
-                  <string id="25093.6" encoding="repr">Manager</string>
+              <list id="25073.5">
+                  <string id="25073.6" encoding="repr">Manager</string>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.7" encoding="repr">_WebDAV_access_Permission</string> </key>
+            <key> <string id="25073.7" encoding="repr">_WebDAV_access_Permission</string> </key>
             <value>
-              <list id="25093.8">
-                  <reference id="25093.6"/>
+              <list id="25073.8">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.9" encoding="repr">_Change_bindings_Permission</string> </key>
+            <key> <string id="25073.9" encoding="repr">_Change_bindings_Permission</string> </key>
             <value>
-              <list id="25093.10">
-                  <reference id="25093.6"/>
+              <list id="25073.10">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.11" encoding="repr">_Access_contents_information_Permission</string> </key>
+            <key> <string id="25073.11" encoding="repr">_Access_contents_information_Permission</string> </key>
             <value>
-              <list id="25093.12">
-                  <reference id="25093.6"/>
+              <list id="25073.12">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.13" encoding="repr">id</string> </key>
-            <value> <string id="25093.14" encoding="repr">main_template</string> </value>
+            <key> <string id="25073.13" encoding="repr">id</string> </key>
+            <value> <string id="25073.14" encoding="repr">main_template</string> </value>
         </item>
         <item>
-            <key> <string id="25093.15" encoding="repr">title</string> </key>
+            <key> <string id="25073.15" encoding="repr">title</string> </key>
             <value> <string encoding="repr"></string> </value>
         </item>
         <item>
-            <key> <string id="25093.16" encoding="repr">_Cacheable__manager_id</string> </key>
+            <key> <string id="25073.16" encoding="repr">_Cacheable__manager_id</string> </key>
             <value>
               <none/>
             </value>
         </item>
         <item>
-            <key> <string id="25093.17" encoding="repr">_Delete_objects_Permission</string> </key>
+            <key> <string id="25073.17" encoding="repr">_Delete_objects_Permission</string> </key>
             <value>
-              <list id="25093.18">
-                  <reference id="25093.6"/>
+              <list id="25073.18">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.19" encoding="repr">_View_Permission</string> </key>
+            <key> <string id="25073.19" encoding="repr">_View_Permission</string> </key>
             <value>
-              <list id="25093.20">
-                  <reference id="25093.6"/>
+              <list id="25073.20">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.21" encoding="repr">_Copy_or_Move_Permission</string> </key>
+            <key> <string id="25073.21" encoding="repr">_Copy_or_Move_Permission</string> </key>
             <value>
-              <list id="25093.22">
-                  <reference id="25093.6"/>
+              <list id="25073.22">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.23" encoding="repr">content_type</string> </key>
-            <value> <string id="25093.24" encoding="repr">text/html</string> </value>
+            <key> <string id="25073.23" encoding="repr">content_type</string> </key>
+            <value> <string id="25073.24" encoding="repr">text/html</string> </value>
         </item>
         <item>
-            <key> <string id="25093.25" encoding="repr">_text</string> </key>
-            <value> <string id="25093.26" encoding="cdata"><![CDATA[
+            <key> <string id="25073.25" encoding="repr">_text</string> </key>
+            <value> <string id="25073.26" encoding="cdata"><![CDATA[
 
 <metal:page define-macro="master"><metal:doctype define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";></metal:doctype>\n
 <metal:block define-slot="top_slot" />\n
@@ -6716,90 +7351,90 @@
 ]]></string> </value>
         </item>
         <item>
-            <key> <string id="25093.27" encoding="repr">_View_management_screens_Permission</string> </key>
+            <key> <string id="25073.27" encoding="repr">_View_management_screens_Permission</string> </key>
             <value>
-              <list id="25093.28">
-                  <reference id="25093.6"/>
+              <list id="25073.28">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.29" encoding="repr">_Change_cache_settings_Permission</string> </key>
+            <key> <string id="25073.29" encoding="repr">_Change_cache_settings_Permission</string> </key>
             <value>
-              <list id="25093.30">
-                  <reference id="25093.6"/>
+              <list id="25073.30">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.31" encoding="repr">expand</string> </key>
+            <key> <string id="25073.31" encoding="repr">expand</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string id="25093.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
+            <key> <string id="25073.32" encoding="repr">_WebDAV_Unlock_items_Permission</string> </key>
             <value>
-              <list id="25093.33">
-                  <reference id="25093.6"/>
+              <list id="25073.33">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.34" encoding="repr">_Manage_properties_Permission</string> </key>
+            <key> <string id="25073.34" encoding="repr">_Manage_properties_Permission</string> </key>
             <value>
-              <list id="25093.35">
-                  <reference id="25093.6"/>
+              <list id="25073.35">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
+            <key> <string id="25073.36" encoding="repr">_WebDAV_Lock_items_Permission</string> </key>
             <value>
-              <list id="25093.37">
-                  <reference id="25093.6"/>
+              <list id="25073.37">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.38" encoding="repr">_Undo_changes_Permission</string> </key>
+            <key> <string id="25073.38" encoding="repr">_Undo_changes_Permission</string> </key>
             <value>
-              <list id="25093.39">
-                  <reference id="25093.6"/>
+              <list id="25073.39">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.40" encoding="repr">_FTP_access_Permission</string> </key>
+            <key> <string id="25073.40" encoding="repr">_FTP_access_Permission</string> </key>
             <value>
-              <list id="25093.41">
-                  <reference id="25093.6"/>
+              <list id="25073.41">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
+            <key> <string id="25073.42" encoding="repr">_Manage_WebDAV_Locks_Permission</string> </key>
             <value>
-              <list id="25093.43">
-                  <reference id="25093.6"/>
+              <list id="25073.43">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.44" encoding="repr">_bind_names</string> </key>
+            <key> <string id="25073.44" encoding="repr">_bind_names</string> </key>
             <value>
-              <object id="25093.46">
+              <object id="25073.46">
                   <klass>
-                    <global id="25093.45" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                    <global id="25073.45" name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
                   </klass>
                   <tuple/>
                   <state>
-                    <dictionary id="25093.47">
+                    <dictionary id="25073.47">
                       <item>
-                          <key> <string id="25093.48" encoding="repr">_asgns</string> </key>
+                          <key> <string id="25073.48" encoding="repr">_asgns</string> </key>
                           <value>
-                            <dictionary id="25093.49">
+                            <dictionary id="25073.49">
                               <item>
-                                  <key> <string id="25093.50" encoding="repr">name_subpath</string> </key>
-                                  <value> <string id="25093.51" encoding="repr">traverse_subpath</string> </value>
+                                  <key> <string id="25073.50" encoding="repr">name_subpath</string> </key>
+                                  <value> <string id="25073.51" encoding="repr">traverse_subpath</string> </value>
                               </item>
                             </dictionary>
                           </value>
@@ -6810,22 +7445,22 @@
             </value>
         </item>
         <item>
-            <key> <string id="25093.52" encoding="repr">_Change_permissions_Permission</string> </key>
+            <key> <string id="25073.52" encoding="repr">_Change_permissions_Permission</string> </key>
             <value>
-              <list id="25093.53">
-                  <reference id="25093.6"/>
+              <list id="25073.53">
+                  <reference id="25073.6"/>
               </list>
             </value>
         </item>
         <item>
-            <key> <string id="25093.54" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25073.54" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25093.55">
+              <dictionary id="25073.55">
                 <item>
-                    <key> <string id="25093.56" encoding="repr">admin</string> </key>
+                    <key> <string id="25073.56" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25093.57">
-                          <string id="25093.58" encoding="repr">Owner</string>
+                      <list id="25073.57">
+                          <string id="25073.58" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -6835,32 +7470,32 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25094" aka="AAAAAAAAYgY=">
+  <record id="25074" aka="AAAAAAAAYfI=">
     <pickle>
-      <tuple id="25094.2">
-          <global id="25094.1" name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
+      <tuple id="25074.2">
+          <global id="25074.1" name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25094.3">
+      <dictionary id="25074.3">
         <item>
-            <key> <string id="25094.4" encoding="repr">_module</string> </key>
-            <value> <string id="25094.5" encoding="repr">homebase_adapters</string> </value>
+            <key> <string id="25074.4" encoding="repr">_module</string> </key>
+            <value> <string id="25074.5" encoding="repr">homebase_adapters</string> </value>
         </item>
         <item>
-            <key> <string id="25094.6" encoding="repr">_function</string> </key>
-            <value> <string id="25094.7" encoding="repr">siteIsSetup</string> </value>
+            <key> <string id="25074.6" encoding="repr">_function</string> </key>
+            <value> <string id="25074.7" encoding="repr">siteIsSetup</string> </value>
         </item>
         <item>
-            <key> <string id="25094.8" encoding="repr">__ac_local_roles__</string> </key>
+            <key> <string id="25074.8" encoding="repr">__ac_local_roles__</string> </key>
             <value>
-              <dictionary id="25094.9">
+              <dictionary id="25074.9">
                 <item>
-                    <key> <string id="25094.10" encoding="repr">admin</string> </key>
+                    <key> <string id="25074.10" encoding="repr">admin</string> </key>
                     <value>
-                      <list id="25094.11">
-                          <string id="25094.12" encoding="repr">Owner</string>
+                      <list id="25074.11">
+                          <string id="25074.12" encoding="repr">Owner</string>
                       </list>
                     </value>
                 </item>
@@ -6868,59 +7503,59 @@
             </value>
         </item>
         <item>
-            <key> <string id="25094.13" encoding="repr">id</string> </key>
-            <value> <string id="25094.14" encoding="repr">siteIsSetup</string> </value>
+            <key> <string id="25074.13" encoding="repr">id</string> </key>
+            <value> <string id="25074.14" encoding="repr">siteIsSetup</string> </value>
         </item>
         <item>
-            <key> <string id="25094.15" encoding="repr">title</string> </key>
-            <value> <string id="25094.16" encoding="repr">siteIsSetup</string> </value>
+            <key> <string id="25074.15" encoding="repr">title</string> </key>
+            <value> <string id="25074.16" encoding="repr">siteIsSetup</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25095" aka="AAAAAAAAYgc=">
+  <record id="25156" aka="AAAAAAAAYkQ=">
     <pickle>
-      <tuple id="25095.2">
-          <global id="25095.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25156.2">
+          <global id="25156.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25095.3">
+      <dictionary id="25156.3">
         <item>
-            <key> <string id="25095.4" encoding="repr">actions</string> </key>
+            <key> <string id="25156.4" encoding="repr">actions</string> </key>
             <value>
-              <dictionary id="25095.5">
+              <dictionary id="25156.5">
                 <item>
                     <key>
-                      <persistent> <string id="25095.6" encoding="base64">AAAAAAAAYhE=</string> </persistent>
+                      <persistent> <string id="25156.6" encoding="base64">AAAAAAAAYkg=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25095.7" encoding="base64">AAAAAAAAYhI=</string> </persistent>
+                      <persistent> <string id="25156.7" encoding="base64">AAAAAAAAYkk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25095.8" encoding="base64">AAAAAAAAYhM=</string> </persistent>
+                      <persistent> <string id="25156.8" encoding="base64">AAAAAAAAYko=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25095.9" encoding="base64">AAAAAAAAYhQ=</string> </persistent>
+                      <persistent> <string id="25156.9" encoding="base64">AAAAAAAAYks=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25095.10" encoding="base64">AAAAAAAAYhU=</string> </persistent>
+                      <persistent> <string id="25156.10" encoding="base64">AAAAAAAAYkw=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25095.11" encoding="base64">AAAAAAAAYhY=</string> </persistent>
+                      <persistent> <string id="25156.11" encoding="base64">AAAAAAAAYk0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25095.12" encoding="base64">AAAAAAAAYhc=</string> </persistent>
+                      <persistent> <string id="25156.12" encoding="base64">AAAAAAAAYk4=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25095.13" encoding="base64">AAAAAAAAYhg=</string> </persistent>
+                      <persistent> <string id="25156.13" encoding="base64">AAAAAAAAYk8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -6929,25 +7564,25 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25096" aka="AAAAAAAAYgg=">
+  <record id="25157" aka="AAAAAAAAYkU=">
     <pickle>
-      <tuple id="25096.2">
-          <global id="25096.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25157.2">
+          <global id="25157.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25096.3">
+      <dictionary id="25157.3">
         <item>
-            <key> <string id="25096.4" encoding="repr">validators</string> </key>
+            <key> <string id="25157.4" encoding="repr">validators</string> </key>
             <value>
-              <dictionary id="25096.5">
+              <dictionary id="25157.5">
                 <item>
                     <key>
-                      <persistent> <string id="25096.6" encoding="base64">AAAAAAAAYhk=</string> </persistent>
+                      <persistent> <string id="25157.6" encoding="base64">AAAAAAAAYkY=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25096.7" encoding="base64">AAAAAAAAYho=</string> </persistent>
+                      <persistent> <string id="25157.7" encoding="base64">AAAAAAAAYkc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -6956,41 +7591,41 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25097" aka="AAAAAAAAYgk=">
+  <record id="25077" aka="AAAAAAAAYfU=">
     <pickle>
-      <tuple id="25097.2">
-          <global id="25097.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25077.2">
+          <global id="25077.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25097.3">
+      <dictionary id="25077.3">
         <item>
-            <key> <string id="25097.4" encoding="repr">actions</string> </key>
+            <key> <string id="25077.4" encoding="repr">actions</string> </key>
             <value>
-              <dictionary id="25097.5">
+              <dictionary id="25077.5">
                 <item>
                     <key>
-                      <persistent> <string id="25097.6" encoding="base64">AAAAAAAAYhs=</string> </persistent>
+                      <persistent> <string id="25077.6" encoding="base64">AAAAAAAAYgc=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25097.7" encoding="base64">AAAAAAAAYhw=</string> </persistent>
+                      <persistent> <string id="25077.7" encoding="base64">AAAAAAAAYgg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25097.8" encoding="base64">AAAAAAAAYh0=</string> </persistent>
+                      <persistent> <string id="25077.8" encoding="base64">AAAAAAAAYgk=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25097.9" encoding="base64">AAAAAAAAYh4=</string> </persistent>
+                      <persistent> <string id="25077.9" encoding="base64">AAAAAAAAYgo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25097.10" encoding="base64">AAAAAAAAYh8=</string> </persistent>
+                      <persistent> <string id="25077.10" encoding="base64">AAAAAAAAYgs=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25097.11" encoding="base64">AAAAAAAAYiA=</string> </persistent>
+                      <persistent> <string id="25077.11" encoding="base64">AAAAAAAAYgw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -6999,33 +7634,33 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25098" aka="AAAAAAAAYgo=">
+  <record id="25078" aka="AAAAAAAAYfY=">
     <pickle>
-      <tuple id="25098.2">
-          <global id="25098.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25078.2">
+          <global id="25078.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25098.3">
+      <dictionary id="25078.3">
         <item>
-            <key> <string id="25098.4" encoding="repr">validators</string> </key>
+            <key> <string id="25078.4" encoding="repr">validators</string> </key>
             <value>
-              <dictionary id="25098.5">
+              <dictionary id="25078.5">
                 <item>
                     <key>
-                      <persistent> <string id="25098.6" encoding="base64">AAAAAAAAYiE=</string> </persistent>
+                      <persistent> <string id="25078.6" encoding="base64">AAAAAAAAYg0=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25098.7" encoding="base64">AAAAAAAAYiI=</string> </persistent>
+                      <persistent> <string id="25078.7" encoding="base64">AAAAAAAAYg4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25098.8" encoding="base64">AAAAAAAAYiM=</string> </persistent>
+                      <persistent> <string id="25078.8" encoding="base64">AAAAAAAAYg8=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25098.9" encoding="base64">AAAAAAAAYiQ=</string> </persistent>
+                      <persistent> <string id="25078.9" encoding="base64">AAAAAAAAYhA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7034,49 +7669,49 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25099" aka="AAAAAAAAYgs=">
+  <record id="25079" aka="AAAAAAAAYfc=">
     <pickle>
-      <tuple id="25099.2">
-          <global id="25099.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25079.2">
+          <global id="25079.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25099.3">
+      <dictionary id="25079.3">
         <item>
-            <key> <string id="25099.4" encoding="repr">actions</string> </key>
+            <key> <string id="25079.4" encoding="repr">actions</string> </key>
             <value>
-              <dictionary id="25099.5">
+              <dictionary id="25079.5">
                 <item>
                     <key>
-                      <persistent> <string id="25099.6" encoding="base64">AAAAAAAAYiU=</string> </persistent>
+                      <persistent> <string id="25079.6" encoding="base64">AAAAAAAAYhE=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25099.7" encoding="base64">AAAAAAAAYiY=</string> </persistent>
+                      <persistent> <string id="25079.7" encoding="base64">AAAAAAAAYhI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25099.8" encoding="base64">AAAAAAAAYic=</string> </persistent>
+                      <persistent> <string id="25079.8" encoding="base64">AAAAAAAAYhM=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25099.9" encoding="base64">AAAAAAAAYig=</string> </persistent>
+                      <persistent> <string id="25079.9" encoding="base64">AAAAAAAAYhQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25099.10" encoding="base64">AAAAAAAAYis=</string> </persistent>
+                      <persistent> <string id="25079.10" encoding="base64">AAAAAAAAYhc=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25099.11" encoding="base64">AAAAAAAAYiw=</string> </persistent>
+                      <persistent> <string id="25079.11" encoding="base64">AAAAAAAAYhg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25099.12" encoding="base64">AAAAAAAAYik=</string> </persistent>
+                      <persistent> <string id="25079.12" encoding="base64">AAAAAAAAYhU=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25099.13" encoding="base64">AAAAAAAAYio=</string> </persistent>
+                      <persistent> <string id="25079.13" encoding="base64">AAAAAAAAYhY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7085,25 +7720,25 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25100" aka="AAAAAAAAYgw=">
+  <record id="25080" aka="AAAAAAAAYfg=">
     <pickle>
-      <tuple id="25100.2">
-          <global id="25100.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25080.2">
+          <global id="25080.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25100.3">
+      <dictionary id="25080.3">
         <item>
-            <key> <string id="25100.4" encoding="repr">validators</string> </key>
+            <key> <string id="25080.4" encoding="repr">validators</string> </key>
             <value>
-              <dictionary id="25100.5">
+              <dictionary id="25080.5">
                 <item>
                     <key>
-                      <persistent> <string id="25100.6" encoding="base64">AAAAAAAAYi0=</string> </persistent>
+                      <persistent> <string id="25080.6" encoding="base64">AAAAAAAAYhk=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25100.7" encoding="base64">AAAAAAAAYi4=</string> </persistent>
+                      <persistent> <string id="25080.7" encoding="base64">AAAAAAAAYho=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7112,41 +7747,41 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25101" aka="AAAAAAAAYg0=">
+  <record id="25081" aka="AAAAAAAAYfk=">
     <pickle>
-      <tuple id="25101.2">
-          <global id="25101.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25081.2">
+          <global id="25081.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25101.3">
+      <dictionary id="25081.3">
         <item>
-            <key> <string id="25101.4" encoding="repr">actions</string> </key>
+            <key> <string id="25081.4" encoding="repr">actions</string> </key>
             <value>
-              <dictionary id="25101.5">
+              <dictionary id="25081.5">
                 <item>
                     <key>
-                      <persistent> <string id="25101.6" encoding="base64">AAAAAAAAYi8=</string> </persistent>
+                      <persistent> <string id="25081.6" encoding="base64">AAAAAAAAYhs=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25101.7" encoding="base64">AAAAAAAAYjA=</string> </persistent>
+                      <persistent> <string id="25081.7" encoding="base64">AAAAAAAAYhw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25101.8" encoding="base64">AAAAAAAAYjE=</string> </persistent>
+                      <persistent> <string id="25081.8" encoding="base64">AAAAAAAAYh0=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25101.9" encoding="base64">AAAAAAAAYjI=</string> </persistent>
+                      <persistent> <string id="25081.9" encoding="base64">AAAAAAAAYh4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25101.10" encoding="base64">AAAAAAAAYjM=</string> </persistent>
+                      <persistent> <string id="25081.10" encoding="base64">AAAAAAAAYh8=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25101.11" encoding="base64">AAAAAAAAYjQ=</string> </persistent>
+                      <persistent> <string id="25081.11" encoding="base64">AAAAAAAAYiA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7155,25 +7790,25 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25102" aka="AAAAAAAAYg4=">
+  <record id="25082" aka="AAAAAAAAYfo=">
     <pickle>
-      <tuple id="25102.2">
-          <global id="25102.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25082.2">
+          <global id="25082.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25102.3">
+      <dictionary id="25082.3">
         <item>
-            <key> <string id="25102.4" encoding="repr">validators</string> </key>
+            <key> <string id="25082.4" encoding="repr">validators</string> </key>
             <value>
-              <dictionary id="25102.5">
+              <dictionary id="25082.5">
                 <item>
                     <key>
-                      <persistent> <string id="25102.6" encoding="base64">AAAAAAAAYjU=</string> </persistent>
+                      <persistent> <string id="25082.6" encoding="base64">AAAAAAAAYiE=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25102.7" encoding="base64">AAAAAAAAYjY=</string> </persistent>
+                      <persistent> <string id="25082.7" encoding="base64">AAAAAAAAYiI=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7182,49 +7817,49 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25103" aka="AAAAAAAAYg8=">
+  <record id="25083" aka="AAAAAAAAYfs=">
     <pickle>
-      <tuple id="25103.2">
-          <global id="25103.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25083.2">
+          <global id="25083.1" name="FormActionContainer" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25103.3">
+      <dictionary id="25083.3">
         <item>
-            <key> <string id="25103.4" encoding="repr">actions</string> </key>
+            <key> <string id="25083.4" encoding="repr">actions</string> </key>
             <value>
-              <dictionary id="25103.5">
+              <dictionary id="25083.5">
                 <item>
                     <key>
-                      <persistent> <string id="25103.6" encoding="base64">AAAAAAAAYjc=</string> </persistent>
+                      <persistent> <string id="25083.6" encoding="base64">AAAAAAAAYiM=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25103.7" encoding="base64">AAAAAAAAYjg=</string> </persistent>
+                      <persistent> <string id="25083.7" encoding="base64">AAAAAAAAYiQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25103.8" encoding="base64">AAAAAAAAYjk=</string> </persistent>
+                      <persistent> <string id="25083.8" encoding="base64">AAAAAAAAYiU=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25103.9" encoding="base64">AAAAAAAAYjo=</string> </persistent>
+                      <persistent> <string id="25083.9" encoding="base64">AAAAAAAAYiY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25103.10" encoding="base64">AAAAAAAAYj0=</string> </persistent>
+                      <persistent> <string id="25083.10" encoding="base64">AAAAAAAAYik=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25103.11" encoding="base64">AAAAAAAAYj4=</string> </persistent>
+                      <persistent> <string id="25083.11" encoding="base64">AAAAAAAAYio=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>
-                      <persistent> <string id="25103.12" encoding="base64">AAAAAAAAYjs=</string> </persistent>
+                      <persistent> <string id="25083.12" encoding="base64">AAAAAAAAYic=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25103.13" encoding="base64">AAAAAAAAYjw=</string> </persistent>
+                      <persistent> <string id="25083.13" encoding="base64">AAAAAAAAYig=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7233,25 +7868,25 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25104" aka="AAAAAAAAYhA=">
+  <record id="25084" aka="AAAAAAAAYfw=">
     <pickle>
-      <tuple id="25104.2">
-          <global id="25104.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25084.2">
+          <global id="25084.1" name="FormValidatorContainer" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25104.3">
+      <dictionary id="25084.3">
         <item>
-            <key> <string id="25104.4" encoding="repr">validators</string> </key>
+            <key> <string id="25084.4" encoding="repr">validators</string> </key>
             <value>
-              <dictionary id="25104.5">
+              <dictionary id="25084.5">
                 <item>
                     <key>
-                      <persistent> <string id="25104.6" encoding="base64">AAAAAAAAYj8=</string> </persistent>
+                      <persistent> <string id="25084.6" encoding="base64">AAAAAAAAYis=</string> </persistent>
                     </key>
                     <value>
-                      <persistent> <string id="25104.7" encoding="base64">AAAAAAAAYkA=</string> </persistent>
+                      <persistent> <string id="25084.7" encoding="base64">AAAAAAAAYiw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -7260,21 +7895,21 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25105" aka="AAAAAAAAYhE=">
+  <record id="25160" aka="AAAAAAAAYkg=">
     <pickle>
-      <tuple id="25105.2">
-          <global id="25105.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25160.2">
+          <global id="25160.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25105.3">
+      <dictionary id="25160.3">
         <item>
-            <key> <string id="25105.4" encoding="repr">key</string> </key>
+            <key> <string id="25160.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25105.7">
-                  <string id="25105.5" encoding="repr">login_form</string>
-                  <string id="25105.6" encoding="repr">failure</string>
+              <tuple id="25160.7">
+                  <string id="25160.5" encoding="repr">login_form</string>
+                  <string id="25160.6" encoding="repr">failure</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7283,31 +7918,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25106" aka="AAAAAAAAYhI=">
+  <record id="25161" aka="AAAAAAAAYkk=">
     <pickle>
-      <tuple id="25106.2">
-          <global id="25106.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25161.2">
+          <global id="25161.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25106.3">
+      <dictionary id="25161.3">
         <item>
-            <key> <string id="25106.4" encoding="repr">action</string> </key>
+            <key> <string id="25161.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25106.7">
+              <object id="25161.7">
                   <klass>
-                    <global id="25106.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25161.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25106.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25161.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25106.8">
+                    <dictionary id="25161.8">
                       <item>
-                          <key> <string id="25106.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25161.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25106.10" encoding="base64">AAAAAAAAYkE=</string> </persistent>
+                            <persistent> <string id="25161.10" encoding="base64">AAAAAAAAYlM=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7316,37 +7951,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25106.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25106.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25106.13" encoding="repr">key</string> </key>
+            <key> <string id="25161.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25106.14" encoding="base64">AAAAAAAAYhE=</string> </persistent>
+              <persistent> <string id="25161.12" encoding="base64">AAAAAAAAYkg=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25106.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25106.16" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25161.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25161.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25161.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25161.16" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25107" aka="AAAAAAAAYhM=">
+  <record id="25162" aka="AAAAAAAAYko=">
     <pickle>
-      <tuple id="25107.2">
-          <global id="25107.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25162.2">
+          <global id="25162.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25107.3">
+      <dictionary id="25162.3">
         <item>
-            <key> <string id="25107.4" encoding="repr">key</string> </key>
+            <key> <string id="25162.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25107.7">
-                  <string id="25107.5" encoding="repr">login_form</string>
-                  <string id="25107.6" encoding="repr">enable_cookies</string>
+              <tuple id="25162.7">
+                  <string id="25162.5" encoding="repr">login_form</string>
+                  <string id="25162.6" encoding="repr">enable_cookies</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7355,31 +7990,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25108" aka="AAAAAAAAYhQ=">
+  <record id="25163" aka="AAAAAAAAYks=">
     <pickle>
-      <tuple id="25108.2">
-          <global id="25108.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25163.2">
+          <global id="25163.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25108.3">
+      <dictionary id="25163.3">
         <item>
-            <key> <string id="25108.4" encoding="repr">action</string> </key>
+            <key> <string id="25163.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25108.7">
+              <object id="25163.7">
                   <klass>
-                    <global id="25108.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25163.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25108.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25163.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25108.8">
+                    <dictionary id="25163.8">
                       <item>
-                          <key> <string id="25108.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25163.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25108.10" encoding="base64">AAAAAAAAYkI=</string> </persistent>
+                            <persistent> <string id="25163.10" encoding="base64">AAAAAAAAYlI=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7388,37 +8023,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25108.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25108.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25108.13" encoding="repr">key</string> </key>
+            <key> <string id="25163.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25108.14" encoding="base64">AAAAAAAAYhM=</string> </persistent>
+              <persistent> <string id="25163.12" encoding="base64">AAAAAAAAYko=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25108.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25108.16" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25163.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25163.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25163.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25163.16" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25109" aka="AAAAAAAAYhU=">
+  <record id="25164" aka="AAAAAAAAYkw=">
     <pickle>
-      <tuple id="25109.2">
-          <global id="25109.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25164.2">
+          <global id="25164.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25109.3">
+      <dictionary id="25164.3">
         <item>
-            <key> <string id="25109.4" encoding="repr">key</string> </key>
+            <key> <string id="25164.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25109.7">
-                  <string id="25109.5" encoding="repr">login_form</string>
-                  <string id="25109.6" encoding="repr">success</string>
+              <tuple id="25164.7">
+                  <string id="25164.5" encoding="repr">login_form</string>
+                  <string id="25164.6" encoding="repr">success</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7427,31 +8062,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25110" aka="AAAAAAAAYhY=">
+  <record id="25165" aka="AAAAAAAAYk0=">
     <pickle>
-      <tuple id="25110.2">
-          <global id="25110.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25165.2">
+          <global id="25165.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25110.3">
+      <dictionary id="25165.3">
         <item>
-            <key> <string id="25110.4" encoding="repr">action</string> </key>
+            <key> <string id="25165.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25110.7">
+              <object id="25165.7">
                   <klass>
-                    <global id="25110.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25165.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25110.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25165.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25110.8">
+                    <dictionary id="25165.8">
                       <item>
-                          <key> <string id="25110.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25165.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25110.10" encoding="base64">AAAAAAAAYkM=</string> </persistent>
+                            <persistent> <string id="25165.10" encoding="base64">AAAAAAAAYlE=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7460,37 +8095,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25110.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25110.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25110.13" encoding="repr">key</string> </key>
+            <key> <string id="25165.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25110.14" encoding="base64">AAAAAAAAYhU=</string> </persistent>
+              <persistent> <string id="25165.12" encoding="base64">AAAAAAAAYkw=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25110.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25110.16" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25165.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25165.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25165.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25165.16" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25111" aka="AAAAAAAAYhc=">
+  <record id="25166" aka="AAAAAAAAYk4=">
     <pickle>
-      <tuple id="25111.2">
-          <global id="25111.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25166.2">
+          <global id="25166.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25111.3">
+      <dictionary id="25166.3">
         <item>
-            <key> <string id="25111.4" encoding="repr">key</string> </key>
+            <key> <string id="25166.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25111.7">
-                  <string id="25111.5" encoding="repr">login_form</string>
-                  <string id="25111.6" encoding="repr">failure_page</string>
+              <tuple id="25166.7">
+                  <string id="25166.5" encoding="repr">login_form</string>
+                  <string id="25166.6" encoding="repr">failure_page</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7499,31 +8134,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25112" aka="AAAAAAAAYhg=">
+  <record id="25167" aka="AAAAAAAAYk8=">
     <pickle>
-      <tuple id="25112.2">
-          <global id="25112.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25167.2">
+          <global id="25167.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25112.3">
+      <dictionary id="25167.3">
         <item>
-            <key> <string id="25112.4" encoding="repr">action</string> </key>
+            <key> <string id="25167.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25112.7">
+              <object id="25167.7">
                   <klass>
-                    <global id="25112.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25167.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25112.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25167.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25112.8">
+                    <dictionary id="25167.8">
                       <item>
-                          <key> <string id="25112.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25167.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25112.10" encoding="base64">AAAAAAAAYkQ=</string> </persistent>
+                            <persistent> <string id="25167.10" encoding="base64">AAAAAAAAYlA=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7532,36 +8167,36 @@
             </value>
         </item>
         <item>
-            <key> <string id="25112.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25112.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25112.13" encoding="repr">key</string> </key>
+            <key> <string id="25167.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25112.14" encoding="base64">AAAAAAAAYhc=</string> </persistent>
+              <persistent> <string id="25167.12" encoding="base64">AAAAAAAAYk4=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25112.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25112.16" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25167.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25167.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25167.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25167.16" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25113" aka="AAAAAAAAYhk=">
+  <record id="25158" aka="AAAAAAAAYkY=">
     <pickle>
-      <tuple id="25113.2">
-          <global id="25113.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25158.2">
+          <global id="25158.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25113.3">
+      <dictionary id="25158.3">
         <item>
-            <key> <string id="25113.4" encoding="repr">key</string> </key>
+            <key> <string id="25158.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25113.6">
-                  <string id="25113.5" encoding="repr">login_form</string>
+              <tuple id="25158.6">
+                  <string id="25158.5" encoding="repr">login_form</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7570,47 +8205,47 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25114" aka="AAAAAAAAYho=">
+  <record id="25159" aka="AAAAAAAAYkc=">
     <pickle>
-      <tuple id="25114.2">
-          <global id="25114.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25159.2">
+          <global id="25159.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25114.3">
+      <dictionary id="25159.3">
         <item>
-            <key> <string id="25114.4" encoding="repr">key</string> </key>
+            <key> <string id="25159.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25114.5" encoding="base64">AAAAAAAAYhk=</string> </persistent>
+              <persistent> <string id="25159.5" encoding="base64">AAAAAAAAYkY=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25114.6" encoding="repr">validators</string> </key>
+            <key> <string id="25159.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25114.7">
-                  <string id="25114.8" encoding="repr">login_form_validate</string>
+              <list id="25159.7">
+                  <string id="25159.8" encoding="repr">login_form_validate</string>
               </list>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25115" aka="AAAAAAAAYhs=">
+  <record id="25095" aka="AAAAAAAAYgc=">
     <pickle>
-      <tuple id="25115.2">
-          <global id="25115.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25095.2">
+          <global id="25095.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25115.3">
+      <dictionary id="25095.3">
         <item>
-            <key> <string id="25115.4" encoding="repr">key</string> </key>
+            <key> <string id="25095.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25115.7">
-                  <string id="25115.5" encoding="repr">document_edit_form_TEST</string>
-                  <string id="25115.6" encoding="repr">failure</string>
+              <tuple id="25095.7">
+                  <string id="25095.5" encoding="repr">document_edit_form_TEST</string>
+                  <string id="25095.6" encoding="repr">failure</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7619,31 +8254,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25116" aka="AAAAAAAAYhw=">
+  <record id="25096" aka="AAAAAAAAYgg=">
     <pickle>
-      <tuple id="25116.2">
-          <global id="25116.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25096.2">
+          <global id="25096.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25116.3">
+      <dictionary id="25096.3">
         <item>
-            <key> <string id="25116.4" encoding="repr">action</string> </key>
+            <key> <string id="25096.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25116.7">
+              <object id="25096.7">
                   <klass>
-                    <global id="25116.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25096.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25116.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25096.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25116.8">
+                    <dictionary id="25096.8">
                       <item>
-                          <key> <string id="25116.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25096.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25116.10" encoding="base64">AAAAAAAAYkU=</string> </persistent>
+                            <persistent> <string id="25096.10" encoding="base64">AAAAAAAAYjE=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7652,37 +8287,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25116.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25116.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25116.13" encoding="repr">key</string> </key>
+            <key> <string id="25096.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25116.14" encoding="base64">AAAAAAAAYhs=</string> </persistent>
+              <persistent> <string id="25096.12" encoding="base64">AAAAAAAAYgc=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25116.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25116.16" encoding="repr">string:document_edit_form</string> </value>
+            <key> <string id="25096.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25096.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25096.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25096.16" encoding="repr">string:document_edit_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25117" aka="AAAAAAAAYh0=">
+  <record id="25097" aka="AAAAAAAAYgk=">
     <pickle>
-      <tuple id="25117.2">
-          <global id="25117.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25097.2">
+          <global id="25097.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25117.3">
+      <dictionary id="25097.3">
         <item>
-            <key> <string id="25117.4" encoding="repr">key</string> </key>
+            <key> <string id="25097.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25117.7">
-                  <string id="25117.5" encoding="repr">document_edit_form_TEST</string>
-                  <string id="25117.6" encoding="repr">success</string>
+              <tuple id="25097.7">
+                  <string id="25097.5" encoding="repr">document_edit_form_TEST</string>
+                  <string id="25097.6" encoding="repr">success</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7691,31 +8326,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25118" aka="AAAAAAAAYh4=">
+  <record id="25098" aka="AAAAAAAAYgo=">
     <pickle>
-      <tuple id="25118.2">
-          <global id="25118.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25098.2">
+          <global id="25098.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25118.3">
+      <dictionary id="25098.3">
         <item>
-            <key> <string id="25118.4" encoding="repr">action</string> </key>
+            <key> <string id="25098.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25118.7">
+              <object id="25098.7">
                   <klass>
-                    <global id="25118.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25098.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25118.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25098.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25118.8">
+                    <dictionary id="25098.8">
                       <item>
-                          <key> <string id="25118.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25098.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25118.10" encoding="base64">AAAAAAAAYkY=</string> </persistent>
+                            <persistent> <string id="25098.10" encoding="base64">AAAAAAAAYjI=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7724,70 +8359,70 @@
             </value>
         </item>
         <item>
-            <key> <string id="25118.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25118.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25118.13" encoding="repr">key</string> </key>
+            <key> <string id="25098.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25118.14" encoding="base64">AAAAAAAAYh0=</string> </persistent>
+              <persistent> <string id="25098.12" encoding="base64">AAAAAAAAYgk=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25118.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25118.16" encoding="repr">string:document_edit</string> </value>
+            <key> <string id="25098.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25098.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25098.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25098.16" encoding="repr">string:document_edit</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25119" aka="AAAAAAAAYh8=">
+  <record id="25099" aka="AAAAAAAAYgs=">
     <pickle>
-      <tuple id="25119.2">
-          <global id="25119.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25099.2">
+          <global id="25099.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25119.3">
+      <dictionary id="25099.3">
         <item>
-            <key> <string id="25119.4" encoding="repr">key</string> </key>
+            <key> <string id="25099.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25119.8">
-                  <string id="25119.5" encoding="repr">document_edit_form_TEST</string>
-                  <string id="25119.6" encoding="repr">success</string>
+              <tuple id="25099.8">
+                  <string id="25099.5" encoding="repr">document_edit_form_TEST</string>
+                  <string id="25099.6" encoding="repr">success</string>
                   <none/>
-                  <string id="25119.7" encoding="repr">Cancel</string>
+                  <string id="25099.7" encoding="repr">Cancel</string>
               </tuple>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25120" aka="AAAAAAAAYiA=">
+  <record id="25100" aka="AAAAAAAAYgw=">
     <pickle>
-      <tuple id="25120.2">
-          <global id="25120.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25100.2">
+          <global id="25100.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25120.3">
+      <dictionary id="25100.3">
         <item>
-            <key> <string id="25120.4" encoding="repr">action</string> </key>
+            <key> <string id="25100.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25120.7">
+              <object id="25100.7">
                   <klass>
-                    <global id="25120.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25100.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25120.6" name="RedirectToAction" module="Products.CMFFormController.Actions.RedirectToAction"/>
+                      <global id="25100.6" name="RedirectToAction" module="Products.CMFFormController.Actions.RedirectToAction"/>
                   </tuple>
                   <state>
-                    <dictionary id="25120.8">
+                    <dictionary id="25100.8">
                       <item>
-                          <key> <string id="25120.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25100.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25120.10" encoding="base64">AAAAAAAAYkc=</string> </persistent>
+                            <persistent> <string id="25100.10" encoding="base64">AAAAAAAAYjM=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7796,82 +8431,82 @@
             </value>
         </item>
         <item>
-            <key> <string id="25120.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25120.12" encoding="repr">redirect_to_action</string> </value>
-        </item>
-        <item>
-            <key> <string id="25120.13" encoding="repr">key</string> </key>
+            <key> <string id="25100.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25120.14" encoding="base64">AAAAAAAAYh8=</string> </persistent>
+              <persistent> <string id="25100.12" encoding="base64">AAAAAAAAYgs=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25120.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25120.16" encoding="repr">string:view</string> </value>
+            <key> <string id="25100.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25100.14" encoding="repr">redirect_to_action</string> </value>
+        </item>
+        <item>
+            <key> <string id="25100.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25100.16" encoding="repr">string:view</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25121" aka="AAAAAAAAYiE=">
+  <record id="25101" aka="AAAAAAAAYg0=">
     <pickle>
-      <tuple id="25121.2">
-          <global id="25121.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25101.2">
+          <global id="25101.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25121.3">
+      <dictionary id="25101.3">
         <item>
-            <key> <string id="25121.4" encoding="repr">key</string> </key>
+            <key> <string id="25101.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25121.7">
-                  <string id="25121.5" encoding="repr">document_edit_form_TEST</string>
+              <tuple id="25101.7">
+                  <string id="25101.5" encoding="repr">document_edit_form_TEST</string>
                   <none/>
-                  <string id="25121.6" encoding="repr">Cancel</string>
+                  <string id="25101.6" encoding="repr">Cancel</string>
               </tuple>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25122" aka="AAAAAAAAYiI=">
+  <record id="25102" aka="AAAAAAAAYg4=">
     <pickle>
-      <tuple id="25122.2">
-          <global id="25122.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25102.2">
+          <global id="25102.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25122.3">
+      <dictionary id="25102.3">
         <item>
-            <key> <string id="25122.4" encoding="repr">key</string> </key>
+            <key> <string id="25102.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25122.5" encoding="base64">AAAAAAAAYiE=</string> </persistent>
+              <persistent> <string id="25102.5" encoding="base64">AAAAAAAAYg0=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25122.6" encoding="repr">validators</string> </key>
+            <key> <string id="25102.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25122.7"/>
+              <list id="25102.7"/>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25123" aka="AAAAAAAAYiM=">
+  <record id="25103" aka="AAAAAAAAYg8=">
     <pickle>
-      <tuple id="25123.2">
-          <global id="25123.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25103.2">
+          <global id="25103.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25123.3">
+      <dictionary id="25103.3">
         <item>
-            <key> <string id="25123.4" encoding="repr">key</string> </key>
+            <key> <string id="25103.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25123.6">
-                  <string id="25123.5" encoding="repr">document_edit_form_TEST</string>
+              <tuple id="25103.6">
+                  <string id="25103.5" encoding="repr">document_edit_form_TEST</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7880,49 +8515,49 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25124" aka="AAAAAAAAYiQ=">
+  <record id="25104" aka="AAAAAAAAYhA=">
     <pickle>
-      <tuple id="25124.2">
-          <global id="25124.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25104.2">
+          <global id="25104.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25124.3">
+      <dictionary id="25104.3">
         <item>
-            <key> <string id="25124.4" encoding="repr">key</string> </key>
+            <key> <string id="25104.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25124.5" encoding="base64">AAAAAAAAYiM=</string> </persistent>
+              <persistent> <string id="25104.5" encoding="base64">AAAAAAAAYg8=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25124.6" encoding="repr">validators</string> </key>
+            <key> <string id="25104.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25124.7">
-                  <string id="25124.8" encoding="repr">validate_id</string>
-                  <string id="25124.9" encoding="repr">validate_title</string>
-                  <string id="25124.10" encoding="repr">validate_document_edit</string>
+              <list id="25104.7">
+                  <string id="25104.8" encoding="repr">validate_id</string>
+                  <string id="25104.9" encoding="repr">validate_title</string>
+                  <string id="25104.10" encoding="repr">validate_document_edit</string>
               </list>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25125" aka="AAAAAAAAYiU=">
+  <record id="25105" aka="AAAAAAAAYhE=">
     <pickle>
-      <tuple id="25125.2">
-          <global id="25125.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25105.2">
+          <global id="25105.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25125.3">
+      <dictionary id="25105.3">
         <item>
-            <key> <string id="25125.4" encoding="repr">key</string> </key>
+            <key> <string id="25105.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25125.7">
-                  <string id="25125.5" encoding="repr">failsafe_login_form</string>
-                  <string id="25125.6" encoding="repr">failure</string>
+              <tuple id="25105.7">
+                  <string id="25105.5" encoding="repr">failsafe_login_form</string>
+                  <string id="25105.6" encoding="repr">failure</string>
                   <none/>
                   <none/>
               </tuple>
@@ -7931,31 +8566,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25126" aka="AAAAAAAAYiY=">
+  <record id="25106" aka="AAAAAAAAYhI=">
     <pickle>
-      <tuple id="25126.2">
-          <global id="25126.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25106.2">
+          <global id="25106.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25126.3">
+      <dictionary id="25106.3">
         <item>
-            <key> <string id="25126.4" encoding="repr">action</string> </key>
+            <key> <string id="25106.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25126.7">
+              <object id="25106.7">
                   <klass>
-                    <global id="25126.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25106.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25126.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25106.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25126.8">
+                    <dictionary id="25106.8">
                       <item>
-                          <key> <string id="25126.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25106.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25126.10" encoding="base64">AAAAAAAAYkg=</string> </persistent>
+                            <persistent> <string id="25106.10" encoding="base64">AAAAAAAAYjQ=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -7964,37 +8599,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25126.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25126.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25126.13" encoding="repr">key</string> </key>
+            <key> <string id="25106.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25126.14" encoding="base64">AAAAAAAAYiU=</string> </persistent>
+              <persistent> <string id="25106.12" encoding="base64">AAAAAAAAYhE=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25126.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25126.16" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25106.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25106.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25106.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25106.16" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25127" aka="AAAAAAAAYic=">
+  <record id="25107" aka="AAAAAAAAYhM=">
     <pickle>
-      <tuple id="25127.2">
-          <global id="25127.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25107.2">
+          <global id="25107.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25127.3">
+      <dictionary id="25107.3">
         <item>
-            <key> <string id="25127.4" encoding="repr">key</string> </key>
+            <key> <string id="25107.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25127.7">
-                  <string id="25127.5" encoding="repr">failsafe_login_form</string>
-                  <string id="25127.6" encoding="repr">success</string>
+              <tuple id="25107.7">
+                  <string id="25107.5" encoding="repr">failsafe_login_form</string>
+                  <string id="25107.6" encoding="repr">success</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8003,31 +8638,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25128" aka="AAAAAAAAYig=">
+  <record id="25108" aka="AAAAAAAAYhQ=">
     <pickle>
-      <tuple id="25128.2">
-          <global id="25128.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25108.2">
+          <global id="25108.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25128.3">
+      <dictionary id="25108.3">
         <item>
-            <key> <string id="25128.4" encoding="repr">action</string> </key>
+            <key> <string id="25108.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25128.7">
+              <object id="25108.7">
                   <klass>
-                    <global id="25128.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25108.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25128.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25108.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25128.8">
+                    <dictionary id="25108.8">
                       <item>
-                          <key> <string id="25128.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25108.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25128.10" encoding="base64">AAAAAAAAYkk=</string> </persistent>
+                            <persistent> <string id="25108.10" encoding="base64">AAAAAAAAYjU=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8036,37 +8671,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25128.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25128.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25128.13" encoding="repr">key</string> </key>
+            <key> <string id="25108.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25128.14" encoding="base64">AAAAAAAAYic=</string> </persistent>
+              <persistent> <string id="25108.12" encoding="base64">AAAAAAAAYhM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25128.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25128.16" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25108.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25108.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25108.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25108.16" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25131" aka="AAAAAAAAYis=">
+  <record id="25111" aka="AAAAAAAAYhc=">
     <pickle>
-      <tuple id="25131.2">
-          <global id="25131.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25111.2">
+          <global id="25111.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25131.3">
+      <dictionary id="25111.3">
         <item>
-            <key> <string id="25131.4" encoding="repr">key</string> </key>
+            <key> <string id="25111.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25131.7">
-                  <string id="25131.5" encoding="repr">failsafe_login_form</string>
-                  <string id="25131.6" encoding="repr">failure_page</string>
+              <tuple id="25111.7">
+                  <string id="25111.5" encoding="repr">failsafe_login_form</string>
+                  <string id="25111.6" encoding="repr">enable_cookies</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8075,31 +8710,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25132" aka="AAAAAAAAYiw=">
+  <record id="25112" aka="AAAAAAAAYhg=">
     <pickle>
-      <tuple id="25132.2">
-          <global id="25132.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25112.2">
+          <global id="25112.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25132.3">
+      <dictionary id="25112.3">
         <item>
-            <key> <string id="25132.4" encoding="repr">action</string> </key>
+            <key> <string id="25112.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25132.7">
+              <object id="25112.7">
                   <klass>
-                    <global id="25132.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25112.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25132.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25112.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25132.8">
+                    <dictionary id="25112.8">
                       <item>
-                          <key> <string id="25132.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25112.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25132.10" encoding="base64">AAAAAAAAYks=</string> </persistent>
+                            <persistent> <string id="25112.10" encoding="base64">AAAAAAAAYjc=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8108,37 +8743,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25132.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25132.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25132.13" encoding="repr">key</string> </key>
+            <key> <string id="25112.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25132.14" encoding="base64">AAAAAAAAYis=</string> </persistent>
+              <persistent> <string id="25112.12" encoding="base64">AAAAAAAAYhc=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25132.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25132.16" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25112.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25112.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25112.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25112.16" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25129" aka="AAAAAAAAYik=">
+  <record id="25109" aka="AAAAAAAAYhU=">
     <pickle>
-      <tuple id="25129.2">
-          <global id="25129.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25109.2">
+          <global id="25109.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25129.3">
+      <dictionary id="25109.3">
         <item>
-            <key> <string id="25129.4" encoding="repr">key</string> </key>
+            <key> <string id="25109.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25129.7">
-                  <string id="25129.5" encoding="repr">failsafe_login_form</string>
-                  <string id="25129.6" encoding="repr">enable_cookies</string>
+              <tuple id="25109.7">
+                  <string id="25109.5" encoding="repr">failsafe_login_form</string>
+                  <string id="25109.6" encoding="repr">failure_page</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8147,31 +8782,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25130" aka="AAAAAAAAYio=">
+  <record id="25110" aka="AAAAAAAAYhY=">
     <pickle>
-      <tuple id="25130.2">
-          <global id="25130.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25110.2">
+          <global id="25110.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25130.3">
+      <dictionary id="25110.3">
         <item>
-            <key> <string id="25130.4" encoding="repr">action</string> </key>
+            <key> <string id="25110.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25130.7">
+              <object id="25110.7">
                   <klass>
-                    <global id="25130.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25110.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25130.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25110.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25130.8">
+                    <dictionary id="25110.8">
                       <item>
-                          <key> <string id="25130.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25110.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25130.10" encoding="base64">AAAAAAAAYko=</string> </persistent>
+                            <persistent> <string id="25110.10" encoding="base64">AAAAAAAAYjY=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8180,36 +8815,36 @@
             </value>
         </item>
         <item>
-            <key> <string id="25130.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25130.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25130.13" encoding="repr">key</string> </key>
+            <key> <string id="25110.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25130.14" encoding="base64">AAAAAAAAYik=</string> </persistent>
+              <persistent> <string id="25110.12" encoding="base64">AAAAAAAAYhU=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25130.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25130.16" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25110.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25110.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25110.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25110.16" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25133" aka="AAAAAAAAYi0=">
+  <record id="25113" aka="AAAAAAAAYhk=">
     <pickle>
-      <tuple id="25133.2">
-          <global id="25133.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25113.2">
+          <global id="25113.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25133.3">
+      <dictionary id="25113.3">
         <item>
-            <key> <string id="25133.4" encoding="repr">key</string> </key>
+            <key> <string id="25113.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25133.6">
-                  <string id="25133.5" encoding="repr">failsafe_login_form</string>
+              <tuple id="25113.6">
+                  <string id="25113.5" encoding="repr">failsafe_login_form</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8218,47 +8853,47 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25134" aka="AAAAAAAAYi4=">
+  <record id="25114" aka="AAAAAAAAYho=">
     <pickle>
-      <tuple id="25134.2">
-          <global id="25134.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25114.2">
+          <global id="25114.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25134.3">
+      <dictionary id="25114.3">
         <item>
-            <key> <string id="25134.4" encoding="repr">key</string> </key>
+            <key> <string id="25114.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25134.5" encoding="base64">AAAAAAAAYi0=</string> </persistent>
+              <persistent> <string id="25114.5" encoding="base64">AAAAAAAAYhk=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25134.6" encoding="repr">validators</string> </key>
+            <key> <string id="25114.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25134.7">
-                  <string id="25134.8" encoding="repr">login_form_validate</string>
+              <list id="25114.7">
+                  <string id="25114.8" encoding="repr">login_form_validate</string>
               </list>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25135" aka="AAAAAAAAYi8=">
+  <record id="25115" aka="AAAAAAAAYhs=">
     <pickle>
-      <tuple id="25135.2">
-          <global id="25135.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25115.2">
+          <global id="25115.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25135.3">
+      <dictionary id="25115.3">
         <item>
-            <key> <string id="25135.4" encoding="repr">key</string> </key>
+            <key> <string id="25115.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25135.7">
-                  <string id="25135.5" encoding="repr">login_password</string>
-                  <string id="25135.6" encoding="repr">failure_anonymous</string>
+              <tuple id="25115.7">
+                  <string id="25115.5" encoding="repr">login_password</string>
+                  <string id="25115.6" encoding="repr">failure_anonymous</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8267,31 +8902,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25136" aka="AAAAAAAAYjA=">
+  <record id="25116" aka="AAAAAAAAYhw=">
     <pickle>
-      <tuple id="25136.2">
-          <global id="25136.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25116.2">
+          <global id="25116.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25136.3">
+      <dictionary id="25116.3">
         <item>
-            <key> <string id="25136.4" encoding="repr">action</string> </key>
+            <key> <string id="25116.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25136.7">
+              <object id="25116.7">
                   <klass>
-                    <global id="25136.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25116.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25136.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25116.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25136.8">
+                    <dictionary id="25116.8">
                       <item>
-                          <key> <string id="25136.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25116.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25136.10" encoding="base64">AAAAAAAAYkw=</string> </persistent>
+                            <persistent> <string id="25116.10" encoding="base64">AAAAAAAAYjg=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8300,37 +8935,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25136.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25136.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25136.13" encoding="repr">key</string> </key>
+            <key> <string id="25116.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25136.14" encoding="base64">AAAAAAAAYi8=</string> </persistent>
+              <persistent> <string id="25116.12" encoding="base64">AAAAAAAAYhs=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25136.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25136.16" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25116.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25116.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25116.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25116.16" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25137" aka="AAAAAAAAYjE=">
+  <record id="25117" aka="AAAAAAAAYh0=">
     <pickle>
-      <tuple id="25137.2">
-          <global id="25137.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25117.2">
+          <global id="25117.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25137.3">
+      <dictionary id="25117.3">
         <item>
-            <key> <string id="25137.4" encoding="repr">key</string> </key>
+            <key> <string id="25117.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25137.7">
-                  <string id="25137.5" encoding="repr">login_password</string>
-                  <string id="25137.6" encoding="repr">success</string>
+              <tuple id="25117.7">
+                  <string id="25117.5" encoding="repr">login_password</string>
+                  <string id="25117.6" encoding="repr">success</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8339,31 +8974,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25138" aka="AAAAAAAAYjI=">
+  <record id="25118" aka="AAAAAAAAYh4=">
     <pickle>
-      <tuple id="25138.2">
-          <global id="25138.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25118.2">
+          <global id="25118.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25138.3">
+      <dictionary id="25118.3">
         <item>
-            <key> <string id="25138.4" encoding="repr">action</string> </key>
+            <key> <string id="25118.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25138.7">
+              <object id="25118.7">
                   <klass>
-                    <global id="25138.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25118.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25138.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25118.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25138.8">
+                    <dictionary id="25118.8">
                       <item>
-                          <key> <string id="25138.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25118.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25138.10" encoding="base64">AAAAAAAAYk0=</string> </persistent>
+                            <persistent> <string id="25118.10" encoding="base64">AAAAAAAAYjk=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8372,37 +9007,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25138.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25138.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25138.13" encoding="repr">key</string> </key>
+            <key> <string id="25118.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25138.14" encoding="base64">AAAAAAAAYjE=</string> </persistent>
+              <persistent> <string id="25118.12" encoding="base64">AAAAAAAAYh0=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25138.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25138.16" encoding="repr">string:login_change_password</string> </value>
+            <key> <string id="25118.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25118.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25118.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25118.16" encoding="repr">string:login_change_password</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25139" aka="AAAAAAAAYjM=">
+  <record id="25119" aka="AAAAAAAAYh8=">
     <pickle>
-      <tuple id="25139.2">
-          <global id="25139.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25119.2">
+          <global id="25119.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25139.3">
+      <dictionary id="25119.3">
         <item>
-            <key> <string id="25139.4" encoding="repr">key</string> </key>
+            <key> <string id="25119.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25139.7">
-                  <string id="25139.5" encoding="repr">login_password</string>
-                  <string id="25139.6" encoding="repr">failure</string>
+              <tuple id="25119.7">
+                  <string id="25119.5" encoding="repr">login_password</string>
+                  <string id="25119.6" encoding="repr">failure</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8411,31 +9046,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25140" aka="AAAAAAAAYjQ=">
+  <record id="25120" aka="AAAAAAAAYiA=">
     <pickle>
-      <tuple id="25140.2">
-          <global id="25140.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25120.2">
+          <global id="25120.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25140.3">
+      <dictionary id="25120.3">
         <item>
-            <key> <string id="25140.4" encoding="repr">action</string> </key>
+            <key> <string id="25120.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25140.7">
+              <object id="25120.7">
                   <klass>
-                    <global id="25140.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25120.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25140.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25120.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25140.8">
+                    <dictionary id="25120.8">
                       <item>
-                          <key> <string id="25140.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25120.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25140.10" encoding="base64">AAAAAAAAYk4=</string> </persistent>
+                            <persistent> <string id="25120.10" encoding="base64">AAAAAAAAYjo=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8444,36 +9079,36 @@
             </value>
         </item>
         <item>
-            <key> <string id="25140.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25140.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25140.13" encoding="repr">key</string> </key>
+            <key> <string id="25120.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25140.14" encoding="base64">AAAAAAAAYjM=</string> </persistent>
+              <persistent> <string id="25120.12" encoding="base64">AAAAAAAAYh8=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25140.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25140.16" encoding="repr">string:login_password</string> </value>
+            <key> <string id="25120.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25120.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25120.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25120.16" encoding="repr">string:login_password</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25141" aka="AAAAAAAAYjU=">
+  <record id="25121" aka="AAAAAAAAYiE=">
     <pickle>
-      <tuple id="25141.2">
-          <global id="25141.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25121.2">
+          <global id="25121.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25141.3">
+      <dictionary id="25121.3">
         <item>
-            <key> <string id="25141.4" encoding="repr">key</string> </key>
+            <key> <string id="25121.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25141.6">
-                  <string id="25141.5" encoding="repr">login_password</string>
+              <tuple id="25121.6">
+                  <string id="25121.5" encoding="repr">login_password</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8482,47 +9117,47 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25142" aka="AAAAAAAAYjY=">
+  <record id="25122" aka="AAAAAAAAYiI=">
     <pickle>
-      <tuple id="25142.2">
-          <global id="25142.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25122.2">
+          <global id="25122.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25142.3">
+      <dictionary id="25122.3">
         <item>
-            <key> <string id="25142.4" encoding="repr">key</string> </key>
+            <key> <string id="25122.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25142.5" encoding="base64">AAAAAAAAYjU=</string> </persistent>
+              <persistent> <string id="25122.5" encoding="base64">AAAAAAAAYiE=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25142.6" encoding="repr">validators</string> </key>
+            <key> <string id="25122.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25142.7">
-                  <string id="25142.8" encoding="repr">login_password_validate</string>
+              <list id="25122.7">
+                  <string id="25122.8" encoding="repr">login_password_validate</string>
               </list>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25143" aka="AAAAAAAAYjc=">
+  <record id="25123" aka="AAAAAAAAYiM=">
     <pickle>
-      <tuple id="25143.2">
-          <global id="25143.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25123.2">
+          <global id="25123.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25143.3">
+      <dictionary id="25123.3">
         <item>
-            <key> <string id="25143.4" encoding="repr">key</string> </key>
+            <key> <string id="25123.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25143.7">
-                  <string id="25143.5" encoding="repr">login_form_TEST</string>
-                  <string id="25143.6" encoding="repr">failure_page</string>
+              <tuple id="25123.7">
+                  <string id="25123.5" encoding="repr">login_form_TEST</string>
+                  <string id="25123.6" encoding="repr">failure_page</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8531,31 +9166,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25144" aka="AAAAAAAAYjg=">
+  <record id="25124" aka="AAAAAAAAYiQ=">
     <pickle>
-      <tuple id="25144.2">
-          <global id="25144.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25124.2">
+          <global id="25124.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25144.3">
+      <dictionary id="25124.3">
         <item>
-            <key> <string id="25144.4" encoding="repr">action</string> </key>
+            <key> <string id="25124.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25144.7">
+              <object id="25124.7">
                   <klass>
-                    <global id="25144.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25124.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25144.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25124.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25144.8">
+                    <dictionary id="25124.8">
                       <item>
-                          <key> <string id="25144.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25124.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25144.10" encoding="base64">AAAAAAAAYk8=</string> </persistent>
+                            <persistent> <string id="25124.10" encoding="base64">AAAAAAAAYjs=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8564,37 +9199,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25144.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25144.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25144.13" encoding="repr">key</string> </key>
+            <key> <string id="25124.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25144.14" encoding="base64">AAAAAAAAYjc=</string> </persistent>
+              <persistent> <string id="25124.12" encoding="base64">AAAAAAAAYiM=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25144.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25144.16" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25124.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25124.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25124.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25124.16" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25145" aka="AAAAAAAAYjk=">
+  <record id="25125" aka="AAAAAAAAYiU=">
     <pickle>
-      <tuple id="25145.2">
-          <global id="25145.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25125.2">
+          <global id="25125.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25145.3">
+      <dictionary id="25125.3">
         <item>
-            <key> <string id="25145.4" encoding="repr">key</string> </key>
+            <key> <string id="25125.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25145.7">
-                  <string id="25145.5" encoding="repr">login_form_TEST</string>
-                  <string id="25145.6" encoding="repr">enable_cookies</string>
+              <tuple id="25125.7">
+                  <string id="25125.5" encoding="repr">login_form_TEST</string>
+                  <string id="25125.6" encoding="repr">enable_cookies</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8603,31 +9238,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25146" aka="AAAAAAAAYjo=">
+  <record id="25126" aka="AAAAAAAAYiY=">
     <pickle>
-      <tuple id="25146.2">
-          <global id="25146.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25126.2">
+          <global id="25126.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25146.3">
+      <dictionary id="25126.3">
         <item>
-            <key> <string id="25146.4" encoding="repr">action</string> </key>
+            <key> <string id="25126.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25146.7">
+              <object id="25126.7">
                   <klass>
-                    <global id="25146.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25126.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25146.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25126.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25146.8">
+                    <dictionary id="25126.8">
                       <item>
-                          <key> <string id="25146.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25126.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25146.10" encoding="base64">AAAAAAAAYlA=</string> </persistent>
+                            <persistent> <string id="25126.10" encoding="base64">AAAAAAAAYjw=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8636,37 +9271,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25146.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25146.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25146.13" encoding="repr">key</string> </key>
+            <key> <string id="25126.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25146.14" encoding="base64">AAAAAAAAYjk=</string> </persistent>
+              <persistent> <string id="25126.12" encoding="base64">AAAAAAAAYiU=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25146.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25146.16" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25126.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25126.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25126.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25126.16" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25149" aka="AAAAAAAAYj0=">
+  <record id="25129" aka="AAAAAAAAYik=">
     <pickle>
-      <tuple id="25149.2">
-          <global id="25149.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25129.2">
+          <global id="25129.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25149.3">
+      <dictionary id="25129.3">
         <item>
-            <key> <string id="25149.4" encoding="repr">key</string> </key>
+            <key> <string id="25129.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25149.7">
-                  <string id="25149.5" encoding="repr">login_form_TEST</string>
-                  <string id="25149.6" encoding="repr">success</string>
+              <tuple id="25129.7">
+                  <string id="25129.5" encoding="repr">login_form_TEST</string>
+                  <string id="25129.6" encoding="repr">failure</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8675,31 +9310,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25150" aka="AAAAAAAAYj4=">
+  <record id="25130" aka="AAAAAAAAYio=">
     <pickle>
-      <tuple id="25150.2">
-          <global id="25150.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25130.2">
+          <global id="25130.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25150.3">
+      <dictionary id="25130.3">
         <item>
-            <key> <string id="25150.4" encoding="repr">action</string> </key>
+            <key> <string id="25130.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25150.7">
+              <object id="25130.7">
                   <klass>
-                    <global id="25150.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25130.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25150.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25130.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25150.8">
+                    <dictionary id="25130.8">
                       <item>
-                          <key> <string id="25150.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25130.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25150.10" encoding="base64">AAAAAAAAYlI=</string> </persistent>
+                            <persistent> <string id="25130.10" encoding="base64">AAAAAAAAYj4=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8708,37 +9343,37 @@
             </value>
         </item>
         <item>
-            <key> <string id="25150.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25150.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25150.13" encoding="repr">key</string> </key>
+            <key> <string id="25130.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25150.14" encoding="base64">AAAAAAAAYj0=</string> </persistent>
+              <persistent> <string id="25130.12" encoding="base64">AAAAAAAAYik=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25150.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25150.16" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25130.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25130.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25130.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25130.16" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25147" aka="AAAAAAAAYjs=">
+  <record id="25127" aka="AAAAAAAAYic=">
     <pickle>
-      <tuple id="25147.2">
-          <global id="25147.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25127.2">
+          <global id="25127.1" name="FormActionKey" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25147.3">
+      <dictionary id="25127.3">
         <item>
-            <key> <string id="25147.4" encoding="repr">key</string> </key>
+            <key> <string id="25127.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25147.7">
-                  <string id="25147.5" encoding="repr">login_form_TEST</string>
-                  <string id="25147.6" encoding="repr">failure</string>
+              <tuple id="25127.7">
+                  <string id="25127.5" encoding="repr">login_form_TEST</string>
+                  <string id="25127.6" encoding="repr">success</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8747,31 +9382,31 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25148" aka="AAAAAAAAYjw=">
+  <record id="25128" aka="AAAAAAAAYig=">
     <pickle>
-      <tuple id="25148.2">
-          <global id="25148.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
+      <tuple id="25128.2">
+          <global id="25128.1" name="FormAction" module="Products.CMFFormController.FormAction"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25148.3">
+      <dictionary id="25128.3">
         <item>
-            <key> <string id="25148.4" encoding="repr">action</string> </key>
+            <key> <string id="25128.4" encoding="repr">action</string> </key>
             <value>
-              <object id="25148.7">
+              <object id="25128.7">
                   <klass>
-                    <global id="25148.5" name="__newobj__" module="copy_reg"/>
+                    <global id="25128.5" name="__newobj__" module="copy_reg"/>
                   </klass>
                   <tuple>
-                      <global id="25148.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
+                      <global id="25128.6" name="TraverseTo" module="Products.CMFFormController.Actions.TraverseTo"/>
                   </tuple>
                   <state>
-                    <dictionary id="25148.8">
+                    <dictionary id="25128.8">
                       <item>
-                          <key> <string id="25148.9" encoding="repr">expression</string> </key>
+                          <key> <string id="25128.9" encoding="repr">expression</string> </key>
                           <value>
-                            <persistent> <string id="25148.10" encoding="base64">AAAAAAAAYlE=</string> </persistent>
+                            <persistent> <string id="25128.10" encoding="base64">AAAAAAAAYj0=</string> </persistent>
                           </value>
                       </item>
                     </dictionary>
@@ -8780,36 +9415,36 @@
             </value>
         </item>
         <item>
-            <key> <string id="25148.11" encoding="repr">action_type</string> </key>
-            <value> <string id="25148.12" encoding="repr">traverse_to</string> </value>
-        </item>
-        <item>
-            <key> <string id="25148.13" encoding="repr">key</string> </key>
+            <key> <string id="25128.11" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25148.14" encoding="base64">AAAAAAAAYjs=</string> </persistent>
+              <persistent> <string id="25128.12" encoding="base64">AAAAAAAAYic=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25148.15" encoding="repr">action_arg</string> </key>
-            <value> <string id="25148.16" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25128.13" encoding="repr">action_type</string> </key>
+            <value> <string id="25128.14" encoding="repr">traverse_to</string> </value>
+        </item>
+        <item>
+            <key> <string id="25128.15" encoding="repr">action_arg</string> </key>
+            <value> <string id="25128.16" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25151" aka="AAAAAAAAYj8=">
+  <record id="25131" aka="AAAAAAAAYis=">
     <pickle>
-      <tuple id="25151.2">
-          <global id="25151.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25131.2">
+          <global id="25131.1" name="FormValidatorKey" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25151.3">
+      <dictionary id="25131.3">
         <item>
-            <key> <string id="25151.4" encoding="repr">key</string> </key>
+            <key> <string id="25131.4" encoding="repr">key</string> </key>
             <value>
-              <tuple id="25151.6">
-                  <string id="25151.5" encoding="repr">login_form_TEST</string>
+              <tuple id="25131.6">
+                  <string id="25131.5" encoding="repr">login_form_TEST</string>
                   <none/>
                   <none/>
               </tuple>
@@ -8818,316 +9453,316 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="25152" aka="AAAAAAAAYkA=">
+  <record id="25132" aka="AAAAAAAAYiw=">
     <pickle>
-      <tuple id="25152.2">
-          <global id="25152.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
+      <tuple id="25132.2">
+          <global id="25132.1" name="FormValidator" module="Products.CMFFormController.FormValidator"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25152.3">
+      <dictionary id="25132.3">
         <item>
-            <key> <string id="25152.4" encoding="repr">key</string> </key>
+            <key> <string id="25132.4" encoding="repr">key</string> </key>
             <value>
-              <persistent> <string id="25152.5" encoding="base64">AAAAAAAAYj8=</string> </persistent>
+              <persistent> <string id="25132.5" encoding="base64">AAAAAAAAYis=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string id="25152.6" encoding="repr">validators</string> </key>
+            <key> <string id="25132.6" encoding="repr">validators</string> </key>
             <value>
-              <list id="25152.7">
-                  <string id="25152.8" encoding="repr">login_form_validate</string>
+              <list id="25132.7">
+                  <string id="25132.8" encoding="repr">login_form_validate</string>
               </list>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25153" aka="AAAAAAAAYkE=">
+  <record id="25171" aka="AAAAAAAAYlM=">
     <pickle>
-      <tuple id="25153.2">
-          <global id="25153.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25171.2">
+          <global id="25171.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25153.3">
+      <dictionary id="25171.3">
         <item>
-            <key> <string id="25153.4" encoding="repr">text</string> </key>
-            <value> <string id="25153.5" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25171.4" encoding="repr">text</string> </key>
+            <value> <string id="25171.5" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25154" aka="AAAAAAAAYkI=">
+  <record id="25170" aka="AAAAAAAAYlI=">
     <pickle>
-      <tuple id="25154.2">
-          <global id="25154.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25170.2">
+          <global id="25170.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25154.3">
+      <dictionary id="25170.3">
         <item>
-            <key> <string id="25154.4" encoding="repr">text</string> </key>
-            <value> <string id="25154.5" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25170.4" encoding="repr">text</string> </key>
+            <value> <string id="25170.5" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25155" aka="AAAAAAAAYkM=">
+  <record id="25169" aka="AAAAAAAAYlE=">
     <pickle>
-      <tuple id="25155.2">
-          <global id="25155.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25169.2">
+          <global id="25169.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25155.3">
+      <dictionary id="25169.3">
         <item>
-            <key> <string id="25155.4" encoding="repr">text</string> </key>
-            <value> <string id="25155.5" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25169.4" encoding="repr">text</string> </key>
+            <value> <string id="25169.5" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25156" aka="AAAAAAAAYkQ=">
+  <record id="25168" aka="AAAAAAAAYlA=">
     <pickle>
-      <tuple id="25156.2">
-          <global id="25156.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25168.2">
+          <global id="25168.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25156.3">
+      <dictionary id="25168.3">
         <item>
-            <key> <string id="25156.4" encoding="repr">text</string> </key>
-            <value> <string id="25156.5" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25168.4" encoding="repr">text</string> </key>
+            <value> <string id="25168.5" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25157" aka="AAAAAAAAYkU=">
+  <record id="25137" aka="AAAAAAAAYjE=">
     <pickle>
-      <tuple id="25157.2">
-          <global id="25157.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25137.2">
+          <global id="25137.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25157.3">
+      <dictionary id="25137.3">
         <item>
-            <key> <string id="25157.4" encoding="repr">text</string> </key>
-            <value> <string id="25157.5" encoding="repr">string:document_edit_form</string> </value>
+            <key> <string id="25137.4" encoding="repr">text</string> </key>
+            <value> <string id="25137.5" encoding="repr">string:document_edit_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25158" aka="AAAAAAAAYkY=">
+  <record id="25138" aka="AAAAAAAAYjI=">
     <pickle>
-      <tuple id="25158.2">
-          <global id="25158.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25138.2">
+          <global id="25138.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25158.3">
+      <dictionary id="25138.3">
         <item>
-            <key> <string id="25158.4" encoding="repr">text</string> </key>
-            <value> <string id="25158.5" encoding="repr">string:document_edit</string> </value>
+            <key> <string id="25138.4" encoding="repr">text</string> </key>
+            <value> <string id="25138.5" encoding="repr">string:document_edit</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25159" aka="AAAAAAAAYkc=">
+  <record id="25139" aka="AAAAAAAAYjM=">
     <pickle>
-      <tuple id="25159.2">
-          <global id="25159.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25139.2">
+          <global id="25139.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25159.3">
+      <dictionary id="25139.3">
         <item>
-            <key> <string id="25159.4" encoding="repr">text</string> </key>
-            <value> <string id="25159.5" encoding="repr">string:view</string> </value>
+            <key> <string id="25139.4" encoding="repr">text</string> </key>
+            <value> <string id="25139.5" encoding="repr">string:view</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25160" aka="AAAAAAAAYkg=">
+  <record id="25140" aka="AAAAAAAAYjQ=">
     <pickle>
-      <tuple id="25160.2">
-          <global id="25160.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25140.2">
+          <global id="25140.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25160.3">
+      <dictionary id="25140.3">
         <item>
-            <key> <string id="25160.4" encoding="repr">text</string> </key>
-            <value> <string id="25160.5" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25140.4" encoding="repr">text</string> </key>
+            <value> <string id="25140.5" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25161" aka="AAAAAAAAYkk=">
+  <record id="25141" aka="AAAAAAAAYjU=">
     <pickle>
-      <tuple id="25161.2">
-          <global id="25161.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25141.2">
+          <global id="25141.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25161.3">
+      <dictionary id="25141.3">
         <item>
-            <key> <string id="25161.4" encoding="repr">text</string> </key>
-            <value> <string id="25161.5" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25141.4" encoding="repr">text</string> </key>
+            <value> <string id="25141.5" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25163" aka="AAAAAAAAYks=">
+  <record id="25143" aka="AAAAAAAAYjc=">
     <pickle>
-      <tuple id="25163.2">
-          <global id="25163.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25143.2">
+          <global id="25143.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25163.3">
+      <dictionary id="25143.3">
         <item>
-            <key> <string id="25163.4" encoding="repr">text</string> </key>
-            <value> <string id="25163.5" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25143.4" encoding="repr">text</string> </key>
+            <value> <string id="25143.5" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25162" aka="AAAAAAAAYko=">
+  <record id="25142" aka="AAAAAAAAYjY=">
     <pickle>
-      <tuple id="25162.2">
-          <global id="25162.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25142.2">
+          <global id="25142.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25162.3">
+      <dictionary id="25142.3">
         <item>
-            <key> <string id="25162.4" encoding="repr">text</string> </key>
-            <value> <string id="25162.5" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25142.4" encoding="repr">text</string> </key>
+            <value> <string id="25142.5" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25164" aka="AAAAAAAAYkw=">
+  <record id="25144" aka="AAAAAAAAYjg=">
     <pickle>
-      <tuple id="25164.2">
-          <global id="25164.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25144.2">
+          <global id="25144.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25164.3">
+      <dictionary id="25144.3">
         <item>
-            <key> <string id="25164.4" encoding="repr">text</string> </key>
-            <value> <string id="25164.5" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25144.4" encoding="repr">text</string> </key>
+            <value> <string id="25144.5" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25165" aka="AAAAAAAAYk0=">
+  <record id="25145" aka="AAAAAAAAYjk=">
     <pickle>
-      <tuple id="25165.2">
-          <global id="25165.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25145.2">
+          <global id="25145.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25165.3">
+      <dictionary id="25145.3">
         <item>
-            <key> <string id="25165.4" encoding="repr">text</string> </key>
-            <value> <string id="25165.5" encoding="repr">string:login_change_password</string> </value>
+            <key> <string id="25145.4" encoding="repr">text</string> </key>
+            <value> <string id="25145.5" encoding="repr">string:login_change_password</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25166" aka="AAAAAAAAYk4=">
+  <record id="25146" aka="AAAAAAAAYjo=">
     <pickle>
-      <tuple id="25166.2">
-          <global id="25166.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25146.2">
+          <global id="25146.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25166.3">
+      <dictionary id="25146.3">
         <item>
-            <key> <string id="25166.4" encoding="repr">text</string> </key>
-            <value> <string id="25166.5" encoding="repr">string:login_password</string> </value>
+            <key> <string id="25146.4" encoding="repr">text</string> </key>
+            <value> <string id="25146.5" encoding="repr">string:login_password</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25167" aka="AAAAAAAAYk8=">
+  <record id="25147" aka="AAAAAAAAYjs=">
     <pickle>
-      <tuple id="25167.2">
-          <global id="25167.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25147.2">
+          <global id="25147.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25167.3">
+      <dictionary id="25147.3">
         <item>
-            <key> <string id="25167.4" encoding="repr">text</string> </key>
-            <value> <string id="25167.5" encoding="repr">string:login_failed</string> </value>
+            <key> <string id="25147.4" encoding="repr">text</string> </key>
+            <value> <string id="25147.5" encoding="repr">string:login_failed</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25168" aka="AAAAAAAAYlA=">
+  <record id="25148" aka="AAAAAAAAYjw=">
     <pickle>
-      <tuple id="25168.2">
-          <global id="25168.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25148.2">
+          <global id="25148.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25168.3">
+      <dictionary id="25148.3">
         <item>
-            <key> <string id="25168.4" encoding="repr">text</string> </key>
-            <value> <string id="25168.5" encoding="repr">string:enabling_cookies</string> </value>
+            <key> <string id="25148.4" encoding="repr">text</string> </key>
+            <value> <string id="25148.5" encoding="repr">string:enabling_cookies</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25170" aka="AAAAAAAAYlI=">
+  <record id="25150" aka="AAAAAAAAYj4=">
     <pickle>
-      <tuple id="25170.2">
-          <global id="25170.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25150.2">
+          <global id="25150.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25170.3">
+      <dictionary id="25150.3">
         <item>
-            <key> <string id="25170.4" encoding="repr">text</string> </key>
-            <value> <string id="25170.5" encoding="repr">string:logged_in</string> </value>
+            <key> <string id="25150.4" encoding="repr">text</string> </key>
+            <value> <string id="25150.5" encoding="repr">string:login_form</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
-  <record id="25169" aka="AAAAAAAAYlE=">
+  <record id="25149" aka="AAAAAAAAYj0=">
     <pickle>
-      <tuple id="25169.2">
-          <global id="25169.1" name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple id="25149.2">
+          <global id="25149.1" name="Expression" module="Products.CMFCore.Expression"/>
           <tuple/>
       </tuple>
     </pickle>
     <pickle>
-      <dictionary id="25169.3">
+      <dictionary id="25149.3">
         <item>
-            <key> <string id="25169.4" encoding="repr">text</string> </key>
-            <value> <string id="25169.5" encoding="repr">string:login_form</string> </value>
+            <key> <string id="25149.4" encoding="repr">text</string> </key>
+            <value> <string id="25149.5" encoding="repr">string:logged_in</string> </value>
         </item>
       </dictionary>
     </pickle>
--- conga/luci/plone-custom/failsafe_login_form	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/failsafe_login_form	2006/07/26 18:03:55	1.2
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
       i18n:domain="plone">
 <head>
-    <script type="text/javascript" tal:attributes="src python:context.portal_url()+'/login.js'" />
+  <title i18n:translate="heading_sign_in">Please log in</title>
 </head>
 
 <body>
@@ -10,13 +10,13 @@
                  actions python:context.portal_actions.listFilteredActionsFor(context);
                  Iterator python:modules['Products.CMFPlone'].IndexIterator;
                  tabindex python:Iterator(pos=30000);
-                 auth nocall:here/cookie_authentication|nothing;
+                 auth nocall:here/acl_users/credentials_cookie_auth|nothing;
                  came_from request/came_from|request/HTTP_REFERER|nothing;
                  came_from python:test(here.portal_url.isURLInPortal(came_from), came_from, None);
                  ztutils modules/ZTUtils;
                  errors options/state/getErrors;">
 
-<h1 i18n:translate="heading_sign_in">Please log in</h1>
+<h1 i18n:translate="heading_sign_in">Log in</h1>
 
 <p i18n:translate="description_sign_in">
 To access this part of the site, you need to log in with your user name and password.
@@ -31,14 +31,19 @@
     While cookie authentication is disabled, cookie-based login is not available.
 </div>
 
+<div style="margin-top:1em"
+  tal:condition="python:not auth and (login_name == 'admin' or ac_name == 'admin')" >
+If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.
+</div>
+
 <form tal:attributes="action python:context.absolute_url()+'/'+template.id"
       method="post"
       id="login_form"
       tal:condition="python:auth">
 
-    <fieldset tal:define="ac_name auth/name_cookie;
-	                  ac_password auth/pw_cookie;
-	                  ac_persist auth/persist_cookie">
+    <fieldset tal:define="ac_name auth/name_cookie|string:__ac_name;
+                          ac_password auth/pw_cookie|string:__ac_password;
+                          ac_persist auth/persist_cookie|nothing">
 
         <legend i18n:translate="legend_account_details">Account details</legend>
 
@@ -63,7 +68,7 @@
 
             <div i18n:translate="help_login_name_caps"
                  class="formHelp">
-    		Login names are case sensitive, make sure the caps lock key is not enabled.
+                Login names are case sensitive, make sure the caps lock key is not enabled.
             </div>
 
             <div tal:content="error">Validation error output</div>
@@ -77,9 +82,9 @@
                                    tabindex tabindex/next;"
                    />
 
-	</div>
+        </div>
 
-	<div class="field"
+        <div class="field"
              tal:define="error python:errors.get(ac_password, None);"
              tal:attributes="class python:test(error, 'field error', 'field')">
 
@@ -101,9 +106,9 @@
                                    id ac_password;
                                    tabindex tabindex/next;"
                    />
-	</div>
+        </div>
 
-        <div class="field">
+        <div class="field" tal:condition="ac_persist">
 
             <input type="checkbox"
                    class="noborder formRememberName"
@@ -133,9 +138,7 @@
                    name="submit"
                    value="Log in"
                    i18n:attributes="value label_log_in;"
-                   tal:attributes="tabindex tabindex/next;
-	                           onclick string:javascript:return setLoginVars('$ac_name','login_name','$ac_password','pwd_empty','js_enabled','cookies_enabled');"
-                   />
+                   tal:attributes="tabindex tabindex/next;" />
 
         </div>
 
--- conga/luci/plone-custom/login_form	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/login_form	2006/07/26 18:03:55	1.2
@@ -7,22 +7,49 @@
     </script>
     <metal:block fill-slot="top_slot"
                  tal:define="dummy python:request.set('disable_border',1)" />
-    </head>
+</head>
 
 <body>
 
 <div metal:fill-slot="main"
-     tal:define="auth nocall:here/cookie_authentication|nothing;
+     tal:define="auth nocall:here/acl_users/credentials_cookie_auth|nothing;
                  came_from request/came_from|request/HTTP_REFERER|nothing;
                  came_from python:test(utool.isURLInPortal(came_from), came_from, None);
-                 errors options/state/getErrors;">
+		 errors options/state/getErrors;
+		 ac_name auth/name_cookie|string:__ac_name;
+		 ac_password auth/pw_cookie|string:__ac_password;
+		 ac_persist auth/persist_cookie|nothing;
+		 login_name python:request.get('login_name', request.get(ac_name, ''));">
 
-<h1 tal:condition="python:here.siteIsSetup()" i18n:translate="heading_sign_in">Please log in</h1>
+<div tal:omit-tag="" tal:condition="python: not here.siteIsSetup()">
+<h1>This site has not yet been initialized.</h1>
+<p>Please login to the server as root and run the command <code>luci_admin init</code> to initialize it.
+</div>
+
+<div tal:omit-tag="" tal:condition="python: here.siteIsSetup()">
+<h1 i18n:translate="heading_sign_in">Please log in</h1>
 
-<p tal:condition="python:here.siteIsSetup()" i18n:translate="description_sign_in">
+<p i18n:translate="description_sign_in">
 To access this part of the site, you need to log in with your user name and password.
 </p>
 
+<p i18n:translate="description_no_account"
+   tal:define="join python:[a['url'] for a in actions['user'] if a['id']=='join']"
+   tal:condition="python: join and checkPermission('Add portal member', here)">
+
+If you do not have an account here, head over to the
+
+<span i18n:name="registration_form">
+    <a href=""
+       tal:define="join python:join.pop();
+                   join join;
+                   join python:join+test(join.find('?')==-1, '?', '&amp;')+ztu.make_query(came_from=came_from);"
+       tal:attributes="href join"
+       i18n:translate="description_no_account_registration_linktext">
+        registration form</a></span>.
+
+</p>
+
 <div id="enable_cookies_message" i18n:translate="enable_cookies_message" class="portalMessage" style="display:none">
   Cookies are not enabled. You must <span i18n:name="enable_cookies">
   <a href="enabling_cookies" i18n:translate="label_enable_cookies">enable cookies</a></span> before you can log in.
@@ -32,28 +59,12 @@
     While cookie authentication is disabled, cookie-based login is not available.
 </div>
 
-<div tal:omit-tag="" tal:condition="python: not here.siteIsSetup()">
-<h1>This site has not yet been initialized.</h1>
-<p>Please login to the server as root and run the command <code>luci_admin init</code> to initialize it.
-</div>
-
-<div style="margin-top:1em"
-  tal:define="ac_name auth/name_cookie;login_name python:request.get('login_name', request.get(ac_name, ''));"
-  tal:condition="python: errors and login_name == 'admin'" >
-If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.
-</div> 
-
-
-
 <form tal:attributes="action python:context.absolute_url()+'/'+template.id"
       method="post"
       id="login_form"
-      tal:condition="python:auth and here.siteIsSetup()">
+      tal:condition="python:auth">
 
-    <fieldset tal:define="ac_name auth/name_cookie;
-                      ac_password auth/pw_cookie;
-                      ac_persist auth/persist_cookie;
-              login_name python:request.get('login_name', request.get(ac_name, ''));">
+    <fieldset>
 
         <legend i18n:translate="legend_account_details">Account details</legend>
 
@@ -96,6 +107,7 @@
     <div class="field"
              tal:define="error python:errors.get(ac_password, None);"
              tal:attributes="class python:test(error, 'field error', 'field')">
+
             <label i18n:translate="label_password"
                    tal:attributes="for ac_password">Password</label>
 
@@ -116,7 +128,7 @@
                    />
     </div>
 
-        <div class="field">
+        <div class="field" tal:condition="ac_persist">
 
             <input type="checkbox"
                    class="noborder formRememberName"
@@ -160,6 +172,7 @@
 
 </form>
 </div>
+</div>
 
 </body>
 </html>
--- conga/luci/plone-custom/login_form_validate	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/login_form_validate	2006/07/26 18:03:55	1.2
@@ -8,7 +8,9 @@
 ##parameters=
 ##title=Validate login
 ##
-LOGIN_FAILED_MESSAGE = 'Login failed'  # TODO need a friendlier message here
+from Products.CMFPlone import PloneMessageFactory as _
+
+LOGIN_FAILED_MESSAGE = _(u'Login failed')
 
 request = context.REQUEST
 js_enabled = request.get('js_enabled',0) # is javascript enabled?
@@ -17,9 +19,8 @@
 cookies_enabled = cookies_enabled=='1' or cookies_enabled==1
 
 if js_enabled and not cookies_enabled:
-    # auth cookie won't persist -- erase it so users aren't confused
-    context.portal_membership.immediateLogout()
-    state.set(status='enable_cookies', portal_status_message='You must enable cookies before you can log in')
+    context.plone_utils.addPortalMessage(_(u'You must enable cookies before you can log in'))
+    state.set(status='enable_cookies')
     return state
 
 mt=context.portal_membership
@@ -34,17 +35,20 @@
 
             if not user_name:
                 # no user name
-                state.setError(ac_name, 'Please enter your login name.', 'login_name_required')
+                state.setError(ac_name, _(u'Please enter your login name.'), 'login_name_required')
             if password_empty:
-                state.setError(ac_password, 'Please enter your password.', 'password_required')
+                state.setError(ac_password, _(u'Please enter your password.'), 'password_required')
             verify_login_name = context.portal_properties.site_properties.getProperty('verify_login_name', 0)
             if user_name and verify_login_name:
+                # XXX mixing up username and loginname here
                 if mt.getMemberById(user_name) is None:
-                    state.setError(ac_name, 'Authentication Error.', 'password_incorrect')
-                elif not password_empty:
-                    state.setError(ac_password, 'Authentication Error.', 'password_incorrect')
-        state.set(status='failure', portal_status_message=LOGIN_FAILED_MESSAGE)
+                    state.setError(ac_password, LOGIN_FAILED_MESSAGE, 'password_incorrect')
+	        elif not password_empty:
+                    state.setError(ac_password, LOGIN_FAILED_MESSAGE, 'password_incorrect')
+	context.plone_utils.addPortalMessage(LOGIN_FAILED_MESSAGE)
+	state.set(status='failure')
     else: # no javascript - do low tech login failure
-        state.set(status='failure_page', portal_status_message=LOGIN_FAILED_MESSAGE)
+	context.plone_utils.addPortalMessage(LOGIN_FAILED_MESSAGE)
+	state.set(status='failure_page')
 
 return state
--- conga/luci/plone-custom/login_password	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/login_password	2006/07/26 18:03:55	1.2
@@ -24,6 +24,10 @@
                 <span tal:content="portal_properties/title" tal:omit-tag="" i18n:name="here">here</span>.
             </span>
 
+            <span i18n:translate="description_change_initial_password">
+            Before you start exploring, you need to change your original password.
+            This ensures that the password you received via email cannot be used in a malicious manner.
+            </span>
             </p>
 
             <p i18n:translate="description_use_form_to_change_password">
@@ -52,7 +56,8 @@
              		 tal:define="error python:errors.get('password', None);"
                          tal:attributes="class python:test(error, 'field error', 'field')">
 
-                        <label i18n:translate="label_new_password">New password</label>
+                        <label for="password"
+                               i18n:translate="label_new_password">New password</label>
 
                         <div class="formHelp" i18n:translate="help_new_password">
                         Enter your new password. Minimum 5 characters.
@@ -62,6 +67,7 @@
 
                         <input type="password"
                                name="password"
+                               id="password"
                                size="10"
                                tabindex=""
                                tal:attributes="tabindex tabindex/next;"
@@ -72,7 +78,8 @@
              		 tal:define="error python:errors.get('confirm', None);"
                          tal:attributes="class python:test(error, 'field error', 'field')">
 
-                        <label i18n:translate="label_confirm_password">Confirm password</label>
+                        <label for="confirm"
+                               i18n:translate="label_confirm_password">Confirm password</label>
 
                         <div class="formHelp" i18n:translate="help_confirm_password">
                             Re-enter the password. Make sure the passwords are identical.
@@ -82,6 +89,7 @@
 
                         <input type="password"
                                name="confirm"
+                               id="confirm"
                                size="10"
                                tabindex=""
                                tal:attributes="tabindex tabindex/next;"
--- conga/luci/plone-custom/login_success	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/login_success	2006/07/26 18:03:55	1.2
@@ -20,9 +20,10 @@
   <div tal:condition="not:isAnon">
     <div tal:define="came_from request/came_from|nothing;
                      initial_login request/initial_login|nothing;
-             js_enabled python:request.get('js_enabled','1')!='0';">
+                     js_enabled python:request.get('js_enabled','1')!='0';">
 
       <h1 i18n:translate="heading_you_are_now_logged_in">You are now logged in</h1>
+        <br />
 
       <p tal:condition="came_from">
         <a href=""
@@ -33,7 +34,7 @@
 
       <p tal:condition="python:not came_from">
         <a href=""
-           tal:attributes="href came_from"
+           tal:attributes="href portal_url"
            i18n:translate="label_login_continue_to_home_page">
           Continue to the
           <span tal:content="portal/title" i18n:name="portal_title">
@@ -70,5 +71,4 @@
 </div>
 
 </body>
-</html>
-
+</html>
\ No newline at end of file
--- conga/luci/plone-custom/portlet_login	2006/07/26 16:55:37	1.1
+++ conga/luci/plone-custom/portlet_login	2006/07/26 18:03:55	1.2
@@ -2,18 +2,24 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal";
       i18n:domain="plone">
 <body tal:define="Iterator python:modules['Products.CMFPlone'].IndexIterator;
-                  tabindex python:Iterator()">
+                  tabindex python:Iterator(mainSlot=False)">
 <div metal:define-macro="portlet"
      tal:omit-tag=""
      tal:define="pageloc python: request.URL.split('/')[-1];
                  okToShowHere python: not pageloc in ('login_form', 'join_form');
-                 auth nocall:here/cookie_authentication|nothing"
+                 auth nocall:here/acl_users/credentials_cookie_auth|nothing"
      tal:condition="python: isAnon and okToShowHere">
 
+<div style="margin-top:1em"
+  tal:define="ac_name auth/name_cookie|string:__ac_name"
+  tal:condition="python:errors and ac_name == 'admin'" >
+If you have forgotten your password, you can reset the password by logging in to the server as root and running the command <code>luci_admin password</code>.
+</div> 
+
 <dl class="portlet"
     id="portlet-login"
-    tal:define="ac_name auth/name_cookie|nothing;
-                ac_password auth/pw_cookie|nothing;
+    tal:define="ac_name auth/name_cookie|string:__ac_name;
+                ac_password auth/pw_cookie|string:__ac_password;
                 ac_persist auth/persist_cookie|nothing;
                 join python:[a['url'] for a in actions['user'] if a['id']=='join'];
                 canRegister python:test(join and hasattr(here,'portal_registration') and checkPermission('Add portal member', here), 1, 0);
@@ -21,9 +27,12 @@
     tal:condition="python: auth">
 
     <dt class="portletHeader">
+        <span class="portletTopLeft"></span>
         <a href="#" 
+           class="tile"
            tal:attributes="href string:$portal_url/login_form"
            i18n:translate="box_sign_in">Log in</a>
+        <span class="portletTopRight"></span>
     </dt>
 
     <dd class="portletItem odd">
@@ -34,14 +43,15 @@
 
             <input type="hidden" name="form.submitted" value="1" />
             <input type="hidden" name="came_from" value=""
-                   tal:attributes="value here/getCurrentUrl" />
+                   tal:attributes="value context/@@plone/getCurrentUrl" />
             <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
             <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
             <input type="hidden" name="login_name" id="login_name" value="" />
             <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
 
             <div class="field">
-                <label for="__ac_name"
+                <label for=""
+                       tal:attributes="for ac_name"
                        i18n:translate="label_login_name">Login Name</label>
                 <br />
                 <input type="text"
@@ -55,7 +65,8 @@
             </div>
             
             <div class="field">
-                <label for="__ac_password"
+                <label for=""
+                       tal:attributes="for ac_password"
                        i18n:translate="label_password">Password</label>
                 <br />
                 <input type="password"
@@ -86,9 +97,15 @@
         </form>
     </dd>
     
- </dl>
-
-
+    <dd class="portletItem even" tal:condition="canRequestPassword">
+        <a href="mail_password_form"
+           class="tile"
+           tal:attributes="href string:${portal_url}/mail_password_form">
+           <tal:block replace="structure portal/info_icon.gif"/>
+           <span tal:omit-tag="" i18n:translate="box_forgot_password_option">Forgot your password?</span>
+        </a>
+    </dd>
+    </dl>
 
 
 <dl class="portlet"
@@ -96,7 +113,9 @@
     tal:condition="python: not auth">
 
     <dt class="portletHeader">
-        <a href="#" i18n:translate="box_sign_in">Log in</a>
+        <a href="#" 
+           class="tile"
+           i18n:translate="box_sign_in">Log in</a>
     </dt>
 
     <dd class="portletItem"
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2006/07/25 20:54:15	1.7 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2006/07/26 18:03:55	1.8 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/make/version.in	2006/07/25 19:51:01	1.9
+++ conga/make/version.in	2006/07/26 18:03:57	1.10
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=8
+RELEASE=9


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]