From 0ce5153c9075fdeb2ee644002b701dcb4519546d Mon Sep 17 00:00:00 2001 From: Christophe Dumez <christophe@nexedi.com> Date: Mon, 26 Jun 2006 11:02:18 +0000 Subject: [PATCH] 2006-06-26 chris * Update according to last XHTML style update git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8163 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_forge/BugModule_viewBugList.xml | 2 +- .../erp5_forge/ExternalFolder_view.xml | 14 -------------- .../erp5_svn/BusinessTemplate_doSvnCommit.xml | 3 ++- .../erp5_svn/BusinessTemplate_viewSvnDiff.xml | 2 +- .../erp5_svn/BusinessTemplate_viewSvnStatus.xml | 2 +- bt5/erp5_forge/bt/change_log | 3 +++ bt5/erp5_forge/bt/version | 2 +- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml index 16f4f0d7be..58e6642f95 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/BugModule_viewBugList.xml @@ -94,7 +94,7 @@ </item> <item> <key> <string>pt</string> </key> - <value> <string>form_list</string> </value> + <value> <string>list_main</string> </value> </item> <item> <key> <string>row_length</string> </key> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml index a8aee35a8c..02ff4e5c9a 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_forge/ExternalFolder_view.xml @@ -62,8 +62,6 @@ <value> <list> <string>left</string> - <string>right</string> - <string>center</string> <string>bottom</string> </list> </value> @@ -80,12 +78,6 @@ </list> </value> </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> <item> <key> <string>left</string> </key> <value> @@ -94,12 +86,6 @@ </list> </value> </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> </dictionary> </value> </item> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml index 93f8736487..8e862f8fc2 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml @@ -87,7 +87,7 @@ if removed != \'\' and removed != \'none\':\n else:\n commit_recurs = removed\n \n -if not changelog :\n +if changelog is None :\n context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n @@ -169,6 +169,7 @@ return context.BusinessTemplate_viewSvnStatus()\n <string>_getitem_</string> <string>context</string> <string>commit_recurs</string> + <string>None</string> <string>False</string> <string>True</string> <string>error</string> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml index 68c157cd8b..146544f9a9 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml @@ -73,7 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n <tal:block tal:define="css_list python: [\'css/movableMenu.css\',];\n js_list python: [\'js/menuico.js\', \'js/movableMenu.js\', \'js/BusinessTemplate_doCreateJavaScriptDiff\']">\n - <tal:block metal:use-macro="here/document/macros/master">\n + <tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:fill-slot="main">\n <!-- Form Hidden : Selected files -->\n <input type=\'hidden\' name=\'removed\' tal:attributes="value python:context.REQUEST[\'removed\']"/>\n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml index ceb0b7a480..3ebeec24cf 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml @@ -73,7 +73,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n <tal:block tal:define="css_list python: [\'css/dhtmlXTree.css\', \'css/movableMenu.css\'];\n js_list python: [\'js/dhtmlXCommon.js\', \'js/dhtmlXTree.js\', \'js/menuico.js\', \'js/movableMenu.js\', \'js/BusinessTemplate_doCreateJavaScriptStatus\']">\n - <tal:block metal:use-macro="here/document/macros/master">\n + <tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:fill-slot="main">\n <noscript>\n <h3 class="error">Please activate javascript in your web browser or this module won\'t work.</h3>\n diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index e48dd302b8..1bdcc2cfc5 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,3 +1,6 @@ +2006-06-26 chris +* Update according to last XHTML style update + 2006-06-22 chris * erp5Subversion is now XHTML Strict compliant * erp5Subversion works with erp5_xhtml_style diff --git a/bt5/erp5_forge/bt/version b/bt5/erp5_forge/bt/version index c18d72be30..53a48a1e8c 100644 --- a/bt5/erp5_forge/bt/version +++ b/bt5/erp5_forge/bt/version @@ -1 +1 @@ -0.8.1 \ No newline at end of file +0.8.2 \ No newline at end of file -- 2.30.9