You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/01/19 16:29:45 UTC
svn commit: r613403 - in /incubator/sling/trunk/osgi/console-web/src/main:
java/org/apache/sling/osgi/console/web/internal/ resources/res/imgs/
resources/res/ui/
Author: fmeschbe
Date: Sat Jan 19 07:29:44 2008
New Revision: 613403
URL: http://svn.apache.org/viewvc?rev=613403&view=rev
Log:
SLING-174 Replace old log with new one:
- New logo
- Adapt CSS: different size and adapt color and size of title
- Replace favicon
Added:
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/Sling.png (with props)
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/favicon.ico (with props)
Removed:
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo.png
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo.svg
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo_16.png
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo_32.png
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo_big.png
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo_powered.png
incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/logo_powered.svg
Modified:
incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java
incubator/sling/trunk/osgi/console-web/src/main/resources/res/ui/admin.css
Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java?rev=613403&r1=613402&r2=613403&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/Util.java Sat Jan 19 07:29:44 2008
@@ -60,7 +60,7 @@
+ "<html>"
+ "<head>"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; utf-8\">"
- + "<link rel=\"icon\" href=\"res/imgs/logo_16.png\">"
+ + "<link rel=\"icon\" href=\"res/imgs/favicon.ico\">"
+ "<title>{0} - {12}</title>"
+ "<script src=\"res/ui/admin.js\" language=\"JavaScript\"></script>"
+ "<script language=\"JavaScript\">"
@@ -81,7 +81,7 @@
+ "{0}<br>{12}"
+ "</h1>"
+ "<p>"
- + "<a target=\"_blank\" href=\"{13}\" title=\"{11}\"><img src=\"res/imgs/logo.png\" width=\"200\" height=\"100\" border=\"0\"></a>"
+ + "<a target=\"_blank\" href=\"{13}\" title=\"{11}\"><img src=\"res/imgs/Sling.png\" width=\"175\" height=\"100\" border=\"0\"></a>"
+ "</p>" + "</div>";
/** The name of the request attribute containig the map of FileItems from the POST request */
@@ -94,7 +94,7 @@
String adminTitle = "Sling Management Console"; // ServletEngine.VERSION.getFullProductName();
String productName = "Sling"; // ServletEngine.VERSION.getShortProductName();
- String productWeb = "http://wiki.apache.org/jackrabbit/ApacheSling";
+ String productWeb = "http://incubator.apache.org/sling";
String vendorName = "http://www.apache.org"; // ServletEngine.VERSION.getVendorWeb();
String vendorWeb = "http://www.apache.org"; // ServletEngine.VERSION.getVendorWeb();
Added: incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/Sling.png
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/Sling.png?rev=613403&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/Sling.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/favicon.ico
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/favicon.ico?rev=613403&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/sling/trunk/osgi/console-web/src/main/resources/res/imgs/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/sling/trunk/osgi/console-web/src/main/resources/res/ui/admin.css
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/resources/res/ui/admin.css?rev=613403&r1=613402&r2=613403&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/console-web/src/main/resources/res/ui/admin.css (original)
+++ incubator/sling/trunk/osgi/console-web/src/main/resources/res/ui/admin.css Sat Jan 19 07:29:44 2008
@@ -28,8 +28,8 @@
border-color: black;
}
-#lead { /* background-*/
- color: #B6CAE4;
+#lead {
+ color: #00678C;
/* color: #ffffff; */
margin: 0px 0px 26px 0px;
padding: 0px;
@@ -43,9 +43,9 @@
*/
margin: 0px;
padding: 5px 0 0 8px;
- font-size: 26px;
- font-weight: normal;
- line-height: 32px;
+ font-size: 400%;
+ font-weight: bold;
+ line-height: 120%;
height: 95px;
/* account for 5px top marging to get a total of 100px */
float: left;