Merge branch 'P5-server' into school-server

Conflicts: branding.spec images/boot.jpg images/boot.png images/logo.png notes/release-notes.all.html.in
2009-10-20 16:58:46 +04:00 · 2009-10-20 16:58:46 +04:00 · e89e570b9e
commit e89e570b9e
parent 1d1ded782f dbe22bdbf1
44 changed files with 1557 additions and 450 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -15,4 +15,4 @@ all:
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"

 include components.mk
-install: browser-qt ahttpd boot
+install: browser-qt ahttpd boot indexhtml
--- a/branding.spec
+++ b/branding.spec
@ -9,7 +9,8 @@

 Name: branding-%brand-%theme
 Version: 5.0.0
-Release: alt5
+Release: alt33
+
 BuildArch: noarch

 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@ -195,17 +196,6 @@ popd
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/

-#indexhtml
-%define _altdocsdir %_defaultdocdir/alt-docs
-%define _indexhtmldir %_altdocsdir/indexhtml
-pushd indexhtml
-mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
-cp -r * %buildroot%_indexhtmldir/
-rm -f %buildroot%_indexhtmldir/*.in %buildroot%_indexhtmldir/indexhtml.desktop
-touch %buildroot%_indexhtmldir/index.html
-install -m644 indexhtml.desktop %buildroot%_desktopdir/
-popd
-
 #xfce-settings
 pushd xfce-settings
 mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
@ -298,18 +288,48 @@ echo $lang > lang
 %files slideshow
 /usr/share/install2/slideshow

+%define indexhtmldir %_datadir/doc/alt-docs/indexhtml
+
 %files indexhtml
-%ghost %_indexhtmldir/index.html
-%_indexhtmldir/*
-%_desktopdir/*
+%ghost %indexhtmldir/index.html
+%indexhtmldir/index-*.html
+%indexhtmldir/index.css
+%indexhtmldir/img
+%_desktopdir/indexhtml.desktop

 %changelog
-* Thu Sep 24 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt5
- new slideshow
- new notes
+* Tue Oct 13 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt33
+- colors of inactive buttons fixed
+- color of progress bar in bootloader fixed
+
+* Mon Oct 12 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt32
+- add classes for color rows in table.alterator-listbox
+
+* Thu Oct 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt31
+- add classes: close-dialog-button, help-button, and resizeable
+- add svg image for close-dialog-button
+
+* Fri Oct 02 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt30
+- not using indexhtml-ua anymore
 - new logo

-* Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt4
+* Tue Sep 29 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt29
+- some colors fixed
+- new indexhtml
+- english versions of indexhtml and notes
+- add svg images and style for page navigation buttons (inger)
+
+* Thu Sep 24 2009 Alexandra Panyukova <mex3@altlinux.ru> 5.0.0-alt28
+- new images
+- new variant of notes
+- some colors fixed
+
+* Fri Sep 18 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt27
+- add style for clock
+- improve style for alterator-listbox (closes: #21503)
+- redesign indexhtml component
+
+* Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt26
 - add style for accordion and #box

 * Thu Aug 27 2009 Vitaly Kuznetsov <vitty@altlinux.ru> 5.0.0-alt3
--- a/components.mk
+++ b/components.mk
@ -12,12 +12,16 @@ browser-qt:components/browser-qt/design/bg.png
 # ahttpd

 ahttpd:
+	for i in components/ahttpd/images/*.svg; do \
+	    image=$${i%.svg}; \
+	    convert -background none $$image.svg $$image.png ; \
+	done
 	install -d $(datadir)/alterator/design/styles
 	cp -a components/ahttpd/images $(datadir)/alterator/design
-	cp -a images/logo.png $(datadir)/alterator/design/images/logo.png
-#[ ! -f images/logo.png ] || convert images/logo.png -fill '#ffffff' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 24 -gravity northwest -draw 'text 0,0 "$(VERSION) $(NAME)"' $(datadir)/alterator/design/images/logo.png
+	install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
 	cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles

+
 # bootloader and bootsplash
 boot:
 	cp -a  /usr/src/design-bootloader-source ./
@ -40,3 +44,14 @@ boot:
 	install -d -m 755 $(datadir)/gfxboot/$(THEME)
 	install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
 	install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
+
+# index html page, start page for all local browsers
+INDEXHTML_DIR=$(datadir)/doc/alt-docs/indexhtml
+indexhtml:
+	for i in notes/index*.html components/indexhtml/*.css;do \
+	  install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
+	done
+	install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
+	cp -a components/indexhtml/img $(INDEXHTML_DIR)
+	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/img/product-logo.png
+	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
--- a/components/ahttpd/images/clock-face.png
+++ b/components/ahttpd/images/clock-face.png
--- a/components/ahttpd/images/close-dialog-button.svg
+++ b/components/ahttpd/images/close-dialog-button.svg
@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22.088934"
+   height="22.084892"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47pre2 r22153"
+   version="1.0"
+   sodipodi:docname="dialog_close.svg"
+   inkscape:output_extension="org.inkscape.output.svgz.inkscape"
+   inkscape:export-filename="/home/pinheiro/pics/oxygen/scalable/actions/dialog-close.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective62" />
+    <linearGradient
+       id="linearGradient4296">
+      <stop
+         id="stop4298"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:1;" />
+      <stop
+         id="stop4300"
+         offset="1"
+         style="stop-color:#650000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient4272"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       id="linearGradient7321">
+      <stop
+         style="stop-color:#8c0000;stop-opacity:1;"
+         offset="0"
+         id="stop7323" />
+      <stop
+         style="stop-color:#650000;stop-opacity:1;"
+         offset="1"
+         id="stop7325" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6740">
+      <stop
+         style="stop-color:#4d0000;stop-opacity:0;"
+         offset="0"
+         id="stop6742" />
+      <stop
+         id="stop6748"
+         offset="0.5"
+         style="stop-color:#4d0000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#4d0000;stop-opacity:0;"
+         offset="1"
+         id="stop6744" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9971"
+       x2="-12.0029"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5958">
+      <stop
+         id="stop5960"
+         style="stop-color:#8c0000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop5962"
+         style="stop-color:#bf0000;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9971"
+       x2="-12.0029"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4770">
+      <stop
+         id="stop4772"
+         style="stop-color:#ffbe00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4774"
+         style="stop-color:#f5d600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       y2="-383.9975"
+       x2="-23.516129"
+       y1="-383.9971"
+       x1="-84.002403"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3711">
+      <stop
+         id="stop3713"
+         style="stop-color:white;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3715"
+         style="stop-color:white;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3290">
+      <stop
+         style="stop-color:yellow;stop-opacity:1;"
+         offset="0"
+         id="stop3292" />
+      <stop
+         style="stop-color:#ffb66d;stop-opacity:1;"
+         offset="1"
+         id="stop3294" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1563">
+      <stop
+         id="stop1565"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop1567"
+         offset="1"
+         style="stop-color:white;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3273">
+      <stop
+         id="stop3275"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.55035973;" />
+      <stop
+         id="stop3277"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5163">
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="fill:url(#linearGradient5167);fill-opacity:1"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle5165" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter5943"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.04"
+         id="feGaussianBlur5945" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7317"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.8805897"
+         id="feGaussianBlur7319" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7321"
+       id="linearGradient8922"
+       gradientUnits="userSpaceOnUse"
+       x1="351.02234"
+       y1="65.788521"
+       x2="309.21854"
+       y2="82.680611" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2390"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3711"
+       id="linearGradient3003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
+       x1="-80.00296"
+       y1="-131.93112"
+       x2="-45.096584"
+       y2="-131.93112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6740"
+       id="linearGradient3008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.000035,-56.000003)"
+       x1="117.81589"
+       y1="103.01254"
+       x2="90.537666"
+       y2="76.633896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient3010"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4770"
+       id="radialGradient3012"
+       gradientUnits="userSpaceOnUse"
+       cx="345.80753"
+       cy="85.250488"
+       fx="345.80753"
+       fy="85.250488"
+       r="36"
+       gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5958"
+       id="linearGradient3014"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       x1="-86.120354"
+       y1="-381.09921"
+       x2="-56.357521"
+       y2="-373.1243" />
+    <filter
+       inkscape:collect="always"
+       id="filter3138"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.6513927"
+         id="feGaussianBlur3140" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3162"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.96794009"
+         id="feGaussianBlur3164" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5958"
+       id="linearGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-39.9985,140.0029)"
+       x1="-86.120354"
+       y1="-381.09921"
+       x2="-56.357521"
+       y2="-373.1243" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4770"
+       id="radialGradient2880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6662862,-0.6560105,0.9893764,1.0048737,31.05592,226.43791)"
+       cx="345.80753"
+       cy="85.250488"
+       fx="345.80753"
+       fy="85.250488"
+       r="36" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4296"
+       id="linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       x1="328.12448"
+       y1="120.81158"
+       x2="336.98077"
+       y2="87.759453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3711"
+       id="linearGradient2884"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.3460321,-1.3460321,0,-112.6741,119.24399)"
+       x1="-80.00296"
+       y1="-131.93112"
+       x2="-45.096584"
+       y2="-131.93112" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6740"
+       id="linearGradient2886"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20.000035,-56.000003)"
+       x1="117.81589"
+       y1="103.01254"
+       x2="90.537666"
+       y2="76.633896" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="9.01806"
+     inkscape:cy="12.37148"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1024"
+     inkscape:window-height="697"
+     inkscape:window-x="107"
+     inkscape:window-y="70"
+     showgrid="true"
+     inkscape:grid-points="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="4px"
+       spacingy="4px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-3.2427146,-50.107128)">
+    <g
+       id="g2868"
+       transform="matrix(0.17079235,0,0,0.17076092,3.2683312,49.899927)">
+      <path
+         transform="matrix(0.5662048,0,0,0.5662048,55.73989,54.555422)"
+         d="m 115.5,20 c 0,55.228475 -44.771525,100 -100,100 -55.228475,0 -100,-44.771525 -100,-100 0,-55.228475 44.771525,-100 100,-100 55.228475,0 100,44.771525 100,100 z"
+         sodipodi:ry="100"
+         sodipodi:rx="100"
+         sodipodi:cy="20"
+         sodipodi:cx="15.5"
+         id="path2396"
+         style="opacity:0.50271738;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.13749999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:4.15;filter:url(#filter3138)"
+         sodipodi:type="arc" />
+      <circle
+         transform="matrix(-1.5639433,0.4190574,-0.4190574,-1.5639433,641.54821,62.027543)"
+         id="circle3581_2_"
+         ry="8.0010004"
+         cy="92"
+         cx="343.99899"
+         rx="8.0010004"
+         r="36"
+         style="fill:url(#linearGradient2878);fill-opacity:1"
+         sodipodi:cx="343.99899"
+         sodipodi:cy="92"
+         sodipodi:rx="36"
+         sodipodi:ry="36"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="fill:url(#radialGradient2880);fill-opacity:1;filter:url(#filter3162)"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle4383"
+         transform="matrix(-1.1729576,0.3142929,-0.3142929,-1.1729576,497.41122,62.095683)"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <circle
+         sodipodi:ry="36"
+         sodipodi:rx="36"
+         sodipodi:cy="92"
+         sodipodi:cx="343.99899"
+         style="opacity:0.8;fill:none;stroke:url(#linearGradient2882);stroke-width:6.75138187;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter7317)"
+         r="36"
+         rx="8.0010004"
+         cx="343.99899"
+         cy="92"
+         ry="8.0010004"
+         id="circle4776"
+         transform="matrix(-1.5639433,-0.4190574,-0.4190574,1.5639433,641.54821,62.572542)"
+         clip-path="url(#clipPath5163)"
+         d="m 379.99899,92 c 0,19.88225 -16.11775,36 -36,36 -19.88225,0 -36,-16.11775 -36,-36 0,-19.882251 16.11775,-36 36,-36 19.88225,0 36,16.117749 36,36 z" />
+      <path
+         id="circle16776"
+         d="m 65.000079,11.557516 c -20.67048,0 -37.942548,14.596148 -42.105568,34.029379 8.298024,7.735491 24.043093,12.955554 42.105568,12.955554 18.062496,0 33.807544,-5.220063 42.105561,-12.955554 -4.163,-19.433231 -21.435087,-34.029379 -42.105561,-34.029379 z"
+         style="opacity:0.8;fill:url(#linearGradient2884);fill-opacity:1" />
+      <g
+         transform="matrix(1.2882604,1.2882604,-1.2882604,1.2882604,-45.790405,-141.24514)"
+         id="g6850">
+        <path
+           id="path4123"
+           d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
+           style="fill:none;stroke:url(#linearGradient2886);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter5943)"
+           sodipodi:nodetypes="ccccccccccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           d="m 118.00003,15.999997 0,16 -16,0 0,8 16,0 0,16 8,0 0,-16 16,0 0,-8 -16,0 0,-16 -8,0 z"
+           id="rect3232"
+           sodipodi:nodetypes="ccccccccccccc" />
+      </g>
+    </g>
+  </g>
+</svg>
--- a/components/ahttpd/images/first-page-button.svg
+++ b/components/ahttpd/images/first-page-button.svg
@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.163"
+   height="20.163"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="first-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3595">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.4325"
+         id="feGaussianBlur3597" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="6.4719397"
+     inkscape:cy="12.058399"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(5.25272,-2084.818)">
+    <g
+       id="g4551"
+       transform="translate(-100.54622,1652.5558)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3719-6"
+         width="25"
+         height="20"
+         x="95.375"
+         y="432.34937"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         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:#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"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3721-0"
+         d="m 114.375,437.34936 0,10 -10,-5 10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+      <rect
+         y="437.34937"
+         x="102.375"
+         height="10.000001"
+         width="2.0000136"
+         id="rect3715-6"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
--- a/components/ahttpd/images/last-page-button.svg
+++ b/components/ahttpd/images/last-page-button.svg
@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.163"
+   height="20.163"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="last-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4769"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4827"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3602">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.4325"
+         id="feGaussianBlur3604" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="6.2525407"
+     inkscape:cy="9.4532616"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(34.78794,-2065.2186)">
+    <g
+       id="g4567"
+       transform="translate(-219.70644,1632.9251)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3719"
+         width="25"
+         height="20"
+         x="185"
+         y="432.36218"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         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:#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"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3721"
+         d="m 192,437.36218 0,10 10,-5 -10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+      <rect
+         transform="scale(-1,1)"
+         y="437.36218"
+         x="-204"
+         height="10.000001"
+         width="2.0000136"
+         id="rect3715"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
--- a/components/ahttpd/images/next-page-button.svg
+++ b/components/ahttpd/images/next-page-button.svg
@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.02"
+   height="20.022818"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="next-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4769"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3596">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.43"
+         id="feGaussianBlur3598" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="10.329226"
+     inkscape:cy="5.3197997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(21.03808,-2078.2196)">
+    <g
+       id="g4562"
+       transform="translate(-176.02808,1645.8574)">
+      <rect
+         ry="3.8469892"
+         rx="3.8469892"
+         y="432.36218"
+         x="155"
+         height="20"
+         width="25"
+         id="rect2849"
+         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:#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:#d0e1ff;fill-opacity:1;stroke:none"
+         d="m 163,437.36218 0,10 10,-5 -10,-5 z"
+         id="path2828" />
+    </g>
+  </g>
+</svg>
--- a/components/ahttpd/images/prev-page-button.svg
+++ b/components/ahttpd/images/prev-page-button.svg
@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25.032"
+   height="20.032"
+   id="svg4592"
+   version="1.1"
+   inkscape:version="0.47pre2 r22153"
+   sodipodi:docname="prev-page-button.svg">
+  <defs
+     id="defs4594">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4600" />
+    <inkscape:perspective
+       id="perspective4581"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4711"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3595">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.43"
+         id="feGaussianBlur3597" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.829866"
+     inkscape:cx="16.33258"
+     inkscape:cy="6.4077993"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="948"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4597">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(15.11336,-2079.2984)">
+    <g
+       id="g4557"
+       transform="translate(-140.09736,1646.9394)">
+      <rect
+         style="fill:#729fcf;fill-opacity:1;stroke:none"
+         id="rect3707"
+         width="25"
+         height="20"
+         x="125"
+         y="432.36218"
+         rx="3.8469892"
+         ry="3.8469892" />
+      <path
+         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:#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"
+         sodipodi:type="inkscape:offset" />
+      <path
+         id="path3709"
+         d="m 142,437.36218 0,10 -10,-5 10,-5 z"
+         style="fill:#d0e1ff;fill-opacity:1;stroke:none"
+         inkscape:label="Triangle" />
+    </g>
+  </g>
+</svg>
--- a/components/ahttpd/images/steps/bacula-restore-finish.png
+++ b/components/ahttpd/images/steps/bacula-restore-finish.png
--- a/components/ahttpd/images/steps/bacula-restore-search.png
+++ b/components/ahttpd/images/steps/bacula-restore-search.png
--- a/components/ahttpd/images/steps/bacula-restore-select.png
+++ b/components/ahttpd/images/steps/bacula-restore-select.png
--- a/components/ahttpd/images/steps/packages.png
+++ b/components/ahttpd/images/steps/packages.png
--- a/components/ahttpd/styles/alterator.css.in
+++ b/components/ahttpd/styles/alterator.css.in
@ -66,22 +66,30 @@ textarea, select, input.text {
 	background-color: #@MIDDLE_LABELS_HEX@;
 }

+.box {
+    position: relative;
+    width: 780px;
+    margin-top: 10px;

-.frame-table {
-	border-style:solid;
-	border-width:1px;
-	margin: 3px;
-}
+    padding: 10px 20px;
+    padding-top: 10px;

-.frame-table td, .frame-table th {
-	border-style:solid;
-	border-width:1px;
-	padding: 1px 1px 3px 3px;
+    background-color: #@LIGHT_COLOR_HEX@;
+    border: 1px solid #@DARK_COLOR_HEX@;;
+
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -khtml-border-radius: 0.5em;
+    border-radius: 0.5em;
 }

 .disabled {
-	color: #c3c7cb;
-	background-color: #@LIGHT_COLOR_HEX@;
+	color: #@MIDDLE_LABELS_HEX@;
+	background-color: #@MIDDLE_COLOR_HEX@;
+}
+
+.disabled:hover {
+	background-color: #@MIDDLE_COLOR_HEX@;
 }

 .alterator-progress {
@ -97,6 +105,37 @@ textarea, select, input.text {
 	height: 20px;
 }

+.next-page-button,.prev-page-button,.first-page-button,.last-page-button {
+    width: 25px;
+    height: 20px;
+    vertical-align:middle;
+    cursor: pointer;
+}
+
+.next-page-button {
+    background: url(/design/images/next-page-button.png) no-repeat;
+}
+
+.prev-page-button {
+    background: url(/design/images/prev-page-button.png) no-repeat;
+}
+
+.first-page-button {
+    background: url(/design/images/first-page-button.png) no-repeat;
+}
+
+.last-page-button {
+    background: url(/design/images/last-page-button.png) no-repeat;
+}
+
+.close-dialog-button {
+	width: 22px;
+	height: 22px;
+	border: 0px;
+	cursor: pointer;
+	background: url(/design/images/close-dialog-button.png) no-repeat;
+}
+
 /* messages */

 .alterator-information-message {
@ -131,6 +170,12 @@ textarea, select, input.text {
    vertical-align:middle;
 }

+/* clock and timeedit */
+
+canvas.alterator-clock {
+    background: url(/design/images/clock-face.png) no-repeat;
+}
+
 /* calendar and dateedit */

 .year {
@ -248,31 +293,6 @@ textarea, select, input.text {
 	border-radius: 4px;
 }

-/* help popup */
-
-#help-popup {
-	padding-left: 10px;
-	padding-right: -30px;
-	background-color: #@LIGHT_COLOR_HEX@;
-
-        border: 1px solid #@DARK_COLOR_HEX@;;
-        -moz-border-radius: 0.5em;
-        -webkit-border-radius: 0.5em;
-        -khtml-border-radius: 0.5em;
-        border-radius: 0.5em;
-}
-
-.hresizeable {
-	width: 100%;
-	height: 7px;
-	background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
-	cursor: s-resize;
-}
-
-.hresizeable:hover {
-	background-color: #@DARK_COLOR_HEX@;
-}
-
 /* tables */

 table.alterator-listbox {
@ -296,6 +316,7 @@ table.alterator-listbox thead tr .header {
 	background-repeat: no-repeat;
 	background-position: center right;
 	cursor: pointer;
+	padding-right: 24px;
 }

 table.alterator-listbox tbody td {
@ -311,6 +332,29 @@ table.alterator-listbox tbody tr.odd td {
 	background-color:#@LIGHT_COLOR_HEX@;
 }

+table.alterator-listbox tbody tr.selected td, table.alterator-listbox tbody tr.odd.selected td {
+	background-color: #D0E1FF;
+	border-top:  #ffffff solid 1px;
+}
+
+table.alterator-listbox tbody tr.error td {
+	background-color: #e6999b;
+	font-weight: bold;
+}
+
+table.alterator-listbox tbody tr.odd.error td {
+	background-color: #e68b8d;
+	font-weight: bold;
+}
+
+table.alterator-listbox tbody tr.working td {
+	background-color: #f2ecbd;
+}
+
+table.alterator-listbox tbody tr.odd.working td {
+	background-color: #f2e88f;
+}
+
 table.alterator-listbox thead tr .headerSortUp {
 	background-image: url(/design/images/asc.gif);
 }
@ -350,6 +394,40 @@ div.alterator-accordion h3.ui-state-active {
 	background-image: url(/design/images/asc.gif);
 }

+/* resizeable */
+
+.ui-resizable-s {
+    cursor: s-resize;
+    height: 7px;
+    width: 100%;
+    bottom: 0px;
+    left: 0px;
+    background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+}
+
+.ui-resizable-s:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}
+
+/* help button */
+
+.ui-help-button {
+	background-color: #@LIGHT_COLOR_HEX@;
+	margin-bottom: 10px;
+	padding-top: 7px;
+
+	border: 1px solid #@DARK_COLOR_HEX@;;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.ui-help-button-content {
+	padding-left: 10px;
+	padding-right: 30px;
+}
+
 /* top line */

 #top {
@ -365,8 +443,8 @@ div.alterator-accordion h3.ui-state-active {
 }

 #product-logo {
-	background: url(/design/images/logo.png) no-repeat;
-	width: 415px;
+	background: url(/design/images/product-logo.png) no-repeat;
+	width: 540px;
 	height: 52px;
 	border: 0px;
 }
@ -390,9 +468,32 @@ div.alterator-accordion h3.ui-state-active {
 /* deprecated */

 .error-message {
-	background-color: #FFCACA;
-	border: 1px solid #FF6060;
+	background-color: #@LIGHT_ERROR_HEX@;
+	border: 1px solid #@DARK_ERROR_HEX@;
 	padding-left:10px;
 	padding-right:10px;
 	margin-bottom:10px;
 }
+
+#help-popup {
+	padding-left: 10px;
+	padding-right: -30px;
+	background-color: #@LIGHT_COLOR_HEX@;
+
+        border: 1px solid #@DARK_COLOR_HEX@;;
+        -moz-border-radius: 0.5em;
+        -webkit-border-radius: 0.5em;
+        -khtml-border-radius: 0.5em;
+        border-radius: 0.5em;
+}
+
+.hresizeable {
+	width: 100%;
+	height: 7px;
+	background:#@MIDDLE_COLOR_HEX@ url(/design/images/hgrabber.gif) no-repeat scroll 45%;
+	cursor: s-resize;
+}
+
+.hresizeable:hover {
+	background-color: #@DARK_COLOR_HEX@;
+}
--- a/components/bootloader/gfxboot.cfg.in
+++ b/components/bootloader/gfxboot.cfg.in
@ -44,7 +44,7 @@ mainmenu.selected.fg=0x@LIGHT_LABELS_HEX@
 bootopt.label.fg=0x@DARK_LABELS_HEX@
 bootopt.text.fg=0x@DARK_LABELS_HEX@
 ; progress bar color
-progress.bar.color=0x@MIDDLE_COLOR_HEX@
+progress.bar.color=0x@DARK_COLOR_HEX@
 ; menu colors
 menu.normal.bg=0x798491
 menu.normal.fg=0x@MIDDLE_LABELS_HEX@
--- a/components/indexhtml/img/alt-linux-team.png
+++ b/components/indexhtml/img/alt-linux-team.png
--- a/components/indexhtml/img/bullet.png
+++ b/components/indexhtml/img/bullet.png
--- a/components/indexhtml/img/null.gif
+++ b/components/indexhtml/img/null.gif
--- a/components/indexhtml/index.css.in
+++ b/components/indexhtml/index.css.in
@ -0,0 +1,88 @@
+/* Stylesheet for index file */
+
+body {
+	background-color: #@MIDDLE_COLOR_HEX@;
+	color: #@MIDDLE_LABELS_HEX@;
+	margin: 0px;
+	padding: 10px;
+	font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
+	font-size: 9pt;
+}
+
+p {
+    text-align: justify;
+}
+
+a:link, a:visited { 
+    text-decoration: none; 
+    color: #39c;
+}
+
+a:hover { 
+    text-decoration: underline; 
+    color: #f60;
+}
+
+ul li {
+    padding-left: 3px;
+    text-align: left;
+    list-style: square url('img/bullet.png');
+}
+
+li.spacebefore {
+    margin-top: 1em;
+}
+
+div.box {
+    position: relative;
+    width: 780px;
+    margin-top: 10px;
+
+    padding: 10px 20px;
+    padding-top: 10px;
+
+    background-color: #@LIGHT_COLOR_HEX@;
+    border: 1px solid #@DARK_COLOR_HEX@;;
+
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+    -khtml-border-radius: 0.5em;
+    border-radius: 0.5em;
+}
+
+div.warning {
+    border: 1px solid #@DARK_ERRORS_HEX@;;
+    background-color: #@LIGHT_ERRORS_HEX@;;
+    padding: 5px;
+}
+
+#lang {
+    text-align: center;
+}
+
+
+.footer {
+	font-size: 9px;
+	color: #@DARK_COLOR_HEX@;
+}
+
+/* top line */
+
+#top {
+	text-align:left;
+	background: #@DARK_COLOR_HEX@;
+
+	padding: 0.25em;
+	margin-bottom: 10px;
+	-moz-border-radius: 0.5em;
+	-webkit-border-radius: 0.5em;
+	-khtml-border-radius: 0.5em;
+	border-radius: 0.5em;
+}
+
+#product-logo {
+	background: url(img/product-logo.png) no-repeat;
+	width: 540px;
+	height: 52px;
+	border: 0px;
+}
--- a/components/indexhtml/indexhtml.desktop.in
+++ b/components/indexhtml/indexhtml.desktop.in
--- a/configure.ac
+++ b/configure.ac
@ -4,12 +4,17 @@ 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=F4F8F9
 MIDDLE_COLOR_HEX=E2E6EB
 DARK_COLOR_HEX=1B3664
 LIGHT_LABELS_HEX=EAEDEF
