Merge branch 'school-teacher' into school-server

.gear/rules

+tar: . name=branding

Makefile.in

@@ -5,27 +5,24 @@ VERSION=@VERSION@
 
 all:
 # generate derivative graphics
-	cp -al images/background16x9.png images/wallpaper.png
-# apply product-logo.png
-	convert images/wallpaper.png images/product-logo.png -geometry +21+60 -composite images/wlogo.png
-	convert images/wlogo.png -resize 800x600 images/grub.png
-	convert images/wlogo.png -resize 800x600 images/boot.png
-	convert images/wlogo.png images/boot.jpg
-# background
+# make default wallpaper
+	cp -al images/background4x3.png images/wallpaper.png
+	cp -al images/wallpaper.png graphics/backgrounds/default.png
+	cp -al images/wallpaper.png graphics/backgrounds/xdm.png
+# make wallpapers for gfxboot and grub2
+	convert images/background4x3.png -resize 800x600 images/small.png
+
+# display status
 	if [ -n "$(STATUS)" ] ; then \
-		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; \
+		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@"' wlogo.png; \
+		convert wlogo.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
 	else \
-		convert images/wallpaper.png wallpaper.png; \
+		convert images/wallpaper.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
 	fi
-	cp -al wallpaper.png graphics/backgrounds/default.png
-	cp -al wallpaper.png graphics/backgrounds/xdm.png
-# kde3-settings	
-	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
-	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
+	convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
+	cp -al images/grub.png images/boot.png
 # product logo for ahttpd
 	cp -al images/product-logo.png components/ahttpd/images/product-logo.png
-	
+
 include components.mk
 install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml

components.mk

@@ -6,7 +6,7 @@ components/browser-qt/design/bg.png: images/installer.png
 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
-	cp -f components/browser-qt/design/design-live.qss components/browser-qt/design/design.qss
+	#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

components/ahttpd/images/first-page-button.svg

@@ -14,7 +14,7 @@
    height="20.163"
    id="svg4592"
    version="1.1"
-   inkscape:version="0.47pre3 r22311"
+   inkscape:version="0.47pre2 r22153"
    sodipodi:docname="first-page-button.svg">
   <defs
      id="defs4594">
@@ -56,13 +56,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="18.829866"
-     inkscape:cx="-3.8308421"
+     inkscape:cx="6.4719397"
      inkscape:cy="12.058399"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="976"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
      inkscape:window-x="-4"
      inkscape:window-y="-4"
      inkscape:window-maximized="1" />
@@ -87,7 +87,7 @@
        id="g4551"
        transform="translate(-100.54622,1652.5558)">
       <rect
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
          id="rect3719-6"
          width="25"
          height="20"
@@ -99,7 +99,7 @@
          d="m 99.21875,432.78125 c -1.896868,0 -3.40625,1.50938 -3.40625,3.40625 l 0,12.3125 c 0,1.89687 1.509382,3.40625 3.40625,3.40625 l 17.3125,0 c 1.89687,0 3.40625,-1.50938 3.40625,-3.40625 l 0,-12.3125 c 0,-1.89687 -1.50938,-3.40625 -3.40625,-3.40625 l -17.3125,0 z"
          inkscape:href="#rect3719-6"
          id="path3791-1"
-         style="fill:#1b3664;fill-opacity:1;stroke:none;filter:url(#filter3595)"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3595)"
          xlink:href="#rect3719-6"
          inkscape:original="M 99.21875 432.34375 C 97.087518 432.34375 95.375 434.05627 95.375 436.1875 L 95.375 448.5 C 95.375 450.63123 97.087518 452.34375 99.21875 452.34375 L 116.53125 452.34375 C 118.66248 452.34375 120.375 450.63123 120.375 448.5 L 120.375 436.1875 C 120.375 434.05627 118.66248 432.34375 116.53125 432.34375 L 99.21875 432.34375 z "
          inkscape:radius="-0.4375"
