Commit 07a7bcee authored by Andrey Cherepanov's avatar Andrey Cherepanov

Merge branch 'school-master' into school-junior

Conflicts: Makefile.in branding.spec components.mk components/ahttpd/images/groups/datetime.png components/ahttpd/images/groups/mail.png components/ahttpd/images/groups/network.png components/ahttpd/images/groups/pkg.png components/ahttpd/images/groups/servers.png components/ahttpd/images/groups/system.png components/ahttpd/images/groups/users.png components/ahttpd/images/groups/xorg.png components/ahttpd/images/steps/install2-preinstall.png components/ahttpd/images/steps/packages.png components/ahttpd/images/steps/timezone.png components/bootloader/config.in components/bootloader/gfxboot.cfg.in components/browser-qt/design/design.qss.in configure.ac graphics/icons/altlinux_16x16.png images/boot.png images/console.jpg images/installer.png images/wallpaper.png kde3-settings/apps/kicker/default-apps kde3-settings/config/kcmdisplayrc kde3-settings/config/kdeglobals.in kde3-settings/config/konquerorrc kde3-settings/config/kwinrc kde4-settings/kde4/share/config/default-apps notes/license.ru.html.in
parents 147b08d0 d2fcb481
tar: . name=branding
...@@ -4,10 +4,27 @@ NAME=@NAME@ ...@@ -4,10 +4,27 @@ NAME=@NAME@
VERSION=@VERSION@ VERSION=@VERSION@
all: all:
# background # generate derivative graphics
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 # make default wallpaper
cp -al wallpaper.png graphics/backgrounds/default.png cp -al images/background4x3.png images/wallpaper.png
cp -al wallpaper.png graphics/backgrounds/xdm.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@"' wlogo.png; \
convert wlogo.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
else \
convert images/wallpaper.png images/product-logo.png -geometry +30+30 -composite images/boot.jpg; \
fi
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
# product logo for indexhtml
cp -al images/product-logo.png components/indexhtml/images/product-logo.png
include components.mk include components.mk
install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml install: browser-qt ahttpd boot-images boot-splash @X86@ indexhtml
...@@ -69,3 +69,4 @@ indexhtml: components/indexhtml/index.css ...@@ -69,3 +69,4 @@ indexhtml: components/indexhtml/index.css
ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \ ln -s /usr/share/doc/$$i $(INDEXHTML_DIR)/$$i; \
done done
install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
install -Dpm755 components/indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
components/ahttpd/images/groups/firewall.png

4.69 KB | W: | H:

components/ahttpd/images/groups/firewall.png

4.33 KB | W: | H:

components/ahttpd/images/groups/firewall.png
components/ahttpd/images/groups/firewall.png
components/ahttpd/images/groups/firewall.png
components/ahttpd/images/groups/firewall.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/images/steps/root.png

1.65 KB | W: | H:

components/ahttpd/images/steps/root.png

3.11 KB | W: | H:

components/ahttpd/images/steps/root.png
components/ahttpd/images/steps/root.png
components/ahttpd/images/steps/root.png
components/ahttpd/images/steps/root.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/images/steps/user.png

5.68 KB | W: | H:

components/ahttpd/images/steps/user.png

3.65 KB | W: | H:

components/ahttpd/images/steps/user.png
components/ahttpd/images/steps/user.png
components/ahttpd/images/steps/user.png
components/ahttpd/images/steps/user.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/images/steps/vm.png

1.75 KB | W: | H:

components/ahttpd/images/steps/vm.png

2.94 KB | W: | H:

components/ahttpd/images/steps/vm.png
components/ahttpd/images/steps/vm.png
components/ahttpd/images/steps/vm.png
components/ahttpd/images/steps/vm.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/images/steps/x11.png

3.34 KB | W: | H:

components/ahttpd/images/steps/x11.png

2.08 KB | W: | H:

components/ahttpd/images/steps/x11.png
components/ahttpd/images/steps/x11.png
components/ahttpd/images/steps/x11.png
components/ahttpd/images/steps/x11.png
  • 2-up
  • Swipe
  • Onion skin