-DARK_LABELS_HEX=B51F2D
+DARK_LABELS_HEX=B51F2D #selection
 MIDDLE_LABELS_HEX=415E6F
+
+DARK_ERROR_HEX=DARK_LABELS_HEX
+LIGHT_ERROR_HEX=FFCACA
+
 LIGHT_COLOR_DEC=`./color_dec ${LIGHT_COLOR_HEX}`
 MIDDLE_COLOR_DEC=`./color_dec ${MIDDLE_COLOR_HEX}`
 DARK_COLOR_DEC=`./color_dec ${DARK_COLOR_HEX}`
@ -48,11 +53,11 @@ AC_CONFIG_FILES([
 		 notes/release-notes.all.html
 		 notes/license.ru.html
 		 notes/license.all.html
-		 indexhtml/indexhtml.desktop
-		 indexhtml/index-ru.html
-		 indexhtml/index-uk.html
-		 indexhtml/index-en.html
-		 indexhtml/index.css
+		 notes/index-ru.html
+		 notes/index-uk.html
+		 notes/index-en.html
+		 components/indexhtml/indexhtml.desktop
+		 components/indexhtml/index.css
 		 gnome-settings/gtkrc
 		 gnome-settings/index.theme
 		 gnome-settings/metacity-theme-1.xml
--- a/images/boot.jpg
+++ b/images/boot.jpg
--- a/images/boot.png
+++ b/images/boot.png
--- a/images/product-logo.png
+++ b/images/product-logo.png
--- a/indexhtml/img/altlinux-logo.png
+++ b/indexhtml/img/altlinux-logo.png
--- a/indexhtml/img/bg.png
+++ b/indexhtml/img/bg.png
--- a/indexhtml/index-en.html.in
+++ b/indexhtml/index-en.html.in
@ -1,82 +0,0 @@
-<!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=lang>
- <a href="index-ru.html">Русский</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div id="content">
-
-<table border="0" cellspacing="10"><tr>
-<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
-<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
-</tr></table>
-
-<div id="main">
-
-<div id="pane">
-<div class="footer">Search on ALT Linux websites</div>
-<!-- Google CSE Search Box Begins  -->
-<form action="http://www.google.com/cse" id="searchbox_014412136813254060649:m2__wfh9ajy">
-<!--table border="1" width="100%">
-<tbody><tr><td-->
-<input type="hidden" name="cx" value="014412136813254060649:m2__wfh9ajy" />
-<input type="text" name="q" size="23" />
-<input type="submit" name="sa" value="Поиск" id="button" />
-<!--/td></tr></tbody></table-->
-</form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
-<!-- Google CSE Search Box Ends -->
-
-<div id="team">
-<h2>ALT Linux Team</h2>
-
-<img src="img/alt-linux-team.png" width="144" height="55">
-
-<p align="justify" style="padding: 15px;">This distribution would never be accomplished without active efforts put by ALT Linux Team&nbsp;&mdash; a community of free/libre software developers.</p>
-<ul>
- <li><a href="http://www.altlinux.org/">Community Wiki</a></li>
- <li><a href="http://backports.altlinux.org/">Backports</a></li>
- <li><a href="http://bugs.altlinux.org/">Report a bug</a></li>
-</ul>
-</div>
-</div>
-
-<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>
-
-<div id="documentation">
-<h2>Documentation</h2>
-<ul>
- <li><a href="../../@THEME@/index.html">User manual</a></li>
-</ul>
-</div>
-
-<div id="web">
-<h2>in Internet</h2>
-<ul>
- <li><a href="http://www.altlinux.ru/">Official ALT Linux website</a></li>
- <li><a href="http://faq.altlinux.ru/">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>
-</div>
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2008. All rights reserved.<br />
-Address: 5th Donskoy proezd, 15/11, Moscow<br />
-Phone/Fax: +7 (495) 662-3883</p>
-</div>
-
-</body>
-</html>
--- a/indexhtml/index-ru.html.in
+++ b/indexhtml/index-ru.html.in
@ -1,82 +0,0 @@
-<!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=lang>
- <a href="index-en.html">English</a> |
- <a href="index-uk.html">Українська</a>
-</div>
-
-<div id="content">
-
-<table border="0" cellspacing="10"><tr>
-<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
-<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
-</tr></table>
-
-<div id="main">
-
-<div id="pane">
-<div class="footer">Поиск по сайтам ALT Linux</div>
-<!-- Google CSE Search Box Begins  -->
-<form action="http://www.google.com/cse" id="searchbox_014412136813254060649:m2__wfh9ajy">
-<!--table border="1" width="100%">
-<tbody><tr><td-->
-<input type="hidden" name="cx" value="014412136813254060649:m2__wfh9ajy" />
-<input type="text" name="q" size="23" />
-<input type="submit" name="sa" value="Поиск" id="button" />
-<!--/td></tr></tbody></table-->
-</form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
-<!-- Google CSE Search Box Ends -->
-
-<div id="team">
-<h2>ALT Linux Team</h2>
-
-<img src="img/alt-linux-team.png" width="144" height="55">
-
-<p align="justify" style="padding: 15px;">Этот дистрибутив не появился бы без активного участия 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>
-</div>
-
-<p align="justify">Добро пожаловать в <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
-
-<div id="documentation">
-<h2>Документация</h2>
-<ul>
- <li><a href="../../@THEME@/index.html">Руководство пользователя</a></li>
-</ul>
-</div>
-
-<div id="web">
-<h2>Информация в Интернете</h2>
-<ul>
- <li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
- <li><a href="http://faq.altlinux.ru/">Ответы на часто задаваемые вопросы</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>
-</div>
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2008. Все права защищены.<br />
-Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 11<br />
-Телефон/факс: +7 (495) 662-3883</p>
-</div>
-
-</body>
-</html>
--- a/indexhtml/index-uk.html.in
+++ b/indexhtml/index-uk.html.in
@ -1,84 +0,0 @@
-<!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=lang>
- <a href="index-en.html">English</a> |
- <a href="index-ru.html">Русский</a>
-</div>
-
-<div id="content">
-
-<table border="0" cellspacing="10"><tr>
-<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
-<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
-</tr></table>
-
-<div id="main">
-
-<div id="pane">
-<div class="footer">Пошук по сайтах ALT Linux</div>
-<!-- Google CSE Search Box Begins  -->
-<form action="http://www.google.com/cse" id="searchbox_014412136813254060649:m2__wfh9ajy">
-<!--table border="1" width="100%">
-<tbody><tr><td-->
-<input type="hidden" name="cx" value="014412136813254060649:m2__wfh9ajy" />
-<input type="text" name="q" size="23" />
-<input type="submit" name="sa" value="Пошук" id="button" />
-<!--/td></tr></tbody></table-->
-</form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_014412136813254060649%3Am2__wfh9ajy"></script>
-<!-- Google CSE Search Box Ends -->
-
-<div id="team">
-<h2>ALT Linux Team</h2>
-
-<img src="img/alt-linux-team.png" width="144" height="55">
-
-<p align="justify" style="padding: 15px;">Цей дистрибутив не міг би з'явитися без активної участі 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>
-</div>
-
-<p align="justify">Ласкаво просимо до <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив налаштований та готовий до роботи, можна починати. Ми сподіваємось, що наша праця буде для Вас корисною.</p>
-
-<div id="documentation">
-<h2>Документація (рос.)</h2>
-<ul>
- <li><a href="../../@THEME@/index.html">Посібник користувача</a></li>
-</ul>
-</div>
-
-<div id="web">
-<h2>Інформація в Інтернеті</h2>
-<ul>
- <li><a href="http://www.altlinux.ru/">Сайт компанії ALT Linux</a></li>
- <li><a href="http://faq.altlinux.ru/">Відповіді на часті запитання</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>
-</div>
-</div>
-
-<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2008. Усі права застережено.<br />
-Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 11<br />
-Телефон/факс: +7 (495) 662-3883</p>
-</div>
-
-</body>
-</html>
--- a/indexhtml/index.css.in
+++ b/indexhtml/index.css.in
@ -1,109 +0,0 @@
-/* Stylesheet for index file */
-
-body {
-	font-family: Verdana,'DejaVu Sans',Helvetica,sans;
-	text-align:  left;
-	font-size: 12px;
-	background: #@LIGHT_COLOR_HEX@;
-	background-image: url('img/bg.png');
-}
-
-.shadow  { position:relative; display:block; color:black; }
-.shadow nobr { position:absolute; display:block; top:0px;  }
-.shadow:before { display:block; padding:2px; content: attr(title); color:#CCC;  } 
-
-h1 {
-	font-size: 28px;
-	font-weight: bold;
-	color: black;
-	/*text-shadow: #CCC 2px 2px 3px;*/
-	vertical-align: baseline;
-}
-
-h2 h3 {
-	color: black;
-}
-
-p { text-align: justify; }
-
-a:link, a:visited { 
-	text-decoration: none; 
-	color: #39c;
-}
-
-a:hover { 
-	text-decoration: underline; 
-	color: #f60;
-}
-
-ul li {
-   	padding-left: 3px;
-   	text-align: left;
-   	list-style: square url('img/bullet.png');
-}
-
-li.spacebefore { margin-top: 1em;}
-
-form {
-	margin: 5px;
-}
-
-input#button {
-	height: 20px;
-}
-
-div#logo {
- 	float: right;
- 	margin-left: 10px;
-}
-
-div#content, div#lang {
-	position: relative;
-	width: 780px;
-	margin: 40px auto;
-}
-
-div#main {
-    background: #FFF;
-    width: 100%;
-	border: 1px solid #@MIDDLE_COLOR_HEX@;
-	padding: 2mm;
-	padding-left: 5mm;
-}
-
-div#pane {
-	float: right;
-	width: 260px;
-	text-align: center;
-	margin: 15px;
-	padding: 0px;
-}
-
-div#team {
-	background: #@MIDDLE_COLOR_HEX@;
-	width: 100%;
-	text-align: center;
-	margin: 0px;
-	padding: 0px;
-	border: 1px solid #@DARK_COLOR_HEX@;
-}
-
-.footer {
-	font-size: 9px;
-	color: #@DARK_COLOR_HEX@;
-}
-
-div.columns  { float: left; }
-
-div#firstcolumn { width: 27em; }
-
-div.indent { padding-left: 5mm; }
-
-div.spacer { clear: both; }
-
-div#lang {
-  text-align: center;
-  background: #fff;
-  padding: 0.2em;
-  border: 1px solid #@DARK_COLOR_HEX@;
-}
--- a/kde4-settings/kde4/share/config/default-apps
+++ b/kde4-settings/kde4/share/config/default-apps
@ -1,2 +1,3 @@
 firefox
 oowriter
