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

BF [2833918] - Adempiere logo 

https://sourceforge.net/tracker/index.php?func=detail&aid=2833918&group_id=176962&atid=879332
This commit is contained in:
trifonnt 2009-09-24 15:44:11 +00:00
parent f3f310ce9d
commit f909e82e23
4 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ public class WebDoc
return create (false, title, false); return create (false, title, false);
} // create } // create
/** Non brealing Space */ /** Non breaking Space */
public static final String NBSP = " "; public static final String NBSP = " ";
@ -163,10 +163,9 @@ public class WebDoc
return; return;
// css, js // css, js
if (javaClient) if (javaClient) {
m_head.addElement(new link("http://www.adempiere.com/css/standard.css", link.REL_STYLESHEET, link.TYPE_CSS)); m_head.addElement(new StoredHtmlSrc("STYLE", "org/compiere/images/standard.css")); //TODO
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("/js/standard.js"))); m_head.addElement(new script((Element)null, WebEnv.getBaseDirectory("/js/standard.js")));
} }
@ -186,15 +185,17 @@ public class WebDoc
// Logo // Logo
m_topRight = new td().setAlign("right"); m_topRight = new td().setAlign("right");
if (javaClient) if (javaClient) {
m_topRight.addElement(new img("http://www.adempiere.com/images/adempiere64x32.png") m_topRight.addElement(
.setAlign(AlignType.RIGHT).setAlt("Adempiere Inc.")); new img("res:org/compiere/images/AD10030.png")
else .setAlign(AlignType.RIGHT).setAlt("Adempiere"));
if(title.equals("")) } else {
if (title.equals("")) {
m_topRight.addElement(WebEnv.getLogo()); m_topRight.addElement(WebEnv.getLogo());
else } else {
m_topRight.addElement(new h1(title)); m_topRight.addElement(new h1(title));
}
}
m_topRow.addElement(m_topRight); m_topRow.addElement(m_topRight);
m_table.addElement(m_topRow); m_table.addElement(m_topRow);
// //
@ -401,4 +402,5 @@ public class WebDoc
doc.output(System.out); doc.output(System.out);
System.out.println("---------"); System.out.println("---------");
} // main } // main
} // WDoc } // WDoc

2
base/src/org/compiere/util/WebEnv.java
View File

@ -184,7 +184,7 @@ public class WebEnv
/************************************************************************** /**************************************************************************
* Get Base Directory entrry. * Get Base Directory entry.
* <br> * <br>
* /adempiere/ * /adempiere/
* @param entry file entry or path * @param entry file entry or path

25
base/src/org/compiere/util/package.html
View File

@ -1,25 +0,0 @@
<html>
<head>
<!--
$Id: package.html,v 1.1 2006/04/21 17:41:35 jjanke Exp $
Copyright 1999-2002 Jorg Janke, Inc.
40 Old Tannery Rd, Monroe, CT 06468, U.S.A.
All Rights Reserved.
-->
</head>
<body>
<p>Provides utility functions.</p>
<h2>Package Specification</h2>
<p>Utility.</p>
<h2> Related Documentation</h2>
<p>For overviews, tutorials, examples, guides, and tool documentation, please
see: <a href="http://www.adempiere.org" target="_blank">http://www.adempiere.org</a></p>
<p>
<!-- Put @see and @since tags down here. -->
</p>
</body>
</html>

1
client/src/org/adempiere/apps/graph/FCHtmlEditorKit.java
View File

@ -17,6 +17,7 @@ public class FCHtmlEditorKit extends HTMLEditorKit {
* *
*/ */
private static final long serialVersionUID = -3371176452691681668L; private static final long serialVersionUID = -3371176452691681668L;
public ViewFactory getViewFactory() { public ViewFactory getViewFactory() {
if (defaultFactory == null) { if (defaultFactory == null) {
defaultFactory = new FCHtmlFactory(super.getViewFactory()); defaultFactory = new FCHtmlFactory(super.getViewFactory());