product=@NAME@ @VERSION@@STATUS@ product=@DISTRO_NAME@
based_on=ALT Linux Sisyphus based_on=ALT Linux Sisyphus
...@@ -23,7 +23,7 @@ talk=0 ...@@ -23,7 +23,7 @@ talk=0
; sound volume (0..100) ; sound volume (0..100)
volume=70 volume=70
; menu background transparency (0..255) ; menu background transparency (0..255)
menu.transparency=60 menu.transparency=0x20
; default font ; default font
font.normal=drs16.fnt font.normal=drs16.fnt
; main menu font ; main menu font
...@@ -35,23 +35,23 @@ background=back.jpg ...@@ -35,23 +35,23 @@ background=back.jpg
; max. visible main menu items ; max. visible main menu items
mainmenu.entries=8 mainmenu.entries=8
; minimal main menu selection bar width ; minimal main menu selection bar width
mainmenu.bar.minwidth=280 mainmenu.bar.minwidth=294
; main menu selection bar transparency (0..255) ; main menu selection bar transparency (0..255)
mainmenu.bar.transparency=0 mainmenu.bar.transparency=0
; main menu colors ; main menu colors
mainmenu.bar.color=0x77b5f2 mainmenu.bar.color=0x001056
mainmenu.normal.fg=0x787878 mainmenu.normal.fg=0x2b328d
mainmenu.selected.fg=0xe4ecf2 mainmenu.selected.fg=0xffffff
; boot option colors ; boot option colors
bootopt.label.fg=0x000000 bootopt.label.fg=0x2b328d
bootopt.text.fg=0x000000 bootopt.text.fg=0x2b328d
; progress bar color ; progress bar color
progress.bar.color=0xd4ecfa progress.bar.color=0x001056
; menu colors ; menu colors
menu.normal.bg=0x798491 menu.normal.bg=0xe9e8e7
menu.normal.fg=0xffffff menu.normal.fg=0x000000
menu.selected.bg=0x787878 menu.selected.bg=0xc9c8c8
menu.selected.fg=0xffffff menu.selected.fg=0x000000
; window colors ; window colors
window.bg=0xffffff window.bg=0xffffff
window.fg=0x000000 window.fg=0x000000
...@@ -59,15 +59,15 @@ window.title.bg=0x787878 ...@@ -59,15 +59,15 @@ window.title.bg=0x787878
window.title.fg=0x000000 window.title.fg=0x000000
window.title.error.bg=0xc00000 window.title.error.bg=0xc00000
; help system colors ; help system colors
help.link.fg=0x@DARK_COLOR_HEX@ help.link.fg=0x185da0
help.link.selected.fg=0xffffff help.link.selected.fg=0xffffff
help.link.selected.bg=0x@DARK_COLOR_HEX@ help.link.selected.bg=0x185da
help.highlight.fg=0x@DARK_COLOR_HEX@ help.highlight.fg=0x@DARK_COLOR_HEX@
; panel colors ; panel colors
panel.fg=0x000000 panel.fg=0x000000
panel.title.fg=0x000000 panel.title.fg=0x001056
panel.normal.fg=0x000000 panel.normal.fg=0x2b328d
panel.f-key.fg=0x000080 panel.f-key.fg=0x2b328d
; default keymap (e.g. de_DE, czech) ; default keymap (e.g. de_DE, czech)
keymap= keymap=
...@@ -75,7 +75,7 @@ keymap= ...@@ -75,7 +75,7 @@ keymap=
; screen size ; screen size
screen.size=800,600 screen.size=800,600
; upper left corner ; upper left corner
mainmenu.pos=260,200 mainmenu.pos=253,210
; boot option input field position ; boot option input field position
bootopt.pos=200,480 bootopt.pos=200,480
...@@ -83,7 +83,7 @@ bootopt.pos=200,480 ...@@ -83,7 +83,7 @@ bootopt.pos=200,480
; screen size ; screen size
screen.size=640,480 screen.size=640,480
; upper left corner ; upper left corner
mainmenu.pos=130,100 mainmenu.pos=130,122
; boot option input field position ; boot option input field position
bootopt.pos=263,380 bootopt.pos=263,380
......
/* Customize any plain widget that is a child of a QMainWindow. */
/* Main area */
.AWizardFace {
border-style: none;
background-position: top left;
background-repeat: no-repeat
}
.ACenterFace {
border-style: none;
}
.ACenterFace #modules_view {
background-color: white;
}
/* Nice WindowsXP-style password character for password line edits. */
QLineEdit {
lineedit-password-character: 9679;
}
QCheckBox:hover, QRadioButton:hover {
background: none;
}
/* Fix side effect on transparent background */
QCheckBox:indicator:hover, QRadioButton:indicator:hover {
margin-left: 1px;
}
...@@ -8,7 +8,9 @@ ...@@ -8,7 +8,9 @@
} }
.AWizardFace #wizardface_title_text { .AWizardFace #wizardface_title_text {
color: rgb(30,144,255); color: rgb(255,255,255);
font: bold;
font-size: 24px;
} }
.ACenterFace { .ACenterFace {
......
components/grub2/selected_blob_c.png

172 Bytes | W: | H:

components/grub2/selected_blob_c.png

190 Bytes | W: | H:

components/grub2/selected_blob_c.png
components/grub2/selected_blob_c.png
components/grub2/selected_blob_c.png
components/grub2/selected_blob_c.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -59,7 +59,6 @@ terminal-font: "Misc Fixed Regular 13" ...@@ -59,7 +59,6 @@ terminal-font: "Misc Fixed Regular 13"
height = 40% height = 40%
item_font = "DejaVu Sans Bold 14" item_font = "DejaVu Sans Bold 14"
selected_item_font = "DejaVu Sans Bold 14" selected_item_font = "DejaVu Sans Bold 14"
icon_height = 24
icon_width = 24 icon_width = 24
item_height = 26 item_height = 26
item_padding = 0 item_padding = 0
......
components/grub2/tick.png

221 Bytes | W: | H:

components/grub2/tick.png

209 Bytes | W: | H:

components/grub2/tick.png
components/grub2/tick.png
components/grub2/tick.png
components/grub2/tick.png
  • 2-up
  • Swipe
  • Onion skin
components/indexhtml/images/bullet.png

169 Bytes | W: | H:

components/indexhtml/images/bullet.png

173 Bytes | W: | H:

components/indexhtml/images/bullet.png
components/indexhtml/images/bullet.png
components/indexhtml/images/bullet.png
components/indexhtml/images/bullet.png
  • 2-up
  • Swipe
  • Onion skin
components/indexhtml/images/lines.png

185 Bytes | W: | H:

components/indexhtml/images/lines.png

185 Bytes | W: | H:

components/indexhtml/images/lines.png
components/indexhtml/images/lines.png
components/indexhtml/images/lines.png
components/indexhtml/images/lines.png
  • 2-up
  • Swipe
  • Onion skin
components/indexhtml/images/twitter.png

2.26 KB | W: | H:

components/indexhtml/images/twitter.png

1.58 KB | W: | H:

components/indexhtml/images/twitter.png
components/indexhtml/images/twitter.png
components/indexhtml/images/twitter.png
components/indexhtml/images/twitter.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<title>@PRODUCT_NAME@</title> <title>@PRODUCT_NAME@</title>
<link href="index.css" rel="stylesheet" type="text/css"> <link href="index.css" rel="stylesheet" type="text/css">
<link href="images/product.png" rel="shortcut icon" type="image/png" />
</head> </head>
<body> <body>
...@@ -16,30 +17,43 @@ ...@@ -16,30 +17,43 @@
</div> </div>
<!-- Disto name --> <!-- Disto name -->
<div id="title">@PRODUCT_NAME@</div> <table border="0" width="100%" id="header">
<tr>
<td id="product-logo"><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">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" placeholder="Search ALT Linux">
</form>
</td>
</tr></table>
<div id="main"> <div id="main">
<!-- Links columns --> <!-- Links columns -->
<table border="0" width="100%"> <table border="0" width="100%" cellspacing="0">
<tr> <tr>
<th width="33%"><img src="images/documentation.png" alt="Documentation"></th> <th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th> <th width="33%"><img src="images/altlinux-logo.png" alt="Company"></th>
<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th> <th width="34%"><img src="images/community.png" alt="Community"></th>
</tr> </tr>
<tr> <tr>
<td width="33%" class="column"> <!-- First column: documentation --> <td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
<ul> <ul>
<li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li> <li><a href="documentation/index.html">User Manual</a></li>
<li><a href="http://docs.altlinux.org">Online Documentation</a></li> <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
<li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li> <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
<li><a href="http://altlinux.org/">Wiki</a></li> <li><a href="http://altlinux.org/">Wiki</a></li>
<li><a href="http://altlinux.org/FAQ">FAQ</a></li> <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
<li><a href="http://altlinux.org/Features">Features</a></li> <li><a href="http://altlinux.org/Features">ALT Linux Features</a></li>
</ul> </ul>
</td> </td>
<td width="33%" id="central_pane"> <!-- Second column: Company --> <td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
<ul> <ul>
<li><a href="http://www.altlinux.com">ALT Linux Website</a></li> <li><a href="http://www.altlinux.com">ALT Linux Website</a></li>
<li><a href="http://shop.altlinux.ru">Internet Shop</a></li> <li><a href="http://shop.altlinux.ru">Internet Shop</a></li>
...@@ -50,7 +64,7 @@ ...@@ -50,7 +64,7 @@
</ul> </ul>
</td> </td>
<td width="34%" class="column"> <!-- Third column: community --> <td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
<ul> <ul>
<li><a href="http://lists.altlinux.org">Mailing Lists</a></li> <li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
<li><a href="http://forum.altlinux.org">User Forum</a></li> <li><a href="http://forum.altlinux.org">User Forum</a></li>
...@@ -63,23 +77,14 @@ ...@@ -63,23 +77,14 @@
</tr> </tr>
<tr><td colspan="3" id="search">
<!-- Search pane -->
<form action="http://www.google.com/search" method="get">
<img src="images/magnifier.png" alt="Search on online resources">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" size="35">
<input id="search_button" type="submit" name="sa" value="Search in Internet">
</form>
</td></tr>
<!-- Social networks --> <!-- Social networks -->
<tr><td colspan="3" id="social">We will be glade to meet you on the following social networks:</td></tr> <tr><td colspan="3" id="social-pane">
<tr> <div id="social">We will be glade to meet you on the following social networks:</div>
<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th> <div id="social-icons">
<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th> <a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th> <a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
</tr> <a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a>
</div></td></tr>
</table> </table>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<title>@PRODUCT_NAME_RU@</title> <title>@PRODUCT_NAME_RU@</title>
<link href="index.css" rel="stylesheet" type="text/css"> <link href="index.css" rel="stylesheet" type="text/css">
<link href="images/product.png" rel="shortcut icon" type="image/png" />
</head> </head>
<body> <body>
...@@ -16,21 +17,34 @@ ...@@ -16,21 +17,34 @@
</div> </div>
<!-- Disto name --> <!-- Disto name -->
<div id="title">@PRODUCT_NAME_RU@</div>
<table border="0" width="100%" id="header">
<tr>
<td id="product-logo"><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">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" placeholder="Поиск по ALT Linux">
</form>
</td>
</tr></table>
<div id="main"> <div id="main">
<!-- Links columns --> <!-- Links columns -->
<table border="0" width="100%"> <table border="0" width="100%" cellspacing="0">
<tr> <tr>
<th width="33%"><img src="images/documentation.png" alt="Документация"></th> <th width="33%"><img src="images/documentation.png" alt="Документация"></th>
<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th> <th width="33%"><img src="images/altlinux-logo.png" alt="Компания"></th>
<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th> <th width="34%"><img src="images/community.png" alt="Сообщество"></th>
</tr> </tr>
<tr> <tr>
<td width="33%" class="column"> <!-- First column: documentation --> <td width="33%" class="column" id="left-pane"> <!-- First column: documentation -->
<ul> <ul>
<li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li> <li><a href="documentation/index.html">Руководство пользователя</a></li>
<li><a href="http://docs.altlinux.org">Онлайновая документация</a></li> <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
<li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li> <li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Книги</a></li>
<li><a href="http://altlinux.org/">Wiki</a></li> <li><a href="http://altlinux.org/">Wiki</a></li>
...@@ -39,7 +53,7 @@ ...@@ -39,7 +53,7 @@
</ul> </ul>
</td> </td>
<td width="33%" id="central_pane"> <!-- Second column: Company --> <td width="33%" class="column" id="central-pane"> <!-- Second column: Company -->
<ul> <ul>
<li><a href="http://www.altlinux.ru">Сайт компании</a></li> <li><a href="http://www.altlinux.ru">Сайт компании</a></li>
<li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li> <li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
...@@ -50,7 +64,7 @@ ...@@ -50,7 +64,7 @@
</ul> </ul>
</td> </td>
<td width="34%" class="column"> <!-- Third column: community --> <td width="34%" class="column" id="right-pane"> <!-- Third column: community -->
<ul> <ul>
<li><a href="http://lists.altlinux.org">Списки рассылки</a></li> <li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
<li><a href="http://forum.altlinux.org">Форум пользователей</a></li> <li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
...@@ -63,23 +77,14 @@ ...@@ -63,23 +77,14 @@
</tr> </tr>
<tr><td colspan="3" id="search">
<!-- Search pane -->
<form action="http://www.google.com/search" method="get">
<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" size="35">
<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
</form>
</td></tr>
<!-- Social networks --> <!-- Social networks -->
<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr> <tr><td colspan="3" id="social-pane">
<tr> <div id="social">Мы рады встретиться с вами в социальных сетях:</div>
<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th> <div id="social-icons">
<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th> <a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a>
<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th> <a href="https://www.facebook.com/group.php?gid=136328550579" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a>
</tr> <a href="http://vkontakte.ru/club667081" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a>
</div></td></tr>
</table> </table>
......
...@@ -8,11 +8,11 @@ body { ...@@ -8,11 +8,11 @@ body {
} }
div#content { div#content {
background: white; background: white;
border: solid 6px #d0d0d0; border: solid 10px #e6e6e6;
border-radius: 8px; border-radius: 16px;
-webkit-border-radius: 8px; -webkit-border-radius: 16px;
-moz-border-radius: 7px; -moz-border-radius: 16px;
-khtml-border-radius: 12px; -khtml-border-radius: 16px;
padding: 0; padding: 0;
position: relative; position: relative;
width: 780px; width: 780px;
...@@ -30,10 +30,10 @@ div#title { ...@@ -30,10 +30,10 @@ div#title {
text-align: center; text-align: center;
margin-top: 0; margin-top: 0;
margin-bottom: 12px; margin-bottom: 12px;
background: #d3eaf9; background: #657fbe;
padding: 6px 0 6px 0; padding: 6px 0 6px 0;
border-top: solid 1px #81c3eb; border-top: solid 1px #657fbe;
border-bottom: solid 1px #81c3eb; border-bottom: solid 1px #657fbe;
background-image: url('images/lines.png'); background-image: url('images/lines.png');
} }
div#top-site { div#top-site {
...@@ -44,12 +44,43 @@ div#top-site { ...@@ -44,12 +44,43 @@ div#top-site {
padding: 4px; padding: 4px;
} }
div#main { div#main {
padding: 12px; padding: 10px 0px 20px 0px;
}
table#header {
padding-left: 12px;
padding-right: 12px;
}
td#product-logo {
text-align: center;
}
td#search {
width: 60%;
text-align: right;
}
input#search_string {
position: relative;
vertical-align: middle;
background: white;
padding: 4px;
padding-right: 24px;
border: solid 1px #aeaeae;
width: 350px;
background: url('images/search.png') no-repeat 357px 2px;
background-color: white;
} }
input#search_button {
margin-top: 12px;
vertical-align: top;
font-size: 130%;
}
th { th {
vertical-align: bottom; vertical-align: bottom;
text-align: center; text-align: center;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px;
} }
img.icon { img.icon {
width: 48px; width: 48px;
...@@ -60,64 +91,61 @@ img.icon_big { ...@@ -60,64 +91,61 @@ img.icon_big {
height: 60px; height: 60px;
} }
img.banner { img.banner {
width: 130px; width: 32px;
height: 30px; height: 32px;
margin: 6px; margin: 5px;
} }
li { li {
line-height: 1.35em; line-height: 1.35em;
} }
td#central_pane { td#left-pane {
border-left: dotted 1px #ccc; background-color: #dbeef6;
border-right: dotted 1px #ccc;
text-align: center;
} }
.column { td#central-pane {
text-align: center; background-color: #ffe57e;
} }
td#search { td#right-pane {
text-align: center; background-color: #f2f2f2;
padding: 12px;
} }
input#search_string { .column {
position: relative; text-align: center;
vertical-align: top; border-top: 2px solid #0088bf;
margin-top: 12px; background: url('images/section.png') no-repeat 112px 0px;
font-size: 130%; padding: 9px 0 5px 0;
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; td#social-pane {
vertical-align: top; padding: 14px 12px 2px 12px;
font-size: 130%;
} }
td#social {
text-align: center; div#social {
text-align: left;
border-bottom: dotted 1px #ccc; border-bottom: dotted 1px #ccc;
font-size: xx-small; font-size: xx-small;
padding-bottom: 10px;
color: #999; color: #999;
} }
div#social-icons {
text-align: left;
padding-top: 10px;
}
td#left_footer, td#right_footer { td#left_footer, td#right_footer {
font-size: xx-small; font-size: xx-small;
color: #999; color: #999;
vertical-align: bottom; vertical-align: bottom;
padding-top: 15px; padding: 2px 12px 0px 12px;
} }
td#right_footer { td#right_footer {
text-align: right; text-align: right;
} }
ul li { ul li {
text-align: left; text-align: left;
list-style: square url('bullet.png'); list-style: square url('images/bullet.png');
} }
a:link, a:visited { a:link, a:visited {
text-decoration: none; text-decoration: none;
color: #2e7194; color: black;
} }
a:hover { a:hover {
text-decoration: none; text-decoration: none;
......
...@@ -3,7 +3,7 @@ VERSION="@VERSION@@STATUS@ (@CODENAME@)" ...@@ -3,7 +3,7 @@ VERSION="@VERSION@@STATUS@ (@CODENAME@)"
ID=altlinux ID=altlinux
VERSION_ID=@VERSION@ VERSION_ID=@VERSION@
PRETTY_NAME="@PRODUCT_NAME@ (@CODENAME@)" PRETTY_NAME="@PRODUCT_NAME@ (@CODENAME@)"
ANSI_COLOR="1;36" ANSI_COLOR="1;33"
CPE_NAME="cpe:/o:alt linux:school teacher:@VERSION@" CPE_NAME="cpe:/o:alt linux:school server:@VERSION@"
HOME_URL="http://altlinux.ru/" HOME_URL="http://altlinux.ru/"
BUG_REPORT_URL="https://bugs.altlinux.org/" BUG_REPORT_URL="https://bugs.altlinux.org/"
...@@ -38,20 +38,20 @@ AC_SUBST(INACTIVE_COLOR) ...@@ -38,20 +38,20 @@ AC_SUBST(INACTIVE_COLOR)
AC_SUBST(X86) AC_SUBST(X86)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
components/bootloader/config components/bootloader/config
components/bootsplash/theme.plymouth components/bootsplash/theme.plymouth
components/browser-qt/design/design.ini components/browser-qt/design/design.ini
components/browser-qt/design/design.qss components/browser-qt/design/design.qss
components/bootloader/gfxboot.cfg components/bootloader/gfxboot.cfg
notes/release-notes.ru.html notes/release-notes.ru.html
notes/release-notes.all.html notes/release-notes.all.html
notes/license.ru.html notes/license.ru.html
notes/license.all.html notes/license.all.html
components/indexhtml/indexhtml.desktop components/indexhtml/indexhtml.desktop
components/indexhtml/index-ru.html components/indexhtml/index-ru.html
components/indexhtml/index-en.html components/indexhtml/index-en.html
components/systemd/os-release components/systemd/os-release
components/ahttpd/styles/alterator.css components/ahttpd/styles/alterator.css
]) ])
AC_OUTPUT AC_OUTPUT
#
Read "/etc/X11/fvwm/system.fvwm2rc"
Style "*" BorderWidth 5, HandleWidth 6
Style "*" FvwmBorder, FirmBorder
BorderStyle Simple
TitleStyle LeftJustified
TitleStyle -- Raised
ButtonStyle All -- Raised
# window title, inactive and active
# #
Colorset 1 fg black, bg rgb:DA/D4/CF, Plain, NoShape
Colorset 2 fg white, bg rgb:4A/8D/D0, Plain, NoShape
#
# # window borders, inactive and active
# #
Colorset 3 fg black, bg rgb:DA/D4/CF, Plain, NoShape
Colorset 4 fg black, bg rgb:4A/8D/D0, Plain, NoShape
# inactive menu item fg+bg and menu face if any
#
Colorset 5 fg black, bg rgb:C0/C0/C0, Plain, NoShape
#
# # active menu item fg+bg
# #
Colorset 6 fg black, bg rgb:80/98/B0, Plain, NoShape
# # greyed menu item fg
# #
Colorset 7 fg grey48, bg grey48, Plain, NoShape
DefaultColorset 0
Style * Colorset 1
Style * HilightColorset 2
Style * BorderColorset 3
Style * HilightBorderColorset 4
MenuStyle * MenuFace, ActiveFore, HilightBack
MenuStyle * MenuColorset 5, ActiveColorset 6, GreyedColorset 7
FuncFvwmDecorBackground
Style "*" Button 1, Button 2, Button 4, Button 6
Style "*" MWMButtons # button relief follows the state
AddButtonStyle 1 Vector 5 25x40@1 25x60@1 75x60@0 75x40@0 25x40@1
AddButtonStyle 2 Vector 16 20x20@1 30x20@1 50x40@1 70x20@1 80x20@1 80x30@0 60x50@0 80x80@0 70x80@0 50x60@0 30x80@0 20x80@0 20x70@0 40x50@1 20x30@0 20x20@1
AddButtonStyle 4 Vector 4 50x25@1 75x75@0 25x75@0 50x25@1
AddButtonStyle 6 Vector 4 50x75@1 25x25@1 75x25@1 50x75@0
ButtonStyle 1 - Clear MWMDecorMenu
ButtonStyle 2 - Clear
ButtonStyle 4 - Clear MWMDecorMax
ButtonStyle 6 - Clear MWMDecorMin
TitleStyle Height MinHeight 18
# button context modifie function
Mouse 1 1 A FuncFvwmWindowOpsOrAction Delete
MouseXX 2 3 1 A Menu MenuFvwmWindowMove
MouseXX 3 2 1 A Menu MenuFvwmWindowGroupOps
Mouse 0 2 A FuncFvwmDeleteOrDestroy
Mouse 1 2 A Close
Mouse 2 2 A Close
Mouse 3 2 A Destroy
Mouse 1 4 A Maximize 100 100
Mouse 2 4 A Maximize 0 100
Mouse 3 4 A Maximize 100 0
Mouse 1 4 S Maximize grow grow
Mouse 2 4 S Maximize 0 grow
Mouse 3 4 S Maximize grow 0
Mouse 1 6 A Iconify
Mouse 2 6 A FuncFvwmIconifySameResource on
Mouse 3 6 A FuncFvwmIconifySameResource toggle
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
<Menu>
<MergeFile>altlinux-applications.menu</MergeFile>
<Name>Applications</Name>
<Menu>
<Name>Multimedia</Name>
<Exclude>
<Filename>adobe_flash_player_eula.desktop</Filename>
</Exclude>
</Menu>
<Menu>
<Name>Internet</Name>
<Exclude>
<Filename>lftp.desktop</Filename>
</Exclude>
</Menu>
<Menu>
<Name>Development</Name>
<Exclude>
<Filename>gdb.desktop</Filename>
</Exclude>
</Menu>
</Menu>
BACKGROUND_COLOR=88DCF8
BACKGROUND_R=136
BACKGROUND_G=220
BACKGROUND_B=248
graphics/faces/default.png

