details: /erp/devel/pi/rev/de8e370f92be
changeset: 12298:de8e370f92be
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri May 20 17:06:44 2011 +0200
summary: realted to issue 17266: small UI changes
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
| 4 ++--
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 9 +++------
3 files changed, 6 insertions(+), 9 deletions(-)
diffs (62 lines):
diff -r a30b8b70201d -r de8e370f92be
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri May 20 14:22:31 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri May 20 17:06:44 2011 +0200
@@ -2098,7 +2098,7 @@
<!--FF8081813008185F01300873148A0027--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081813008185F01300873148A0027--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8081813008185F01300873148A0027-->
<VALUE><![CDATA[OBUIAPP_ImplicitFilter]]></VALUE>
-<!--FF8081813008185F01300873148A0027--> <MSGTEXT><![CDATA[implicit
filter]]></MSGTEXT>
+<!--FF8081813008185F01300873148A0027--> <MSGTEXT><![CDATA[an implicit
filter]]></MSGTEXT>
<!--FF8081813008185F01300873148A0027--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081813008185F01300873148A0027-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081813008185F01300873148A0027--></AD_MESSAGE>
@@ -2109,7 +2109,7 @@
<!--FF8081813008185F013008744C5D002F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081813008185F013008744C5D002F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8081813008185F013008744C5D002F-->
<VALUE><![CDATA[OBUIAPP_TransactionalFilter]]></VALUE>
-<!--FF8081813008185F013008744C5D002F--> <MSGTEXT><![CDATA[transactional
filter <i>(only draft & modified documents in the last %n
day(s))</i>]]></MSGTEXT>
+<!--FF8081813008185F013008744C5D002F--> <MSGTEXT><![CDATA[a transactional
filter <i>(only draft & modified documents in the last %n
day(s))</i>]]></MSGTEXT>
<!--FF8081813008185F013008744C5D002F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081813008185F013008744C5D002F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081813008185F013008744C5D002F--></AD_MESSAGE>
diff -r a30b8b70201d -r de8e370f92be
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Fri May 20 14:22:31 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
Fri May 20 17:06:44 2011 +0200
@@ -166,7 +166,7 @@
if (!filterName.isEmpty()) {
filterName = Utility.messageBD(new DalConnectionProvider(false),
"OBUIAPP_FilteredGrid",
OBContext.getOBContext().getLanguage().getLanguage())
- + " " + filterName;
+ + " " + filterName + ".";
}
return filterName;
diff -r a30b8b70201d -r de8e370f92be
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Fri May 20 14:22:31 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Fri May 20 17:06:44 2011 +0200
@@ -304,22 +304,19 @@
this.filterImage.hide();
}
- if (this.filterClause && !this.view.messageBar.isVisible()) {
+ if (this.filterClause && !this.view.isShowingForm &&
!this.view.messageBar.isVisible()) {
var showMessageProperty =
OB.PropertyStore.get('OBUIAPP_ShowImplicitFilterMsg'),
showMessage = (showMessageProperty !== 'N' && showMessageProperty
!== '"N"');
if (showMessage) {
this.view.messageBar.setMessage(OBMessageBar.TYPE_INFO, '<div><div
style="float: left;">'+
- this.filterName + ' ' + OB.I18N.getLabel('OBUIAPP_ClearFilters') +
- '</div><div style="float: right; padding: 15px; padding-bottom:
0;"><a href="#" style="font-weight:normal; color:inherit;"
onclick="console.log(\''+
+ this.filterName + '<br/>' +
OB.I18N.getLabel('OBUIAPP_ClearFilters') +
+ '</div><div style="float: right; padding-top: 15px;"><a href="#"
style="font-weight:normal; color:inherit;" onclick="console.log(\''+
this.view.messageBar.ID+'\'); window[\''+
this.view.messageBar.ID+'\'].hide();
OB.PropertyStore.set(\'OBUIAPP_ShowImplicitFilterMsg\', \'N\');">'+
OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain')+'</a></div></div>',' ');
this.view.messageBar.hasFilterMessage = true;
}
}
-
-
-
},
isGridFiltered: function(criteria) {
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
