6.9.9-alt1

components.mk

 # browser-qt
 
 components/browser-qt/design/bg.png: images/installer.png
-	convert $< -resize '800x600!' $@
-	#convert $< -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)"' $@
+	convert $<  -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
 
 browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc;
-	subst 's/background-image.*//' components/browser-qt/design/design.qss
-	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc;
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME).rcc
+	cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss
+	rcc-qt4 -binary components/browser-qt/theme.qrc -o $(datadir)/alterator-browser-qt/design/$(THEME)-live.rcc
 	install -d $(sysconfdir)/alternatives/packages.d
 	printf '/etc/alterator/design-browser-qt\t/usr/share/alterator-browser-qt/design/$(THEME).rcc\t50\n'>$(sysconfdir)/alternatives/packages.d/$(THEME).rcc
 
@@ -21,7 +20,6 @@ ahttpd:
 	done
 	install -d $(datadir)/alterator/design/styles
 	cp -a components/ahttpd/images $(datadir)/alterator/design
-	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
 
 
@@ -39,13 +37,12 @@ boot-images:
 #bootsplash
 boot-splash: boot-images
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
-	convert -size 800x600 xc:#306ac4 $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	#cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
 #bootloader
 boot: boot-images
-	subst 's/label:ALT/label:School/g' design-bootloader-source/src/dia_install.inc
 	DEFAULT_LANG='--lang-to-subst--' PATH=$(PATH):/usr/sbin make -C design-bootloader-source
 	install -d -m 755  $(sysconfdir)/../boot/splash/$(THEME)
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
@@ -54,7 +51,8 @@ boot: boot-images
 #grub2
 	install -d -m 755  $(sysconfdir)/../boot/grub/themes/$(THEME)
 	cp -a components/grub2/* $(sysconfdir)/../boot/grub/themes/$(THEME)/
-	 install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 images/grub.png $(sysconfdir)/../boot/grub/themes/$(THEME)/boot.png
+	install -m 644 boot-800x600.jpg $(sysconfdir)/../boot/grub/themes/$(THEME)/grub.jpg
 
 # index html page, start page for all local browsers
 components/indexhtml/index.css:
@@ -70,5 +68,4 @@ indexhtml: components/indexhtml/index.css
 	for i in alt-docs documentation;do \
 	  ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
 	done
-	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop

components/ahttpd/images/steps/datetime.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/finish.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/greeting.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install2-basesystem.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/install2-preinstall.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/lilo.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/net-eth.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/notes-license.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/notes-release-notes.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/pkg-groups.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/preinstall.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/root.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-base.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-kbd.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/sysconfig-language.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/timezone.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/user.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/users.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/vm.png

+empty.png
\ No newline at end of file

components/ahttpd/images/steps/x11.png

+empty.png
\ No newline at end of file

components/bootloader/gfxboot.cfg.in

@@ -40,40 +40,34 @@ mainmenu.bar.minwidth=294
 mainmenu.bar.transparency=0
 ; main menu colors
 mainmenu.bar.color=0x001056
-mainmenu.normal.fg=0x001056
+mainmenu.normal.fg=0xb6c1cd
 mainmenu.selected.fg=0xffffff
 ; boot option colors
 bootopt.label.fg=0xffffff
 bootopt.text.fg=0xffffff
 ; progress bar color
-progress.bar.color=0x@DARK_COLOR_HEX@
+progress.bar.color=0x@MIDDLE_COLOR_HEX@
 ; menu colors
-menu.normal.bg=0x798491
-menu.normal.fg=@DARK_LABELS_HEX@
-menu.selected.bg=0x@LIGHT_COLOR_HEX@
-menu.selected.fg=@DARK_LABELS_HEX@
+menu.normal.bg=0xe9e8e7
+menu.normal.fg=0x000000
+menu.selected.bg=0xc9c8c8
+menu.selected.fg=0x000000
 ; window colors
 window.bg=0xd8deed
 window.fg=0x000000
 window.title.bg=0x@TITLE_COLOR@
-window.title.fg=0x@MIDDLE_LABELS_HEX@
+window.title.fg=0x@DARK_LABELS_HEX@
 window.title.error.bg=0xc00000
 ; help system colors
-help.link.fg=0x@DARK_COLOR_HEX@
+help.link.fg=0x185da0
 help.link.selected.fg=0xffffff
-help.link.selected.bg=0x@DARK_COLOR_HEX@
+help.link.selected.bg=0x185da
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-<<<<<<< HEAD
-panel.title.fg=0x5c6570
-panel.normal.fg=0x5c6570
-panel.f-key.fg=0x@MIDDLE_LABELS_HEX@
-=======
 panel.title.fg=0xffffff
-panel.normal.fg=0xffffff
-panel.f-key.fg=0xffffff
->>>>>>> school-server/sisyphus
+panel.normal.fg=0xf1f1ff
+panel.f-key.fg=0xf8e97c
 ; default keymap (e.g. de_DE, czech)
 keymap=
 

components/browser-qt/design/design-live.qss.in

+/* Customize any plain widget that is a child of a QMainWindow. */
+
+/* Main area */
+.AWizardFace {
+    border-style: none;
+    background-position: top left;
+    background-repeat: no-repeat
+}
+
+.ACenterFace {
+    border-style: none;
+}
+
+.ACenterFace #modules_view {
+    background-color: white;
+}
+
+/* Nice WindowsXP-style password character for password line edits. */
+QLineEdit {
+    lineedit-password-character: 9679;
+}
+
+QCheckBox:hover, QRadioButton:hover {
+	background: none;
+}
+
+/* Fix side effect on transparent background */
+QCheckBox:indicator:hover, QRadioButton:indicator:hover {
+	margin-left: 1px;
+}

