From b19af5129248d2116897a433a45093202911074a Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Mon, 28 Aug 2006 11:50:57 +0000 Subject: [PATCH] XML-ify rendering to make html mechanize-friendly. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9497 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_html_style/breadcrumb.xml | 4 +-- .../erp5_html_style/dialog_master.xml | 24 +++++++--------- .../erp5_html_style/form_html.xml | 11 ++++---- .../erp5_html_style/form_sort.xml | 4 +-- .../erp5_html_style/form_view_dialog.xml | 6 ++-- .../erp5_html_style/list_master.xml | 6 ++-- .../erp5_html_style/list_menu_box.xml | 4 +-- .../erp5_html_style/main_template.xml | 4 +-- .../portal_skins/erp5_html_style/menu_box.xml | 27 ++++++++---------- .../erp5_html_style/navigation_box.xml | 28 +++++++++---------- .../erp5_html_style/view_menu_box.xml | 6 ++-- .../erp5_html_style/view_selection_box.xml | 4 +-- 12 files changed, 59 insertions(+), 69 deletions(-) diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml index 8c45706daa..ef5c9cfbba 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/breadcrumb.xml @@ -87,7 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div metal:define-macro="small_breadcrumb">\n <table width="100%">\n <tr>\n - <td nowrap align="left">\n + <td nowrap="nowrap" align="left">\n <tal:block tal:repeat="item here/breadcrumbs">\n <tal:block tal:replace="nothing">\n Breadcrumbs are like Site / Module / Document / Subdocument.\n @@ -120,7 +120,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div metal:define-macro="full_breadcrumb">\n <table width="100%">\n <tr>\n - <td nowrap align="left">\n + <td nowrap="nowrap" align="left">\n <tal:block tal:repeat="item here/breadcrumbs">\n <tal:block tal:condition="python: repeat[\'item\'].index < 2">\n <a href="url goes here"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml index f174cb47dd..1857690850 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/dialog_master.xml @@ -102,24 +102,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div metal:use-macro="here/global_definition/macros/global_definition" />\n <span tal:condition="request/form_id | nothing">\n <input type="hidden" name="form_id" value="form"\n - tal:attributes="value request/form_id">\n + tal:attributes="value request/form_id"/>\n </span>\n <input type="hidden" name="dialog_id" value="form"\n - tal:attributes="value form/id">\n + tal:attributes="value form/id"/>\n <span tal:condition="request/pickle_string | nothing">\n <input type="hidden" name="pickle_string" value="form"\n - tal:attributes="value request/pickle_string">\n + tal:attributes="value request/pickle_string"/>\n </span>\n <input type="hidden" name="selection_name" value="selection_name"\n - tal:attributes="value selection_name">\n + tal:attributes="value selection_name"/>\n <!-- Menu Boxes -->\n <table cellpadding="0" cellspacing="0" border="0" width="100%">\n <tr>\n <td>\n <!-- Navigation Box Goes Here -->\n <div class="NavigationBox" tal:define=\'global form_action string:Base_callDialogMethod\'>\n - <div metal:use-macro="here/navigation_box/macros/navigation_box"\n - >Navigation Box</div>\n + <div metal:use-macro="here/navigation_box/macros/navigation_box">Navigation Box</div>\n </div>\n </td>\n </tr>\n @@ -128,16 +127,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <!-- Menu Box Goes Here -->\n \n <div class="MenuBox">\n - <!--<div metal:use-macro="here/list_menu_box/macros/list_menu_box"\n - >MenuBox</div> -->\n + <!--<div metal:use-macro="here/list_menu_box/macros/list_menu_box">MenuBox</div> -->\n </div>\n </td>\n </tr>\n </table>\n <!-- Breadcrumb, owner and date-->\n <div class="Breadcrumb">\n - <div metal:use-macro="here/breadcrumb/macros/small_breadcrumb"\n - >Breadcrumb</div>\n + <div metal:use-macro="here/breadcrumb/macros/small_breadcrumb">Breadcrumb</div>\n </div>\n <!-- Optional Portal Status Message -->\n <div class="Main"\n @@ -185,12 +182,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <input type="hidden" name="dialog_method" value="cancel_url"\n tal:attributes="value python: form.action"/>\n <input type="hidden" name="cancel_url" value="cancel_url"\n - tal:attributes="value cancel_url">\n + tal:attributes="value cancel_url"/>\n <input type="hidden" name="previous_form_id" value="previous_form_id"\n - tal:attributes="value previous_form_id">\n + tal:attributes="value previous_form_id"/>\n <input type="Submit" value="Cancel" name="Base_cancel:method"\n - i18n:attributes="value" i18n:domain="ui"\n - /> \n + i18n:attributes="value" i18n:domain="ui"/> \n <span tal:condition="python: form.update_action!=\'\'">\n <input type="hidden" name="update_method" value="cancel_url"\n tal:attributes="value python: form.update_action"/>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml index d03664efe3..829393df4e 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_html.xml @@ -138,21 +138,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n enctype="multipart/form-data" >\n <div metal:use-macro="here/global_definition/macros/global_definition" />\n <input type="hidden" name="form_id" value="form"\n - tal:attributes="value form/id | template/id | script/id">\n + tal:attributes="value form/id | template/id | script/id"/>\n <input type="hidden" name="query_string" value="query"\n tal:attributes="value request/QUERY_STRING">\n <input type="hidden" name="object_uid" value="uid"\n - tal:attributes="value here/getUid">\n + tal:attributes="value here/getUid"/>\n <input type="hidden" name="object_path" value="path"\n - tal:attributes="value here/getPath">\n + tal:attributes="value here/getPath"/>\n <!-- Menu Boxes -->\n <table cellpadding="0" cellspacing="0" width="100%">\n <tr>\n - <td nowrap>\n + <td nowrap="nowrap">\n <!-- Navigation Box Goes Here -->\n <div class="NavigationBox">\n - <div metal:use-macro="here/navigation_box/macros/navigation_box"\n - >Navigation Box</div>\n + <div metal:use-macro="here/navigation_box/macros/navigation_box">Navigation Box</div>\n </div>\n </td>\n </tr>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_sort.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_sort.xml index a544874f8e..f71b25e79e 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_sort.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_sort.xml @@ -108,7 +108,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n i18n:translate="" i18n:domain="ui"\n tal:attributes="value python:option[0]"\n value="None"\n - selected></option>\n + selected="selected"></option>\n <option tal:condition="python:option[0]!=item[0]"\n tal:content="python:option[1]"\n i18n:translate="" i18n:domain="ui"\n @@ -130,7 +130,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </td>\n <td id="sort_on_0" tal:attributes=\'id python:"sort_on_%d" % row_index\'>\n <select name="field_sort_on">\n - <option selected value="None">None</option>\n + <option selected="selected" value="None">None</option>\n <option tal:repeat="option all_columns"\n tal:content="python:option[1]"\n i18n:translate="" i18n:domain="ui"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_view_dialog.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_view_dialog.xml index 21cc3fb92c..e8d33b4136 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_view_dialog.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/form_view_dialog.xml @@ -92,7 +92,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <table>\n <tr tal:condition="request/dialog_category | nothing">\n <td i18n:translate="" i18n:domain="ui">Search Type:</td>\n - <td valign="middle" align="right" nowrap\n + <td valign="middle" align="right" nowrap="nowrap"\n tal:define="dialog_category request/dialog_category;\n actions python:filtered_actions[dialog_category]">\n <input type="hidden" name="dialog_category" value="dialog_category"\n @@ -108,11 +108,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:condition="python: action[\'url\'].find(form.id) >= 0"\n i18n:translate="" i18n:domain="ui"\n tal:attributes="value action/url"\n - selected></option>\n + selected="selected"></option>\n </span>\n </select>\n </td>\n - <td valign="bottom" align="left" nowrap> \n + <td valign="bottom" align="left" nowrap="nowrap"> \n <input type="image" src="/images/erp5_html_style/images/exec16.png" title="Action"\n i18n:attributes="title" i18n:domain="ui"\n alt="Action" name="Base_doDialog:method" /> \n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml index a957c9b241..911e90f172 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_master.xml @@ -99,10 +99,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n enctype form/enctype | nothing">\n <div metal:use-macro="here/global_definition/macros/global_definition" />\n <input type="hidden" name="form_id" value="form"\n - tal:attributes="value form/id">\n + tal:attributes="value form/id"/>\n <input type="hidden" name="query_string" value="query"\n - tal:attributes="value request/QUERY_STRING">\n - <input type="hidden" name="is_list" value="1">\n + tal:attributes="value request/QUERY_STRING"/>\n + <input type="hidden" name="is_list" value="1"/>\n <!-- Menu Boxes -->\n <table cellpadding="0" cellspacing="0" border="0" width="100%">\n <tr>\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml index 2419c98d3b..2ca38d316f 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/list_menu_box.xml @@ -95,9 +95,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n list_method_id request/list_method_id | nothing;\n selection_name form/listbox/selection_name | string:">\n <input type="hidden" name="selection_name" value="selection_name"\n - tal:attributes="value selection_name">\n + tal:attributes="value selection_name"/>\n <input type="hidden" name="list_method_id" value="list_method_id"\n - tal:attributes="value list_method_id" tal:condition="list_method_id">\n + tal:attributes="value list_method_id" tal:condition="list_method_id"/>\n <img src="/images/erp5_html_style/images/sepacla.png" alt="|"\n tal:attributes="src string:$portal_url/images/sepacla.png"/> \n <input type="image" src="/images/erp5_html_style/images/editcut.png" title="Cut"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml index 35a0834cb7..189873d25e 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/main_template.xml @@ -100,11 +100,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n global util_macros here/index_html_utils/macros;">\n <div metal:use-macro="here/global_definition/macros/global_definition" />\n <input type="hidden" name="object_uid" value="uid"\n - tal:attributes="value here/getUid">\n + tal:attributes="value here/getUid"/>\n <!-- Menu Boxes -->\n <table cellpadding="0" cellspacing="0" width="100%">\n <tr>\n - <td nowrap>\n + <td nowrap="nowrap">\n <!-- Navigation Box Goes Here -->\n <div class="NavigationBox">\n <div metal:use-macro="here/navigation_box/macros/navigation_box"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml index 4b2778374e..9a59232106 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/menu_box.xml @@ -97,9 +97,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <div metal:define-macro="menu_box" tal:define="absolute_url here/absolute_url">\n <table border="0" cellpadding="0" cellspacing="0" width="100%">\n <tr>\n - <td valign="middle" align="left" nowrap> \n + <td valign="middle" align="left" nowrap="nowrap"> \n <select name="jump_select" size="1" tal:attributes="onChange string:submitAction(this.form,\'${absolute_url}/Base_doJump\')">\n - <option selected="selected" value="1" disabled i18n:translate="" i18n:domain="ui">Jump...</option>\n + <option selected="selected" value="1" disabled="disabled" i18n:translate="" i18n:domain="ui">Jump...</option>\n <tal:block tal:repeat="action jump_actions">\n <option tal:content="action/name"\n i18n:translate="" i18n:domain="ui"\n @@ -117,7 +117,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </tal:block>\n </select></td>\n - <td valign="bottom" align="center" nowrap>\n + <td valign="bottom" align="center" nowrap="nowrap">\n <input type="image" src="/images/erp5_html_style/images/jump.png" title="Jump"\n alt="Jump" name="Base_doJump:method"\n i18n:attributes="title" i18n:domain="ui"\n @@ -125,9 +125,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <img src="/images/erp5_html_style/images/sepacla.png" alt="|"\n tal:attributes="src string:$portal_url/images/sepacla.png"/> \n </td>\n - <td valign="middle" align="right" nowrap>\n + <td valign="middle" align="right" nowrap="nowrap">\n <select name="action_select" size="1" tal:attributes="onChange string:submitAction(this.form,\'${absolute_url}/Base_doAction\')">\n - <option selected value="" i18n:translate="" i18n:domain="ui">Action...</option>\n + <option selected="selected" value="" i18n:translate="" i18n:domain="ui">Action...</option>\n <tal:block tal:repeat="content here/allowedContentTypes | nothing">\n <tal:block tal:condition="python: not content.id in here.portal_types.getTypeInfo(here).getHiddenContentTypeList()">\n <option value="" tal:attributes="value python: \'add \' + content.id"\n @@ -135,20 +135,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </tal:block>\n <tal:block tal:condition="document_template_list">\n - <option disabled>-- <tal:block i18n:translate="" i18n:domain="ui">Templates</tal:block> --</option>\n + <option disabled="disabled">-- <tal:block i18n:translate="" i18n:domain="ui">Templates</tal:block> --</option>\n <tal:block tal:repeat="document_template document_template_list">\n <option value="1"\n tal:attributes="value python:\'template \' + document_template.getRelativeUrl()">\n <tal:block i18n:translate="" i18n:domain="ui">Add <tal:block tal:content="document_template/getTitle" i18n:name="document_template">Document Template</tal:block></tal:block></option>\n </tal:block>\n </tal:block>\n - <option disabled>-- <tal:block i18n:translate="" i18n:domain="ui">Workflows</tal:block> --</option>\n + <option disabled="disabled">-- <tal:block i18n:translate="" i18n:domain="ui">Workflows</tal:block> --</option>\n <tal:block tal:repeat="action workflow_actions">\n <option value="1" tal:content="action/name"\n i18n:translate="" i18n:domain="ui"\n tal:attributes="value python: \'workflow \' + action[\'url\']">Saut</option>\n </tal:block>\n - <option disabled>-- <tal:block i18n:translate="" i18n:domain="ui">Object</tal:block> --</option>\n + <option disabled="disabled">-- <tal:block i18n:translate="" i18n:domain="ui">Object</tal:block> --</option>\n <tal:block tal:repeat="action object_actions">\n <option value="1" tal:content="action/name"\n i18n:translate="" i18n:domain="ui"\n @@ -156,28 +156,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n <tal:block tal:replace=\'nothing\'>\n <!-- XXX folder actions is inherited from CMF, but not used in ERP5 (for now) -->\n - <option disabled>-- <tal:block i18n:translate="" i18n:domain="ui">folder</tal:block> --</option>\n + <option disabled="disabled">-- <tal:block i18n:translate="" i18n:domain="ui">folder</tal:block> --</option>\n <tal:block tal:repeat="action folder_actions">\n <option value="1" tal:content="action/name"\n tal:attributes="value python: \'folder \' + action[\'url\']">Saut</option>\n </tal:block>\n </tal:block>\n </select></td>\n - <td valign="bottom" align="left" nowrap> \n + <td valign="bottom" align="left" nowrap="nowrap"> \n <input type="image" src="/images/erp5_html_style/images/exec16.png" title="Action"\n alt="Action" name="Base_doAction:method"\n i18n:attributes="title" i18n:domain="ui"\n tal:attributes="src string:$portal_url/images/exec16.png"/> \n </td>\n <td width="100%"><tal:block metal:define-slot="buttons"/></td>\n - <!-- URL target is invalid for now. -->\n - <!--td align="right" valign="center"\n - tal:define="form_id form/id|nothing">\n - <a title="Help" tal:attributes="href python: here.Base_getHelpUrl(form_id=form_id)"><img src="images/userhelp.png" alt="Help"></a>\n - </td-->\n <td align="right" valign="center"\n tal:condition="here/portal_preferences/getPreferredHtmlStyleDevelopperMode">\n - <a title="Inspect object" tal:attributes="href python: \'%s/Base_viewInspectionReport\' % (here.absolute_url(),)"><img src="images/inspect.png" alt="Inspect object"></a>\n + <a title="Inspect object" tal:attributes="href python: \'%s/Base_viewInspectionReport\' % (here.absolute_url(),)"><img src="images/inspect.png" alt="Inspect object"/></a>\n </td>\n <td aligh="right" valign="center"\n tal:condition="here/hasActivity | nothing">\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml index ffacefc4ff..66008a2b17 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/navigation_box.xml @@ -94,20 +94,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <body>\n <table width="100%" metal:define-macro="navigation_box">\n <tr>\n - <td valign="middle" align="center" nowrap>\n + <td valign="middle" align="center" nowrap="nowrap">\n <!-- Hidden button as explained in http://ppewww.ph.gla.ac.uk/~flavell/www/formquestion.html -->\n <!-- We should probably call the default method instead -->\n <input class="input_image" type="image" src="/images/erp5_html_style/images/spacer.png" width="3" height="3" border="0"\n alt="dummy" name="Base_doSelect:method"\n tal:define="form_action form_action | form/action | form/id | template/action | template/id | script/id"\n tal:attributes="name python:form_action + \':method\';\n - src string:$portal_url/images/spacer.png">\n + src string:$portal_url/images/spacer.png"/>\n <select name="favorite_select" size="1"\n tal:attributes="onChange string:submitAction(this.form,\'${here/absolute_url}/Base_doFavorite\')">\n - <option selected value="" i18n:translate="" i18n:domain="ui" disabled>My favourites</option>\n + <option selected="selected" value="" i18n:translate="" i18n:domain="ui" disabled="disabled">My favourites</option>\n <tal:block tal:condition="ordered_global_actions">\n <tal:block tal:repeat="action ordered_global_actions">\n - <option disabled tal:condition="action/disabled">\n + <option disabled="disabled" tal:condition="action/disabled">\n -- <tal:block i18n:translate="" i18n:domain="ui" tal:content="action/title" /> --\n </option>\n <tal:block tal:condition="not:action/disabled"\n @@ -137,7 +137,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </tal:block>\n <tal:block tal:condition="user_actions">\n - <option disabled> -- <tal:block i18n:translate="" i18n:domain="ui">User</tal:block> -- </option>\n + <option disabled="disabled"> -- <tal:block i18n:translate="" i18n:domain="ui">User</tal:block> -- </option>\n <tal:block tal:repeat="action user_actions">\n <option value="1"\n i18n:translate="" i18n:domain="ui"\n @@ -147,18 +147,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </select>\n </td>\n - <td valign="middle" align="left" nowrap>\n + <td valign="middle" align="left" nowrap="nowrap">\n <input class="input_image" type="image" src="/images/erp5_html_style/images/favourite.png" title="Select Favorite"\n i18n:attributes="title" i18n:domain="ui"\n alt="Select Favorite" name="Base_doFavorite:method"\n tal:attributes="src string:$portal_url/images/favourite.png"/> \n <img src="/images/erp5_html_style/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/> \n </td>\n - <td align="center" valign="middle" nowrap>\n + <td align="center" valign="middle" nowrap="nowrap">\n <select name="module_select" size="1"\n tal:attributes="onChange string:submitAction(this.form,\'${here/absolute_url}/Base_doModule\')"\n tal:define="module_list here/ERP5Site_getModuleItemList">\n - <option selected value="" i18n:translate="" i18n:domain="ui" disabled>ERP5 Modules</option>\n + <option selected="selected" value="" i18n:translate="" i18n:domain="ui" disabled="disabled">ERP5 Modules</option>\n <tal:block tal:repeat="module module_list">\n <option value="something"\n tal:attributes="value python: module[1]"\n @@ -166,7 +166,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </select>\n </td>\n - <td align="left" valign="middle" nowrap>\n + <td align="left" valign="middle" nowrap="nowrap">\n <input class="input_image" type="image" src="/images/erp5_html_style/images/appearance.png" title="Select Module"\n i18n:attributes="title" i18n:domain="ui"\n alt="Select Module" name="Base_doModule:method" tal:attributes="src string:$portal_url/images/appearance.png"/> \n @@ -176,7 +176,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </a>\n <img src="/images/erp5_html_style/images/reload.png" alt="img"/-->\n </td>\n - <td valign="middle" align="center" nowrap width="100%">\n + <td valign="middle" align="center" nowrap="nowrap" width="100%">\n <div align="center">\n <!--img src="/images/erp5_html_style/images/mail.png" alt="Email" title="Email"\n i18n:attributes="title"/>\n @@ -194,11 +194,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <select name="language_select" size="1"\n tal:attributes="onChange string:submitAction(this.form,\'${here/absolute_url}/Base_doLanguage\')"\n tal:define="language_map python: here.Localizer.get_languages_map()">\n - <option selected value="" i18n:translate="" i18n:domain="ui" disabled>My language</option>\n + <option selected="selected" value="" i18n:translate="" i18n:domain="ui" disabled="disabled">My language</option>\n <tal:block tal:repeat="language language_map">\n <tal:block tal:condition="language/selected">\n <option value="en"\n - selected\n + selected="selected"\n tal:attributes="value language/id"\n tal:content="python: here.Localizer.erp5_ui.gettext(language[\'title\'], lang=language[\'id\'])">\n English\n @@ -214,7 +214,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </select>\n </td>\n - <td align="right" valign="middle" nowrap>\n + <td align="right" valign="middle" nowrap="nowrap">\n <input class="input_image" type="image"\n src="/images/erp5_html_style/images/info.png"\n title="Change Language" alt="Change Language" name="Base_doLanguage:method"\n @@ -223,7 +223,7 @@ src="/images/erp5_html_style/images/info.png"\n <img src="/images/erp5_html_style/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/> \n </td>\n <td align="right" valign="middle">\n - <input type="text" name="SearchableText">\n + <input type="text" name="SearchableText"/>\n </td>\n <td align="right" valign="middle">\n <input class="input_image" type="image"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml index 2c96ca411d..6e3f8981c2 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_menu_box.xml @@ -94,11 +94,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n selection_url python:here.portal_selections.getSelectionListUrlFor(selection_name,REQUEST=request)\n ">\n <input type="hidden" name="selection_name" value="selection_name"\n - tal:attributes="value selection_name">\n + tal:attributes="value selection_name"/>\n <input type="hidden" name="selection_index" value="selection_index"\n - tal:attributes="value selection_index">\n + tal:attributes="value selection_index"/>\n <input type="hidden" name="selection_url" value="selection_url"\n - tal:attributes="value selection_url">\n + tal:attributes="value selection_url"/>\n <div metal:use-macro="here/menu_box/macros/menu_box">\n <div metal:fill-slot="buttons">\n <img src="/images/erp5_html_style/images/sepacla.png" alt="|"\n diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml index 5cc6e29ab5..0094c1799a 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_selection_box.xml @@ -121,7 +121,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n <img src="/images/erp5_html_style/images/Left.png" border="0" alt="left"\n tal:attributes="src string:$portal_url/images/Left.png"/>\n </td>\n - <td nowrap class="BorderTop" valign="bottom">\n + <td nowrap="nowrap" class="BorderTop" valign="bottom">\n <img src="/images/erp5_html_style/images/spacer.png" width="5" height="5" border="0"\n alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>\n </td>\n @@ -158,7 +158,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>\n </td>\n </tal:block>\n - <td nowrap align="center" valign="bottom"\n + <td nowrap="nowrap" align="center" valign="bottom"\n tal:attributes="class python: is_action_selected and \'On\' or \'Off\'"\n tal:define="url action/url">\n <a tal:content="action/name"\n -- 2.30.9