Merge branch 'alt-desktop' into altlinux-office-server

alterator/styles/alterator.css

+body {
+	background-color: #cdcdcd;/*#92b2b8;/*#67999a;/*#c0dbdb;*/
+	color: #178093;
+	margin: 0px;
+	padding: 10px;
+	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 9pt;
+}
+
+a {
+	color: #178093;
+	font-weight: bold;
+}
+
+table {
+	font-size: 9pt;
+	border-color: #178093;
+	border-collapse: collapse;
+}
+
+th {
+	padding: 0px 7px 3px 0px;
+}
+
+tr {
+	vertical-align: top;
+}
+
+hr {
+	border: none;
+	border-top: 1px solid #5ac;
+}
+
+h1 {
+	text-align: center;
+	margin: 0px;
+}
+
+textarea, select, input.text {
+	border: 1px solid #178093;
+	font-size: 8pt;
+	margin: 1px 3px 1px 0px;
+	padding: 1px 3px;
+}
+
+.btn {
+	background-color: #cdcdcd;
+	color: #178093;
+	border: 1px solid #178093;
+	cursor: pointer;
+	font-size: 9pt;
+	padding: 0px 3px;
+}
+
+.btn:hover {
+	background-color: #94c4cd;
+}
+
+.error-message {
+	background-color: #FFCACA;
+	border: 1px solid #FF6060;
+	padding-left:10px;
+	padding-right:10px;
+	margin-bottom:10px;
+}
+
+.info-name {
+	font-size: 18pt;
+	border-bottom: 2px solid #178093;
+}
+
+.info-description {
+	font-size: 12pt;
+	font-weight: bold;
+	padding-top: 10px;
+}
+
+
+.frame-table {
+	border-style:solid;
+	border-width:1px;
+	margin: 3px;
+}
+
+.frame-table td, .frame-table th {
+	border-style:solid;
+	border-width:1px;
+	padding: 1px 1px 3px 3px;
+}
+
+.disabled {
+	color: #6e6e6e;
+}
+
+.alterator-progress {
+	border: 1px solid #178093;
+	height: 20px;
+	width: 200px;
+	padding: 2px;
+	background-color: #FFFFFF;
+}
+
+.alterator-progress div {
+	background-color: #178093;
+	height: 20px;
+}
+
+.year {
+	font-weight: bold;
+	background-color: #baeaea;
+}
+
+.week {
+	border-style:solid;
+	border-width:1px;
+	background-color: white;
+}
+
+.today {
+	border-style:solid;
+	border-width:1px;
+	background-color: pink;
+	cursor: pointer;
+}
+
+.day {
+	border-style:solid;
+	border-width:1px;
+	background-color: #baeaea;
+	cursor: pointer;
+}
+
+.day:hover {
+	background-color: #178093;
+}
+
+.alterator-dateedit-calendar table {
+	width: 100%;
+	text-align: center;
+	background-color: #baeaea;
+	border-style: solid;
+	border-width: 1px;
+}
+
+.alterator-dateedit-calendar td {
+	padding: 3px;
+}
+
+.alterator-dateedit-button {
+	vertical-align:middle;
+	cursor:pointer;
+	background: url(/design/images/dateedit.png) no-repeat;
+	width: 15px;
+	height: 16px;
+}
+
+table.alterator-listbox {
+	border: solid 1px;
+}
+
+table.alterator-listbox th {
+	background-color:  #cdcdcd;
+	font-weight: bold;
+	border: solid 1px;
+	padding: 3px;
+}
+
+table.alterator-listbox td {
+	background: #ffffff;
+	border-left: solid 1px;
+	border-right: solid 1px;
+	padding: 3px;
+}

alterator/styles/card-index.css

+.selector-actions {
+	position: absolute;
+	right: 30px;
+}
+
+.selector-chooser {
+	width: 100%;
+}

alterator/styles/menu.css