components/browser-qt/design/design.qss.in

 /* Customize any plain widget that is a child of a QMainWindow. */
+
+/* Main area */
 .AWizardFace {
     border-style: none;
     background-image: url(:/design/bg.png);
-    background-position: bottom right;
+    background-position: top left;
     background-repeat: no-repeat
 }
 
 .ACenterFace {
     border-style: none;
-    }
+}
 
 .ACenterFace #modules_view {
     background-color: white;
 }
 
 /* Nice WindowsXP-style password character for password line edits. */
-QLineEdit[echoMode="2"] {
+QLineEdit {
     lineedit-password-character: 9679;
 }
 
+AWizardFace QLineEdit {
+    border: 2px inset gray;
+}
+
+/* White color for labels: 100% for title text and 80% for other labels */
+AWizardFace QLabel {
+	color: rgba(255, 255, 255, 80%);
+}
+
+QCheckBox, QRadioButton {
+	color: black;
+}
+
+AWizardFace QCheckBox:checked, AWizardFace QCheckBox:unchecked, AWizardFace QCheckBox:indeterminate {
+	color: rgba(255, 255, 255, 80%);
+}
+
+AWizardFace QRadioButton:checked, AWizardFace QRadioButton:unchecked, AWizardFace QRadioButton:indeterminate {
+	color: rgba(255, 255, 255, 80%);
+}
+
+/* Sections */
+AWizardFace AGroupBox {
+	border: 1px solid rgba(255, 255, 255, 0%);
+}
+
+AWizardFace AGroupBox::title {
+        color: #F8E97C;
+	font: bold;
+}
+
+QCheckBox:hover, QRadioButton:hover {
+	background: none;
+}
+
+/* Fix side effect on transparent background */
+QCheckBox:indicator:hover, QRadioButton:indicator:hover {
+	margin-left: 1px;
+}
+
+/* Step title */
+QLabel#wizardface_title_text {
+	color: white;
+}
+
+/* Popup dialogs and message boxes with warnings and errors */
+MessageBox {
+	background-color: rgba(235, 235, 235, 100%);
+	border: 5px solid #d7d7d7;
+}
+
+AGridBox {
+	background-color: transparent;
+	border: 0px;
+}
+
+/* Installation steps list
+AWizardFaceStepList {
+	background-color: rgba(235, 235, 235, 10%);
+}
+*/

