Merge branch 'master' into office-server

branding.spec

@@ -229,7 +229,8 @@ install -m 644 etcskel/.wm-select %buildroot/etc/skel/
 install -m 644 etcskel/.Xdefaults %buildroot/etc/skel/
 
 mkdir -p  %buildroot/usr/share/xfce4/backdrops
-install -m 644 backgrounds/* %buildroot/usr/share/xfce4/backdrops
+install -m 644 ../graphics/backgrounds/default.png %buildroot/usr/share/xfce4/backdrops
+install -m 644 ../graphics/backgrounds/xdm.png %buildroot/usr/share/xfce4/backdrops
 mkdir -p  '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0'
 install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/'
 install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/'

components/ahttpd/styles/alterator.css.in

@@ -183,82 +183,6 @@ textarea, select, input.text {
 	height: 16px;
 }
 
-.top-button-menu {
-/*        background: url(/design/images/gradient-top.png) 0% 0% repeat-x;*/
-	background: #@DARK_COLOR_HEX@;
-        padding-right: 10px;
-        padding-top: 22px;
-}
-
-/* control center page */
-
-#logo-td {
-	border-left: none;
-	padding-left: 10px;
-	padding-right: 10px;
-	text-align:left;
-	padding-top: 10px;
-/*	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;*/
-	background: #@DARK_COLOR_HEX@;
-	width: 275px;
-/*	-moz-border-radius-topleft: 1em;
-	-webkit-border-radius-topleft: 1em;
-	-khtml-border-radius-topleft: 1em;
-	border-radius-topleft: 1em;
-	-moz-border-radius-bottomleft: 1em;
-	-webkit-border-radius-bottomleft: 1em;
-	-khtml-border-radius-bottomleft: 1em;
-	border-radius-bottomleft: 1em;*/
-}
-
-#logo-td img {
-	background: url(/design/images/logo.png) no-repeat;
-	width: 415px; /*325*/
-	height: 60px;
-}
-
-#help-td {
-	/*border-left: none;*/
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 10px;
-	width: 20px;
-	text-align:left;
-	color: #@LIGHT_LABELS_HEX@;
-	background: #@DARK_COLOR_HEX@;
-/*	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;*/
-}
-
-#locale-td {
-	padding-left: 10px;
-	padding-top: 10px;
-	color: #@LIGHT_LABELS_HEX@;
-	padding-right: 10px;
-	text-align:center;
-	width: 100px;
-	background: #@DARK_COLOR_HEX@;
-/*	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
-	-moz-border-radius-topright: 1em;
-        -webkit-border-radius-topright: 1em;
-        -khtml-border-radius-topright: 1em;
-        border-radius-topright: 1em;*/
-}
-
-#hostinfo-td {
-/*	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;*/
-	background: #@DARK_COLOR_HEX@;
-
-	padding-left: 10px;
-	padding-right: 10px;
-	padding-top: 27px;
-	text-align: left;
-
-	color: #@LIGHT_LABELS_HEX@; /*#0574B2;*/
-	font-weight: bold;
-	text-decoration: none;
-	font-size:large;
-}
-
 /* main menu */
 
 #menu-td {
@@ -464,10 +388,6 @@ table.alterator-listbox thead tr .headerSortDown, table.alterator-listbox thead
 
 /* deprecated */
 
-.expanded {
-    width: 100%;
-}
-
 .error-message {
 	background-color: #FFCACA;
 	border: 1px solid #FF6060;