diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
index dd18f99a92487bb4f8129d84fa095cf3cca04b79..1022e52353f1c2f69c4fb78fc6e4189971f9a1ee 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
@@ -86,12 +86,14 @@ MISSING:\n
 -->\n
 </tal:block>\n
 <tal:block metal:define-macro="master">\n
-  <tal:block tal:define="ignore_layout          request/ignore_layout | nothing;\n
-                         layout_form_id         here/getApplicableLayout | nothing;\n
-                         editable_mode  python: layout_form_id and request.get(\'editable_mode\', ignore_layout) or 1;\n
-                         dummy          python: request.set(\'editable_mode\', editable_mode);\n
-                         layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
-                         page_template  python: (layout_form and not(ignore_layout)) and getattr(layout_form, \'pt\', None) or \'template_erp5_xhtml_style\';">\n
+  <tal:block\n
+   tal:define="ignore_layout          request/ignore_layout | nothing;\n
+               layout_form_id         here/getApplicableLayout | nothing;\n
+               is_edit_mode   python: not (not(hasattr(context.REQUEST, \'editable_mode\')) or not(context.REQUEST[\'editable_mode\']));\n
+               editable_mode  python: layout_form_id in (\'\', None) and True or (is_edit_mode or ignore_layout);\n
+               dummy          python: request.set(\'editable_mode\', editable_mode);\n
+               layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
+               page_template  python: (layout_form and not(ignore_layout)) and getattr(layout_form, \'pt\', None) or \'template_erp5_xhtml_style\';">\n
     <tal:block metal:use-macro="python: getattr(here, page_template).macros[\'master\']">\n
       <tal:block metal:fill-slot="context_bar">\n
         <tal:block metal:define-slot="context_bar"/>\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
index 83371a8a42b56b25050cb5cd277598b824c898f6..c63c86acddd077a081aeb3c8c97882d10c27f182 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
@@ -1,3 +1,6 @@
+2006-08-22 Kevin
+* Unset editable_mode when viewing an object through Web Site object.
+
 2006-08-21 Kevin
 * Include support for editable_mode parameter in main_template.
 * Remove default value (by jp).
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/id_generator b/product/ERP5/bootstrap/erp5_xhtml_style/bt/id_generator
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index d97edbb29fa140807215ea46cfdc2b84f4c97dcd..105d7d9ad3afc7bb78a0dec4d829880831605dfb 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-99
\ No newline at end of file
+100
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
index 7e099ec5d75abf22ee60bb93ebb1803ec9b2687a..a77d7d9272df36f467e1fdeecae0454570e4cf07 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version
@@ -1 +1 @@
-1.2.6
\ No newline at end of file
+1.2.7
\ No newline at end of file