diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml
new file mode 100755
index 0000000000000000000000000000000000000000..da92c01cd9b6cb6c3c4660d24f70f8964ef6aa5e
--- /dev/null
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/history.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>history</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>5.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>History</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <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>string:${object_url}/Base_viewHistory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
index 94e56f7335aa2a6aa038952ce39865039f100000..d38a393f380a02ec9af38b7972b7325373140b83 100755
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Page/metadata.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>5.0</float> </value>
+            <value> <float>6.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/history.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/history.xml
new file mode 100755
index 0000000000000000000000000000000000000000..e2856b9771be8a11756ca9486fab923c74b842fe
--- /dev/null
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/history.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>history</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>4.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>History</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <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>string:${object_url}/Base_viewHistory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/metadata.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/metadata.xml
index db21efb9f145295ed9090bdad88dea59d4d2bb49..94e56f7335aa2a6aa038952ce39865039f100000 100755
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/metadata.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Section/metadata.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>4.0</float> </value>
+            <value> <float>5.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/history.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/history.xml
new file mode 100755
index 0000000000000000000000000000000000000000..8a72e4e09d1fb5085e07f1680413a2c1cde7784a
--- /dev/null
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/history.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.ActionInformation</string>
+          <string>ActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>history</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <float>3.0</float> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>History</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <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>string:${object_url}/Base_viewHistory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/metadata.xml b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/metadata.xml
index 2aa4a6dcd43651422c6becc1fd7cb127e5076ae0..db21efb9f145295ed9090bdad88dea59d4d2bb49 100755
--- a/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/metadata.xml
+++ b/bt5/erp5_web/ActionTemplateItem/portal_types/Web%20Site/metadata.xml
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>3.0</float> </value>
+            <value> <float>4.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
index 662b6bffd6a8a2c74312d9cd4381f0801c75eb9a..e38ad52831734df69b83e5eb95b96fe879555d52 100755
--- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
+++ b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_drop_fulltext.xml
@@ -81,7 +81,7 @@
         </item>
         <item>
             <key> <string>connection_id</string> </key>
-            <value> <string>erp5_deferred_mysql</string> </value>
+            <value> <string>erp5_deferred_sql_connection</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
index 2d83be76b20cd655d2c7e0dd1d0773895128b6bf..3367b90afe4663c7f36ee2cf172df6dfc1fa9594 100755
--- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
+++ b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z0_uncatalog_fulltext.xml
@@ -90,7 +90,7 @@
         </item>
         <item>
             <key> <string>connection_id</string> </key>
-            <value> <string>erp5_deferred_mysql</string> </value>
+            <value> <string>erp5_deferred_sql_connection</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
index 6d6a908ca040dc5dcaf9d67516e0c8fe1a05a80c..b6389e0b640c32b4d06cf0b2d73b20f285deb7a0 100755
--- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
+++ b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
@@ -98,7 +98,7 @@ SearchableText</string> </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
-            <value> <string>erp5_deferred_mysql</string> </value>
+            <value> <string>erp5_deferred_sql_connection</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
index 0c75252bc36b32c5de5622c6665fe6aa992c56da..d319af3b67b1b5f7f0f3a5570aafd76c5340c947 100755
--- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
+++ b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_create_fulltext.xml
@@ -87,7 +87,7 @@
         </item>
         <item>
             <key> <string>connection_id</string> </key>
-            <value> <string>erp5_deferred_mysql</string> </value>
+            <value> <string>erp5_deferred_sql_connection</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
index d3e269261e8bac2b5af5e0cf04d37d876adc745d..10f1eaa5bfba32199d8e29db4244a8d40e679939 100755
--- a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
@@ -502,4 +502,4 @@
  </permission_list>
  <portal_type>Web Site Module</portal_type>
  <title>Web Sites</title>
-</module>
\ No newline at end of file
+</module>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/listbox.xml
index 93546fc866b89360222ebea382c819f06aa7af0a..462cb1cd5df178e71db517c7d722a04cb6122e53 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/listbox.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_view/listbox.xml
@@ -345,6 +345,10 @@
                           <string>short_title</string>
                           <string>Short Title</string>
                         </tuple>
+                        <tuple>
+                          <string>validation_state</string>
+                          <string>Valisation State</string>
+                        </tuple>
                         <tuple>
                           <string>portal_type</string>
                           <string>Type</string>
@@ -535,6 +539,10 @@
                           <string>short_title</string>
                           <string>WebSite_getListboxUrl</string>
                         </tuple>
+                        <tuple>
+                          <string>validation_state</string>
+                          <string>WebSite_getListboxUrl</string>
+                        </tuple>
                         <tuple>
                           <string>portal_type</string>
                           <string>WebSite_getListboxUrl</string>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
index cfa46c121b7c4b0d0fb8f7d58779ab2f4c12ea6a..36792b6e0ddddf0902ebcd35cdbe645a7e797e8e 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
@@ -85,7 +85,7 @@ new_content.setVersion(version)\n
 new_content.setLanguage(language)\n
 new_content.setTextContent(context.getTextContent())\n
 \n