3.03 KB | W: | H:

graphics/faces/default.png

2.35 KB | W: | H:

graphics/faces/default.png
graphics/faces/default.png
graphics/faces/default.png
graphics/faces/default.png
  • 2-up
  • Swipe
  • Onion skin
graphics/faces/user04.png

6.21 KB | W: | H:

graphics/faces/user04.png

2.75 KB | W: | H:

graphics/faces/user04.png
graphics/faces/user04.png
graphics/faces/user04.png
graphics/faces/user04.png
  • 2-up
  • Swipe
  • Onion skin
[KSplash Theme: Default]
Engine = Default
Icons Flashing = true
[KSplash Theme: Default]
Engine = Default
Icons Flashing = true
[ColorEffects:Disabled]
Color=56,56,56
ColorAmount=0
ColorEffect=0
ContrastAmount=0.65
ContrastEffect=1
IntensityAmount=0.1
IntensityEffect=2
[ColorEffects:Inactive]
ChangeSelectionColor=true
Color=112,111,110
ColorAmount=-0.9
ColorEffect=1
ContrastAmount=0.25
ContrastEffect=2
Enable=true
IntensityAmount=0
IntensityEffect=0
[Colors:Button]
BackgroundAlternate=224,223,222
BackgroundNormal=223,220,217
DecorationFocus=58,167,221
DecorationHover=110,214,255
ForegroundActive=255,128,224
ForegroundInactive=137,136,135
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=34,31,30
ForegroundPositive=0,110,40
ForegroundVisited=100,74,155
[Colors:Selection]
BackgroundAlternate=62,138,204
BackgroundNormal=67,172,232
DecorationFocus=58,167,221
DecorationHover=110,214,255
ForegroundActive=255,128,224
ForegroundInactive=165,193,228
ForegroundLink=0,49,110
ForegroundNegative=156,14,14
ForegroundNeutral=255,221,0
ForegroundNormal=255,255,255
ForegroundPositive=128,255,128
ForegroundVisited=69,40,134
[Colors:Tooltip]
BackgroundAlternate=196,224,255
BackgroundNormal=24,21,19
DecorationFocus=58,167,221
DecorationHover=110,214,255
ForegroundActive=255,128,224
ForegroundInactive=137,136,135
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=231,253,255
ForegroundPositive=0,110,40
ForegroundVisited=100,74,155
[Colors:View]
BackgroundAlternate=248,247,246
BackgroundNormal=255,255,255
DecorationFocus=58,167,221
DecorationHover=110,214,255
ForegroundActive=255,128,224
ForegroundInactive=137,136,135
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=31,28,27
ForegroundPositive=0,110,40
ForegroundVisited=100,74,155
[Colors:Window]
BackgroundAlternate=218,217,216
BackgroundNormal=214,210,208
DecorationFocus=58,167,221
DecorationHover=110,214,255
ForegroundActive=255,128,224
ForegroundInactive=137,136,135
ForegroundLink=0,87,174
ForegroundNegative=191,3,3
ForegroundNeutral=176,128,0
ForegroundNormal=34,31,30
ForegroundPositive=0,110,40
ForegroundVisited=100,74,155
[General]
ColorScheme=Oxygen
Name=Oxygen
shadeSortColumn=true
[KDE]
contrast=7
[WM]
activeBackground=48,174,232
activeForeground=255,255,255
inactiveBackground=224,223,222
inactiveForeground=75,71,67
# This is not really a .desktop file like the rest, but it is useful to treat
# it as such
[KdmGreeterTheme]
Greeter=oxygen-air.xml
Name=KDM Default
Author=Xavier Araque
Copyright=GPL 2008 Xavier Araque | xavieraraque@gmail.com
Screenshot=screenshot.png
../../backgrounds/xdm.png
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE greeter SYSTEM "greeter.dtd">
<greeter id="theme">
<style font="Sans 12" guistyle="Oxygen"
base-color="#bfd9ff" text-color="#0b678c"/>
<item type="pixmap" id="background" background="true">
<normal file="background.png"/>
<pos anchor="c" x="50%" y="50%" width="scale" width="100%" height="100%"/>
</item>
<item type="pixmap" id="system-session">
<normal file="win-login.png"/>
<pos anchor="c" x="50%" y="45%" width="615" height="401"/>
<box orientation="vertical" spacing="10" homogeneous="true">
<item type="pixmap">
<normal file="icon-altlinux.png"/>
<pos anchor="c" x="50%" y="80%"/>
</item>
<item type="label" id="welcome">
<pos anchor="c" x="50%" y="46%"/>
<normal alpha="0.5" font="Sans Bold 18" color="#334560"/>
<stock type="welcome-label"/>
</item>
<item type="rect" id="user-field">
<pos anchor="c" x="50%" y="43%" width="400" height="144"/>
<box orientation="vertical" spacing="0" homogeneous="true">
<item type="rect">
<pos anchor="c" x="50%" y="60%" height="box" width="box"/>
<box orientation="horizontal" spacing="10">
<item type="pixmap">
<normal file="user-entry.png"/>
</item>
<item type="entry" id="user-entry">
<pos width="157" height="30"/>
<style frame="true"/>
</item>
</box>
</item>
<item type="rect">
<pos anchor="c" x="50%" y="40%" height="box" width="box"/>
<box orientation="horizontal" spacing="10">
<item type="pixmap">
<normal file="pw-entry.png"/>
</item>
<item type="entry" id="pw-entry">
<pos width="157" height="30"/>
<style frame="true"/>
</item>
</box>
</item>
</box>
</item>
<item type="rect" id="system-session">
<pos anchor="c" x="50%" y="70%" width="615" height="44"/>
<fixed>
<item type="label">
<pos anchor="se" x="96%" y="70%"/>
<normal alpha="0.5" font="Sans 8" color="#334560"/>
<text>%c</text>
</item>
<item type="pixmap" id="session_button" button="true">
<normal file="session_button.png"/>
<prelight file="session_button-li.png"/>
<active file="session_button-li.png"/>
<pos anchor="w" x="15" y="50%"/>
</item>
<item type="pixmap" id="system_button" button="true">
<normal file="system_button.png"/>
<prelight file="system_button-li.png"/>
<active file="system_button-li.png"/>
<pos anchor="w" x="47" y="50%"/>
</item>
</fixed>
</item>
</box>
</item>
<item type="pixmap" id="caps-lock-warning">
<normal file="caps.png"/>
<pos anchor="c" x="50%" y="45%"/>
<fixed>
<item type="label" id="mesage">
<normal color="#0b678c" font="Sans Bold 10"/>
<pos anchor="c" x="50%" y="85%"/>
<stock type="caps-lock-warning"/>
</item>
</fixed>
</item>
<item type="rect" id="pam-error-paceholder">
<pos anchor="c" x="50%" y="98%" widht="615" height="200"/>
<item type="label" id="dummy1">
<normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
<!-- </text> -->
</item>
<item type="label" id="pam-error">
<pos anchor="c" x="50%" y="50%" expand="true"/>
<normal alpha="0" color="#0b678c" font="Sans Bold 10"/>
<!-- </text> -->
</item>
</item>
</greeter>
../../../../backgrounds/default.png
\ No newline at end of file
SCALE ON
BACKGROUND_IMAGE 0 0 background.png
SCALE OFF
# the image is 390x234, make it centered, all icons need the same adjustment too
IMAGE_REL CC 0 0 CC rectangle.png
# these have their relative positions to the rectangle adjusted by -195,-117
# (i.e. half of the rectangle size)
# 3,32
ANIM_REL 1 CC -192 -50 LT 30 icon1_anim.png 85 1
WAIT_STATE kded
# 69,32
ANIM_REL 2 CC -126 -50 LT 30 icon2_anim.png 85 1
WAIT_STATE kcminit
# 135,32
ANIM_REL 3 CC -60 -50 LT 29 icon3_anim.png 85 1
WAIT_STATE ksmserver
# 201,32
ANIM_REL 4 CC 6 -50 LT 30 icon4_anim.png 85 1
WAIT_STATE wm
# 263,15
ANIM_REL 5 CC 68 -88 LT 30 icon5_anim.png 85 1
WAIT_STATE desktop
WAIT_STATE ready
# show the icons fully right before the splash goes away
STOP_ANIM 1
IMAGE_REL CC -192 -50 LT icon1.png
STOP_ANIM 2
IMAGE_REL CC -126 -50 LT icon2.png
STOP_ANIM 3
IMAGE_REL CC -60 -50 LT icon3.png
STOP_ANIM 4
IMAGE_REL CC 6 -50 LT icon4.png
STOP_ANIM 5
IMAGE_REL CC 68 -88 LT icon5.png
This diff is collapsed. Click to expand it.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment