base_url can be just an absolute url of the portal.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25521 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml

@@ -42,11 +42,10 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
-            tal:define="base_url  python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId());\n
-                        global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
+            tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="base_url">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr tal:condition="is_selenium_0_8">\n
@@ -68,7 +67,7 @@
     <tal:block tal:condition="init_method">\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string:$base_url/accounting_module/$init_method" />\n
+      <td tal:content="string:$${base_url}/accounting_module/$init_method" />\n
       <td></td>\n
     </tr>\n
     <tr>\n

bt5/erp5_accounting_ui_test/bt/revision

-116
+117
\ No newline at end of file

bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml

@@ -42,11 +42,10 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
   <tal:block metal:define-macro="init"\n
-            tal:define="base_url  python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId());\n
-                        global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
+            tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() &gt; \'Zelenium-0.8\'">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="base_url">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr tal:condition="is_selenium_0_8">\n
@@ -88,7 +87,7 @@
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string:$base_url/internal_packing_list_module/$init_method" />\n
+      <td tal:content="string:$${base_url}/internal_packing_list_module/$init_method" />\n
       <td></td>\n
     </tr>\n
     <tr>\n

bt5/erp5_pdm_ui_test/bt/revision

-13
+14
\ No newline at end of file

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/BTZuite_CommonTemplate.xml

@@ -61,12 +61,12 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string: ${here/portal_url}/foo_module/BTZuite_reset"/>\n
+      <td>${base_url}/foo_module/BTZuite_reset</td>\n
       <td></td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml

@@ -58,11 +58,10 @@
 
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
            xmlns:metal="http://xml.zope.org/namespaces/metal">\n
-\n
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml

@@ -61,7 +61,7 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/MatrixBoxZuite_CommonTemplate.xml

@@ -61,7 +61,7 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/PTZuite_CommonTemplate.xml

@@ -62,12 +62,12 @@
     <!-- reuse listbox suite reset to clear modules. -->\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n
       <td>open</td>\n
-      <td tal:content="string: ${here/portal_url}/foo_module/ListBoxZuite_reset"/>\n
+      <td>${base_url}/foo_module/ListBoxZuite_reset</td>\n
       <td></td>\n
     </tr>\n
     <tr>\n
@@ -78,7 +78,7 @@
     <tr>\n
       <td>open</td>\n
       <!-- create a Foo -->\n
-      <td tal:content="string: ${here/portal_url}/foo_module/Foo_createObjects?start:int=1&num:int=1"/>\n
+      <td>${base_url}/foo_module/Foo_createObjects?start:int=1&amp;num:int=1</td>\n
       <td></td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/RelationFieldZuite_CommonTemplate.xml

@@ -61,7 +61,7 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

bt5/erp5_ui_test/bt/revision

-410
+411
\ No newline at end of file

bt5/erp5_web_ui_test/SkinTemplateItem/portal_skins/erp5_web_ui_test/Zuite_erp5_web_common.xml

@@ -44,7 +44,7 @@
   <tal:block metal:define-macro="init">\n
     <tr>\n
       <td>store</td>\n
-      <td tal:content="python:\'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\',  here.getPortalObject().getId())">erp5</td>\n
+      <td tal:content="python:here.getPortalObject().absolute_url()">http://example.com/erp5</td>\n
       <td>base_url</td>\n
     </tr>\n
     <tr>\n

bt5/erp5_web_ui_test/bt/revision

-6
+7
\ No newline at end of file