From 3ae1477d1a633ef5b296abe863ad07a25d9a1b97 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 27 Dec 2006 16:13:36 +0000 Subject: [PATCH] Problems with java 6 reported by kisitomomo BUG ID 1622968 - Problem with the Help functionality --- base/src/org/compiere/util/WebDoc.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/base/src/org/compiere/util/WebDoc.java b/base/src/org/compiere/util/WebDoc.java index d6b8f0ccbd..39e50a9b98 100644 --- a/base/src/org/compiere/util/WebDoc.java +++ b/base/src/org/compiere/util/WebDoc.java @@ -130,13 +130,14 @@ public class WebDoc // css, js if (javaClient) - m_head.addElement(new link("http://www.adempiere.org/standard.css", link.REL_STYLESHEET, link.TYPE_CSS)); + m_head.addElement(new link("http://www.adempiere.com/standard.css", link.REL_STYLESHEET, link.TYPE_CSS)); else { m_head.addElement(new link(WebEnv.getStylesheetURL(), link.REL_STYLESHEET, link.TYPE_CSS)); m_head.addElement(new script((Element)null, WebEnv.getBaseDirectory("standard.js"))); } - m_head.addElement(new meta().setHttpEquiv("Content-Type", "text/html; charset=UTF-8")); + // globalqss - problems with java 6 reported by kisitomomo + // m_head.addElement(new meta().setHttpEquiv("Content-Type", "text/html; charset=UTF-8")); m_head.addElement(new meta().setName("description", "adempiere HTML UI")); m_table = new table("0", "2", "0", "100%", null); // spacing 2 @@ -150,12 +151,9 @@ public class WebDoc m_topRow.addElement(m_topLeft); // Logo m_topRight = new td().setAlign("right"); - /** Removing/modifying the adempiere logo is a violation of the license */ if (javaClient) - m_topRight.addElement(new img("http://www.adempiere.org/images/adempiere64x32.png") - // Changing the copyright notice in any way violates the license - // and you'll be held liable for any damage claims - .setAlign(AlignType.RIGHT).setAlt("© Jorg Janke/adempiere")); + m_topRight.addElement(new img("http://www.adempiere.com/images/adempiere64x32.png") + .setAlign(AlignType.RIGHT).setAlt("Adempiere Inc.")); else m_topRight.addElement(WebEnv.getLogo()); m_topRow.addElement(m_topRight);