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 b9cfcdc2815df6b1a213479942c8a9d942fb2e92..56e03db726f1eade79ba1dcd70d61c3755e268d1 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 19287929d23dd7d0bcfd4ac41e88c7514fc5cd70..a416497a5bebc79f204c4a3299cc237b147171ec 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 b93c298950f50732c92eafffa694db5886d63224..520a91787357a8d45d5aeba643e09109bc49b024 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 023bb4ee07e0ce13e2b65b1c0b7e71908b6b69fe..dfab2af30705f91451f4e671c773e27b53bfed39 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 1eeb70e941b148ca67f926b9098fe6e137998931..cf1193a420fb51c4498617188b234b31f15f0d57 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>