components/grub2/theme.txt

@@ -21,10 +21,10 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "Misc Fixed Bold 13"
+message-font: "DejaVu Sans Regular 12"
 title-text: ""
 message-color: "#000000"
-message-bg-color: "#ffffff"
+message-bg-color: "#0c2c6c"
 desktop-image: "boot.png"
 terminal-font: "Misc Fixed Regular 13"
 
@@ -34,20 +34,20 @@ terminal-font: "Misc Fixed Regular 13"
 	left = 0
 	width = 100%
 	height = 20
-	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
+	text = "To boot the selected operating system using default settings, press Enter. For additional settings, press E"
 	align = "center"
-	font = "DejaVu Sans Regular 10"
-	color = "#000000"
+	font = "DejaVu Sans Regular 12"
+	color = "#F8E97C"
 }
 
 #menu
 + boot_menu {
-	left = 21%
-	width = 58%
+	left = 16%
+	width = 68%
 	top = 30%
 	height = 40%
-	item_font = "Misc Fixed Bold 13"
-	selected_item_font = "Misc Fixed Bold 13"
+	item_font = "DejaVu Sans Bold 14"
+	selected_item_font = "DejaVu Sans Bold 14"
 	icon_height = 24
 	icon_width = 24
 	item_height = 26
@@ -59,7 +59,7 @@ terminal-font: "Misc Fixed Regular 13"
 	scrollbar_width = 20
 	scrollbar_thumb = "scrollbar_slider_*.png"
 	scrollbar_frame = "scrollbar_border_*.png"
-	item_color = "#001056"
+	item_color = "#b5bdd0"
 	selected_item_color = "#ffffff"
 }
 

components/indexhtml/index-en.html.in

@@ -5,6 +5,7 @@
 <title>@NAME@ @VERSION@ @STATUS@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>
 
@@ -16,30 +17,43 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">@NAME@ @VERSION@ @STATUS@</div>
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="@NAME@ @VERSION@ @STATUS@" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Search in Internet">
+
+</form>
+</td>
+</tr></table>
+
 
 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Company"></th>
+<th width="34%"><img src="images/community.png" alt="Community"></th>
 </tr>
 
 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
 <li><a href="documentation/index.html">User Manual</a></li>
 <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
 <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
 <li><a href="http://altlinux.org/">Wiki</a></li>
 <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
-<li><a href="http://altlinux.org/Features">Features</a></li>
+<li><a href="http://altlinux.org/Features">ALT Linux Features</a></li>
 </ul>
 </td>
 
-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.com">ALT Linux Website</a></li>
 <li><a href="http://shop.altlinux.ru">Internet Shop</a></li>
@@ -50,7 +64,7 @@
 </ul>
 </td>
 
-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
 <li><a href="http://forum.altlinux.org">User Forum</a></li>
@@ -63,23 +77,14 @@
 
 </tr>
 
-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Search on online resources">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Search in Internet">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">We will be glade to meet you on the following social networks:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a>
+</div></td></tr>
 
 </table>
 

components/indexhtml/index-ru.html.in

@@ -2,9 +2,10 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Информика 6.0 Школьный Сервер</title>
+<title>Альт Линукс 7.0 Кентавр</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
+<link href="images/product.png" rel="shortcut icon" type="image/png" />
 </head>
 <body>
 
@@ -16,19 +17,32 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">Информика 6.0 Школьный Сервер</div>
+
+<table border="0" width="100%" id="header">
+<tr>
+<td><img src="images/product-logo.png" alt="Альт Линукс 7.0 Кентавр" id="product-logo"></td>
+<td id="search">
+<!-- Search pane -->
+<form action="http://www.google.com/search" method="get">
+<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
+
+<input id="search_string" type="text" name="q" placeholder="Поиск в Интернете">
+
+</form>
+</td>
+</tr></table>
 
 <div id="main">
 <!-- Links columns -->
-<table border="0" width="100%">
+<table border="0" width="100%" cellspacing="0">
 <tr>
 <th width="33%"><img src="images/documentation.png" alt="Документация"></th>