@@ -107,7 +107,7 @@
       <path
          id="path3721-0"
          d="m 114.375,437.34936 0,10 -10,-5 10,-5 z"
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
          inkscape:label="Triangle" />
       <rect
          y="437.34937"
@@ -115,7 +115,7 @@
          height="10.000001"
          width="2.0000136"
          id="rect3715-6"
-         style="fill:#eaedef;fill-opacity:1;stroke:none" />
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>

components/ahttpd/images/last-page-button.svg

@@ -14,7 +14,7 @@
    height="20.163"
    id="svg4592"
    version="1.1"
-   inkscape:version="0.47pre3 r22311"
+   inkscape:version="0.47pre2 r22153"
    sodipodi:docname="last-page-button.svg">
   <defs
      id="defs4594">
@@ -77,13 +77,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="18.829866"
-     inkscape:cx="-4.0502411"
+     inkscape:cx="6.2525407"
      inkscape:cy="9.4532616"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="976"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
      inkscape:window-x="-4"
      inkscape:window-y="-4"
      inkscape:window-maximized="1" />
@@ -108,7 +108,7 @@
        id="g4567"
        transform="translate(-219.70644,1632.9251)">
       <rect
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
          id="rect3719"
          width="25"
          height="20"
@@ -120,7 +120,7 @@
          d="m 188.84375,432.8125 c -1.89687,0 -3.40625,1.50938 -3.40625,3.40625 l 0,12.28125 c 0,1.89687 1.51366,3.4375 3.40625,3.4375 l 17.3125,0 c 1.89259,0 3.40625,-1.54063 3.40625,-3.4375 l 0,-12.28125 c 0,-1.89687 -1.50938,-3.40625 -3.40625,-3.40625 l -17.3125,0 z"
          inkscape:href="#rect3719"
          id="path3791"
-         style="fill:#1b3664;fill-opacity:0.94117647;stroke:none;filter:url(#filter3602)"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3602)"
          xlink:href="#rect3719"
          inkscape:original="M 188.84375 432.375 C 186.71252 432.375 185 434.08752 185 436.21875 L 185 448.5 C 185 450.63123 186.71252 452.375 188.84375 452.375 L 206.15625 452.375 C 208.28748 452.375 210 450.63123 210 448.5 L 210 436.21875 C 210 434.08752 208.28748 432.375 206.15625 432.375 L 188.84375 432.375 z "
          inkscape:radius="-0.4375"
@@ -128,7 +128,7 @@
       <path
          id="path3721"
          d="m 192,437.36218 0,10 10,-5 -10,-5 z"
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
          inkscape:label="Triangle" />
       <rect
          transform="scale(-1,1)"
@@ -137,7 +137,7 @@
          height="10.000001"
          width="2.0000136"
          id="rect3715"
-         style="fill:#eaedef;fill-opacity:1;stroke:none" />
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>

components/ahttpd/images/next-page-button.svg

@@ -14,7 +14,7 @@
    height="20.022818"
    id="svg4592"
    version="1.1"
-   inkscape:version="0.47pre3 r22311"
+   inkscape:version="0.47pre2 r22153"
    sodipodi:docname="next-page-button.svg">
   <defs
      id="defs4594">
@@ -70,13 +70,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="18.829866"
-     inkscape:cx="0.026444238"
+     inkscape:cx="10.329226"
      inkscape:cy="5.3197997"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="976"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
      inkscape:window-x="-4"
      inkscape:window-y="-4"
      inkscape:window-maximized="1" />
@@ -108,19 +108,19 @@
          height="20"
          width="25"
          id="rect2849"