+/* c0dbdb */
+
+#logo-td {
+	border-left: none;
+	padding-left: 10px;
+	padding-right: 10px;
+	text-align:left;
+/*	background: #fff;*/
+	padding-top: 10px;
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+	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: 275px; /*325*/
+	height: 30px;
+}
+
+#help-td {
+	/*border-left: none;*/
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 10px;
+	width: 20px;
+	text-align:left;
+	color: #fff;
+/*        border-bottom: 1px solid #056560;;*/
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	-moz-border-radius-topleft: 1em;
+	-moz-border-radius-topright: 1em;
+        -webkit-border-radius-topleft: 1em;
+        -khtml-border-radius-topleft: 1em;
+        border-radius-topleft: 1em; */
+}
+
+#locale-td {
+/*	border-left: none; */
+	padding-left: 10px;
+	padding-top: 10px;
+	color: #fff;
+	padding-right: 10px;
+	text-align:center;
+	width: 100px;
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	border-left: 1px solid #056560;;
+	border-right: 1px solid #056560;;
+	border-bottom: 1px solid #056560;; */
+	-moz-border-radius-topright: 1em;
+        -webkit-border-radius-topright: 1em;
+        -khtml-border-radius-topright: 1em;
+        border-radius-topright: 1em;
+}
+
+#hostinfo-td {
+/*	border-left:  1px solid #056560;;
+	border-top:  1px solid #056560;;
+	border-right:  1px solid #056560;; */
+	background: url(/design/images/gradient-top.png) 0% 0% repeat-x;
+/*	-moz-border-radius-topleft: 1em;
+        -webkit-border-radius-topleft: 1em;
+        -khtml-border-radius-topleft: 1em;
+        border-radius-topleft: 1em;
+	*/
+	
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 10px;
+	text-align: left;
+
+	color: #fff; /*#0574B2;*/
+	font-weight: bold;
+	text-decoration: none;
+	font-size:large;
+}
+
+.expanded {
+/*	padding-left: 40px;*/
+    width: 100%;
+}
+
+
+
+/* main menu */
+
+#menu-td {
+	padding-right: 12px;
+}
+
+#main {
+	padding: 10px 20px;
+}
+
+
+#main-td {
+/*	padding: 10px 20px;*/
+/*	background-color: #baeaea;*/
+	background-color: #fff;
+	width: 100%;
+	/*border: 1px solid #056560;;*/
+	-moz-border-radius-bottomright: 1em;
+        -webkit-border-radius-bottomright: 1em;
+        -khtml-border-radius-bottomright: 1em;
+        border-radius-bottomright: 1em;
+	-moz-border-radius-bottomleft: 1em;
+        -webkit-border-radius-bottomleft: 1em;
+        -khtml-border-radius-bottomleft: 1em;
+        border-radius-bottomleft: 1em;
+}
+
+.menu-item-normal a {
+	font-weight: normal;
+	padding-left: 5px;
+	padding-right: 5px;
+	text-decoration: none;
+}
+
+.menu-item-selected a {
+	font-weight: bold;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+.menu-group-name  {
+	padding-left: 5px;
+	padding-right: 5px;
+	color: #fff;
+	text-decoration: none;
+	/*background-color:#baeaea;*/
+	padding-top: 3px;
+	background: url(/design/images/gradient.png) 0% 0% repeat-x;
+	font-weight: bold;
+	-moz-border-radius-topright: 1em;
+	-webkit-border-radius-topright: 1em;
+	-khtml-border-radius-topright: 1em;
+	border-radius-topright: 1em;
+	-moz-border-radius-topleft: 1em;
+	-webkit-border-radius-topleft: 1em;
+	-khtml-border-radius-topleft: 1em;
+	border-radius-topleft: 1em;
+}
+
+.menu-group {
+	padding-bottom: 5px;
+	/*width:250px;*/
+/*	padding-right: 5px;*/
+	padding-top: 5px;
+	border-collapse: collapse;
+	background: url(/design/images/gradient-menu.png) 0% 0% repeat-x;
+/*	border-bottom: 1px solid #056560;;
+	border-left: 1px solid #056560;;
+	border-right: 1px solid #056560;; */
+	-moz-border-radius-bottomright: 1em;     /* mozilla 1.5 */
+	-webkit-border-radius-bottomright: 1em;  /* safari 3 */
+	-khtml-border-radius-bottomright: 1em;   /* Konqueror */
+	border-radius-bottomright: 1em;          /* CSS3 */
+	-moz-border-radius-bottomleft: 1em;     /* mozilla 1.5 */
+	-webkit-border-radius-bottomleft: 1em;  /* safari 3 */
+	-khtml-border-radius-bottomleft: 1em;   /* Konqueror */
+	border-radius-bottomleft: 1em;          /* CSS3 */
+}
+
+#help-popup {
+	padding-left: 10px;
+	width: 95%;
+	background-color: #EEF2F5;
+/*	padding-right: 5px;
+	padding-top: 10px;*/
+}
+
+.hresizeable {
+	width: 100%;
+	height: 7px;
+	background:#cdcdcd url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	cursor: s-resize;
+}
+
+.hresizeable:hover {
+	background-color: #178093;
+}

branding.spec

@@ -9,7 +9,7 @@
 
 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt3
+Release: alt4
 BuildArch: noarch
 
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -190,6 +190,7 @@ install theme.rcc %buildroot/usr/share/alterator-browser-qt/design/%theme.rcc
 
 mkdir -p %buildroot/usr/share/alterator/design/
 cp -a images %buildroot/usr/share/alterator/design/
+cp -a styles %buildroot/usr/share/alterator/design/
 popd
 
 mkdir -p %buildroot/%_altdir
@@ -264,7 +265,7 @@ echo $lang > lang
 %files alterator
 %config %_altdir/%name-browser-qt
 /usr/share/alterator-browser-qt/design/%theme.rcc
-/usr/share/alterator/design/images
+/usr/share/alterator/design/*
 
 
 %files bootsplash
@@ -288,6 +289,9 @@ echo $lang > lang
 %_desktopdir/*
 
 %changelog
+* Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt4
+- www design fixed 
+
 * Tue Mar 31 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt3
 - conflicts for -alterator subpackages added
 - design for web alterator changed