2007-01-19 JPS

* Global commit of refactored bt. More refactoring needed still

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

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

@@ -102,7 +102,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: not (hasattr(request, \'web_site_value\') and not (getattr(request, \'ignore_layout\', False) or getattr(request, \'editable_mode\', False)))</string> </value>
+            <value> <string>python: object is not None and not object.isWebMode()</string> </value>
         </item>
       </dictionary>
     </pickle>

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

@@ -30,7 +30,9 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -86,4 +88,23 @@
       </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: object is not None and not object.isWebMode()</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

bt5/erp5_web/CategoryTemplateItem/portal_categories/similar.xml

@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,18 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>A base category to create similarity relations</string> </value>
         </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>similar</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Similar</string> </value>
@@ -76,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_web/ModuleTemplateItem/web_page_module.xml

@@ -37,9 +37,6 @@
   <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
@@ -47,17 +44,14 @@
    <name>Add CMF Default Tools</name>
   </permission>
   <permission type='list'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Groups Tools</name>
   </permission>
   <permission type='list'>
-   <name>Add CMF Setup Tools</name>
+   <name>Add CMF Report Tools</name>
   </permission>
   <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Unique Id Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
@@ -67,9 +61,6 @@
   <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission type='list'>
-   <name>Add Configured CMF Sites</name>
-  </permission>
   <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
@@ -145,6 +136,15 @@
   <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
+  <permission type='list'>
+   <name>Add GroupUserFolder</name>
+  </permission>
+  <permission type='list'>
+   <name>Add GroupUserFolders</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Groups</name>
+  </permission>
   <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
@@ -215,7 +215,7 @@
    <name>Add Z MySQL Database Connections</name>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Deferred Database Connections</name>
+   <name>Add Z MySQL Database Deferred Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
@@ -235,9 +235,6 @@
   <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission type='list'>
-   <name>Add portal events</name>
-  </permission>
   <permission type='list'>
    <name>Add portal folders</name>
   </permission>
@@ -247,6 +244,9 @@
   <permission type='list'>
    <name>Add portal topics</name>
   </permission>
+  <permission type='list'>
+   <name>Add secure MailHost objects</name>
+  </permission>
   <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
@@ -319,9 +319,6 @@
   <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission type='list'>
-   <name>Change portal events</name>
-  </permission>
   <permission type='list'>
    <name>Change portal topics</name>
   </permission>
@@ -340,6 +337,9 @@
   <permission type='list'>
    <name>Define permissions</name>
   </permission>
+  <permission type='list'>
+   <name>Delete Groups</name>
+  </permission>
   <permission type='list'>
    <name>Delete objects</name>
   </permission>
@@ -409,6 +409,9 @@
   <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='list'>
    <name>Manage languages</name>
   </permission>
@@ -460,6 +463,9 @@
   <permission type='list'>
    <name>Search for principals</name>
   </permission>
+  <permission type='list'>
+   <name>Set Group Ownership</name>
+  </permission>
   <permission type='list'>
    <name>Set own password</name>
   </permission>
@@ -484,12 +490,18 @@
   <permission type='list'>
    <name>Use Factories</name>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
   <permission type='list'>
    <name>View</name>
   </permission>
+  <permission type='list'>
+   <name>View Groups</name>
+  </permission>
   <permission type='list'>
    <name>View History</name>
   </permission>

bt5/erp5_web/ModuleTemplateItem/web_site_module.xml

@@ -42,9 +42,6 @@
   <permission type='list'>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMF Core Tools</name>
   </permission>
@@ -52,17 +49,14 @@
    <name>Add CMF Default Tools</name>
   </permission>
   <permission type='list'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Groups Tools</name>
   </permission>
   <permission type='list'>
-   <name>Add CMF Setup Tools</name>
+   <name>Add CMF Report Tools</name>
   </permission>
   <permission type='list'>
    <name>Add CMF Sites</name>
   </permission>
-  <permission type='list'>
-   <name>Add CMF Unique Id Tools</name>
-  </permission>
   <permission type='list'>
    <name>Add CMFActivity Tools</name>
   </permission>
@@ -72,9 +66,6 @@
   <permission type='list'>
    <name>Add CMFMailIn Tools</name>
   </permission>
-  <permission type='list'>
-   <name>Add Configured CMF Sites</name>
-  </permission>
   <permission type='list'>
    <name>Add Content Type Registrys</name>
   </permission>
@@ -150,6 +141,15 @@
   <permission type='list'>
    <name>Add Formulator Forms</name>
   </permission>
+  <permission type='list'>
+   <name>Add GroupUserFolder</name>
+  </permission>
+  <permission type='list'>
+   <name>Add GroupUserFolders</name>
+  </permission>
+  <permission type='list'>
+   <name>Add Groups</name>
+  </permission>
   <permission type='list'>
    <name>Add LocalContents</name>
   </permission>
@@ -220,7 +220,7 @@
    <name>Add Z MySQL Database Connections</name>
   </permission>
   <permission type='list'>
-   <name>Add Z MySQL Deferred Database Connections</name>
+   <name>Add Z MySQL Database Deferred Connections</name>
   </permission>
   <permission type='list'>
    <name>Add ZCatalogs</name>
@@ -240,9 +240,6 @@
   <permission type='list'>
    <name>Add portal content</name>
   </permission>
-  <permission type='list'>
-   <name>Add portal events</name>
-  </permission>
   <permission type='list'>
    <name>Add portal folders</name>
   </permission>
@@ -252,6 +249,9 @@
   <permission type='list'>
    <name>Add portal topics</name>
   </permission>
+  <permission type='list'>
+   <name>Add secure MailHost objects</name>
+  </permission>
   <permission type='list'>
    <name>Change Browser Id Manager</name>
   </permission>
@@ -324,9 +324,6 @@
   <permission type='list'>
    <name>Change permissions</name>
   </permission>
-  <permission type='list'>
-   <name>Change portal events</name>
-  </permission>
   <permission type='list'>
    <name>Change portal topics</name>
   </permission>
@@ -345,6 +342,9 @@
   <permission type='list'>
    <name>Define permissions</name>
   </permission>
+  <permission type='list'>
+   <name>Delete Groups</name>
+  </permission>
   <permission type='list'>
    <name>Delete objects</name>
   </permission>
@@ -414,6 +414,9 @@
   <permission type='list'>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission type='list'>
+   <name>Manage extensions</name>
+  </permission>
   <permission type='list'>
    <name>Manage languages</name>
   </permission>
@@ -465,6 +468,9 @@
   <permission type='list'>
    <name>Search for principals</name>
   </permission>
+  <permission type='list'>
+   <name>Set Group Ownership</name>
+  </permission>
   <permission type='list'>
    <name>Set own password</name>
   </permission>
@@ -489,6 +495,9 @@
   <permission type='list'>
    <name>Use Factories</name>
   </permission>
+  <permission type='list'>
+   <name>Use external editor</name>
+  </permission>
   <permission type='list'>
    <name>Use mailhost services</name>
   </permission>
@@ -500,6 +509,9 @@
    <role>Manager</role>
    <role>Owner</role>
   </permission>
+  <permission type='list'>
+   <name>View Groups</name>
+  </permission>
   <permission type='list'>
    <name>View History</name>
   </permission>

bt5/erp5_web/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml

+<hidden_content_type_list>
+ <portal_type id="Web Section">
+  <item>Web Section</item>
+ </portal_type>
+</hidden_content_type_list>
\ No newline at end of file

bt5/erp5_web/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

@@ -2,10 +2,11 @@
  <portal_type id="Web Page">
   <item>Reference</item>
   <item>SortIndex</item>
+  <item>TextDocument</item>
  </portal_type>
  <portal_type id="Web Section">
-  <item>SortIndex</item>
   <item>WebSite</item>
+  <item>SortIndex</item>
  </portal_type>
  <portal_type id="Web Site">
   <item>WebSite</item>

bt5/erp5_web/PortalTypeTemplateItem/portal_types/Web%20Page.xml

@@ -60,7 +60,7 @@
         </item>
         <item>
             <key> <string>content_icon</string> </key>
-            <value> <string>document.gif</string> </value>
+            <value> <string>web_page.png</string> </value>
         </item>
         <item>
             <key> <string>content_meta_type</string> </key>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_fckeditor/fckconfig.js.xml

@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts47966145.85</string> </value>
+            <value> <string>ts69134692.35</string> </value>
         </item>
         <item>
             <key> <string>_FTP_access_Permission</string> </key>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_view/my_int_index.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>IntegerField</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>my_int_index</string> </value>
-        </item>
-        <item>
-            <key> <string>message_values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-                <item>
-                    <key> <string>integer_out_of_range</string> </key>
-                    <value> <string>The integer you entered was out of range.</string> </value>
-                </item>
-                <item>
-                    <key> <string>not_integer</string> </key>
-                    <value> <string>You did not enter an integer.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input given.</string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>overrides</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>end</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>start</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>tales</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>end</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>start</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>values</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>default</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>description</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <int>5</int> </value>
-                </item>
-                <item>
-                    <key> <string>editable</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>enabled</string> </key>
-                    <value> <int>1</int> </value>
-                </item>
-                <item>
-                    <key> <string>end</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>extra</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>start</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>title</string> </key>
-                    <value> <string>Order Index</string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_viewRelated.xml → bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewAsWeb.xml

@@ -55,13 +55,14 @@
         </item>
         <item>
             <key> <string>enctype</string> </key>
-            <value> <string>multipart/form-data</string> </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>left</string>
+                <string>left webcontent</string>
+                <string>bottom</string>
               </list>
             </value>
         </item>
@@ -70,12 +71,18 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>left</string> </key>
+                    <key>                 <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>my_text_content</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key>                 <string>left webcontent</string> </key>
                     <value>
                       <list>
-                        <string>my_similar_title_list</string>
-                        <string>my_destination_title_list</string>
-                        <string>my_source_title_list</string>
+                        <string>my_title</string>
                       </list>
                     </value>
                 </item>
@@ -84,7 +91,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Document_viewRelated</string> </value>
+            <value> <string>WebPage_viewAsWeb</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -92,7 +99,7 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>Document_viewRelated</string> </value>
+            <value> <string>WebPage_view</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
@@ -108,7 +115,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Related Documents</string> </value>
+            <value> <string>Web Page</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

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

@@ -211,7 +211,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>page</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -239,7 +239,7 @@
                 </item>
                 <item>
                     <key> <string>height</string> </key>
-                    <value> <int>5</int> </value>
+                    <value> <int>18</int> </value>
                 </item>
                 <item>
                     <key> <string>hidden</string> </key>
@@ -275,7 +275,7 @@
                 </item>
                 <item>
                     <key> <string>width</string> </key>
-                    <value> <int>40</int> </value>
+                    <value> <int>80</int> </value>
                 </item>
               </dictionary>
             </value>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/my_title.xml → bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPage_viewAsWeb/my_title.xml

@@ -195,7 +195,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>headline</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -203,7 +203,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>The title is display as main content title and page title.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml

@@ -100,11 +100,11 @@ language = portal.Localizer.get_selected_language()\n
 \n
 # Search the catalog for all documents matching the reference\n
 # this will only return documents which are accessible by the user\n
-web_page_list = portal_catalog(reference=name, portal_type=valid_portal_type_list,\n
-                               language=language,\n
-                               order_by=[(\'version\', \'descending\')],\n
-                               group_by=(\'reference\',))\n
-\n
+web_page_list = portal_catalog(reference=name, portal_type=valid_portal_type_list, \n
+                               order_by=[(\'index\', \'descending\'), (\'version\', \'descending\')],\n
+                               language=language)\n
+                               # XXX - group_by is missing here\n
+                               # portal_catalog extension required\n
 try:\n
   # Try to get the first page on the list\n
   web_page = web_page_list[0]\n
@@ -112,8 +112,9 @@ try:\n
 except IndexError:\n
   # Search again without the language\n
   web_page_list = portal_catalog(reference=name, portal_type=\'Web Page\', \n
-                                 order_by=[(\'version\', \'descending\')],\n
-                                 group_by=(\'reference\',))\n
+                                 order_by=[(\'index\', \'descending\'), (\'version\', \'descending\')])\n
+                                 # XXX - group_by is missing here\n
+                                 # portal_catalog extension required\n
   try:\n
     # Try to get the first page on the list\n
     web_page = web_page_list[0]\n
@@ -204,10 +205,6 @@ return web_page\n
             <key> <string>id</string> </key>
             <value> <string>WebSection_getDocumentValue</string> </value>
         </item>
-        <item>
-            <key> <string>isIndexable</string> </key>
-            <value> <int>0</int> </value>
-        </item>
         <item>
             <key> <string>warnings</string> </key>
             <value>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/ImageModule_viewImageList.xml → bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_viewAsWeb.xml

@@ -45,9 +45,15 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>Base_doSelect</string> </value>
+            <value> <string>Base_edit</string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>
@@ -61,8 +67,8 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>bottom</string>
-                <string>hidden</string>
+                <string>webcontent header bottom</string>
+                <string>webcontent bottom</string>
               </list>
             </value>
         </item>
@@ -71,18 +77,19 @@
             <value>
               <dictionary>
                 <item>
-                    <key>                 <string>bottom</string> </key>
+                    <key> <string>webcontent bottom</string> </key>
                     <value>
                       <list>
-                        <string>listbox</string>
+                        <string>my_section_content</string>
                       </list>
                     </value>
                 </item>
                 <item>
-                    <key> <string>hidden</string> </key>
+                    <key> <string>webcontent header bottom</string> </key>
                     <value>
                       <list>
-                        <string>listbox_caption</string>
+                        <string>page_title</string>
+                        <string>page_summary</string>
                       </list>
                     </value>
                 </item>
@@ -91,7 +98,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>ImageModule_viewImageList</string> </value>
+            <value> <string>WebSection_viewAsWeb</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>
@@ -99,15 +106,11 @@
         </item>
         <item>
             <key> <string>name</string> </key>
-            <value> <string>Folder_viewContentList</string> </value>
+            <value> <string>WebSection_viewAsWeb</string> </value>
         </item>
         <item>
             <key> <string>pt</string> </key>
-            <value> <string>form_list</string> </value>
-        </item>
-        <item>
-            <key> <string>rid</string> </key>
-            <value> <int>-1722436574</int> </value>
+            <value> <string>form_view</string> </value>
         </item>
         <item>
             <key> <string>row_length</string> </key>
@@ -119,13 +122,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Folder Contents</string> </value>
-        </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Web Section</string> </value>
         </item>
         <item>
             <key> <string>unicode_mode</string> </key>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/web_page.png.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>OFS.Image</string>
+          <string>Image</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>web_page.png</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>image/png</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
+BGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VG
+AAACxUlEQVR42mLs7+//z0ABAAggFhBRUFDAsPnMTwZmpv8MfFyMDIeufWV48PIHw/fffxm+/vwD
+xL8ZvnwH0X8ZvgH5n77/Zngxx4xhwoQJDAABxAIzyU6LFUyzszAyaMmwMLz+yMXw489/BhbGfwxs
+zAwM3OwMDD+BBv75+5/h3z+EowECCG4APxcTmL71/BfDsw9/GBhBksxAkpGRASQD1MegIsYGZIEM
++Ac3ACCAWJD9s+vKV4bnn34x6MpwMPBxMjEAHQDU+B9oKwPDnbe/GR68/cXgoMbK8PsP0FUcED0A
+AQQ34PLjnwzLz3xgCDDgYXjx8Q/D048MDO++/GEA6mcAOZgF6Ixjd78DXcPOYKfMDLcUIIDgBqw+
+84nh1WdgIP1jYvgLdOHp658Z3n3+w8DFwQz2DjPQgP3AwP308TeDjbIA3ACAAIIbcP3RD4Ztxz8w
+/P/9n8HfRohBUpKL4f33rwyHL38BBxzIIFagM779ZmD49ZeRgQuqDyCAmGAGCICMeveD4dTZDww/
+gBosdPkY/G2FGb5+BAbqix8Mpjq8DBpS7AyGStxAgxBeAAgguAucdTkYLt/jY4gIkGSw0OJlYGdi
+ZBCU5mCIcBZh4OFhYZCR42bYtOslg6IAEwMnO9xeBoAAghvgZcTN8IOBhUFfj4+Bl4MRLAaMQYbU
+IEkGUCB8/PqPQTFMkkGd+wfD5y8/GPgFOMFqAAIIbgAXGxODjz4bw7NfPxm+/wI68ec/BnZWRgZm
+VqDfOZkZmH79YHh5YjPDS7SkDBBAcAP+/mdkYP33k0GK4Q/Do7fAaL35neEHMEBFhdgYDLS5GQS+
+fwCrCw8PB9OgZFxYWMgKEEBwA5iZmRl4+PjBbGHh/wxGGoxQmf8M/4HR+uUrwt9QzWAFAAEEN4CF
+hQVnjmME6uXi4sLQDAIAAcQCEyQWIGsGAYAAAwCeAuP3tKq/lwAAAABJRU5ErkJggg==</string> </value>
+        </item>
+        <item>
+            <key> <string>height</string> </key>
+            <value> <int>16</int> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <int>847</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Web Page</string> </value>
+        </item>
+        <item>
+            <key> <string>width</string> </key>
+            <value> <int>16</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_default_theme/erp5_web_editable_content.css.xml

@@ -451,6 +451,27 @@ div#main_content > fieldset.webcontent span.summary {\n
   padding: 0 2em;\n
   font-style: italic;\n
 }\n
+\n
+\n
+div#main_content fieldset.webcontent span.headline {\n
+  margin: 1em 0;\n
+  padding: 0 1em;\n
+  font-size: 250%;\n
+  color: #999;\n
+  font-weight: bold;\n
+  text-shadow: .1em .1em .1em #eee;\n
+  line-height: 140%;\n
+  text-align: left;\n
+}\n
+\n
+div#main_content .headline legend,\n
+div#main_content .headline label {\n
+  margin: 0;\n
+  width: 0em;\n
+  text-align: left;\n
+  float: left;\n
+  display: none;\n
+}\n
 
 
 ]]></string> </value>

bt5/erp5_web/bt/change_log

+2007-01-19 JPS
+* Global commit of refactored bt. More refactoring needed still
+
 2006-10-05 Kevin
 * Minor fixes.
 * Don't show unvisible object in sub_web_object_list (thanks to Kristian).