-         style="fill:#eaedef;fill-opacity:1;stroke:none" />
+         style="fill:#729fcf;fill-opacity:1;stroke:none" />
       <path
          d="m 158.84375,432.875 c -1.86901,0 -3.34375,1.47474 -3.34375,3.34375 l 0,12.28125 c 0,1.86901 1.47952,3.375 3.34375,3.375 l 17.3125,0 c 1.86423,0 3.34375,-1.50599 3.34375,-3.375 l 0,-12.28125 c 0,-1.86901 -1.47474,-3.34375 -3.34375,-3.34375 l -17.3125,0 z"
          inkscape:href="#rect2849"
          id="path3785"
-         style="fill:#1b3664;fill-opacity:1;stroke:none;filter:url(#filter3596)"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3596)"
          xlink:href="#rect2849"
          inkscape:original="M 158.84375 432.375 C 156.71252 432.375 155 434.08752 155 436.21875 L 155 448.5 C 155 450.63123 156.71252 452.375 158.84375 452.375 L 176.15625 452.375 C 178.28748 452.375 180 450.63123 180 448.5 L 180 436.21875 C 180 434.08752 178.28748 432.375 176.15625 432.375 L 158.84375 432.375 z "
          inkscape:radius="-0.48949021"
          sodipodi:type="inkscape:offset" />
       <path
          inkscape:label="Triangle"
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
          d="m 163,437.36218 0,10 10,-5 -10,-5 z"
          id="path2828" />
     </g>

components/ahttpd/images/prev-page-button.svg

@@ -14,7 +14,7 @@
    height="20.032"
    id="svg4592"
    version="1.1"
-   inkscape:version="0.47pre3 r22311"
+   inkscape:version="0.47pre2 r22153"
    sodipodi:docname="prev-page-button.svg">
   <defs
      id="defs4594">
@@ -63,13 +63,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="18.829866"
-     inkscape:cx="6.0297982"
+     inkscape:cx="16.33258"
      inkscape:cy="6.4077993"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="976"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
      inkscape:window-x="-4"
      inkscape:window-y="-4"
      inkscape:window-maximized="1" />
@@ -94,7 +94,7 @@
        id="g4557"
        transform="translate(-140.09736,1646.9394)">
       <rect
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
          id="rect3707"
          width="25"
          height="20"
@@ -106,7 +106,7 @@
          d="m 128.84375,432.875 c -1.86338,0 -3.34375,1.48037 -3.34375,3.34375 l 0,12.28125 c 0,1.86338 1.48525,3.375 3.34375,3.375 l 17.3125,0 c 1.8585,0 3.34375,-1.51162 3.34375,-3.375 l 0,-12.28125 c 0,-1.86338 -1.48037,-3.34375 -3.34375,-3.34375 l -17.3125,0 z"
          inkscape:href="#rect3707"
          id="path3725"
-         style="fill:#1b3664;fill-opacity:1;stroke:none;filter:url(#filter3595)"
+         style="fill:#476596;fill-opacity:1;stroke:none;filter:url(#filter3595)"
          xlink:href="#rect3707"
          inkscape:original="M 128.84375 432.375 C 126.71252 432.375 125 434.08752 125 436.21875 L 125 448.5 C 125 450.63123 126.71252 452.375 128.84375 452.375 L 146.15625 452.375 C 148.28748 452.375 150 450.63123 150 448.5 L 150 436.21875 C 150 434.08752 148.28748 432.375 146.15625 432.375 L 128.84375 432.375 z "
          inkscape:radius="-0.5"
@@ -114,7 +114,7 @@
       <path
          id="path3709"
          d="m 142,437.36218 0,10 -10,-5 10,-5 z"
-         style="fill:#eaedef;fill-opacity:1;stroke:none"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
          inkscape:label="Triangle" />
     </g>
   </g>

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/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/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/config.in

-product=@BRAND_FNAME@ @VERSION@ @NAME@
+product=@NAME@ @VERSION@@STATUS@
 based_on=ALT Linux Sisyphus

components/bootloader/gfxboot.cfg.in

