details: /erp/devel/pi/rev/be81ceac4a34
changeset: 10876:be81ceac4a34
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Feb 24 17:58:42 2011 +0100
summary: Added new Openbravo 3 logos
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 4 +-
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
| 13 +
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
| 10 +
src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java
| 4 +-
src/org/openbravo/erpCommon/obps/GetOpenbravoLogoGen.java
| 78 ++++++++++
src/org/openbravo/erpCommon/security/Login.html
| 2 +-
src/org/openbravo/erpCommon/security/Login_F1.html
| 2 +-
web/images/PoweredByOpenbravo.png
| 0
web/images/PoweredByOpenbravoGen.png
| 0
web/images/PoweredByOpenbravoGenOPS.png
| 0
web/images/PoweredByOpenbravoOPS.png
| 0
web/js/utils.js
| 2 +-
web/skins/Default/Openbravo_ERP_250.css
| 4 +-
13 files changed, 110 insertions(+), 9 deletions(-)
diffs (225 lines):
diff -r 42788f7114d6 -r be81ceac4a34
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Thu Feb 24 17:46:48 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Thu Feb 24 17:58:42 2011 +0100
@@ -83,8 +83,8 @@
OB.TopLayout.OpenbravoLogo = isc.Img.create({
imageType: 'normal',
- imageWidth: '122',
- imageHeight: '34',
+ imageWidth: '130',
+ imageHeight: '32',
src: OB.Application.contextUrl + 'utility/GetOpenbravoLogo.png',
getInnerHTML: function() {
var html = this.Super('getInnerHTML', arguments);
diff -r 42788f7114d6 -r be81ceac4a34
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Feb 24 17:46:48
2011 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Feb 24 17:58:42
2011 +0100
@@ -4108,6 +4108,19 @@
<!--8993A79B45F8457CB56FC27F084FF5C6-->
<NAME><![CDATA[GetOpenbravoLogo]]></NAME>
<!--8993A79B45F8457CB56FC27F084FF5C6--></AD_MODEL_OBJECT>
+<!--8A935F84A79B45F8457CB91B09764786--><AD_MODEL_OBJECT>
+<!--8A935F84A79B45F8457CB91B09764786-->
<AD_MODEL_OBJECT_ID><![CDATA[8A935F84A79B45F8457CB91B09764786]]></AD_MODEL_OBJECT_ID>
+<!--8A935F84A79B45F8457CB91B09764786-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8A935F84A79B45F8457CB91B09764786--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8A935F84A79B45F8457CB91B09764786--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8A935F84A79B45F8457CB91B09764786--> <ACTION><![CDATA[M]]></ACTION>
+<!--8A935F84A79B45F8457CB91B09764786-->
<CLASSNAME><![CDATA[org.openbravo.erpCommon.obps.GetOpenbravoLogoGen]]></CLASSNAME>
+<!--8A935F84A79B45F8457CB91B09764786--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--8A935F84A79B45F8457CB91B09764786-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8A935F84A79B45F8457CB91B09764786-->
<OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--8A935F84A79B45F8457CB91B09764786-->
<NAME><![CDATA[GetOpenbravoLogoGen]]></NAME>
+<!--8A935F84A79B45F8457CB91B09764786--></AD_MODEL_OBJECT>
+
<!--8B7776CB913C4AA691B099647862D191--><AD_MODEL_OBJECT>
<!--8B7776CB913C4AA691B099647862D191-->
<AD_MODEL_OBJECT_ID><![CDATA[8B7776CB913C4AA691B099647862D191]]></AD_MODEL_OBJECT_ID>
<!--8B7776CB913C4AA691B099647862D191-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 42788f7114d6 -r be81ceac4a34
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Feb 24
17:46:48 2011 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Feb 24
17:58:42 2011 +0100
@@ -4180,6 +4180,16 @@
<!--372045A027A74A08B6EBE5761AE7F061--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--372045A027A74A08B6EBE5761AE7F061--></AD_MODEL_OBJECT_MAPPING>
+<!--38247A747684E7CA774A08A08B6EBE55--><AD_MODEL_OBJECT_MAPPING>
+<!--38247A747684E7CA774A08A08B6EBE55-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[38247A747684E7CA774A08A08B6EBE55]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--38247A747684E7CA774A08A08B6EBE55-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--38247A747684E7CA774A08A08B6EBE55--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--38247A747684E7CA774A08A08B6EBE55--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--38247A747684E7CA774A08A08B6EBE55-->
<AD_MODEL_OBJECT_ID><![CDATA[8A935F84A79B45F8457CB91B09764786]]></AD_MODEL_OBJECT_ID>
+<!--38247A747684E7CA774A08A08B6EBE55-->
<MAPPINGNAME><![CDATA[/utility/GetOpenbravoLogoGen.png]]></MAPPINGNAME>
+<!--38247A747684E7CA774A08A08B6EBE55--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--38247A747684E7CA774A08A08B6EBE55--></AD_MODEL_OBJECT_MAPPING>
+
<!--3AB6696A84484E7CA72454C26A2B9534--><AD_MODEL_OBJECT_MAPPING>
<!--3AB6696A84484E7CA72454C26A2B9534-->
<AD_MODEL_OBJECT_MAPPING_ID><![CDATA[3AB6696A84484E7CA72454C26A2B9534]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--3AB6696A84484E7CA72454C26A2B9534-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 42788f7114d6 -r be81ceac4a34
src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java
--- a/src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java Thu Feb 24
17:46:48 2011 +0100
+++ b/src/org/openbravo/erpCommon/obps/GetOpenbravoLogo.java Thu Feb 24
17:58:42 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -30,7 +30,7 @@
import org.openbravo.utils.FileUtility;
/**
- * Servlet which returns the openbravo logo image. Depending on instance
activation status either
+ * Servlet which returns the openbravo logo image with version number.
Depending on instance activation status either
* the ops image or the normal powered by openbravo image is returned.
*
* @author huehner
diff -r 42788f7114d6 -r be81ceac4a34
src/org/openbravo/erpCommon/obps/GetOpenbravoLogoGen.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/obps/GetOpenbravoLogoGen.java Thu Feb 24
17:58:42 2011 +0100
@@ -0,0 +1,78 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.erpCommon.obps;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openbravo.base.HttpBaseServlet;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.utils.FileUtility;
+
+/**
+ * Servlet which returns the openbravo logo image without version number
(generic logo). Depending on instance activation status either
+ * the ops image or the normal powered by openbravo image is returned.
+ *
+ * @author huehner
+ *
+ */
+public class GetOpenbravoLogoGen extends HttpBaseServlet {
+ private static final long serialVersionUID = 1L;
+
+ public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException,
+ ServletException {
+
+ String communityLogo = "PoweredByOpenbravoGen.png";
+ String opsLogo = "PoweredByOpenbravoGenOPS.png";
+
+ // get instance active status from db
+ boolean active = false;
+ OBContext.setAdminMode();
+ try {
+ active = ActivationKey.getInstance().isActive();
+ log4j.debug("GetOpsLogo: activated: " + active);
+ } finally {
+ OBContext.restorePreviousMode();
+ }
+
+ String activeLogo;
+ if (active) {
+ activeLogo = opsLogo;
+ } else {
+ activeLogo = communityLogo;
+ }
+
+ FileUtility f = new FileUtility(this.globalParameters.prefix +
"web/images", activeLogo, false,
+ true);
+ response.setContentType("image/png");
+ // mark response as cache-forever
+ response.addHeader("Expires", "Sun, 17 Jan 2038 19:14:07 GMT");
+ response.addHeader("Cache-Control", "public");
+
+ f.dumpFile(response.getOutputStream());
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+
+ }
+
+}
diff -r 42788f7114d6 -r be81ceac4a34
src/org/openbravo/erpCommon/security/Login.html
--- a/src/org/openbravo/erpCommon/security/Login.html Thu Feb 24 17:46:48
2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login.html Thu Feb 24 17:58:42
2011 +0100
@@ -373,7 +373,7 @@
}
catch (e) { }
- if ((!revisionControl('10720')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('10876')) || (isOpsInstance() !=
isOpsInstanceCached())) {
maskLoginWindow(cacheMsg);
setLoginMessage('Warning', '', cacheMsg);
}
diff -r 42788f7114d6 -r be81ceac4a34
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html Thu Feb 24
17:46:48 2011 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html Thu Feb 24
17:58:42 2011 +0100
@@ -126,7 +126,7 @@
clearForm();
} catch (e) {}
setWindowElementFocus('firstElement');
- if ((!revisionControl('10720')) || (isOpsInstance() !=
isOpsInstanceCached())) {
+ if ((!revisionControl('10876')) || (isOpsInstance() !=
isOpsInstanceCached())) {
alert(cacheMsg);
}
diff -r 42788f7114d6 -r be81ceac4a34 web/images/PoweredByOpenbravo.png
Binary file web/images/PoweredByOpenbravo.png has changed
diff -r 42788f7114d6 -r be81ceac4a34 web/images/PoweredByOpenbravoGen.png
Binary file web/images/PoweredByOpenbravoGen.png has changed
diff -r 42788f7114d6 -r be81ceac4a34 web/images/PoweredByOpenbravoGenOPS.png
Binary file web/images/PoweredByOpenbravoGenOPS.png has changed
diff -r 42788f7114d6 -r be81ceac4a34 web/images/PoweredByOpenbravoOPS.png
Binary file web/images/PoweredByOpenbravoOPS.png has changed
diff -r 42788f7114d6 -r be81ceac4a34 web/js/utils.js
--- a/web/js/utils.js Thu Feb 24 17:46:48 2011 +0100
+++ b/web/js/utils.js Thu Feb 24 17:58:42 2011 +0100
@@ -95,7 +95,7 @@
* Return a number that would be checked at the Login screen to know if the
file is cached with the correct version
*/
function getCurrentRevision() {
- var number = '10720';
+ var number = '10876';
return number;
}
diff -r 42788f7114d6 -r be81ceac4a34 web/skins/Default/Openbravo_ERP_250.css
--- a/web/skins/Default/Openbravo_ERP_250.css Thu Feb 24 17:46:48 2011 +0100
+++ b/web/skins/Default/Openbravo_ERP_250.css Thu Feb 24 17:58:42 2011 +0100
@@ -6326,7 +6326,7 @@
height: 34px;
background-repeat: no-repeat;
background-position: center center;
- background-image: url(../../../../utility/GetOpenbravoLogo.png);
+ background-image: url(../../../../utility/GetOpenbravoLogoGen.png);
}
.Main_NavBar_separator_cell {
@@ -9958,7 +9958,7 @@
height: 34px;
background-repeat: no-repeat;
background-position: center center;
- background-image: url(../../../images/PoweredByOpenbravo.png);
+ background-image: url(../../../../utility/GetOpenbravoLogoGen.png);
}
.Popup_NavBar_Popup_title_cell {
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
