Use WebSitePreference to show / hide login functionality.

9af5c430 · Ivan Tyagov · 23be927c · 9af5c430 · 9af5c430 · 9af5c430
Commit 9af5c430 authored Nov 24, 2011 by Ivan Tyagov
19 changed files
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_login.xml
@@ -142,7 +142,9 @@
                </item>
                <item>
                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                </item>
                <item>
                    <key> <string>external_validator</string> </key>
@@ -176,6 +178,10 @@
                    <key> <string>required</string> </key>
                    <value> <string></string> </value>
                </item>
+                <item>
+                    <key> <string>text_editor</string> </key>
+                    <value> <string></string> </value>
+                </item>
                <item>
                    <key> <string>title</string> </key>
                    <value> <string></string> </value>
@@ -285,4 +291,17 @@
      </dictionary>
    </pickle>
  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedLogin()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_password.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/ac_password.xml
@@ -142,7 +142,9 @@
                </item>
                <item>
                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                </item>
                <item>
                    <key> <string>external_validator</string> </key>
@@ -176,6 +178,10 @@
                    <key> <string>required</string> </key>
                    <value> <string></string> </value>
                </item>
+                <item>
+                    <key> <string>text_editor</string> </key>
+                    <value> <string></string> </value>
+                </item>
                <item>
                    <key> <string>title</string> </key>
                    <value> <string></string> </value>
@@ -290,4 +296,17 @@ true);"\n
      </dictionary>
    </pickle>
  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedLogin()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/login.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/login.xml
@@ -91,7 +91,9 @@
                </item>
                <item>
                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                </item>
                <item>
                    <key> <string>extra</string> </key>
@@ -101,6 +103,10 @@
                    <key> <string>hidden</string> </key>
                    <value> <string></string> </value>
                </item>
+                <item>
+                    <key> <string>image</string> </key>
+                    <value> <string></string> </value>
+                </item>
                <item>
                    <key> <string>name</string> </key>
                    <value> <string></string> </value>
@@ -164,13 +170,7 @@
  </record>
  <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
      <dictionary>
@@ -181,4 +181,17 @@
      </dictionary>
    </pickle>
  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedLogin()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/login_message.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/login_message.xml
@@ -261,19 +261,13 @@
  </record>
  <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:here.Base_translateString("Existing users please log in by entering your email address and password in the two fields below.")</string> </value>
+            <value> <string>python:test(here.getWebSiteValue().isUserAllowedLogin(), here.Base_translateString("Existing users please log in by entering your email address and password in the two fields below."), here.Base_translateString("This web site does not allow user login."))</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/registration_message.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/registration_message.xml
@@ -140,9 +140,7 @@
                </item>
                <item>
                    <key> <string>enabled</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                </item>
                <item>
                    <key> <string>external_validator</string> </key>
@@ -269,20 +267,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: here.Base_translateString("If you have not created an account yet, please fill all the fields below to register yourself and create a new account.")</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: test(here.isUserAllowedRequestNewAccount(), here.Base_translateString("If you have not created an account yet, please fill all the fields below to register yourself and create a new account."), here.Base_translateString("User registration is not allowed for this web site."))</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/reset_password.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/reset_password.xml
@@ -146,7 +146,9 @@
                </item>
                <item>
                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                </item>
                <item>
                    <key> <string>external_validator</string> </key>
@@ -295,4 +297,17 @@ id="reference"/>\n
      </dictionary>
    </pickle>
  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestPasswordReset()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/submit.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/submit.xml
@@ -131,7 +131,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_city.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_city.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_region.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_region.xml
@@ -129,7 +129,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_street_address.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_street_address.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_zip_code.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_address_zip_code.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_email_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_email_text.xml
@@ -67,6 +67,10 @@
                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                    </value>
                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
                <item>
                    <key> <string>field_id</string> </key>
                    <value> <string></string> </value>
@@ -122,7 +126,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_fax_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_fax_text.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_telephone_text.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_default_telephone_text.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_first_name.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_first_name.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_last_name.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_last_name.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_password.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_password.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_password_confirm.xml
+++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/login_form/your_password_confirm.xml
@@ -107,7 +107,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python: context.getLayoutProperty(\'layout_display_anonymous_user_registration\',True)</string> </value>
+            <value> <string>python: here.getWebSiteValue().isUserAllowedRequestNewAccount()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_km/bt/revision
+++ b/bt5/erp5_km/bt/revision
-1838
\ No newline at end of file
+1839
\ No newline at end of file