@@ -43,20 +43,20 @@ mainmenu.bar.color=0x001056
 mainmenu.normal.fg=0x2b328d
 mainmenu.selected.fg=0xffffff
 ; boot option colors
-bootopt.label.fg=0xffffff
-bootopt.text.fg=0xffffff
+bootopt.label.fg=0x2b328d
+bootopt.text.fg=0x2b328d
 ; progress bar color
-progress.bar.color=0x@MIDDLE_COLOR_HEX@
+progress.bar.color=0x001056
 ; menu colors
 menu.normal.bg=0xe9e8e7
 menu.normal.fg=0x000000
 menu.selected.bg=0xc9c8c8
 menu.selected.fg=0x000000
 ; window colors
-window.bg=0xd8deed
+window.bg=0xffffff
 window.fg=0x000000
-window.title.bg=0x@TITLE_COLOR@
-window.title.fg=0x@DARK_LABELS_HEX@
+window.title.bg=0x787878
+window.title.fg=0x000000
 window.title.error.bg=0xc00000
 ; help system colors
 help.link.fg=0x185da0
@@ -65,9 +65,9 @@ help.link.selected.bg=0x185da
 help.highlight.fg=0x@DARK_COLOR_HEX@
 ; panel colors
 panel.fg=0x000000
-panel.title.fg=0xffffff
-panel.normal.fg=0xf1f1ff
-panel.f-key.fg=0xf8e97c
+panel.title.fg=0x001056
+panel.normal.fg=0x2b328d
+panel.f-key.fg=0x2b328d
 ; default keymap (e.g. de_DE, czech)
 keymap=
 

components/browser-qt/Makefile

+all:
+	rcc-qt4 -binary theme.qrc -o theme.rcc

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

@@ -2,4 +2,3 @@ Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #f
 Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
  Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4,  #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7,  #eeece9, #000000, #aed4a1, #141312
 
-Style=Cleanlooks

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

@@ -8,7 +8,9 @@
 }
 
 .AWizardFace #wizardface_title_text {