+kde4-dolphin
--- a/notes/Makefile
+++ b/notes/Makefile
@ -2,3 +2,4 @@
 install:
 	install -d $(datadir)/alt-notes
 	cp -a *.html $(datadir)/alt-notes
+	cp -a makelink.js $(datadir)/alt-notes
--- a/notes/index-en.html.in
+++ b/notes/index-en.html.in
@ -0,0 +1,83 @@
+<!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 onload="MakeLink()">
+<script type="text/javascript" src="makelink.js"></script>
+
+<div id="top">
+	<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" id="lang">
+ <a href="index-ru.html">Русский</a>
+</div>
+
+<div class="box">
+  <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>Server configuration</h2>
+  <ul>
+    <li id="smc_link">Web-interface for server configuration
+    <span class="linkemu">https://ip-address:8080/</span></li>
+    <li id="cups_link">Commn UNIX Printing System (CUPS) Settings
+    <span class="linkemu">http://ip-address:631/</span></li>
+  </ul>
+  <div class="warning">
+  Attention! For security reasons, it is recommended to log out after configuration.
+  </div>
+
+
+  <h2>Documentation</h2>
+  <ul>
+   <li><a href="../../@THEME@/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 - http://www.altlinux.org</a></li>
+   <li><a href="http://shop.altlinux.ru/">Online shop - http://shop.altlinux.ru</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@ @STATUS@</nobr> &copy; ALT Linux, 2008. All rights reserved.<br />
+  Address: 5th Donskoy proezd, 15/6, Moscow<br />
+  Phone/Fax: +7 (495) 662-3883
+</p>
+
+</body>
+</html>
--- a/notes/index-ru.html.in
+++ b/notes/index-ru.html.in
@ -0,0 +1,83 @@
+<!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 onload="MakeLink()">
+<script type="text/javascript" src="makelink.js"></script>
+
+<div id="top">
+	<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" id="lang">
+ <a href="index-en.html">English</a>
+</div>
+
+<div class="box">
+  <p>Добро пожаловать в <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
+  
+  <h2>Настройка сервера</h2>
+  <ul>
+    <li id="smc_link">Интерфейс администрирования сервера
+    <span class="linkemu">https://ip-address:8080/</span></li>
+    <li id="cups_link">Настройка системы печати CUPS
+    <span class="linkemu">http://ip-address:631/</span></li>
+  </ul>
+  <div class="warning">
+  Внимание! В целях безопасности после окончания настройки выходите из административного интерфейса.
+  </div>
+
+  <h2>Документация</h2>
+  <ul>
+    <li><a href="../../@THEME@/index.html">Локальная документация по дистрибутиву</a></li>
+    <li><a href="http://altlinux.org/">Онлайновая документация на http://altlinux.org</a></li>
+  </ul>
+
+  <h2>Веб-сайты</h2>
+  <ul>
+   <li><a href="http://www.altlinux.ru/">Официальный сайт компании ALT Linux - http://altlinux.ru</a></li>
+   <li><a href="http://shop.altlinux.ru/">Интернет-магазин - http://shop.altlinux.ru</a></li>
+  </ul>
+
+  <h2>Техническая поддержка</h2>
+  
+  <h3>Платная официальная поддержка</h3>  
+  <ul>
+  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
+  </ul>
+  <div class="warning">
+  Предоставляется только зарегистрированным пользователям (по купонам).
+  </div>
+
+  <h3>Неофициальная поддержка</h3>
+  <ul>
+  <li><a href="http://lists.altlinux.org/">Списки рассылки</a></li>
+  <li><a href="http://forum.altlinux.org/">Форум</a></li>
+  <li><a href="http://bugzilla.altlinux.org/">Система сбора ошибок по дистрибутивам</a></li>
+  <li><a href="http://search.altlinux.org/">Поиск по ресурсам ALT Linux</a></li>
+  </ul>
+  <div class="warning">
+  Общение с пользователями без гарантий разрешения проблем!
+  </div>
+  
+</div>
+
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr> &copy; ALT Linux, 2009. Все права защищены.<br />
+   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
+   Телефон/факс: +7 (495) 662-3883
+</p>
+
+</body>
+</html>
--- a/notes/index-uk.html.in
+++ b/notes/index-uk.html.in
@ -0,0 +1,64 @@
+<!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">
+	<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" id="lang">
+ <a href="index-en.html">English</a> |
+ <a href="index-ru.html">Русский</a>
+</div>
+
+<div class="box">
+  <p>Ласкаво просимо до <nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr>. Дистрибутив налаштований та готовий до роботи, можна починати. Ми сподіваємось, що наша праця буде для Вас корисною.</p>
+
+  <h2>Документація (рос.)</h2>
+  <ul>
+    <li><a href="../../@THEME@/index.html">Посібник користувача</a></li>
+  </ul>
+
+  <h2>Інформація в Інтернеті</h2>
+  <ul>
+   <li><a href="http://www.altlinux.ru/">Сайт компанії ALT Linux</a></li>
+   <li><a href="http://faq.altlinux.ru/">Відповіді на часті запитання</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, 2008. Усі права застережено.<br />
+   Адреса: м. Москва, 5-й Донський проїзд, 15, буд. 11<br />
+   Телефон/факс: +7 (495) 662-3883
+</p>
+
+</body>
+</html>
--- a/notes/license.all.html.in
+++ b/notes/license.all.html.in
@ -51,8 +51,6 @@
 <li>    Drivers for pct789 (PCTel), cm8738, i8xx, sis and via686a modems</li>
 <li>    Promise IDE/RAID controller drivers</li>
 <li>    Lucent/Agere support modules </li>
