details: /erp/devel/pi/rev/42f4be6cf1f8
changeset: 8757:42f4be6cf1f8
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 12:22:53 2010 +0200
summary: Fixed issue 15026.Use document.location.protocol on community
branding requests to butler.
diffstat:
src/org/openbravo/erpCommon/utility/Home.html | 2 +-
src/org/openbravo/erpCommon/utility/Home.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r e7412260acf2 -r 42f4be6cf1f8
src/org/openbravo/erpCommon/utility/Home.html
--- a/src/org/openbravo/erpCommon/utility/Home.html Wed Oct 27 11:59:20
2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/Home.html Wed Oct 27 12:22:53
2010 +0200
@@ -36,7 +36,7 @@
return;
}
if(typeof internetConnection !== 'undefined') {
- iframe.src = communityBrandingUrl;
+ iframe.src = document.location.protocol + communityBrandingUrl;
return;
}
iframe.src = staticUrl;
diff -r e7412260acf2 -r 42f4be6cf1f8
src/org/openbravo/erpCommon/utility/Home.java
--- a/src/org/openbravo/erpCommon/utility/Home.java Wed Oct 27 11:59:20
2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/Home.java Wed Oct 27 12:22:53
2010 +0200
@@ -37,7 +37,7 @@
public class Home extends HttpSecureAppServlet {
private static final long serialVersionUID = 1L;
- private static final String COMMUNITY_BRANDING_URL =
"http://butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html";;
+ private static final String COMMUNITY_BRANDING_URL =
"//butler.openbravo.com/heartbeat-server/org.openbravo.butler.communitybranding/CommunityBranding.html";
private static final String STATIC_COMMUNITY_BRANDING_URL =
"StaticCommunityBranding.html";
private static final String BUTLER_UTILS_URL =
"//butler.openbravo.com/web/static-content/js/ob-utils.js";
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