-    color: rgb(43,50,141);
+    color: rgb(255,255,255);
+	font: bold;
+	font-size: 24px;
 }
 
 .ACenterFace {

components/browser-qt/theme.qrc

@@ -5,5 +5,6 @@
    <file>design/design.ini</file>
    <file>design/forward.png</file>
    <file>design/backward.png</file>
+   <file>design/progress-cleanlooks.png</file>
 </qresource>
 </RCC>

components/grub2/theme.txt

@@ -24,26 +24,37 @@
 message-font: "DejaVu Sans Regular 12"
 title-text: ""
 message-color: "#000000"
-message-bg-color: "#0c2c6c"
+message-bg-color: "#77b5f2"
 desktop-image: "boot.png"
 terminal-font: "Misc Fixed Regular 13"
 
 #help bar at the bottom
 + label {
-	top = 100%-25
-	left = 0
-	width = 100%
-	height = 20
-	text = "To boot the selected operating system using default settings, press Enter. For additional settings, press E"
+	top = 100%-60
+	left = 20%
+	width = 60%
+	height = 25
+	text = "Для запуска системы выберите пункт меню и нажмите Enter."
 	align = "center"
-	font = "DejaVu Sans Regular 12"
-	color = "#F8E97C"
+	font = "Droid Sans Bold 14"
+	color = "#008"
+}
+
++ label {
+	top = 100%-40
+	left = 20%
+	width = 60%
+	height = 25
+	text = "Для редактирования меню нажмите E. Для выхода - Esc."
+	align = "center"
+	font = "Droid Sans Bold 14"
+	color = "#008"
 }
 
 #menu
 + boot_menu {
-	left = 16%
-	width = 68%
+	left = 20%
+	width = 60%
 	top = 30%
 	height = 40%
 	item_font = "DejaVu Sans Bold 14"
@@ -59,7 +70,7 @@ terminal-font: "Misc Fixed Regular 13"
 	scrollbar_width = 20
 	scrollbar_thumb = "scrollbar_slider_*.png"
 	scrollbar_frame = "scrollbar_border_*.png"
-	item_color = "#b5bdd0"
+	item_color = "#000080"
 	selected_item_color = "#ffffff"
 }
 

components/indexhtml/index-en.html.in

@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>@NAME@ @VERSION@ @STATUS@</title>
+<title>@product_name@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 <link href="images/product.png" rel="shortcut icon" type="image/png" />
@@ -19,7 +19,7 @@
 <!-- Disto name -->
 <table border="0" width="100%" id="header">
 <tr>
-<td><img src="images/product-logo.png" alt="@NAME@ @VERSION@ @STATUS@" id="product-logo"></td>
+<td><img src="images/product-logo.png" alt="@product_name@" id="product-logo"></td>
 <td id="search">
 <!-- Search pane -->
 <form action="http://www.google.com/search" method="get">
@@ -92,7 +92,7 @@
 <div id="footer">
 <table border="0" width="100%">
 <tr>
-<td id="left_footer">&copy; 2012 ALT Linux. All rights reserved.</td>
+<td id="left_footer">&copy; 2013 ALT Linux. All rights reserved.</td>
 <td id="right_footer">
 Tel/fax: +7 (495) 662-3883<br>
 119334, Russian Federation, Moscow, 5-th Donskoy proezd, 15, build 6.

components/indexhtml/index-ru.html.in

@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Альт Линукс 7.0 Кентавр</title>
+<title>@product_name_ru</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 <link href="images/product.png" rel="shortcut icon" type="image/png" />
@@ -20,7 +20,7 @@
 
 <table border="0" width="100%" id="header">
 <tr>
-<td><img src="images/product-logo.png" alt="Альт Линукс 7.0 Кентавр" id="product-logo"></td>
+<td><img src="images/product-logo.png" alt="@product_name_ru@" id="product-logo"></td>
 <td id="search">
 <!-- Search pane -->
 <form action="http://www.google.com/search" method="get">
@@ -92,7 +92,7 @@
 <div id="footer">
 <table border="0" width="100%">
 <tr>
-<td id="left_footer">&copy; ALT Linux, 2012. Все права защищены.</td>
+<td id="left_footer">&copy; ALT Linux, 2013. Все права защищены.</td>
 <td id="right_footer">
 Телефон/факс: +7 (495) 662-3883<br>
 Москва, 5-й Донской проезд, д. 15, стр. 6

components/indexhtml/index.css

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

components/indexhtml/indexhtml.desktop.in

@@ -4,8 +4,8 @@ Type=Application
 Exec=xdg-open /usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=Information about @NAME@ @VERSION@ @STATUS@
+Name=About @PRODUCT_NAME@
 Categories=System;Documentation;
 
 # Translations
-Name[ru]=Сведения о @NAME@ @VERSION@ @STATUS@
+Name[ru]=О дистрибутиве «@PRODUCT_NAME_RU@»

components/systemd/os-release.in

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

configure.ac

 AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 
-
-PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
-TITLE_COLOR=`./fetch_color handle`
-INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
-LIGHT_COLOR_HEX=F5F5F5 #new
-MIDDLE_COLOR_HEX=306ac4 #new
-DARK_COLOR_HEX=001056
-LIGHT_LABELS_HEX=FFFFFF #new
-DARK_LABELS_HEX=242a60  #mew
-MIDDLE_LABELS_HEX=666666 #new
-SHADOW_HEX=A6A6A6
-LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
-MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
-DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
+# 00a1e4
+PROGRESS_COLOR=0093d7 
+TITLE_COLOR=5C96CC
+LIGHT_COLOR_HEX=DFDFE0
+MIDDLE_COLOR_HEX=C8C9CB
+DARK_COLOR_HEX=909195
+LIGHT_LABELS_HEX=FFFFFF
+DARK_LABELS_HEX=000000
+MIDDLE_LABELS_HEX=4d4d4f
 
 DOCDIR=documentation
 
@@ -25,6 +20,7 @@ AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)
+AC_SUBST(PRODUCT_NAME)
 AC_SUBST(PRODUCT_NAME_RU)
 AC_SUBST(DOCDIR)
 AC_SUBST(PROGRESS_COLOR)