-<li>    Adobe Flash Player Plugin</li>
-<li>    Java 2 (SUN) Runtime Environment, Standard Edition</li>
 </ul>

 <p>Owners of exclusive rights for the listed above APPLICATIONS this way or the other limit your freedom of using these APPLICATIONS. Please familiarize yourself with license agreements accompanying these APPLICATIONS to decide, whether any use of any of those APPLICATIONS is legitimate, if it's outside boundaries of "free reproduction". License agreements for these APPLICATIONS are inside correspondent packages of the Distribution.
--- a/notes/license.ru.html.in
+++ b/notes/license.ru.html.in
@ -47,8 +47,6 @@
 <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>Обладатели исключительных прав на перечисленные ПРОГРАММЫ так или иначе ограничивают вашу свободу в использовании этих ПРОГРАММ. Ознакомьтесь с текстами сопровождающих указанные ПРОГРАММЫ лицензионных договоров для того, чтобы определить, правомерно ли то или иное использование той или иной ПРОГРАММЫ, выходящее за пределы «свободного воспроизведения». Лицензионные договоры этих ПРОГРАММ поставляются в составе пакетов ДИСТРИБУТИВА.
--- a/notes/makelink.js
+++ b/notes/makelink.js
@ -0,0 +1,24 @@
+function MakeLink() {
+
+  if (document.location.hostname!=="") {
+    current_hostname=document.location.hostname;
+  } else {
+    current_hostname='localhost';
+  }
+
+  smc_link='https://'+current_hostname+':8080/';
+  document.getElementById('smc_link').innerHTML=
+    '<a href="'+smc_link+'">Центр управления системой</a>';
+
+  cups_link='http://'+current_hostname+':631/';
+  document.getElementById('cups_link').innerHTML=
+    '<a href="'+cups_link+'">CUPS (настройка печати)</a>';
+
+  moodle_link='http://'+current_hostname+'/moodle/';
+  document.getElementById('moodle_link').innerHTML=
+    '<a href="'+moodle_link+'">Moodle</a>';
+
+  mediawiki_link='http://'+current_hostname+'/mediawiki/';
+  document.getElementById('mediawiki_link').innerHTML=
+    '<a href="'+mediawiki_link+'">MediaWiki</a>';
+}
--- a/notes/release-notes.all.html.in
+++ b/notes/release-notes.all.html.in
@ -1,30 +1,28 @@
-<html>
-<head>
-    <meta http-equiv="content-type" value="text/html;charset=utf-8"/>
-</head>
-<body>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+</HEAD>
+<BODY>
    <H2>Thank you for choosing ALT Linux 5.0 School: Server!</H2>