-<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th>
-<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th>
+<th width="33%"><img src="images/altlinux-logo.png" alt="Компания"></th>
+<th width="34%"><img src="images/community.png" alt="Сообщество"></th>
 </tr>
 
 <tr>
-<td width="33%" class="column"> <!-- First column: documentation -->
+<td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
 <ul>
 <li><a href="documentation/index.html">Руководство пользователя</a></li>
 <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
@@ -39,7 +53,7 @@
 </ul>
 </td>
 
-<td width="33%" id="central_pane"> <!-- Second column: Company -->
+<td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
 <ul>
 <li><a href="http://www.altlinux.ru">Сайт компании</a></li>
 <li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
@@ -50,7 +64,7 @@
 </ul>
 </td>
 
-<td width="34%" class="column"> <!-- Third column: community -->
+<td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
 <ul>
 <li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
 <li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
@@ -63,23 +77,14 @@
 
 </tr>
 
-<tr><td colspan="3" id="search">
-<!-- Search pane -->
-<form action="http://www.google.com/search" method="get">
-<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
-<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
-<input id="search_string" type="text" name="q" size="35">
-<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
-</form>
-</td></tr>
-
 <!-- Social networks -->
-<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr>
-<tr>
-<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
-<th><a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
-<th><a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th>
-</tr>
+<tr><td colspan="3" id="social-pane">
+<div id="social">Мы рады встретиться с вами в социальных сетях:</div>
+<div id="social-icons">
+<a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
+<a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
+<a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a>
+</div></td></tr>
 
 </table>
 

components/indexhtml/index.css

@@ -8,14 +8,14 @@ body {
 }
 div#content {
     background: white;
-    border: solid 6px #d0d0d0;
-    border-radius: 8px; 
-    -webkit-border-radius: 8px; 
-    -moz-border-radius: 7px; 
-    -khtml-border-radius: 12px;
+    border: solid 10px #e6e6e6;
+    border-radius: 16px; 
+    -webkit-border-radius: 16px; 
+    -moz-border-radius: 16px; 
+    -khtml-border-radius: 16px;
     padding: 0;
     position: relative;
-    width: 780px;
+    width: 740px;
     margin: 40px auto;
 }
 div#languages {
@@ -44,12 +44,39 @@ div#top-site {
     padding: 4px;
 }
 div#main {
-    padding: 12px;
+    padding: 10px 0px 20px 0px;
+}
+table#header {
+    padding-left: 12px;
+    padding-right: 12px;
+}
+
+td#search {
+	width: 99%;
+	text-align: right;
+}
+input#search_string {
+    position: relative;
+    vertical-align: middle;
+    background: white;
+    padding: 4px;
+    padding-right: 24px;
+    border: solid 1px #aeaeae;
+    width: 350px;
+    background: url('images/search.png') no-repeat 357px 2px;
+	background-color: white;
 }
+input#search_button {
+    margin-top: 12px;
+    vertical-align: top;
+    font-size: 130%;
+}
+
 th {
     vertical-align: bottom;
     text-align: center;
     padding-top: 5px;
+    padding-bottom: 5px;
 }
 img.icon {
     width: 48px;
@@ -60,64 +87,61 @@ img.icon_big {
     height: 60px;
 }
 img.banner {
-    width: 130px;
-    height: 30px;
-    margin: 6px;
+    width:  32px;
+    height: 32px;
+    margin: 5px;
 }
 li {
     line-height: 1.35em;
 }
-td#central_pane {
-    border-left:  dotted 1px #ccc;
-    border-right: dotted 1px #ccc;
-    text-align: center;
+td#left-pane {
+    background-color: #dbeef6;
 }
-.column {
-    text-align: center;
+td#central-pane {
+    background-color: #ffe57e;
 }
-td#search {
-    text-align: center;
-    padding: 12px;
+td#right-pane {
+    background-color: #f2f2f2;
 }
