midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Problems with java 6 reported by kisitomomo 

BUG ID 1622968 - Problem with the Help functionality
This commit is contained in:
Carlos Ruiz 2006-12-27 16:13:36 +00:00
parent 280a4e9b87
commit 3ae1477d1a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/src/org/compiere/util/WebDoc.java
View File

@ -130,13 +130,14 @@ public class WebDoc
// css, js // css, js
if (javaClient) 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 else
{ {
m_head.addElement(new link(WebEnv.getStylesheetURL(), link.REL_STYLESHEET, link.TYPE_CSS)); 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 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_head.addElement(new meta().setName("description", "adempiere HTML UI"));
m_table = new table("0", "2", "0", "100%", null); // spacing 2 m_table = new table("0", "2", "0", "100%", null); // spacing 2
@ -150,12 +151,9 @@ public class WebDoc
m_topRow.addElement(m_topLeft); m_topRow.addElement(m_topLeft);
// Logo // Logo
m_topRight = new td().setAlign("right"); m_topRight = new td().setAlign("right");
/** Removing/modifying the adempiere logo is a violation of the license */
if (javaClient) if (javaClient)
m_topRight.addElement(new img("http://www.adempiere.org/images/adempiere64x32.png") m_topRight.addElement(new img("http://www.adempiere.com/images/adempiere64x32.png")
// Changing the copyright notice in any way violates the license .setAlign(AlignType.RIGHT).setAlt("Adempiere Inc."));
// and you'll be held liable for any damage claims
.setAlign(AlignType.RIGHT).setAlt("© Jorg Janke/adempiere"));
else else
m_topRight.addElement(WebEnv.getLogo()); m_topRight.addElement(WebEnv.getLogo());
m_topRow.addElement(m_topRight); m_topRow.addElement(m_topRight);