details: /erp/devel/pi/rev/d1887f7014d1 changeset: 8773:d1887f7014d1 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Oct 28 16:42:41 2010 +0200 summary: Related to issue 15061.Give more space to the drop down on the instance purpose popup.
details: /erp/devel/pi/rev/831da14a213c changeset: 8774:831da14a213c user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Oct 28 17:11:20 2010 +0200 summary: Related to issue 15061.Set 'you must select a purpose' in red bold and fix typo. details: /erp/devel/pi/rev/e9f6aa14b3d8 changeset: 8775:e9f6aa14b3d8 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Oct 28 18:06:31 2010 +0200 summary: Related to issue 15061.Replace the learn more url's by real links details: /erp/devel/pi/rev/b11a9e29d336 changeset: 8776:b11a9e29d336 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu Oct 28 18:40:22 2010 +0200 summary: Fixed issue 15061.Add a tooltip on case the purpose is not set. diffstat: src-db/database/sourcedata/AD_MESSAGE.xml | 18 +++++++++-- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 +++++++------- src/org/openbravo/erpCommon/ad_forms/Heartbeat.java | 3 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html | 5 ++- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 3 +- src/org/openbravo/erpCommon/utility/Home.html | 10 ++++++- src/org/openbravo/erpCommon/utility/Home.java | 2 + src/org/openbravo/erpCommon/utility/Home.xml | 2 + 8 files changed, 43 insertions(+), 22 deletions(-) diffs (182 lines): diff -r 0a0fb2432e0d -r b11a9e29d336 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Oct 28 16:38:06 2010 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Oct 28 18:40:22 2010 +0200 @@ -28013,8 +28013,8 @@ <!--1005800002--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--1005800002--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--1005800002--> <VALUE><![CDATA[HB_WELCOME]]></VALUE> -<!--1005800002--> <MSGTEXT><![CDATA[To help us improve the software quality and understand its worldwide usage, we invite you to enable the Heartbeat. This tool periodically sends to Openbravo anonymous updates regarding your technical system specifications (e.g. operating system, database, Openbravo version, etc.). Enabling the Heartbeat is required to access additional services provided by Openbravo, such as the ability to download and install extension modules. For a full description of the information transmitted to Openbravo, see the Heartbeat Configuration chapter of the User Manual. -http://wiki.openbravo.com/wiki/ERP/2.50/User_Manual/HeartBeat +<!--1005800002--> <MSGTEXT><![CDATA[To help us improve the software quality and understand its worldwide usage, we invite you to enable the Heartbeat. This tool periodically sends to Openbravo anonymous updates regarding your technical system specifications (e.g. operating system, database, Openbravo version, etc.). Enabling the Heartbeat is required to access additional services provided by Openbravo, such as the ability to download and install extension modules. For a full description of the information transmitted to Openbravo, see the <a href='http://wiki.openbravo.com/wiki/ERP/2.50/User_Manual/HeartBeat' target='_blank' class='LabelLink'>Heartbeat Configuration</a> chapter of the User Manual. + Do you want to enable the Heartbeat?]]></MSGTEXT> @@ -30299,6 +30299,17 @@ <!--272961BF12DB4930A0F8EDDADE8827CA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--272961BF12DB4930A0F8EDDADE8827CA--></AD_MESSAGE> +<!--27D70A51233E44C9B1319F3BE1453507--><AD_MESSAGE> +<!--27D70A51233E44C9B1319F3BE1453507--> <AD_MESSAGE_ID><![CDATA[27D70A51233E44C9B1319F3BE1453507]]></AD_MESSAGE_ID> +<!--27D70A51233E44C9B1319F3BE1453507--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--27D70A51233E44C9B1319F3BE1453507--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--27D70A51233E44C9B1319F3BE1453507--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--27D70A51233E44C9B1319F3BE1453507--> <VALUE><![CDATA[Home_Purpose_Tooltip]]></VALUE> +<!--27D70A51233E44C9B1319F3BE1453507--> <MSGTEXT><![CDATA[Instance purpose is unknown.]]></MSGTEXT> +<!--27D70A51233E44C9B1319F3BE1453507--> <MSGTYPE><![CDATA[C]]></MSGTYPE> +<!--27D70A51233E44C9B1319F3BE1453507--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--27D70A51233E44C9B1319F3BE1453507--></AD_MESSAGE> + <!--29C3C655E5394359B44C086A5D8B5C15--><AD_MESSAGE> <!--29C3C655E5394359B44C086A5D8B5C15--> <AD_MESSAGE_ID><![CDATA[29C3C655E5394359B44C086A5D8B5C15]]></AD_MESSAGE_ID> <!--29C3C655E5394359B44C086A5D8B5C15--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -31004,8 +31015,7 @@ Thank you for downloading and supporting our open source ERP. -Since this is the first time that you login, please select the purpose of this instance. Learn more: -http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Getting_started#Configuring_the_Instance_Purpose]]></MSGTEXT> +Since this is the first time that you login, please select the purpose of this instance. <a href='http://wiki.openbravo.com/wiki/ERP/2.50/Configuration_Manual/Getting_started#Configuring_the_Instance_Purpose' target='_blank' class='LabelLink'>Learn more</a>]]></MSGTEXT> <!--5319728ED743474AA75BB9BBF8F08321--> <MSGTYPE><![CDATA[I]]></MSGTYPE> <!--5319728ED743474AA75BB9BBF8F08321--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5319728ED743474AA75BB9BBF8F08321--></AD_MESSAGE> diff -r 0a0fb2432e0d -r b11a9e29d336 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Oct 28 16:38:06 2010 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Oct 28 18:40:22 2010 +0200 @@ -21120,17 +21120,6 @@ <!--91EFCD58CF2021D7E040007F0100314C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--91EFCD58CF2021D7E040007F0100314C--></AD_TEXTINTERFACES> -<!--920934443FE058FBE040007F0100124B--><AD_TEXTINTERFACES> -<!--920934443FE058FBE040007F0100124B--> <AD_TEXTINTERFACES_ID><![CDATA[920934443FE058FBE040007F0100124B]]></AD_TEXTINTERFACES_ID> -<!--920934443FE058FBE040007F0100124B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--920934443FE058FBE040007F0100124B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--920934443FE058FBE040007F0100124B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--920934443FE058FBE040007F0100124B--> <TEXT><![CDATA[You must select purpose]]></TEXT> -<!--920934443FE058FBE040007F0100124B--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstancePurpose.html]]></FILENAME> -<!--920934443FE058FBE040007F0100124B--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--920934443FE058FBE040007F0100124B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--920934443FE058FBE040007F0100124B--></AD_TEXTINTERFACES> - <!--9249205697BC413FB680A90F9784D501--><AD_TEXTINTERFACES> <!--9249205697BC413FB680A90F9784D501--> <AD_TEXTINTERFACES_ID><![CDATA[9249205697BC413FB680A90F9784D501]]></AD_TEXTINTERFACES_ID> <!--9249205697BC413FB680A90F9784D501--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -21406,6 +21395,17 @@ <!--93871158F2B811DDADFC001D09C4A2FE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--93871158F2B811DDADFC001D09C4A2FE--></AD_TEXTINTERFACES> +<!--93AE8790C6A45EF7E040007F010073E2--><AD_TEXTINTERFACES> +<!--93AE8790C6A45EF7E040007F010073E2--> <AD_TEXTINTERFACES_ID><![CDATA[93AE8790C6A45EF7E040007F010073E2]]></AD_TEXTINTERFACES_ID> +<!--93AE8790C6A45EF7E040007F010073E2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--93AE8790C6A45EF7E040007F010073E2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--93AE8790C6A45EF7E040007F010073E2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--93AE8790C6A45EF7E040007F010073E2--> <TEXT><![CDATA[You must select a purpose]]></TEXT> +<!--93AE8790C6A45EF7E040007F010073E2--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstancePurpose.html]]></FILENAME> +<!--93AE8790C6A45EF7E040007F010073E2--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--93AE8790C6A45EF7E040007F010073E2--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--93AE8790C6A45EF7E040007F010073E2--></AD_TEXTINTERFACES> + <!--9F0C2175AC6145B49570E24110762368--><AD_TEXTINTERFACES> <!--9F0C2175AC6145B49570E24110762368--> <AD_TEXTINTERFACES_ID><![CDATA[9F0C2175AC6145B49570E24110762368]]></AD_TEXTINTERFACES_ID> <!--9F0C2175AC6145B49570E24110762368--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/ad_forms/Heartbeat.java --- a/src/org/openbravo/erpCommon/ad_forms/Heartbeat.java Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/Heartbeat.java Thu Oct 28 18:40:22 2010 +0200 @@ -86,8 +86,7 @@ String msgCode = vars.getCommand().equals("DEFAULT_MODULE") ? "HB_WELCOME_MODULE" : "HB_WELCOME"; - xmlDocument.setParameter("welcome", Utility.formatMessageBDToHtml(Utility.messageBD(this, - msgCode, vars.getLanguage()))); + xmlDocument.setParameter("welcome", Utility.messageBD(this, msgCode, vars.getLanguage())); xmlDocument.setParameter("recordId", vars.getStringParameter("inpcRecordId", IsIDFilter.instance)); diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html --- a/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html Thu Oct 28 18:40:22 2010 +0200 @@ -188,12 +188,13 @@ <td class="TableEdition_OneCell_width"/> </tr> <tr><td height="20" colspan="4"></td></tr> - <tr id="purposeComboRow1"><td colspan="4"><span class="LabelText">What is the purpose of this Openbravo ERP instance?</span></td></tr> + <tr id="purposeComboRow1" style="height: 30px;"><td colspan="4"><span class="LabelText">What is the purpose of this Openbravo ERP instance?</span></td></tr> + <tr></tr> <tr id="purposeComboRow2"> <td class="Combo_ContentCell" colspan="4"><select name="instancePurpose" id="inpInstancePurpose" class="ComboKey Combo_OneCell_width" required="yes"> <option value="">--please select--</option> <div id="reportPurpose"></div> - </select><span id="noPurposeSelected" class="LabelText" style="color:red; padding-left: 10px;">You must select purpose</span></td> + </select><span id="noPurposeSelected" class="LabelText" style="color:red; font-weight: bold; padding-left: 10px;">You must select a purpose</span></td> </tr> <tr> diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java --- a/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java Thu Oct 28 18:40:22 2010 +0200 @@ -96,8 +96,7 @@ xmlDocument.setParameter("selectedPurpose", purpose); } } - xmlDocument.setParameter("welcome", Utility.formatMessageBDToHtml(Utility.messageBD(this, - strWelcomeMsg, vars.getLanguage()))); + xmlDocument.setParameter("welcome", Utility.messageBD(this, strWelcomeMsg, vars.getLanguage())); xmlDocument.setParameter("title", Utility.messageBD(myPool, strTitle, vars.getLanguage())); xmlDocument.setParameter("recordId", vars.getStringParameter("inpcRecordId", diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/utility/Home.html --- a/src/org/openbravo/erpCommon/utility/Home.html Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/utility/Home.html Thu Oct 28 18:40:22 2010 +0200 @@ -34,12 +34,20 @@ var divPurpose = document.getElementById('cbPurpose'); if (purposeCode == 'D') { divPurpose.className = 'Login_Home_Community_Branding_development'; + divPurpose.title = ''; + divPurpose.alt = ''; } else if (purposeCode == 'P') { divPurpose.className = 'Login_Home_Community_Branding_production'; + divPurpose.title = ''; + divPurpose.alt = ''; } else if (purposeCode == 'T') { divPurpose.className = 'Login_Home_Community_Branding_testing'; + divPurpose.title = ''; + divPurpose.alt = ''; } else if (purposeCode == 'E') { divPurpose.className = 'Login_Home_Community_Branding_evaluation'; + divPurpose.title = ''; + divPurpose.alt = ''; } else { divPurpose.className = 'Login_Home_Community_Branding_unknown'; } @@ -130,7 +138,7 @@ <div id="communityBranding" class="Login_Home_Community_Branding" border="0"> <div class="Login_Home_Community_Branding_top"></div> <div class="Login_Home_Community_Branding_title"> - <div class="Login_Home_Community_Branding_purpose" id="cbPurpose"></div> + <div class="Login_Home_Community_Branding_purpose" alt="" title="" id="cbPurpose"></div> <div class="Login_Home_Community_Branding_version" id="cbVersion">xx2.50 - Community Edition - MP23</div> </div> <div class="Login_Home_Community_Branding_iframe"> diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/utility/Home.java --- a/src/org/openbravo/erpCommon/utility/Home.java Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/utility/Home.java Thu Oct 28 18:40:22 2010 +0200 @@ -78,6 +78,8 @@ String strPurpose = getPurpose(); if (strPurpose == null) { strPurpose = "unknown"; + xmlDocument.setParameter("cbPurposeTooltip", Utility.messageBD(myPool, + "Home_Purpose_Tooltip", vars.getLanguage())); } xmlDocument.setParameter("cbPurpose", strPurpose.toLowerCase()); xmlDocument.setParameter("cbVersion", getVersion()); diff -r 0a0fb2432e0d -r b11a9e29d336 src/org/openbravo/erpCommon/utility/Home.xml --- a/src/org/openbravo/erpCommon/utility/Home.xml Thu Oct 28 16:38:06 2010 +0200 +++ b/src/org/openbravo/erpCommon/utility/Home.xml Thu Oct 28 18:40:22 2010 +0200 @@ -27,5 +27,7 @@ <PARAMETER id="customJS" name="customJS" default="" /> <PARAMETER id="fieldUrls" name="urls" /> <PARAMETER id="cbPurpose" name="cbPurpose" attribute="class" replace="purpose"/> + <PARAMETER id="cbPurpose" name="cbPurposeTooltip" attribute="alt"/> + <PARAMETER id="cbPurpose" name="cbPurposeTooltip" attribute="title"/> <PARAMETER id="cbVersion" name="cbVersion"/> </REPORT> ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
