details: https://code.openbravo.com/erp/devel/pi/rev/bd81eb1ac9a5 changeset: 13440:bd81eb1ac9a5 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 05 12:58:06 2011 +0200 summary: Use common premium functionality message
details: https://code.openbravo.com/erp/devel/pi/rev/89375137ecd1 changeset: 13441:89375137ecd1 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 05 12:59:04 2011 +0200 summary: Use common base premium functionality message - Part II details: https://code.openbravo.com/erp/devel/pi/rev/9a862a92d22f changeset: 13442:9a862a92d22f user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 05 13:00:06 2011 +0200 summary: Use common base message for premium functionality - Part III details: https://code.openbravo.com/erp/devel/pi/rev/7e1aea78244f changeset: 13443:7e1aea78244f user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Aug 05 13:00:46 2011 +0200 summary: Use common base message for premium functionality - Part IV diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js | 14 +--- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js | 18 +---- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++ modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 31 +++------ modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java | 9 +- 7 files changed, 37 insertions(+), 50 deletions(-) diffs (171 lines): diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js Fri Aug 05 13:00:46 2011 +0200 @@ -24,21 +24,11 @@ var personalizationButtonProperties = { action: function() { - var tabIdentifier, personalizeForm, - activateButton = isc.addProperties({}, isc.Dialog.OK, { - getTitle: function() { - return OB.I18N.getLabel('OBUIAPP_LearnMore'); - }, - click: function() { - this.topElement.cancelClick(); - window.open('http://www.openbravo.com/product/erp/get-basic/'); - }}); - if(OB.Application.licenseType === 'C') { - isc.confirm(OB.I18N.getLabel('OBUIAPP_ActivateMessage'), { + isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [OB.I18N.getLabel('OBUIAPP_ActivateMessagePersonalization')]), { isModal: true, showModalMask: true, - toolbarButtons: [activateButton, isc.Dialog.CANCEL] + toolbarButtons: [isc.Dialog.OK] }); return; } diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 13:00:46 2011 +0200 @@ -141,7 +141,7 @@ <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <VALUE><![CDATA[OBKMO_ActivateMessage]]></VALUE> -<!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <MSGTEXT><![CDATA[Only Professional and Basic Edition subscribers are allowed to delete this widget. The <b>Learn More</b> button will show you how to activate your instance.]]></MSGTEXT> +<!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <MSGTEXT><![CDATA[to delete this widget]]></MSGTEXT> <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--> <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID> <!--4D4433A442EB4F0C8DF2F2A57A8BBE31--></AD_MESSAGE> diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js --- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-community-branding-widget.js Fri Aug 05 13:00:46 2011 +0200 @@ -129,9 +129,8 @@ } }, - confirmedClosePortlet: function(ok) { - var activateButton; - + confirmedClosePortlet: function (ok) { + if (!ok) { this.Super('confirmedClosePortlet', arguments); return; @@ -141,21 +140,12 @@ this.Super('confirmedClosePortlet', arguments); return; } - - activateButton = isc.addProperties({}, isc.Dialog.OK, { - getTitle: function() { - return OB.I18N.getLabel('OBKMO_LearnMore'); - }, - click: function() { - this.topElement.cancelClick(); - window.open('http://www.openbravo.com/product/erp/get-basic/'); - }}); if(OB.Application.licenseType === 'C') { - isc.confirm(OB.I18N.getLabel('OBKMO_ActivateMessage'), { + isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [OB.I18N.getLabel('OBKMO_ActivateMessage')]), { isModal: true, showModalMask: true, - toolbarButtons: [activateButton, isc.Dialog.CANCEL] + toolbarButtons: [isc.Dialog.OK] }); return; } diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 13:00:46 2011 +0200 @@ -33,4 +33,15 @@ <!--5E5284441DF84DD9805D53C571E2D05E--> <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID> <!--5E5284441DF84DD9805D53C571E2D05E--></AD_MESSAGE> +<!--FF808081319977E50131998EB8900032--><AD_MESSAGE> +<!--FF808081319977E50131998EB8900032--> <AD_MESSAGE_ID><![CDATA[FF808081319977E50131998EB8900032]]></AD_MESSAGE_ID> +<!--FF808081319977E50131998EB8900032--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF808081319977E50131998EB8900032--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF808081319977E50131998EB8900032--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF808081319977E50131998EB8900032--> <VALUE><![CDATA[OBCQL_ActivateMessageExport]]></VALUE> +<!--FF808081319977E50131998EB8900032--> <MSGTEXT><![CDATA[export data]]></MSGTEXT> +<!--FF808081319977E50131998EB8900032--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--FF808081319977E50131998EB8900032--> <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID> +<!--FF808081319977E50131998EB8900032--></AD_MESSAGE> + </data> diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js --- a/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.client.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js Fri Aug 05 13:00:46 2011 +0200 @@ -121,26 +121,19 @@ this.grid.filterData(); }, - exportGrid: function() { - var grid = this.widget.grid, requestProperties, additionalProperties, - activateButton = isc.addProperties({}, isc.Dialog.OK, { - getTitle: function() { - return OB.I18N.getLabel('OBKMO_LearnMore'); - }, - click: function() { - this.topElement.cancelClick(); - window.open('http://www.openbravo.com/product/erp/get-basic/'); - }}); + exportGrid: function () { + var grid = this.widget.grid, + requestProperties, + additionalProperties; - if (OB.Application.licenseType === 'C') { - isc.confirm(OB.I18N.getLabel('OBUIAPP_ActivateMessage'), { - isModal: true, - showModalMask: true, - toolbarButtons: [activateButton, isc.Dialog.CANCEL] - }); - - return; - } + if (OB.Application.licenseType === 'C') { + isc.warn(OB.I18N.getLabel('OBUIAPP_ActivateMessage', [OB.I18N.getLabel('OBCQL_ActivateMessageExport')]), { + isModal: true, + showModalMask: true, + toolbarButtons: [isc.Dialog.OK] + }); + return; + } requestProperties = { exportAs: 'csv', diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MESSAGE.xml Fri Aug 05 13:00:46 2011 +0200 @@ -40,7 +40,7 @@ <!--FF808081318528680131852B80EF000A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--FF808081318528680131852B80EF000A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF808081318528680131852B80EF000A--> <VALUE><![CDATA[OBSEIG_Activate]]></VALUE> -<!--FF808081318528680131852B80EF000A--> <MSGTEXT><![CDATA[Only Professional and Basic Edition subscribers can log in to application using Google Account. <a target="_blank" href="http://www.openbravo.com/product/erp/editions/";>Learn more</a> about the benefits of Openbravo's commercial editions.]]></MSGTEXT> +<!--FF808081318528680131852B80EF000A--> <MSGTEXT><![CDATA[<a href="http://wiki.openbravo.com/wiki/Configuration_Manual/Google_Integration"; target="_blank">log in to application using Google Account</a>]]></MSGTEXT> <!--FF808081318528680131852B80EF000A--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--FF808081318528680131852B80EF000A--> <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID> <!--FF808081318528680131852B80EF000A--></AD_MESSAGE> diff -r 2f3439ca07ae -r 7e1aea78244f modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java --- a/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java Fri Aug 05 12:32:56 2011 +0200 +++ b/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java Fri Aug 05 13:00:46 2011 +0200 @@ -78,10 +78,13 @@ if (!ActivationKey.getInstance().isActive()) { OBError error = new OBError(); - // messageDB escapes double-quotes + + String message = Utility.messageBD(this, "OBUIAPP_ActivateMessage", lang); + message = message.replace("%0", Utility.messageBD(this, "OBSEIG_Activate", lang)); + message = message.replaceAll(""", "\""); + error.setTitle(""); - error.setMessage(Utility.messageBD(this, "OBSEIG_Activate", lang) - .replaceAll(""", "\"")); + error.setMessage(message); error.setType("Error"); vars.setSessionObject("LoginErrorMsg", error); resp.sendRedirect(strDireccion); ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
