From e297a0d8c1d1b5618b6bf581c76b5b761921c04a Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Fri, 2 Mar 2007 23:51:20 +0000
Subject: [PATCH] WebSection_newWebPage now redirects to editable mode better
 translation support

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13200 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_web/WebSection_newDefaultWebPage.xml |  3 ++-
 .../erp5_web/WebSection_newWebPage.xml        |  5 ++--
 .../WebSite_viewContributeRenderer.xml        | 23 +++++++++++++++----
 .../WebSite_viewDashboardRenderer.xml         | 12 ++++++++++
 .../WebSite_viewSCALEWidget.xml               |  5 ++--
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newDefaultWebPage.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newDefaultWebPage.xml
index b9cfcdc281..56e03db726 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newDefaultWebPage.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newDefaultWebPage.xml
@@ -88,7 +88,8 @@ context.setDefaultAggregateValue(web_page)\n
 \n
 # Return the new page in the section context\n
 return web_page.Base_redirect(\'view\',\n
-          keep_items = dict(portal_status_message = translateString("New default Web Page for section ${web_section}.",\n
+          keep_items = dict(editable_mode=1,\n
+            portal_status_message = translateString("New default Web Page for section ${web_section}.",\n
           mapping = dict(web_section = title))))\n
 </string> </value>
         </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newWebPage.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newWebPage.xml
index 19287929d2..a416497a5b 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newWebPage.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_newWebPage.xml
@@ -92,8 +92,9 @@ context.setDefaultAggregateValue(web_page)\n
 \n
 # Return the new page in the section context\n
 return web_page.Base_redirect(\'view\',\n
-          keep_items = dict(portal_status_message = translateString("New Web Page of section ${web_section}.",\n
-          mapping = dict(web_section = title))))\n
+          keep_items = dict(editable_mode=1,\n
+              portal_status_message=translateString("New Web Page of section ${web_section}.",\n
+          mapping = dict(web_section=title))))\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
index b93c298950..520a917873 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
@@ -107,7 +107,7 @@
         Theme\n
       </div>\n
     </div>\n
-    <input style="float:right" type="submit" name="WebSite_contributeLink:method" value="Contribute"/>\n
+    <input style="float:right" type="submit" name="WebSite_linkContent:method" value="Contribute"/>\n
     <div class="clear"></div>\n
   </div>\n
   \n
@@ -145,7 +145,7 @@
             </span>\n
           </li>\n
           <li tal:condition="python:here.ERP5Site_isNewContentAllowed(\'External Library File\', user)">\n
-            <a href="Base_createContent?portal_type=External Library File" value="" i18n:translate="" i18n:domain="ui">Library File</a>\n
+            <a href="ERP?portal_type=External Library File" value="" i18n:translate="" i18n:domain="ui">Library File</a>\n
           </li>\n
         </ul>\n
       </ul>\n
@@ -199,10 +199,10 @@
         <li class="listheader" value="" i18n:translate="" i18n:domain="ui">Contacts:</li>\n
         <ul>\n
           <li tal:condition="python:here.ERP5Site_isNewContentAllowed(\'Organisation\', user)">\n
-            <a href="Base_createContent?portal_type=Organisation" value="" i18n:translate="" i18n:domain="ui">Organisation</a>\n
+            <a href="ERP5Site_newContent?portal_type=Organisation" value="" i18n:translate="" i18n:domain="ui">Organisation</a>\n
           </li>\n
           <li tal:condition="python:here.ERP5Site_isNewContentAllowed(\'Person\', user)">\n
-            <a href="Base_createContent?portal_type=Person" value="" i18n:translate="" i18n:domain="ui">Person</a>\n
+            <a href="ERP5Site_newContent?portal_type=Person" value="" i18n:translate="" i18n:domain="ui">Person</a>\n
           </li>\n
         </ul>\n
       </ul>\n
@@ -212,14 +212,27 @@
   </div>\n
 </div>\n
 \n
-</tal:block>
+</tal:block>\n
+
 
 ]]></string> </value>
         </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>WebSite_viewContributeRenderer</string> </value>
         </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml
index 023bb4ee07..dfab2af307 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml
@@ -116,10 +116,22 @@
 
 ]]></string> </value>
         </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>WebSite_viewDashboardRenderer</string> </value>
         </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml
index 1eeb70e941..cf1193a420 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewSCALEWidget.xml
@@ -48,7 +48,6 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-\n
 <div id="home_search">\n
   <tal:block metal:use-macro="here/WebSite_viewSearchRenderer/macros/main"/>\n
 </div>\n
@@ -61,14 +60,14 @@
   <div class="box left" tal:define="global TASK_LEN python: 20">\n
     <tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/act"/>\n
   </div>\n
-  \n
-  <div class="box left" tal:define="NEWS_LEN python: 20">\n
+    <div class="box left" tal:define="NEWS_LEN python: 20">\n
     <tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/learn"/>\n
   </div>\n
   \n
   <div class="box left">\n
     <tal:block metal:use-macro="here/WebSite_viewDashboardRenderer/macros/evaluate"/>\n
   </div>\n
+\n
 </div>
 
 ]]></string> </value>
-- 
2.30.9