felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r813064 - in /felix/trunk/karaf: assembly/src/main/filtered-resources/ webconsole/branding/src/main/resources/META-INF/ webconsole/branding/src/main/resources/res/karaf/ui/
Date Wed, 09 Sep 2009 18:10:35 GMT
Author: gnodet
Date: Wed Sep  9 18:10:35 2009
New Revision: 813064

URL: http://svn.apache.org/viewvc?rev=813064&view=rev
Log:
[karaf] include the webconsole branding

Added:
    felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
Removed:
    felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/admin.css
Modified:
    felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
    felix/trunk/karaf/webconsole/branding/src/main/resources/META-INF/webconsole.properties

Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml?rev=813064&r1=813063&r2=813064&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/features.xml Wed Sep  9 18:10:35
2009
@@ -56,10 +56,8 @@
           password=karaf
         </config>
         <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
-        <!-- TODO: uncomment when FELIX-1133 is resolved
         <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.branding/${version}</bundle>
-        -->
+        <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
         <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.admin/${version}</bundle>
         <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.features/${version}</bundle>
         <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.gogo/${version}</bundle>

Modified: felix/trunk/karaf/webconsole/branding/src/main/resources/META-INF/webconsole.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/src/main/resources/META-INF/webconsole.properties?rev=813064&r1=813063&r2=813064&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/branding/src/main/resources/META-INF/webconsole.properties
(original)
+++ felix/trunk/karaf/webconsole/branding/src/main/resources/META-INF/webconsole.properties
Wed Sep  9 18:10:35 2009
@@ -19,7 +19,7 @@
 
 
 #
-# This file contains branding properties to overwrite the defualt
+# This file contains branding properties to overwrite the default
 # branding of the Apache Felix Web Console when deployed in an
 # Apache Felix Karaf application.
 
@@ -32,4 +32,4 @@
 webconsole.vendor.image = /res/karaf/imgs/logo.png
 
 webconsole.favicon = /res/karaf/imgs/favicon.ico
-webconsole.stylesheet = /res/karaf/ui/admin.css
+webconsole.stylesheet = /res/karaf/ui/webconsole.css

Added: felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css?rev=813064&view=auto
==============================================================================
--- felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css (added)
+++ felix/trunk/karaf/webconsole/branding/src/main/resources/res/karaf/ui/webconsole.css Wed
Sep  9 18:10:35 2009
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * The webconsole.css is the main CSS which sets up the following parts
+ *
+ *   div main -> outermost div just inside body
+ *   div lead -> the page lead with title and logo
+ *   div technav -> the top navigation
+ *   div content -> the div surrounding the content being rendered by
+ *      the plugin in the renderContent (or service) method
+ *
+ * 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;
+}
+
+#lead {
+    color: #00678C;
+    /* color: #ffffff; */
+    margin: 0px 0px 26px 0px;
+    padding: 0px;
+    height: 100px;
+}
+
+/* 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 */
+#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;
+}
+
+#technav a {
+    text-decoration: none;
+    padding: 3px 10px 3px 10px;
+    color: #6181A9;
+    text-decoration: none;
+}
+
+#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;
+}
+
+#content A:link {
+    color: #336600;
+    text-decoration: underline;
+}
+
+#content A:visited {
+    color: #666666;
+    text-decoration: underline;
+}
+
+#content A:hover {
+    color: #ffffff;
+    background-color: #336600;
+    text-decoration: none;
+}
+
+#content A:active {
+    color: #ffffff;
+    background-color: #000000;
+    text-decoration: none;
+}
+



Mime
View raw message