From 8c1148efbdec6f97bf9e889ac86f7ff18ddc82b0 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 5 Sep 2007 08:35:20 +0000 Subject: [PATCH] 2007-09-04 Kazuhiko * use portal_url.getPortalObject().absolute_url_path() instead of portal_url.getPortalPath() for better virtual host support. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16061 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_mobile_ui/erp5.css.xml | 22 +++--- .../erp5_mobile_ui/login_form.xml | 2 +- bt5/erp5_mobile/bt/change_log | 2 +- bt5/erp5_mobile/bt/revision | 2 +- .../document_zuite/testAddObject.xml | 9 ++- ...testDropDownListActionsNothingSelected.xml | 3 +- .../testSimpleRelationFieldSaveButton.xml | 2 +- bt5/erp5_ui_test/bt/change_log | 2 +- bt5/erp5_ui_test/bt/revision | 2 +- .../erp5_xhtml_style/erp5.css.xml | 70 +++++++++---------- .../erp5_xhtml_style/login_form.xml | 2 +- .../bootstrap/erp5_xhtml_style/bt/change_log | 2 +- .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml index 170750dc37..e3c5045752 100644 --- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml +++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml @@ -806,7 +806,7 @@ fieldset {\n /* listbox */\n \n .ListSummary {\n - background: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n + background: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n color: #000;\n background-color: <dtml-var document_background_color>;\n padding-left: 10px;\n @@ -904,43 +904,43 @@ fieldset {\n }\n \n #favourites button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/favourite.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/favourite.png\');\n }\n \n #modules button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/appearance.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/appearance.png\');\n }\n \n #language button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/language.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/language.png\');\n }\n \n #search button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/info.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/info.png\');\n }\n \n #actions button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/exec16.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/exec16.png\');\n }\n \n #context_bar .tool_buttons .jump_first .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/2leftarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/2leftarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_previous .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/1leftarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/1leftarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_next .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/1rightarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/1rightarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_last .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/2rightarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/2rightarrowb.png\');\n }\n \n #context_bar .tool_buttons .list_mode .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/text_block.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/text_block.png\');\n }\n \n #navigation_bar button .image,\n diff --git a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.xml b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.xml index 1f448eb08c..150395385d 100644 --- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.xml +++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/login_form.xml @@ -76,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n <tal:block tal:define="form_action string:logged_in;\n - js_list python: [\'%s/login_form.js\' % (here.portal_url.absolute_url_path(), )]">\n + js_list python: [\'%s/login_form.js\' % (here.portal_url.getPortalObject().absolute_url_path(), )]">\n <tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:fill-slot="main">\n <div class="content login">\n diff --git a/bt5/erp5_mobile/bt/change_log b/bt5/erp5_mobile/bt/change_log index da3b1b9b26..e2b1a91d9e 100644 --- a/bt5/erp5_mobile/bt/change_log +++ b/bt5/erp5_mobile/bt/change_log @@ -1,2 +1,2 @@ 2007-09-04 Kazuhiko -* use absolute_url_path instead of getPortalPath for better virtual host support. \ No newline at end of file +* use portal_url.getPortalObject().absolute_url_path() instead of portal_url.getPortalPath() for better virtual host support. \ No newline at end of file diff --git a/bt5/erp5_mobile/bt/revision b/bt5/erp5_mobile/bt/revision index dec2bf5d61..2edeafb09d 100644 --- a/bt5/erp5_mobile/bt/revision +++ b/bt5/erp5_mobile/bt/revision @@ -1 +1 @@ -19 \ No newline at end of file +20 \ No newline at end of file diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml index d62aec196f..3dc0eb9c35 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml @@ -51,7 +51,6 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -\n <html xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n <head>\n @@ -80,7 +79,7 @@ have id "2". This is probably a bit too stupid. -->\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string:${here/portal_url/absolute_url_path}/foo_module/2/view"/>\n + <td tal:content="string:${here/portal_url/getPortalObject/absolute_url_path}/foo_module/2/view"/>\n <td></td>\n </tr>\n <tr>\n @@ -101,7 +100,7 @@ have id "2". This is probably a bit too stupid. -->\n </tr>\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string:${here/portal_url/absolute_url_path}/foo_module/2/1/view"/>\n + <td tal:content="string:${here/portal_url/getPortalObject/absolute_url_path}/foo_module/2/1/view"/>\n <td></td>\n </tr>\n <tr>\n @@ -129,7 +128,7 @@ have id "2". This is probably a bit too stupid. -->\n </tr>\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string:${here/portal_url/absolute_url_path}/foo_module/3/view"/>\n + <td tal:content="string:${here/portal_url/getPortalObject/absolute_url_path}/foo_module/3/view"/>\n <td></td>\n </tr>\n <tr>\n @@ -151,7 +150,7 @@ another object of the same type. -->\n </tr>\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string:${here/portal_url/absolute_url_path}/foo_module/4/view"/>\n + <td tal:content="string:${here/portal_url/getPortalObject/absolute_url_path}/foo_module/4/view"/>\n <td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml index 625ea902fb..b078f6cd57 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDropDownListActionsNothingSelected.xml @@ -90,7 +90,7 @@ shouldn\'t do anything. -->\n </tr>\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string: ${here/portal_url/absolute_url_path}/foo_module/1/view">/erp5/foo_module/1/view</td>\n + <td tal:content="string: ${here/portal_url/getPortalObject/absolute_url_path}/foo_module/1/view">/erp5/foo_module/1/view</td>\n <td/>\n </tr>\n <tr>\n @@ -101,6 +101,7 @@ shouldn\'t do anything. -->\n </tal:block>\n </body>\n </html>\n +\n ]]></string> </value> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml index 96d6a98a10..2d8203b663 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleRelationFieldSaveButton.xml @@ -131,7 +131,7 @@ button</td></tr>\n </tr>\n <tr>\n <td>assertLocation</td>\n - <td tal:content="string: ${here/portal_url/absolute_url_path}/portal_categories/foo_category/a/a1/view"/>\n + <td tal:content="string: ${here/portal_url/getPortalObject/absolute_url_path}/portal_categories/foo_category/a/a1/view"/>\n <td/>\n </tr>\n </tbody></table>\n diff --git a/bt5/erp5_ui_test/bt/change_log b/bt5/erp5_ui_test/bt/change_log index 94f4c78176..6e0cf4996a 100644 --- a/bt5/erp5_ui_test/bt/change_log +++ b/bt5/erp5_ui_test/bt/change_log @@ -1,5 +1,5 @@ 2007-09-04 Kazuhiko -* use absolute_url_path instead of getPortalPath for better virtual host support. +* use portal_url.getPortalObject().absolute_url_path() instead of portal_url.getPortalPath() for better virtual host support. 2007-02-13 yo * Add datetime_field_zuite. diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 05cf25896d..252b382b33 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -201 \ No newline at end of file +202 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml index 5d34b11ac3..d0c2145082 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.xml @@ -719,19 +719,19 @@ fieldset.bottom .field .input {\n }\n \n #favourites button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/favourite.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/favourite.png\');\n }\n \n #modules button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/appearance.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/appearance.png\');\n }\n \n #language button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/language.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/language.png\');\n }\n \n #search button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/info.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/info.png\');\n }\n \n #status,\n @@ -774,11 +774,11 @@ fieldset.bottom .field .input {\n }\n \n #main_bar .separator {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/sepafon.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/sepafon.png\');\n }\n \n #context_bar .separator {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/sepacla.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/sepacla.png\');\n }\n \n #context_bar .tool_buttons a .image,\n @@ -792,99 +792,99 @@ fieldset.bottom .field .input {\n }\n \n #context_bar #jump button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/jump.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/jump.png\');\n }\n \n #context_bar #action button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/exec16.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/exec16.png\');\n }\n \n #context_bar .tool_buttons .list_mode .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/text_block.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/text_block.png\');\n }\n \n #context_bar .tool_buttons .new .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/filenew.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/filenew.png\');\n }\n \n #context_bar .tool_buttons .jump_first .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/2leftarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/2leftarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_previous .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/1leftarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/1leftarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_next .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/1rightarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/1rightarrowb.png\');\n }\n \n #context_bar .tool_buttons .jump_last .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/2rightarrowb.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/2rightarrowb.png\');\n }\n \n #context_bar .tool_buttons .import_export .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/imp-exp.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/imp-exp.png\');\n }\n \n #context_bar .tool_buttons .jump_help .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/userhelp.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/userhelp.png\');\n }\n \n #context_bar .tool_buttons .find .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/find.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/find.png\');\n }\n \n #context_bar .tool_buttons .print .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/print.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/print.png\');\n }\n \n #context_bar .tool_buttons .report .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/report.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/report.png\');\n }\n \n #context_bar .tool_buttons .cut .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/editcut.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/editcut.png\');\n }\n \n #context_bar .tool_buttons .copy .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/editcopy.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/editcopy.png\');\n }\n \n #context_bar .tool_buttons .paste .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/editpaste.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/editpaste.png\');\n }\n \n #context_bar .tool_buttons .delete .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/edittrash.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/edittrash.png\');\n }\n \n #context_bar .tool_buttons .show_all .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/showall.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/showall.png\');\n }\n \n #context_bar .tool_buttons .filter .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/filter.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/filter.png\');\n }\n \n #context_bar .tool_buttons .filter_on .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/filter_on.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/filter_on.png\');\n }\n \n #context_bar .tool_buttons .sort .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/sort.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/sort.png\');\n }\n \n #context_bar .tool_buttons .configure .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/configure.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/configure.png\');\n }\n \n #context_bar .tool_buttons .activity_pending .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/activity_busy.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/activity_busy.png\');\n }\n \n #context_bar .tool_buttons .inspect_object .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/inspect.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/inspect.png\');\n }\n \n /* Status */\n @@ -936,7 +936,7 @@ fieldset.bottom .field .input {\n }\n \n .dialog_selector button .image {\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/exec16.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/exec16.png\');\n }\n \n .document .actions {\n @@ -958,7 +958,7 @@ fieldset.bottom .field .input {\n .document .actions button.save span.image {\n width: 34px;\n height: 34px;\n - background-image: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/save2.png\');\n + background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/save2.png\');\n }\n \n .document .actions ul {\n @@ -973,7 +973,7 @@ fieldset.bottom .field .input {\n .document .actions li {\n float: left;\n color: inherit;\n - background: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n + background: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n margin: 0;\n padding: 0 0 0 10px;\n }\n @@ -983,7 +983,7 @@ fieldset.bottom .field .input {\n padding: 5px 15px 4px 5px;\n color: inherit;\n background-color: inherit;\n - background: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/tab_right.png\') top right no-repeat;\n + background: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/tab_right.png\') top right no-repeat;\n /* font-size: 90%; */\n }\n \n @@ -1013,7 +1013,7 @@ fieldset.bottom .field .input {\n - hardcoded images in html which are inly used for rendering style\n */\n .ListSummary {\n - background: url(\'<dtml-var expr="portal_url.absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n + background: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url_path()">/images/tab_left.png\') top left no-repeat;\n color: #000;\n background-color: <dtml-var document_background_color>;\n padding-left: 10px;\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml index 7aecbc74f5..629a6312e3 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/login_form.xml @@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n <tal:block tal:define="form_action string:logged_in;\n global form_id string:login_form;\n - js_list python: [\'%s/login_form.js\' % (here.portal_url.absolute_url_path(), )]">\n + js_list python: [\'%s/login_form.js\' % (here.portal_url.getPortalObject().absolute_url_path(), )]">\n <tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:fill-slot="main">\n <div class="content login">\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index effa719768..5db2f16352 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -1,5 +1,5 @@ 2007-09-04 Kazuhiko -* use absolute_url_path instead of getPortalPath for better virtual host support. +* use portal_url.getPortalObject().absolute_url_path() instead of portal_url.getPortalPath() for better virtual host support. 2007-08-29 Yusei * Add module_view action in context box. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 66e214a2e8..af40ff6b88 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -432 \ No newline at end of file +433 \ No newline at end of file -- 2.30.9