-    <hr>
    <p>
-    В целях безопасности на сервере нет графического интерфейса, однако можно настроить сервер с любого компьютера, расположенного в той же локальной сети.
-    Для этого нужно узнать сетевой адрес установленного сервера. Перечень адресов, с которых можно настроить сервер, выводится при загрузке сервера на мони
-    Для этого откройте веб-браузер и зайдите по этому адресу.
+    For security reasons server has no graphical interface, but it could be configured from any other computer from same local network.
+    Find out server IP-address. List of IP-addresses for server configuration could be found on server screen.
+    Open browser and go to that address.
    </p>
-    <h3>Примеры IP-адресов (СЕРВЕР):<br>
+    <h3>Examoles of IP-addresses (SERVER):<br>
    192.168.0.1<br>
    10.1.0.2</h3>
    <p>
-    Документация по использованию сервера расположена по адресу: <h2>http://СЕРВЕР/</h2>
-    Управление сервером расположено по адресу: <h2>https://СЕРВЕР:8080/</h2>
+    Local documentation: <h2>http://SERVER/</h2>
+    Server configuration: <h2>https://SERVER:8080/</h2>
    </p>
    <hr>
    <p>
-    In the online shop <a href="http://shop.altlinux.ru">shop.altlinux.ru</a> technical support and profiles of virtual machines could be bought.
-    We hope our software will be useful for you.
+    Virtual machine profiles and technical support could be bought at ALT Linux online shop <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>.
+    We hope our software products would be useful for you.
    </p>
-    <p align="right">ALT Linux</p>
-
-    </p></center>
-</body>
-</html>
+    <p align="right">ALT Linux Developers</p>
+</BODY>
+</HTML>
--- a/slideshow/Server_01.png
+++ b/slideshow/Server_01.png
--- a/slideshow/Server_02.png
+++ b/slideshow/Server_02.png
--- a/slideshow/Server_03.png
+++ b/slideshow/Server_03.png
--- a/slideshow/Server_04.png
+++ b/slideshow/Server_04.png
--- a/slideshow/Server_05.png
+++ b/slideshow/Server_05.png