@@ -47,22 +43,15 @@ 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
 		 components/indexhtml/indexhtml.desktop
-		 gnome-settings/gtkrc
-		 gnome-settings/index.theme
-		 gnome-settings/metacity-theme-1.xml
-		 components/ahttpd/styles/alterator.css
-		 kde3-styles-splash/Theme.rc
-		 xfce-settings/xinitrc
+		 components/indexhtml/index-ru.html
+		 components/indexhtml/index-en.html
+		 components/systemd/os-release
+         components/ahttpd/styles/alterator.css
 ])
 AC_OUTPUT

menu/50-xfce-applications.menu

+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+    <Name>Xfce</Name>
+    <AppDir>/usr/share/slinux-style/applications</AppDir>
+
+    <Menu>
+        <Name>ShallowSettings</Name>
+        <Directory>altlinux-settings-desktop.directory</Directory>
+        <Menu>
+            <Name>WineSettings</Name>
+            <Directory>altlinux-wine.directory</Directory>
+            <Include>
+                <And>
+                    <Category>Wine</Category>
+                    <Category>Settings</Category>
+                </And>
+            </Include>
+        </Menu>
+        <Include>
+            <Category>Settings</Category>
+        </Include>
+        <Exclude>
+			<Category>Wine</Category>
+			<Category>X-XFCE-SettingsDialog</Category>
+        </Exclude>
+
+        <Layout>
+            <Filename>xfce-settings-manager.desktop</Filename>
+            <Filename>acc.desktop</Filename>
+            <Separator/>
+            <Merge type="all"/>
+        </Layout>
+
+        <Menu>
+            <Name>Screensavers</Name>
+            <Directory>altlinux-screensaver.directory</Directory>
+            <Include>
+                <Category>Screensaver</Category>
+            </Include>
+        </Menu>
+    </Menu>
+
+    <Layout>
+        <Filename>xfce4-run.desktop</Filename>
+        <Filename>xfce4-appfinder.desktop</Filename>
+        <Separator/>
+        <Filename>exo-terminal-emulator.desktop</Filename>
+        <Filename>exo-file-manager.desktop</Filename>
+        <Filename>exo-mail-reader.desktop</Filename>
+        <Filename>exo-web-browser.desktop</Filename>
+        <Separator/>
+        <Menuname>Settings</Menuname>
+        <Menuname>ShallowSettings</Menuname>
+        <Separator/>
+        <Merge type="all"/>
+        <Separator/>
+        <Filename>xfce4-about.desktop</Filename>
+        <Filename>xfce4-session-logout.desktop</Filename>
+    </Layout>
+
+    <Move>
+      <Old>Settings/DesktopSettings/XFCE</Old>
+      <New>Settings/NativeSettings</New>
+    </Move>
+
+    <Menu>
+        <Name>Accessories</Name>
+        <Menu>
+            <Name>WineUtils</Name>
+            <Directory>altlinux-wine.directory</Directory>
+            <Include>
+                <And>
+                    <Category>Wine</Category>
+                    <Category>Utility</Category>
+                </And>
+            </Include>
+        </Menu>
+        <Exclude>
+            <Or>
+                <Filename>exo-file-manager.desktop</Filename>
+                <Filename>exo-terminal-emulator.desktop</Filename>
+                <Filename>xfce4-about.desktop</Filename>
+                <Filename>xfce4-run.desktop</Filename>
+                <Category>Wine</Category>
+            </Or>
+        </Exclude>
+	<Menu>
+	    <Name>Other</Name>
+	    <Exclude>
+	        <Or>
+        	    <Category>X-Xfce-Toplevel</Category>
+		    <Filename>exo-file-manager.desktop</Filename>
+		    <Filename>exo-terminal-emulator.desktop</Filename>
+		    <Filename>xfce4-about.desktop</Filename>
+		    <Filename>xfce4-run.desktop</Filename>
+		</Or>
+	    </Exclude>
+	</Menu>
+    </Menu>
+
+    <Menu>
+        <Name>Internet</Name>
+        <Exclude>
+            <Or>
+                <Filename>exo-mail-reader.desktop</Filename>
+                <Filename>exo-web-browser.desktop</Filename>
+            </Or>
+        </Exclude>
+	<Menu>
+	    <Name>Other</Name>
+	    <Exclude>
+	        <Or>
+                    <Filename>exo-mail-reader.desktop</Filename>
+		    <Filename>exo-web-browser.desktop</Filename>
+		    <Category>X-Xfce-Toplevel</Category>
+		</Or>
+	    </Exclude>
+	</Menu>
+    </Menu>
+
+    <Menu>
+        <Name>System</Name>
+        <Exclude>
+            <Or>
+                <Filename>xfce4-session-logout.desktop</Filename>
+            </Or>
+        </Exclude>
+        <Layout>
+        <Filename>indexhtml.desktop</Filename>
+        <Filename>livecd-install.desktop</Filename>
+        <Filename>apt-indicator.desktop</Filename>
+        <Separator/>
+        <Merge type="all"/>
+        </Layout>
+	<Menu>
+	    <Name>Other</Name>
+	    <Exclude>
+	        <Or>
+                    <Filename>xfce4-session-logout.desktop</Filename>
+		    <Category>X-Xfce-Toplevel</Category>
+		</Or>
+	    </Exclude>
+	</Menu>
+    </Menu>
+
+    <Include>
+        <Category>X-Xfce-Toplevel</Category>
+    </Include>
+
+    <MergeFile>applications-menueditor.menu</MergeFile>
+    <MergeFile>xfce-applications-menueditor.menu</MergeFile>
+
+</Menu>

