Merge branch 'master' into altlinux-office-server

Makefile.in

@@ -5,12 +5,12 @@ VERSION=@VERSION@
 
 all:
 # background
-	convert images/background.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@"' background.png
-	cp -al background.png graphics/backgrounds/default.png
-	cp -al background.png graphics/backgrounds/xdm.png
-	convert background.png kde3-styles-splash/Background.jpg
-	cp -al background.png kde3-styles-splash/Background.png
-	convert -resize '400x320!' images/background.png kde3-styles-splash/Preview.png
+	convert images/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@"' wallpaper.png
+	cp -al wallpaper.png graphics/backgrounds/default.png
+	cp -al wallpaper.png graphics/backgrounds/xdm.png
+	convert wallpaper.png kde3-styles-splash/Background.jpg
+	cp -al wallpaper.png kde3-styles-splash/Background.png
+	convert -resize '400x320!' images/wallpaper.png kde3-styles-splash/Preview.png
 #color scheme
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
 

components.mk

@@ -24,7 +24,7 @@ boot:
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
 	for size in 1024x768 800x600 640x480; do \
-		convert images/boot.jpg -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' boot-$$size.jpg ;\
+		convert images/boot.jpg -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\
 		cp -al boot-$$size.jpg components/bootsplash/images/silent-$$size.jpg ;\
 		convert -resize "$$size!" images/console.jpg components/bootsplash/images/bootsplash-$$size.jpg;\
 	done

components/ahttpd/styles/alterator.css.in

@@ -95,9 +95,11 @@ textarea, select, input.text {
 	height: 20px;
 }
 
+/* messages */
+
 .alterator-information-message {
     font-style:italic;
-    font-size:small;
+    font-size: 9pt;
     padding-top:3px;
     padding-bottom:3px;
 }
@@ -106,6 +108,27 @@ textarea, select, input.text {
     vertical-align:middle;
 }
 
+.alterator-attention-message {
+    color: darkred;
+    border-color: darkred;
+    border-width: 5px;
+    border-style: double;
+    padding: 4px;
+    margin: 4px;
+
+    min-width:10px;
+    float:left;
+
+    -moz-border-radius: 7px;
+    -webkit-border-radius: 7px;
+    -khtml-border-radius: 7px;
+    border-radius: 7px;
+}
+
+.alterator-attention-message img {
+    vertical-align:middle;
+}
+
 /* calendar and dateedit */
 
 .year {