Replace dummy guards on alternate Web Page view with correct behaviour.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9600 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/view.xml

@@ -30,9 +30,7 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -56,7 +54,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.0</float> </value>
+            <value> <float>1.5</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -88,23 +86,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.CMFCore.Expression</string>
-          <string>Expression</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>text</string> </key>
-            <value> <string>python: False</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/web_view.xml

@@ -56,7 +56,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>1.5</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -102,7 +102,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: True</string> </value>
+            <value> <string>python: hasattr(request, \'web_site_value\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False))</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/WebPage_viewAsWeb.xml

@@ -104,7 +104,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>WebPage_view</string> </value>
+            <value> <string>WebPage_viewAsWeb</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>

bt5/erp5_web/bt/change_log

@@ -4,7 +4,7 @@
 * Set the default Webmaster User ID at Web Site creation.
 * Webmaster and ID are now required.
 Rename "Webmaster" to "Webmaster User ID" to avoid confusion.
-* Add alternate Web Page view with dummy guards.
+* Add alternate Web Page view for web mode.
 
 2006-08-31 Stefan
 * WebSection_getDocumentValueList now returns the newest version for each

bt5/erp5_web/bt/revision

-301
\ No newline at end of file
+304
\ No newline at end of file

bt5/erp5_web/bt/version

-0.3.18
\ No newline at end of file
+0.3.19
\ No newline at end of file