-input#search_string {
-    position: relative;
-    vertical-align: top;
-    margin-top: 12px;
-    font-size: 130%;
-    background: white;
-    border: solid 1px #657fbe;
-    border-radius: 2px; 
-    -webkit-border-radius: 2px; 
-    -moz-border-radius: 2px; 
-    -khtml-border-radius: 2px;
+.column {
+    text-align: center;
+    border-top: 2px solid #0088bf;
+    background: url('images/section.png') no-repeat 112px 0px;
+    padding: 9px 0 5px 0;
 }
-input#search_button {
-    margin-top: 12px;
-    vertical-align: top;
-    font-size: 130%;
+
+td#social-pane {
+    padding: 14px 12px 2px 12px;
 }
-td#social {
-    text-align: center;
+
+div#social {
+    text-align: left;
     border-bottom: dotted 1px #ccc;
     font-size: xx-small;
+    padding-bottom: 10px;
     color: #999;
 }
+div#social-icons {
+    text-align: left;
+    padding-top: 10px;
+}
+
 td#left_footer, td#right_footer {
     font-size: xx-small;
     color: #999;
     vertical-align: bottom;
-    padding-top: 15px;
+    padding: 2px 12px 0px 12px;
 }
 td#right_footer {
     text-align: right;
 }
 ul li {
     text-align: left;
-    list-style: square url('bullet.png');
+    list-style: square url('images/bullet.png');
 }
 a:link, a:visited {
     text-decoration: none;
-    color: #2e7194;
+    color: black;
 }
 a:hover {
     text-decoration: none;

components/systemd/os-release.in

+NAME="ALT Linux"
+VERSION="@VERSION@ @STATUS_EN@ (@CODENAME@)"
+ID=altlinux
+VERSION_ID=@VERSION@
+PRETTY_NAME="@BRAND_FNAME@ @VERSION@ @STATUS_EN@ @NAME@ (@CODENAME@)"
+ANSI_COLOR="1;33"
+CPE_NAME="cpe:/o:alt linux:@THEME@:@VERSION@"
+HOME_URL="http://altlinux.ru/"
+BUG_REPORT_URL="https://bugs.altlinux.org/"

configure.ac

@@ -18,12 +18,14 @@ DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
 DOCDIR=documentation
 
 AC_SUBST(THEME)
+AC_SUBST(CODENAME)
 AC_SUBST(NAME)
 AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)
+AC_SUBST(PRODUCT_NAME_RU)
 AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
 AC_SUBST(LIGHT_COLOR_HEX)
