Merge branch 'default' into default-server

Makefile.in

@@ -15,11 +15,11 @@ all:
 	convert graphics/backgrounds/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' prototype.png
 	cp -al prototype.png graphics/backgrounds/default.png
 	cp -al background.png graphics/backgrounds/xdm.png
-	convert -resize '800x600!' alterator/images/background.png alterator/design/bg.png
+	convert alterator/images/background.png -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@" alterator/design/bg.png
 # console background
 	cp -al images/console.jpg bootsplash/images/bootsplash-800x600.jpg
 	convert -resize '640x480!' bootsplash/images/bootsplash-800x600.jpg bootsplash/images/bootsplash-640x480.jpg
 # logo for web alterator
-	cp images/logo.png alterator/images/
+	convert images/logo.png -fill '#@LIGHT_LASELS_HEX@' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 36 -gravity northwest -draw 'text 0,0 "@VERSION@ @NAME@"' alterator/images/logo.png
 #color scheme
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"

alterator/styles/alterator.css.in

@@ -1,6 +1,6 @@
 body {
 	background-color: #@MIDDLE_COLOR_HEX@;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
-	color: #@DARK_COLOR_HEX@;
+	color: #@MIDDLE_LABELS_HEX@;
 	margin: 0px;
 	padding: 10px;
 	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
@@ -8,13 +8,13 @@ body {
 }
 
 a {
-	color: #@DARK_COLOR_HEX@;
+	color: #@MIDDLE_LABELS_HEX@;
 	font-weight: bold;
 }
 
 table {
 	font-size: 9pt;
-	border-color: #@DARK_COLOR_HEX@;
+	border-color: #@MIDDLE_LABELS_HEX@;
 	border-collapse: collapse;
 }
 
@@ -37,7 +37,7 @@ h1 {
 }
 
 textarea, select, input.text {
-	border: 1px solid #@DARK_COLOR_HEX@;
+	border: 1px solid #@MIDDLE_LABELS_HEX@;
 	font-size: 8pt;
 	margin: 1px 3px 1px 0px;
 	padding: 1px 3px;
@@ -46,7 +46,7 @@ textarea, select, input.text {
 .btn {
 	background-color: #@MIDDLE_COLOR_HEX@;
 	color: #@DARK_COLOR_HEX@;
-	border: 1px solid #@DARK_COLOR_HEX@;
+	border: 1px solid #@MIDDLE_LABELS_HEX@;
 	cursor: pointer;
 	font-size: 9pt;
 	padding: 0px 3px;
@@ -66,7 +66,7 @@ textarea, select, input.text {
 
 .info-name {
 	font-size: 18pt;
-	border-bottom: 2px solid #@DARK_COLOR_HEX@;
+	border-bottom: 2px solid #@MIDDLE_LABELS_HEX@;
 }
 
 .info-description {
@@ -89,11 +89,11 @@ textarea, select, input.text {
 }
 
 .disabled {
-	color: #@DARK_COLOR_HEX@;
+	color: #@MIDDLE_LABELS_HEX@;
 }
 
 .alterator-progress {
-	border: 1px solid #@DARK_COLOR_HEX@;
+	border: 1px solid #@MIDDLE_LABELS_HEX@;
 	height: 20px;
 	width: 200px;
 	padding: 2px;
@@ -101,7 +101,7 @@ textarea, select, input.text {
 }
 
 .alterator-progress div {
-	background-color: #@DARK_COLOR_HEX@;
+	background-color: #@MIDDLE_LABELS_HEX@;
 	height: 20px;
 }
 

alterator/styles/menu.css.in

@@ -1,5 +1,11 @@
 /* c0dbdb */
 
+.top-button-menu {
+        background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+        padding-right: 10px;
+        padding-top: 10px;
+}
+
 #logo-td {
 	border-left: none;
 	padding-left: 10px;
@@ -46,7 +52,7 @@
 /*	border-left: none; */
 	padding-left: 10px;
 	padding-top: 10px;
-	color: #@LIGHT_LABELS_TEXT@;
+	color: #@LIGHT_LABELS_HEX@;
 	padding-right: 10px;
 	text-align:center;
 	width: 100px;
@@ -171,7 +177,7 @@
 #help-popup {
 	padding-left: 10px;
 	width: 95%;
-	background-color: #@MIDDLE_COLOR_HEX@;
+	background-color: #@LIGHT_COLOR_HEX@;
 /*	padding-right: 5px;
 	padding-top: 10px;*/
 }

configure.ac

@@ -9,6 +9,7 @@ MIDDLE_COLOR_HEX=C8C9CB
 DARK_COLOR_HEX=909195
 LIGHT_LABELS_HEX=FFFFFF
 DARK_LABELS_HEX=000000
+MIDDLE_LABELS_HEX=4d4d4f
 LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
 MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
 DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`