details: http://code.openbravo.com/erp/devel/pi/rev/57b9c4091447
changeset: 3470:57b9c4091447
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Mon Mar 30 15:40:07 2009 +0200
summary: Fixed bug [8345]: Now Action Button generated windows have the new
button pattern
diffstat:
src-wad/src/org/openbravo/wad/Configuration_ActionButton.xmlxml | 19 +-
src-wad/src/org/openbravo/wad/Template_ActionButton.html | 94
+++++++------
src-wad/src/org/openbravo/wad/Template_ActionButton.xml | 2 +-
3 files changed, 63 insertions(+), 52 deletions(-)
diffs (167 lines):
diff -r d75a4e18a463 -r 57b9c4091447
src-wad/src/org/openbravo/wad/Configuration_ActionButton.xmlxml
--- a/src-wad/src/org/openbravo/wad/Configuration_ActionButton.xmlxml Mon Mar
30 16:09:46 2009 +0530
+++ b/src-wad/src/org/openbravo/wad/Configuration_ActionButton.xmlxml Mon Mar
30 15:40:07 2009 +0200
@@ -37,14 +37,19 @@
<PARAMETER id="processDescription" name="processDescription"
replace="#processDescription#" default=""/>
<PARAMETER id="processHelp" name="processHelp" replace="#processHelp#"
default=""/>
-<PARAMETER id="linkButtonCancel" name="cancel" attribute="onmouseover"
replace="xx" default=""/>
-<PARAMETER id="linkButtonOk" name="ok" attribute="onmouseover" replace="xx"
default=""/>
-<PARAMETER id="buttonCancel" name="cancel" attribute="alt" replace="xx"
default=""/>
-<PARAMETER id="buttonOk" name="ok" attribute="alt" replace="xx" default=""/>
-<PARAMETER id="tdButtonOk" name="ok"/>
-<PARAMETER id="buttonCancel" name="cancel" attribute="title" replace="xx"
default=""/>
+
+<PARAMETER id="buttonOK" name="ok" attribute="onmouseover" replace="xx"
default=""/>
+<PARAMETER id="buttonOK" name="ok" attribute="onfocus" replace="xx"
default=""/>
+<PARAMETER id="imgButtonOK" name="ok" attribute="alt" replace="xx" default=""/>
+<PARAMETER id="imgButtonOK" name="ok" attribute="title" replace="xx"
default=""/>
+<PARAMETER id="tdButtonOK" name="ok"/>
+
+<PARAMETER id="buttonCancel" name="cancel" attribute="onmouseover"
replace="xx" default=""/>
+<PARAMETER id="buttonCancel" name="cancel" attribute="onfocus" replace="xx"
default=""/>
+<PARAMETER id="imgButtonCancel" name="cancel" attribute="alt" replace="xx"
default=""/>
+<PARAMETER id="imgButtonCancel" name="cancel" attribute="title" replace="xx"
default=""/>
<PARAMETER id="tdButtonCancel" name="cancel"/>
-<PARAMETER id="buttonOk" name="ok" attribute="title" replace="xx" default=""/>
+
<PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy"
default="HIDDEN"/>
<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
diff -r d75a4e18a463 -r 57b9c4091447
src-wad/src/org/openbravo/wad/Template_ActionButton.html
--- a/src-wad/src/org/openbravo/wad/Template_ActionButton.html Mon Mar 30
16:09:46 2009 +0530
+++ b/src-wad/src/org/openbravo/wad/Template_ActionButton.html Mon Mar 30
15:40:07 2009 +0200
@@ -247,71 +247,77 @@
<td></td>
<td class="Button_RightAlign_ContentCell" id="fieldDiscardProcess">
<div>
- <a class="ButtonLink" href="#"
- onfocus="setWindowElementFocus(this); window.status='xx';
return true;"
- onblur="window.status=''; return true;"
- onkeypress="this.className='ButtonLink_active'; return true;"
- onkeyup="this.className='ButtonLink_focus'; return true;"
- onclick="submitThisPageJasper();return false;"
- id="linkButtonOk">
- <table class="Button"
- onmousedown="this.className='Button_active'; return true;"
- onmouseup="this.className='Button'; return true;"
-
onmouseover="this.className='Button_hover';window.status='OK';return true;"
- onmouseout="this.className='Button'; window.status='';
return true;">
+ <button type="button"
+ id="buttonOK"
+ class="ButtonLink"
+ onclick="submitThisPageJasper();return false;"
+ onfocus="buttonEvent('onfocus', this); window.status='xx';
return true;"
+ onblur="buttonEvent('onblur', this);"
+ onkeyup="buttonEvent('onkeyup', this);"
+ onkeydown="buttonEvent('onkeydown', this);"
+ onkeypress="buttonEvent('onkeypress', this);"
+ onmouseup="buttonEvent('onmouseup', this);"
+ onmousedown="buttonEvent('onmousedown', this);"
+ onmouseover="buttonEvent('onmouseover', this);
window.status='xx'; return true;"
+ onmouseout="buttonEvent('onmouseout', this);">
+ <table class="Button">
<tr>
- <td class="Button_left"><img class="Button_Icon
Button_Icon_ok" alt="xx" title="xx" src="../../../../../web/images/blank.gif"
border=0 id="buttonOk"/></td>
- <td class="Button_text Button_width"
id="tdButtonOk">OK</td>
+ <td class="Button_left"><img class="Button_Icon
Button_Icon_ok" alt="xx" title="xx" src="../../../../../web/images/blank.gif"
border="0" id="imgButtonOK"/></td>
+ <td class="Button_text Button_width"
id="tdButtonOK">OK</td>
<td class="Button_right"></td>
</tr>
</table>
- </a>
+ </button>
</div>
</td>
<td class="Button_RightAlign_ContentCell" id="fieldDiscardJasper">
<div>
- <a class="ButtonLink" href="#"
- onfocus="setWindowElementFocus(this); window.status='OK';
return true;"
- onblur="window.status=''; return true;"
- onkeypress="this.className='ButtonLink_active'; return true;"
- onkeyup="this.className='ButtonLink_focus'; return true;"
- onclick="submitThisPage('SAVE_BUTTONxx');return false;"
- id="linkButtonOk">
- <table class="Button"
- onmousedown="this.className='Button_active'; return true;"
- onmouseup="this.className='Button'; return true;"
-
onmouseover="this.className='Button_hover';window.status='OK';return true;"
- onmouseout="this.className='Button'; window.status='';
return true;">
+ <button type="button"
+ id="buttonOK"
+ class="ButtonLink"
+ onclick="submitThisPage('SAVE_BUTTONxx');return false;"
+ onfocus="buttonEvent('onfocus', this); window.status='xx';
return true;"
+ onblur="buttonEvent('onblur', this);"
+ onkeyup="buttonEvent('onkeyup', this);"
+ onkeydown="buttonEvent('onkeydown', this);"
+ onkeypress="buttonEvent('onkeypress', this);"
+ onmouseup="buttonEvent('onmouseup', this);"
+ onmousedown="buttonEvent('onmousedown', this);"
+ onmouseover="buttonEvent('onmouseover', this);
window.status='xx'; return true;"
+ onmouseout="buttonEvent('onmouseout', this);">
+ <table class="Button">
<tr>
- <td class="Button_left"><img class="Button_Icon
Button_Icon_ok" alt="xx" title="xx" src="../../../../../web/images/blank.gif"
border=0 id="buttonOk"/></td>
- <td class="Button_text Button_width"
id="tdButtonOk">OK</td>
+ <td class="Button_left"><img class="Button_Icon
Button_Icon_ok" alt="xx" title="xx" src="../../../../../web/images/blank.gif"
border="0" id="imgButtonOK"/></td>
+ <td class="Button_text Button_width"
id="tdButtonOK">OK</td>
<td class="Button_right"></td>
</tr>
</table>
- </a>
+ </button>
</div>
</td>
<td class="Button_LeftAlign_ContentCell">
<div>
- <a class="ButtonLink" href="#"
- onfocus="setWindowElementFocus(this); window.status='xx';
return true;"
- onblur="window.status=''; return true;"
- onkeypress="this.className='ButtonLink_active'; return true;"
- onkeyup="this.className='ButtonLink_focus'; return true;"
- onclick="closeThisPage();return false;"
- id="linkButtonCancel">
- <table class="Button"
- onmousedown="this.className='Button_active'; return true;"
- onmouseup="this.className='Button'; return true;"
-
onmouseover="this.className='Button_hover';window.status='Cancel';return true;"
- onmouseout="this.className='Button'; window.status='';
return true;">
+ <button type="button"
+ id="buttonCancel"
+ class="ButtonLink"
+ onclick="closeThisPage();return false;"
+ onfocus="buttonEvent('onfocus', this); window.status='xx';
return true;"
+ onblur="buttonEvent('onblur', this);"
+ onkeyup="buttonEvent('onkeyup', this);"
+ onkeydown="buttonEvent('onkeydown', this);"
+ onkeypress="buttonEvent('onkeypress', this);"
+ onmouseup="buttonEvent('onmouseup', this);"
+ onmousedown="buttonEvent('onmousedown', this);"
+ onmouseover="buttonEvent('onmouseover', this);
window.status='xx'; return true;"
+ onmouseout="buttonEvent('onmouseout', this);">
+ <table class="Button">
<tr>
- <td class="Button_left"><img class="Button_Icon
Button_Icon_cancel" alt="xx" title="xx"
src="../../../../../web/images/blank.gif" border=0 title="xx"
id="buttonCancel"/></td>
+ <td class="Button_left"><img class="Button_Icon
Button_Icon_cancel" alt="xx" title="xx"
src="../../../../../web/images/blank.gif" border="0" id="imgButtonCancel"/></td>
<td class="Button_text Button_width"
id="tdButtonCancel">Cancel</td>
<td class="Button_right"></td>
</tr>
</table>
- </a>
+ </button>
</div>
</td>
<td></td>
diff -r d75a4e18a463 -r 57b9c4091447
src-wad/src/org/openbravo/wad/Template_ActionButton.xml
--- a/src-wad/src/org/openbravo/wad/Template_ActionButton.xml Mon Mar 30
16:09:46 2009 +0530
+++ b/src-wad/src/org/openbravo/wad/Template_ActionButton.xml Mon Mar 30
15:40:07 2009 +0200
@@ -24,7 +24,7 @@
<template file="Template_ActionButton.html" />
<PARAMETER id="tab" name = "tab" default=" "/>
-<PARAMETER id="linkButtonOk" name = "columnname" default=" "
attribute="onclick" replace="xx"/>
+<PARAMETER id="buttonOK" name = "columnname" default=" " attribute="onclick"
replace="xx"/>
<PARAMETER id="importCSS" name = "importCSS" default=" "/>
<PARAMETER id="importJS" name = "importJS" default=" "/>
<PARAMETER id="fieldScript" name = "script" default=" "/>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
