diff --git a/org.adempiere.base/src/org/compiere/util/WebDoc.java b/org.adempiere.base/src/org/compiere/util/WebDoc.java index b735db112e..23ab5f17ad 100644 --- a/org.adempiere.base/src/org/compiere/util/WebDoc.java +++ b/org.adempiere.base/src/org/compiere/util/WebDoc.java @@ -163,12 +163,7 @@ public class WebDoc return; // css, js - if (javaClient) { - m_head.addElement(new StoredHtmlSrc("STYLE", "org/compiere/images/standard.css")); - } else { - 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 link("/resources/css/idempiereMonitor.css", link.REL_STYLESHEET, link.TYPE_CSS)); m_head.addElement(new meta().setHttpEquiv("Content-Type", "text/html; charset=UTF-8")); m_head.addElement(new meta().setName("description", "iDempiere HTML UI")); @@ -185,13 +180,8 @@ public class WebDoc // Logo m_topRight = new td().setAlign("right"); - if (javaClient) { - m_topRight.addElement(new img("res:org/compiere/images/iD10030.png") + m_topRight.addElement(new img("/webui/images/header-logo.png") .setAlign(AlignType.RIGHT).setAlt("iDempiere")); - } else { - m_topRight.addElement(new img("/webui/images/header-logo.png") - .setAlign(AlignType.RIGHT).setAlt("iDempiere")); - } m_topRow.addElement(m_topRight); m_table.addElement(m_topRow); // diff --git a/org.adempiere.server/resources/css/idempiereMonitor.css b/org.adempiere.server/resources/css/idempiereMonitor.css new file mode 100644 index 0000000000..6fea17dde7 --- /dev/null +++ b/org.adempiere.server/resources/css/idempiereMonitor.css @@ -0,0 +1,46 @@ +/* Adempiere Root (c) Jorg Janke */ +/* $Id: standard.css,v 1.1 2006/04/21 18:04:14 jjanke Exp $ */ +body{ + background-color: #FFFFFF; + color: #000000; + font-size: 0.8em; + font-family: Verdana, Arial, sans-serif; + line-height: 1.3em; +} + +a{ + color: #3465a4; + text-decoration: none; +} + +a:hover{ + color: #24272c; +} + +h1{ + color: #FF0000; + font-size: x-large; + margin-bottom: 10px; + margin-top: 0; +} + +hr{ + color: #000099; + padding-bottom: 0; + padding-top: 0; +} + +table { + font-size: 1em; + column-span: none; + border-collapse: collapse; +} + +p{ + text-align: justify; +} + +th{ + background-color: #E6E6FA; + text-align: left; +} \ No newline at end of file diff --git a/org.adempiere.server/standard.css b/org.adempiere.server/standard.css deleted file mode 100644 index abf0eea4da..0000000000 --- a/org.adempiere.server/standard.css +++ /dev/null @@ -1,151 +0,0 @@ -/* Adempiere Root (c) Jorg Janke */ -/* $Id: standard.css,v 1.1 2006/04/21 18:04:14 jjanke Exp $ */ -body{ - background-color: #FFFFFF; - color: #000000; - font-size: 76%; - font-family: Verdana, Arial, sans-serif; - line-height: 1.3em; -} - -a{ - color: #3465a4; - text-decoration: none; -} - -a:hover{ - text-decoration: none; -} - -h1{ - color: #FF0000; - font-size: x-large; - margin-bottom: 10px; - margin-top: 0; -} - -h2{ - color: #000066; - font-size: large; -} - -h3{ - color: #0000CC; - font-size: medium; - font-style: normal; - font-weight: bold; -} - -h4{ - color: #6600CC; - font-size: medium; - font-style: italic; -} - -h5{ - color: #660099; - font-size: medium; - font-weight: normal; -} - -h6{ - font-size: larger; - font-weight: bold; -} - -hr{ - color: #000099; - padding-bottom: 0; - padding-top: 0; -} - -p{ - text-align: justify; -} - -th{ - background-color: #E6E6FA; - text-align: left; -} - -caption{ - color: #660099; - text-align: left; - font-style: italic; - font-weight: bolder; -} - - -.menuDetail{ - color: #660099; - font-family: Arial,Helvetica,sans-serif; - font-size: 12px; - padding-bottom: 0; - padding-left: 20px; - padding-top: 0; - text-decoration: none; -} - -.menuDetail:hover{ - color: #660099; - font-family: Arial,Helvetica,sans-serif; - font-size: 12px; - padding-bottom: 0; - padding-left: 20px; - padding-top: 0; - text-decoration: none; - background-color: #99FFFF; -} - -.menuMain{ - color: #000066; - font-family: Arial,Helvetica,sans-serif; - font-size: 16px; - text-align: left; - text-decoration: none; -} - -.menuMain:hover{ - color: #000066; - font-family: Arial,Helvetica,sans-serif; - font-size: 16px; - text-align: left; - text-decoration: none; - background-color: #99FFFF; -} - -.menuSub{ - color: #000066; - font-family: Arial,Helvetica,sans-serif; - font-size: 14px; - padding-left: 10px; - text-align: left; - text-decoration: none; -} - -.menuSub:hover{ - color: #000066; - font-family: Arial,Helvetica,sans-serif; - font-size: 14px; - padding-left: 10px; - text-align: left; - text-decoration: none; - background-color: #99FFFF; -} - -.Cerror{ -background:#FF4A4A; -} -.Cmandatory{ -background:#9DFFFF; -} -.Cbasket{ - font-size: 9px; - display: inline; -} -#imgButton{ -border-style:outset; -} -#imgButtonPressed{ -border-style:inset; -}