menu/altlinux-wine.directory

+[Desktop Entry]
+Name=Wine
+Comment=Wine
+Icon=wine
+Type=Directory
\ No newline at end of file

menu/applications/Ri-li.desktop

+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Ri-li
+GenericName=Ri-li
+Comment=Drive a toy wood engine
+Exec=Ri_li
+TryExec=Ri_li
+Icon=Ri-li
+Terminal=false
+StartupNotify=false
+Categories=Game;ArcadeGame;

menu/applications/adobe_flash_player_eula.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Adobe Flash Plugin EULA
+GenericName=License Agreement
+GenericName[ru]=Лицензионное соглашение
+Icon=networking_www_section
+Exec=/bin/sh -c "$BROWSER file:///usr/share/doc/mozilla-plugin-adobe-flash-10.0.32.18/LICENSE.txt"
+TryExec=/bin/sh -c "$BROWSER file:///usr/share/doc/mozilla-plugin-adobe-flash-10.0.32.18/LICENSE.txt"
+Categories=AudioVideo;
+NoDisplay=true
\ No newline at end of file

menu/applications/alt-alt_linux.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=ALT Linux
+GenericName=
+Comment=ALT Linux Documentation main page
+Icon=altlinux.png
+Exec=/bin/sh -c "$BROWSER /usr/share/doc/alt-docs/index.html"
+TryExec=/bin/sh -c "$BROWSER /usr/share/doc/alt-docs/index.html"
+Terminal=false
+Hidden=true
+Categories=Utility;
+Name[ru]=ALT Linux
+Comment[ru]=Главная страница документации ALT Linux
\ No newline at end of file

