svn commit: r997634 - in /karaf/trunk: assembly/src/main/filtered-resources/features.xml webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css

[gnodet]

Author: gnodet
Date: Thu Sep 16 07:58:19 2010
New Revision: 997634

URL: http://svn.apache.org/viewvc?rev=997634&view=rev
Log:
Restore the name of the webconsole feature, fix css for the translation flags

Modified:
    karaf/trunk/assembly/src/main/filtered-resources/features.xml
    
karaf/trunk/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css

Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: 
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=997634&r1=997633&r2=997634&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Thu Sep 16 
07:58:19 2010
@@ -66,7 +66,7 @@
         <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
         
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
     </feature>
-        <feature name="webconsole-base" version="${project.version}">
+    <feature name="webconsole-base" version="${project.version}">
         <feature version="${project.version}">http</feature>
         <config name="org.apache.karaf.webconsole">
             realm=karaf
@@ -74,12 +74,12 @@
         
<bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
         
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
         
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
-        
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
-        
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
     </feature>
-    <feature name="webconsole-admin" version="${project.version}">
+    <feature name="webconsole" version="${project.version}">
         <feature version="${project.version}">webconsole-base</feature>
         
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
+        
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
+        
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
     </feature>
     <feature name="ssh" version="${project.version}">
         <config name="org.apache.karaf.shell">

Modified: 
karaf/trunk/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
URL: 
http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css?rev=997634&r1=997633&r2=997634&view=diff
==============================================================================
--- 
karaf/trunk/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css 
(original)
+++ 
karaf/trunk/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css 
Thu Sep 16 07:58:19 2010
@@ -48,6 +48,9 @@
        float: right;
        height: 73px; /* must be the same as #lead height */
 }
+#lead p img { /* This is the logo */
+       height: 63px; /* must be #lead.height - #lead.padding-top */
+}
 
 
 /* TOP NAVIGATION */
@@ -64,9 +67,8 @@
 }
 
 /* CENTRAL CONTENT AREA STYLING */
-#content {
-       font-size: 8pt;
-}
+#content, .ui-widget, .ui-widget input, .ui-widget select, .ui-widget 
textarea, .ui-widget button { font-size: 8pt }
+
 
 /* used in some plugins - showing ID (long) element in tables */
 .col_Id {
@@ -168,3 +170,6 @@ ul.icons li {
        float: left;
        list-style: none
 }
+/* language selection element */
+#langSelect { position: absolute;      top: 5px; right: 5px }
+#langSelect img   { display: block; padding: 2px 0 }