@@ -45,17 +47,16 @@ AC_CONFIG_FILES([
 		 components/bootsplash/theme.plymouth
 		 components/browser-qt/design/design.ini
 		 components/browser-qt/design/design.qss
+		 components/browser-qt/design/design-live.qss
 		 components/bootloader/gfxboot.cfg
 		 components/indexhtml/index-ru.html
 		 components/indexhtml/index-en.html
+		 components/systemd/os-release
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
 		 notes/release-notes.ru.html
 		 notes/release-notes.all.html
 		 notes/license.ru.html
 		 notes/license.all.html
-		 notes/index-ru.html
-		 notes/index-uk.html
-		 notes/index-en.html
 		 components/indexhtml/indexhtml.desktop
 		 gnome-settings/gtkrc
 		 gnome-settings/index.theme

gnome-settings/index.theme.in

@@ -5,11 +5,10 @@ Comment=Theme for @BRAND_FNAME@ @NAME@
 
 [X-GNOME-Metatheme]
 Encoding=UTF-8
-GtkTheme=Glossy
-MetacityTheme=Clearlooks
+GtkTheme=TraditionalOk
+MetacityTheme=TraditionalOk
 IconTheme=gnome
 GtkColorScheme=base_color:#ffffff,fg_color:#000000,tooltip_fg_color:#000000,selected_fg_color:#5598d7,selected_fg_color:#ffffff,text_color:#000000,bg_color:#ede9e3,tooltip_bg_color:#FFFFBF
 CursorTheme=default
 CursorSize=18
 NotificationTheme=slider
-

images/README

+background16x9.png: PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		wallpaper for 16x9 monitors (without logotypes)
+background4x3.png:  PNG image, 1600 x 1200, 8-bit/color RGB, non-interlaced		wallpaper for 4x3 monitors (without logotypes)
+boot.jpg:           JPEG image data, JFIF standard 1.01							screen for Plymouth (with logotypes)
+boot.png:           PNG image, 800 x 600, 8-bit/color RGB, non-interlaced		DVD disk menu screen (with logotypes)
+console.jpg:        JPEG image data, JFIF standard 1.01							?
+grub.png:           PNG image, 800 x 600, 8-bit/color RGB, non-interlaced		GRUB loader screen for installed system (with logotypes)
+installer.png:      PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		installer backgrount (only right bottom corner is used) (without logotypes)
+product-logo.png:   PNG image, 348 x 45, 8-bit/color RGBA, non-interlaced		product logotype
+wallpaper.png:      PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced		default wallpaper (without logotypes)

mate-settings/50_mate-background.gschema.override

+[org.mate.background]
+color-shading-type="solid"
+primary-color="#0c0c2c2c6c6c"
+picture-options="zoom"
+picture-filename="/usr/share/design/current/backgrounds/default.png"
+secondary-color="#0c0c2c2c6c6c"
+

mate-settings/60_mate-theme.gschema.override

+[org.mate.interface]
+gtk-theme="Clearlooks-Phenix"
+icon-theme="mate"
+
+[org.mate.Marco.general]
+theme="Clearlooks-Phenix"
+

mate-settings/Trolltech.conf

+[Qt]
+style=GTK+

notes/index-en.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-
-<body onload="MakeLink()">
-<script type="text/javascript" src="makelink.js"></script>
-
-<div id="top" class="ui-corner-all">
-	<table>
-	    <tbody>
-		<tr>
-		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
-		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
-		</tr>
-	    </tbody>
-	</table>
-</div>
-
-<div class="box ui-corner-all" id="lang">
- <a href="index-ru.html">Русский</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p align="justify">Welcome to <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. The distribution is set up and ready to use, you may proceed. We hope that results of our work will be of use to you.</p>
-
-  <h2>Documentation</h2>
-  <ul>
-   <li><a href="../@DOCDIR@/index.html">Local documentation on this distribution</a></li>
-   <li><a href="http://altlinux.org/">Online documentation on http://altlinux.org</a></li>
-  </ul>
-
-  <h2>In the Internet</h2>
-  <ul>
-   <li><a href="http://www.altlinux.ru/">Official ALT Linux website</a></li>
-   <li><a href="http://www.altlinux.ru/FAQ">Frequently Asked QUestion</a></li>
-   <li><a href="http://search.altlinux.ru/">Search on ALT Linux websites</a></li>
-   <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Mailing lists</a></li>
-   <li><a href="http://forum.altlinux.org/">ALT Linux Forum</a></li>
-   <li><a href="http://support.altlinux.ru/">Technical support</a></li>
-  </ul>
-  
-  <h2>Support</h2>
-
-  <h3>Official ALT Linux support</h3>
-  <ul>
-  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
-  </ul>
-  <div class="warning">
-  Only for registered users with coupons!
-  </div>
-  <h3>Unofficial support</h3>
-  <ul>
-  <li><a href="http://lists.altlinux.org/">Mailing lists</a></li>
-  <li><a href="http://forum.altlinux.org/">Forum</a></li>
-  <li><a href="http://bugzilla.altlinux.org/">Bug tracking system</a></li>
-  <li><a href="http://search.altlinux.org/">Search on ALT Linux websites</a></li>
-  </ul>
-  <div class="warning">
-  No warranity on solving problems!
-  </div>
-
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2012. All rights reserved.<br />
-  Address: 5th Donskoy proezd, 15/6, Moscow<br />
-  Phone/Fax: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/index-ru.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-
-<body>
-
-<div id="top" class="ui-corner-all">
-	<table>
-	    <tbody>
-		<tr>
-		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
-		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
-		</tr>
-	    </tbody>
-	</table>
-</div>
-
-<div class="box ui-corner-all" id="lang">
- <a href="index-en.html">English</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p>Добро пожаловать в <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
-
-  <h2>Документация</h2>
-  <ul>
-    <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
-  </ul>
-
-  <h2>Информация в Интернете</h2>
-  <ul>
- <li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
- <li><a href="http://www.altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li>
- <li><a href="http://www.altlinux.org/">Онлайновая документация</a></li>
- <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
- <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
- <li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
- <li><a href="http://support.altlinux.ru/">Техническая поддержка через веб-сайт</a></li>
-  </ul>
-
-  <h2>ALT Linux Team</h2>
-  <p>Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
-  <ul>
-    <li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
-    <li><a href="http://backports.altlinux.org/">Backports</a></li>
-    <li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
-  </ul>
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2012. Все права защищены.<br />
-   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
-   Телефон/факс: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/index-uk.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-<head>
-  <title>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link rel="stylesheet" type="text/css" href="index.css">
-</head>
-
-<body>
-
-<div id="top" class="ui-corner-all">
-	<table>
-	    <tbody>
-		<tr>
-		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
-		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
-		</tr>
-	    </tbody>
-	</table>
-</div>
-
-<div class="box ui-corner-all" id="lang">
- <a href="index-en.html">English</a> |
- <a href="index-ru.html">Русский</a>
-</div>
-
-<div class="box ui-corner-all">
-  <p>Ласкаво просимо до <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив налаштований та готовий до роботи, можна починати. Ми сподіваємось, що наша праця буде для Вас корисною.</p>
-
-  <h2>Документація (рос.)</h2>
-  <ul>
-    <li><a href="../@DOCDIR@/index.html">Посібник користувача</a></li>
-  </ul>
-
-  <h2>Інформація в Інтернеті</h2>
-  <ul>
-   <li><a href="http://www.altlinux.ru/">Сайт компанії ALT Linux</a></li>
-   <li><a href="http://www.altlinux.ru/FAQ">Відповіді на часті запитання</a></li>
-   <li><a href="http://search.altlinux.ru/">Пошук інформації по ALT Linux</a></li>
-   <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки розсилання</a></li>
-   <li><a href="http://forum.altlinux.org">Форум користувачів ALT Linux</a></li>
-   <li><a href="http://support.altlinux.ru/">Технічна підтримка через веб-сайт</a></li>
-   <li><a href="http://www.magic.kiev.ua/">Підтримка та рішення в Україні</a></li>
-  </ul>
-
-  <h2>ALT Linux Team</h2>
-  <p>Цей дистрибутив не міг би з'явитися без активної участі ALT Linux Team &mdash; спільноти розробників вільного програмного забезпечення.</p>
-  <ul>
-   <li><a href="http://www.altlinux.org/">Wiki спільноти</a> (<a
-	 href="http://uk.altlinux.org/">українською</a>)</li>
-   <li><a href="http://backports.altlinux.org/">Backports</a></li>
-   <li><a href="http://bugs.altlinux.org/">Повідомити про помилку</a></li>
-  </ul>
-
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2010. Усі права застережено.<br />
-   Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 6<br />
-   Телефон/факс: +7 (495) 662-3883
-</p>
-
-</body>
-</html>

notes/license.ru.html.in

@@ -6,13 +6,13 @@
 <body>
 
 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение Информика 6.0 Школьный Сервер и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение @PRODUCT_NAME_RU@ и включенные в него программы для ЭВМ</h2>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>Информика 6.0 Школьный Сервер</strong> 
+<strong>@PRODUCT_NAME_RU@</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
 
 <p>1.2 Предмет договора</p>
@@ -47,6 +47,8 @@
 <li>    Драйверы модемов pct789 (PCTel), cm8738, i8xx, sis и via686a</li>
 <li>    Драйверы контроллеров Promise IDE/RAID</li>
 <li>    Модули поддержки модемов Lucent/Agere</li>
+<li>    Adobe Flash Player Plugin</li>
+<li>    Java 2 (SUN) Runtime Environment, Standard Edition</li>
 </ul>
 
 <p>Обладатели исключительных прав на перечисленные ПРОГРАММЫ так или иначе ограничивают вашу свободу в использовании этих ПРОГРАММ. Ознакомьтесь с текстами сопровождающих указанные ПРОГРАММЫ лицензионных договоров для того, чтобы определить, правомерно ли то или иное использование той или иной ПРОГРАММЫ, выходящее за пределы «свободного воспроизведения». Лицензионные договоры этих ПРОГРАММ поставляются в составе пакетов ДИСТРИБУТИВА.

notes/release-notes.all.html.in

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
 </head>
 <body>
-    <H2>Thank you for choosing ALT Linux 6.0 School Server!</H2>
+    <center><p>
+        Thank you for choosing @BRAND_FNAME@ @VERSION@!
+    </p></center>
     <p>
     You can learn more about features of this product at our official site:
     <a href="http://www.altlinux.ru">www.altlinux.ru</a>.
     </p>
     <p>
+    You can start working right now: creating and editing office documents,
+    browsing Internet sites, processing audio and images, and a lot of
+    other activities. Look through the menu to find many new useful
+    programs.
+    </p>
+    <p>
     <em>Hint</em>: if you visit
     <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>, you'll find the
     whole assortment of ALT Linux products and services, with useful,
     interesting, and even exclusive items for IT professionals, users and
     connosseurs of ALT Linux products.
     </p>
+	<p>Other userful resources:</p>
+	<dl>
+		<dt><strong>Distribution Welcome Page</strong> (make this page as web-browser start page)
+			<dd><a href="file:/usr/share/doc/indexhtml/index.html">file:/usr/share/doc/indexhtml/index.html</a>
+		<dt>Online Documentation
+			<dd><a href="http://docs.altlinux.org">http://docs.altlinux.org</a>
+		<dt>Wiki
+			<dd><a href="http://altlinux.org/">http://altlinux.org/</a>
+		<dt>FAQ
+			<dd><a href="http://altlinux.org/FAQ">http://altlinux.org/FAQ</a>
+		<dt>Community Forum
+			<dd><a href="http://forum.altlinux.org">http://forum.altlinux.org</a>
+	</dl>
+	<p>This page is available after installation in System Control Center (<tt>acc</tt>) → Release Notes.
+	<p><i>Free Software for Free People</i></p>
 </body>
 </html>

notes/release-notes.ru.html.in

@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 </HEAD>
 <BODY>
-    <H2>Спасибо Вам за выбор Информика 6.0 Школьный Сервер!</H2>
+    <H2>Спасибо Вам за выбор @PRODUCT_NAME_RU@!</H2>
     <p>
     На нашем официальном сайте
     <a href="http://www.altlinux.ru">www.altlinux.ru</a> вы можете
@@ -18,5 +18,20 @@
     полезного, интересного и даже эксклюзивного для специалистов,
     пользователей и ценителей системы.
     </p>
+    <p>Другие полезные ресурсы:</p>
+    <dl>
+        <dt><strong>Страница дистрибутива</strong> (можете сделать её домашней страницей веб-браузера)
+            <dd><a href="file:/usr/share/doc/indexhtml/index.html">file:/usr/share/doc/indexhtml/index.html</a>
+        <dt>Онлайновая документация
+            <dd><a href="http://docs.altlinux.org">http://docs.altlinux.org</a>
+        <dt>Wiki
+            <dd><a href="http://altlinux.org/">http://altlinux.org/</a>
+        <dt>FAQ
+            <dd><a href="http://altlinux.org/FAQ">http://altlinux.org/FAQ</a>
+        <dt>Форум сообщества
+            <dd><a href="http://forum.altlinux.org">http://forum.altlinux.org</a>
+    </dl>
+    <p>Эта страница доступна после установки в Центре управления системой (<tt>acc</tt>) → Информация о дистрибутиве.
+    <p><i>Свободные программы для свободных людей</i></p>
 </BODY>
 </HTML>