FELIX-2315: Upgrade to felix web console 3.0.0
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@939721 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 09d3404..19ec53f 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -83,7 +83,7 @@
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.1.0-SNAPSHOT</felix.plugin.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
- <felix.webconsole.version>2.0.6</felix.webconsole.version>
+ <felix.webconsole.version>3.0.0</felix.webconsole.version>
<felix.metatype.version>1.0.2</felix.metatype.version>
<aries.blueprint.version>0.1-incubating-SNAPSHOT</aries.blueprint.version>
<aries.jmx.version>0.1-incubating-SNAPSHOT</aries.jmx.version>
diff --git a/karaf/webconsole/branding/pom.xml b/karaf/webconsole/branding/pom.xml
index 9a791df..1089b6d 100644
--- a/karaf/webconsole/branding/pom.xml
+++ b/karaf/webconsole/branding/pom.xml
@@ -46,12 +46,13 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+<version>2.1.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-DocURL>http://felix.apache.org/site/apache-felix-karaf.html</Bundle-DocURL>
- <Fragment-Host>org.apache.felix.webconsole</Fragment-Host>
+ <Fragment-Host>org.apache.felix.webconsole;bundle-version="[3,4)"</Fragment-Host>
<Export-Package>!*</Export-Package>
</instructions>
</configuration>
diff --git a/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css b/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
index b815bd0..ea9b12f 100644
--- a/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
+++ b/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
@@ -26,114 +26,145 @@
*
* See also http://felix.apache.org/site/branding-the-web-console.html
*/
-
#main {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: black;
- background-color: white;
- border-collapse: collapse;
- padding: 0px;
- margin: 30px;
- position: absolute;
- text-align: left;
- border-color: black;
+ width: 90% !important;
+ margin-left: 5%;
}
+#main img { border: none }
+
+/* LOGO & BRANDING */
#lead {
- color: #00678C;
- /* color: #ffffff; */
- margin: 0px 0px 26px 0px;
- padding: 0px;
- height: 100px;
+ padding-top: 10px;
+ margin: 0;
+ height: 73px; /* must be the same as logo (#lead p) height */
+}
+#lead h1 { /* This contains the page title */
+ font-size: 26px;
+ font-weight: bold;
+ float: left;
+}
+#lead p { /* This contains the logo */
+ float: right;
+ height: 73px; /* must be the same as #lead height */
}
-/* This contains the page title */
-#lead h1 {
- margin: 0px;
- padding: 5px 0 0 8px;
- font-size: 300%;
- font-weight: bold;
- line-height: 120%;
- /* account for 5px top padding to get a total of 100px */
- height: 95px;
- float: left;
-}
-#lead br {
- line-height: 20px;
-}
-
-/* This contains the logo */
-#lead p {
- margin: 0px;
- padding: 0px;
- height: 100px;
- position:absolute;
- right: 0px;
-}
-
-/* This contains the top navigation */
+/* TOP NAVIGATION */
#technav {
- border-bottom: 1px solid #6181A9;
- border-top: 1px solid #6181A9;
- color: black;
- font-size: 10px;
- font-weight: bold;
- line-height: 21px;
- padding: 0;
- margin: 0;
+ font-size: 10px;
+ line-height: 21px;
+ padding: 0;
+ margin: 0;
}
-
-#technav a {
- text-decoration: none;
- padding: 3px 10px 3px 10px;
- color: #6181A9;
- text-decoration: none;
+#technav div {
+ display: inline;
+ padding: .2em 1em;
+ white-space: nowrap;
}
-#technav a:hover {
- background-color: black;
-}
-
-/* Special rendering of the "button" for the current page */
-#technav .technavat {
- text-decoration: none;
- padding: 3px 10px 3px 10px;
- background-color: #B6CAE4;
- color: black;
-}
-
-#technav .technavitem {
- display: inline;
- white-space: nowrap;
-}
-
-
/* CENTRAL CONTENT AREA STYLING */
#content {
- position: relative;
+ font-size: 8pt;
}
-#content A:link {
- color: #336600;
- text-decoration: underline;
+/* used in some plugins - showing ID (long) element in tables */
+.col_Id {
+ width: 5em;
}
-#content A:visited {
- color: #666666;
- text-decoration: underline;
+/* styling button groups like in the bundles & log plugins */
+.buttonGroup {
+ text-align: right;
+ padding: .5em 1em .5em 0;
+ vertical-align: middle;
+}
+.buttonGroup select {
+ display: inline;
+ float: none;
+ margin: 0;
}
-#content A:hover {
- color: #ffffff;
- background-color: #336600;
- text-decoration: none;
+/* The following styles are not complete. They usually apply only padding,
+ * margin... mostly *WHERE* the elements are visualised. Visual styling like
+ * colors and fonts are applied automatically by a JavaScript that borrows
+ * the visual element styles from the JQuery UI theme
+ */
+
+/* input box, checkbox & buttons styling */
+.inputText, input.text, input.password, input.file, textarea, select {
+ color: #184054;
+ background-color: #f0f0f0;
+}
+.inputText, input.text, input.password, textarea {
+ border: 1px solid #999999;
+ border-bottom: 1px solid #cccccc;
+ border-right: 1px solid #cccccc;
}
-#content A:active {
- color: #ffffff;
- background-color: #000000;
- text-decoration: none;
+/* tables styling - must be in synch with tablesorter CSS */
+td, th { vertical-align: top }
+table.nicetable {
+ width: 100%;
+ text-align: left;
+}
+table.nicetable th, table.nicetable td {
+ border-bottom: 1px solid #cccccc;
+ text-align: left;
+ padding: .2em;
+ padding-left: .8em;
}
+/* tablesorter styling */
+tr .header {
+ background-image: url(../lib/bg.gif);
+ background-repeat: no-repeat;
+ background-position: center right;
+ cursor: pointer;
+}
+tr .headerSortUp {
+ background-image: url(../lib/asc.gif);
+}
+tr .headerSortDown {
+ background-image: url(../lib/desc.gif);
+}
+
+/* status line */
+.statline {
+ margin-top: .5em !important;
+ margin-bottom: .5em !important;
+ padding: .2em;
+}
+
+/* zebra tables */
+.even {
+ /* default background unmodified from JQuery UI Theme */
+}
+
+.odd {
+ /* overwrite background from JQuery UI Theme */
+ background: none !important;
+}
+
+/*
+ * Common UI style to define button icons like in bundles plugin. The HTML markup is:
+ * <ul class="icons ui-widget">
+ * <li class="dynhover" title="tooltip comes here"><span class="ui-icon ui-icon-refresh"> </span></li>
+ * </ul>
+ */
+ul.icons {
+ margin: 0;
+ padding: 0
+}
+ul.icons span.ui-icon {
+ float: left;
+ margin: 0 1px
+}
+ul.icons li {
+ margin: 1px;
+ position: relative;
+ padding: 1px 0;
+ cursor: pointer;
+ float: left;
+ list-style: none
+}
diff --git a/karaf/webconsole/gogo/src/main/resources/res/ui/gogo.css b/karaf/webconsole/gogo/src/main/resources/res/ui/gogo.css
index 0e806a1..b15ece8 100644
--- a/karaf/webconsole/gogo/src/main/resources/res/ui/gogo.css
+++ b/karaf/webconsole/gogo/src/main/resources/res/ui/gogo.css
@@ -20,10 +20,6 @@
* Public Domain License
*/
-body {
- background-color: #888;
-}
-
div#console {
font-size: 12px;
margin: 12px;