-redirect_url = new_content.WebSite_getDocumentUrl()\n
+redirect_url = new_content.WebSite_getDocumentPhysicalUrl()\n
 context.log(\'WebSite_createContent\',\'redirect_url = %s\' % redirect_url)\n
 return request.RESPONSE.redirect( redirect_url )\n
 </string> </value>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml
new file mode 100755
index 0000000000000000000000000000000000000000..d7c2014deafa051def7d1393d80737d55b7edfd1
--- /dev/null
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocument.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">bfINCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return context.WebSite_getDefaultDocumentValue().WebSite_getUrl()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocument</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+<string>context</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getDefaultDocument</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml
new file mode 100755
index 0000000000000000000000000000000000000000..109bc5a60bd1f86eaeb077697ae27604190129d4
--- /dev/null
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDefaultDocumentValue.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">bfINCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>"""\n
+  The purpose of this method is to get a default content for a given section.\n
+  Multiple strategies can be implemented. For example, if the default\n
+  content points to an actual document, the reference of this document\n
+  is used to search in the catalog for the latest version in the appropriate\n
+  language.\n
+\n
+  This method can be customised for every Web site\n
+"""\n
+\n
+source_value = context.getDefaultSourceValue()\n
+\n
+if source_value is not None:\n
+  return source_value \n
+\n
+return None\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDefaultDocumentValue</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>source_value</string>
+                            <string>None</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getDefaultDocumentValue</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
index 987713b6d89978713b0767f8ae827a1875aafc7c..ef665f37fa43128bbfb8388358c941eab338b61f 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentPhysicalPath.xml
@@ -69,10 +69,9 @@
             <value> <string>if reference_path is None:\n
   reference_path = context\n
 section = reference_path.WebSite_getSectionValue()\n
-if section is None:\n
-  section = context.WebSite_getSite()\n
-if context.WebSite_getDocumentValue() is not None:\n
-  return "%s/%s" % (section.WebSite_getUrl(),context.WebSite_getDocumentValue().getRelativeUrl())\n
+document = context.WebSite_getDocumentValue()\n
+if section is not None and document is not None:\n
+  return "%s/%s" % (section.WebSite_getUrl(), document.getRelativeUrl())\n
 return None\n
 </string> </value>
         </item>
@@ -125,6 +124,7 @@ return None\n
                             <string>context</string>
                             <string>_getattr_</string>
                             <string>section</string>
+                            <string>document</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
index 84c359a2db1af2709107bad20898b1856b491c2d..bfa343f276279b5bfac9cad1f2f58329f9fa315d 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentUrl.xml
@@ -66,8 +66,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>if context.WebSite_getDocumentValue() is not None:\n
-  return context.WebSite_getDocumentValue().WebSite_getUrl()\n
+            <value> <string>document = context.WebSite_getDocumentValue()\n
+if document is not None:\n
+  return document.WebSite_getUrl()\n
 return context.WebSite_getUrl()\n
 </string> </value>
         </item>
@@ -117,6 +118,7 @@ return context.WebSite_getUrl()\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>document</string>
                             <string>None</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
index d83a6894450c537f34f00cb44da23903fc6dbe3e..c7faadc30c158f34a1c8a3deb7f0216e714d569d 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSection.xml
@@ -66,8 +66,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>if context.WebSite_getSectionValue() is not None:\n
-  return context.WebSite_getSectionValue().getTitle()\n
+            <value> <string>section = context.WebSite_getSectionValue()\n
+if section is not None:\n
+  return section.getTitle()\n
 return None\n
 </string> </value>
         </item>
@@ -116,7 +117,8 @@ return None\n
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
+                            <string>section</string>
                             <string>None</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
index 3dcdfffb0796ad57b25613a580f92fcde19745d8..ade8cd8cdff13e2f59f89b13a38acdee88df677e 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSectionValue.xml
@@ -66,14 +66,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>while context is not None and context.getPortalType() not in (\'Web Section\', \'Web Site\'):\n
+            <value> <string>while hasattr(context, \'getPortalType\'):\n
+  if context.getPortalType() == \'Web Section\':\n
+    return context\n
   context = context.getParent()\n
-\n
-if context is None:\n
-  return None\n
-if context.getPortalType() == \'Web Site\':\n
-  return None\n
-return context\n
+return None\n
 </string> </value>
         </item>
         <item>
@@ -120,9 +117,10 @@ return context\n
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>hasattr</string>
                             <string>context</string>
-                            <string>None</string>
                             <string>_getattr_</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
index 2bc1dedcd110be589e1111413d1bbc0190402c94..dee91f44de7d868a42f435ce3266caed13a6d0d1 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
@@ -66,11 +66,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>current_section = context\n
-while current_section is not None and current_section.getPortalType() != \'Web Site\':\n
-  current_section = current_section.getParent()\n
-\n
-return current_section\n
+            <value> <string>site = context.WebSite_getSiteValue()\n
+if site is not None:\n
+  return site.getTitle()\n
+return None\n
 </string> </value>
         </item>
         <item>
@@ -117,10 +116,10 @@ return current_section\n
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
-                            <string>context</string>
-                            <string>current_section</string>
-                            <string>None</string>
                             <string>_getattr_</string>
+<string>context</string>
+                            <string>site</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml
new file mode 100755
index 0000000000000000000000000000000000000000..64637dfbb6504dd21578bd5b5311675d64ee44e9
--- /dev/null
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSiteValue.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">bfINCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>while hasattr(context, \'getPortalType\'):\n
+  if context.getPortalType() == \'Web Site\':\n
+    return context\n
+  context = context.getParent()\n
+return None\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSiteValue</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>hasattr</string>
+                            <string>context</string>
+                            <string>_getattr_</string>
+                            <string>None</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>WebSite_getSiteValue</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
index 767261ff7af00e3ab647c15f0b33bf99c44b0a7a..199e97ab8ba5df86db418cc41e973e95e50c85cd 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getUrl.xml
@@ -67,16 +67,19 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>path_list = []\n
+parent_portal_type = \'\'\n
 \n
 for crumb in context.WebSite_getBreadcrumbValue():\n
-  if crumb.getPortalType() == \'Web Site\':\n
-    path_list = [context.WebSite_getSite().absolute_url()]\n
-  elif hasattr(crumb, \'default_reference\') and \\\n
-       crumb.getPortalType() == \'Web Page\' and \\\n
-       \'Module\' not in crumb.getParent().getPortalType():\n
+  portal_type = crumb.getPortalType()\n
+  if portal_type == \'Web Site\':\n
+    path_list = [context.WebSite_getSiteValue().absolute_url()]\n
+  elif portal_type == \'Web Page\' and \\\n
+       hasattr(crumb, \'default_reference\') and \\\n
+       \'Module\' not in parent_portal_type:\n
     path_list.append(crumb.getReference())\n
   else:\n
     path_list.append(crumb.getId())\n
+  parent_portal_type = portal_type\n
 \n
 return \'/\'.join(path_list)\n
 </string> </value>
@@ -126,10 +129,12 @@ return \'/\'.join(path_list)\n
                         <value>
                           <tuple>
                             <string>path_list</string>
+                            <string>parent_portal_type</string>
                             <string>_getiter_</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>crumb</string>
+                            <string>portal_type</string>
                             <string>hasattr</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
index 7c81341524c09d100ad790543bc72c559fdabced..789ef83e8f490f1d1248737749ee3e630d49d236 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml
@@ -54,7 +54,7 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<tal:block tal:define="default_content here/WebSite_getDefaultDocument | nothing;\n
+<tal:block tal:define="default_content here/WebSite_getDefaultDocumentValue | nothing;\n
                        layout_form_id here/getApplicableLayout | nothing;\n
                        ignore_layout request/ignore_layout | nothing;\n
                        editable_mode request/editable_mode | nothing;\n
@@ -62,21 +62,16 @@
                        layout_id layout_form/pt | string:view_master;">\n
   <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
     <tal:block metal:fill-slot="main">\n
-      <tal:block tal:condition="not: editable_mode">\n
-        <tal:block tal:condition="python:(not ignore_layout) and default_content">\n
-          <tal:block tal:define="here python:default_content;\n
-                                 form python:here.WebPage_view;\n
-                                 default_content_title python:here.getTitle()">\n
-            <tal:block metal:use-macro="here/form_view/macros/form_render" />\n
-          </tal:block>\n
-        </tal:block>\n
-        <tal:block tal:condition="python: ignore_layout or (not default_content)">\n
-          <tal:block metal:use-macro="here/form_view/macros/form_render" />\n
-        </tal:block>\n
-      </tal:block>\n
-      <tal:block tal:condition="editable_mode">\n
-        <tal:block metal:use-macro="here/form_view/macros/form_render" />\n
+      <tal:block tal:condition="python:(not editable_mode) and (not ignore_layout) and default_content is not None">\n
+        <tal:block tal:define="global here python:default_content;\n
+                               global form python:here.WebPage_view;\n
+                               global default_content_title python:here.getTitle()"/>\n
       </tal:block>\n
+      <tal:block tal:replace="here/getPath"/><br/>\n
+      <tal:block tal:condition="not: editable_mode">not </tal:block>editable_mode<br/>\n
+      <tal:block tal:condition="not: ignore_layout">not </tal:block>ignore_layout<br/>\n
+      <tal:block tal:replace="default_content/getPath"/><br/>\n
+      <tal:block metal:use-macro="here/form_view/macros/form_render" />\n
     </tal:block>\n
   </tal:block>\n
 </tal:block>
diff --git a/bt5/erp5_web/bt/template_path_list b/bt5/erp5_web/bt/template_path_list
index 2ef729b2c8f0c926f43915eccf76a052fc1d061f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100755
--- a/bt5/erp5_web/bt/template_path_list
+++ b/bt5/erp5_web/bt/template_path_list
@@ -1 +0,0 @@
-erp5_deferred_mysql
\ No newline at end of file