menu/applications/alt-docs-main.desktop

+[Desktop Entry]
+Type=Application
+Icon=altlinux
+Hidden=true
+Name=ALT Linux Documentation
+Name[ru]=Документация ALT Linux
+Comment=ALT Linux Documentation main page
+Exec=url_handler.sh /usr/share/doc/alt-docs/index.html
+TryExec=url_handler.sh /usr/share/doc/alt-docs/index.html
+Categories=Documentation;System;Core;X-ALTLinux-Core;

menu/applications/celestia.desktop

+[Desktop Entry]
+Name=Space simulator Celestia
+Name[ru]=Симуляция космоса Celestia
+GenericName=Space simulation Celestia
+GenericName[ru]=Симуляция космоса Celestia
+Encoding=UTF-8
+Comment=A real-time visual space simulation
+Exec=celestia %f
+TryExec=celestia %f
+Terminal=false
+Icon=celestia
+Type=Application
+Categories=Game;

menu/applications/cups.desktop

+[Desktop Entry]
+Categories=System;Printing;HardwareSettings;X-Red-Hat-Base;
+Exec=/usr/bin/xdg-open http://localhost:631/
+TryExec=/usr/bin/xdg-open http://localhost:631/
+Icon=cups
+StartupNotify=false
+Terminal=false
+Type=Application
+Name=Manage Printing
+Comment=CUPS Web Interface
+Name[de]=Druckerverwaltung
+Comment[de]=CUPS Webinterface
+Name[en_US]=Manage Printing
+Comment[en_US]=CUPS Web Interface
+Name[es]=Administrar impresión
+Comment[es]=Interfaz Web de CUPS
+Name[et]=Trükkimise haldur
+Comment[et]=CUPS-i veebiliides
+Name[eu]=Kudeatu inprimaketak
+Comment[eu]=CUPSen web interfazea
+Name[fr]=Gestionnaire d'impression
+Comment[fr]=Interface Web de CUPS
+Name[he]=נהל הדפסות
+Comment[he]=ממשק דפדפן של CUPS
+Name[id]=Manajemen Pencetakan
+Comment[id]=Antarmuka Web CUPS
+Name[it]=Gestione stampa
+Comment[it]=Interfaccia web di CUPS
+Name[ja]=印刷の管理
+Comment[ja]=CUPS Web インタフェース
+Name[pl]=Zarządzanie drukowaniem
+Comment[pl]=Interfejs WWW CUPS
+Name[ru]=Настройка печати
+Comment[ru]=Настройка CUPS
+Name[sv]=Hantera skrivare
+Comment[sv]=CUPS webb-gränssnitt
+Name[zh]=打印机管理
+Comment[zh]=CUPS网页界面
+Name[zh_TW]=印表管理
+Comment[zh_TW]=CUPS 網頁介面
+Hidden=true
\ No newline at end of file

menu/applications/defaults.list

+[Default Applications]
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/pdf=evince.desktop
+image/jpeg=gthumb.desktop
+image/png=gthumb.desktop
+image/gif=gthumb.desktop
+image/tiff=gthumb.desktop
+image/bmp=gthumb.desktop
+audio/mpeg=smplayer.desktop
+video/x-flv=smplayer.desktop
+video/quicktime=smplayer.desktop
+video/x-msvideo=smplayer.desktop
+audio/x-scpls=smplayer.desktop

menu/applications/dropbox.desktop

+[Desktop Entry]
+Name=Dropbox File Synchronizer
+Name[ru]=Синхронизация файлов Dropbox
+GenericName=Dropbox File Synchronizer
+GenericName[ru]=Синхронизация файлов Dropbox
+Comment=Sync your files across computers and to the web
+Exec=dropbox-wrapper
+TryExec=dropbox-wrapper
+Terminal=false
+Type=Application
+Icon=dropbox
+Categories=Network;FileTransfer;
+StartupNotify=false