From e1d909cf570bbf2b38b6ac4cf7cc0771865fed96 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Tue, 18 Aug 2009 13:36:39 +0000 Subject: [PATCH] - use buttons instead of inputs, this make apparence customisation easier. - Modify css to have transparent background on span inside buttons. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28441 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_xhtml_style/dialog_main.xml | 31 ++++++++++++------- .../erp5_xhtml_style/erp5.css.xml | 5 +-- .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml index 4bd2dbc057..9a08de6b8e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml @@ -60,22 +60,29 @@ <tal:block metal:define-slot="main" />\n <tal:block metal:define-slot="bottom" />\n </div>\n - <input tal:condition="cancel_url|request/cancel_url|nothing"\n - i18n:attributes="value" i18n:domain="ui" value="Cancel Action" accesskey="C"\n - id="dialog_cancel_button" name="Base_cancel:method" type="submit" />\n - <input i18n:attributes="value" i18n:domain="ui"\n - tal:attributes="value python: here.Base_getFormViewDialogActionButtonUpdateActionTitle(form);"\n - tal:condition="form/update_action|nothing" accesskey="U"\n - id="dialog_update_button"\n - name="Base_showUpdateDialog:method" type="submit" />\n - <input tal:attributes="value python: here.Base_getFormViewDialogActionButtonTitle(form);"\n - i18n:attributes="value" i18n:domain="ui" accesskey="V"\n - id="dialog_submit_button" type="submit" name="Base_callDialogMethod:method" />\n + <button \n + value="Cancel Action" accesskey="C"\n + id="dialog_cancel_button" name="Base_cancel:method"\n + type="submit" class="bt-med">\n + <span i18n:translate="" i18n:domain="ui" tal:content="string:Cancel Action">Update</span>\n + </button>\n + <button tal:condition="form/update_action|nothing" accesskey="U"\n + id="dialog_update_button" class="bt-med"\n + name="Base_showUpdateDialog:method" type="submit">\n + <span i18n:translate="" i18n:domain="ui" tal:content="python:\n + here.Base_getFormViewDialogActionButtonUpdateActionTitle(form)">Update</span>\n + </button>\n + <button accesskey="V"\n + id="dialog_submit_button" class="bt-med" \n + type="submit" name="Base_callDialogMethod:method">\n + <span i18n:translate="" i18n:domain="ui" tal:content="python: here.Base_getFormViewDialogActionButtonTitle(form)">Clone & Edit</span>\n + </button>\n </tal:block>\n </tal:block>\n </tal:block>\n </tal:block>\n -</tal:block> +</tal:block>\n + ]]></string> </value> </item> 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 385e6496f0..044a87f4a0 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 @@ -422,7 +422,7 @@ button, select, input {\n }\n \n button span {\n - background-color: inherit;\n + background-color: transparent;\n color: #000;\n }\n \n @@ -1510,7 +1510,8 @@ div.search .searchPages .selected{\n }\n .listbox_missing_search_criterion td{\n text-align: center!important;\n -} +}\n + ]]></string> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 7a4ca1f90f..5be040fc33 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -806 \ No newline at end of file +808 \ No newline at end of file -- 2.30.9