Skip to content

B
branding-etersoft-ximper
Commit 000989f5 authored by Andrey Cherepanov's avatar Andrey Cherepanov
Browse files
Options

Merge branch 'school-server' into school-master

Conflicts: Makefile.in branding.spec components/ahttpd/images/groups/datetime.png components/ahttpd/images/groups/firewall.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/timezone.png components/ahttpd/styles/alterator.css.in components/bootloader/config.in components/bootloader/gfxboot.cfg.in components/browser-qt/design/design.qss.in components/indexhtml/index-en.html.in components/indexhtml/index-ru.html.in components/indexhtml/index.css components/systemd/os-release.in configure.ac gnome-settings/index.theme.in gnome-settings/metacity-theme-1.xml.in images/background16x9.png images/background4x3.png images/boot.png images/grub.png images/product-logo.png notes/index-ru.html.in slideshow/README
parents 6cd04500 96f4010d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 502 deletions
Makefile.in
View file @ 000989f5
...@@ -4,10 +4,25 @@ NAME=@NAME@ ...@@ -4,10 +4,25 @@ 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 -draw 'gravity SouthEast rotate -90 text -300,5 "$(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
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
components/ahttpd/images/clock-face.png
View replaced file @ 6cd04500 View file @ 000989f5
components/ahttpd/images/clock-face.png

29.4 KB | W: | H:

components/ahttpd/images/clock-face.png

19.5 KB | W: | H:

components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
components/ahttpd/images/clock-face.png
  • 2-up
  • Swipe
  • Onion skin
components/ahttpd/styles/alterator.css.in
View file @ 000989f5
...@@ -756,222 +756,6 @@ div.alterator-accordion { ...@@ -756,222 +756,6 @@ div.alterator-accordion {
padding-right: 30px; padding-right: 30px;
} }
.btn.ui-state-disabled {
color: #@MIDDLE_LABELS_HEX@;
background-color: #@MIDDLE_COLOR_HEX@;
}
.btn.ui-state-disabled:hover {
background-color: #@MIDDLE_COLOR_HEX@;
}
/* progressbar */
.ui-progressbar {
height:20px;
text-align: left;
}
.ui-progressbar .ui-progressbar-value {
height:100%;
}
/* accordion */
div.alterator-accordion h3 {
background-color: #eaecf2;
font-size: 9pt;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 24px;
margin: 2px;
background-image: url(/design/images/right.gif);
background-repeat: no-repeat;
background-position: center left;
cursor: pointer;
}
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:#E2E6EB url(/design/images/hgrabber.gif) no-repeat scroll 45%;
}
.ui-resizable-s:hover {
background-color: #1B3664;
}
/* corner radius */
.ui-corner-tl {
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
}
.ui-corner-tr {
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
}
.ui-corner-bl {
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
}
.ui-corner-br {
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
}
.ui-corner-top {
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
}
.ui-corner-bottom {
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
}
.ui-corner-right {
-moz-border-radius-topright: 4px;
-webkit-border-top-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
}
.ui-corner-left {
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
}
.ui-corner-all {
/*-moz-border-radius: 0.8em;
-webkit-border-radius: 0.8em;*/
}
/* overlays */
.ui-widget-overlay {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: #aaaaaa;
opacity: .3;
filter:Alpha(Opacity=30);
}
/* dialog */
.ui-widget-content {
background-color: #@LIGHT_LABELS_HEX@;
border: 1px solid #@MIDDLE_COLOR_HEX@;
}
.ui-widget-header {
color: #EAEDEF;
background-color: #@MIDDLE_COLOR_HEX@;
font-weight: bold;
}
.ui-dialog .ui-dialog-title {
float: left;
margin: .1em 0 .2em;
}
.ui-dialog .ui-dialog-titlebar {
padding: .5em .3em .3em 1em;
}
.ui-dialog .ui-dialog-titlebar-close {
float:right;
}
.ui-dialog .ui-dialog-titlebar-close span {
display: block;
margin: 1px;
}
.ui-dialog .ui-dialog-content {
border: 0;
padding: .5em 1em;
background: none;
overflow: auto;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
border-width: 1px 0 0 0;
background-image: none;
margin: .5em 0 0 0;
padding: .3em 1em .5em .4em;
}
.ui-dialog .ui-dialog-buttonpane button {
float: right;
margin: .5em .4em .5em 0;
cursor: pointer;
width:auto;
overflow:visible;
}
.ui-icon-closethick {
width: 22px;
height: 22px;
text-indent: -99999px;
overflow: hidden;
background: url(/design/images/close-dialog-button.png) no-repeat;
}
/* layout helpers */
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.ui-helper-clearfix { display: inline-block; }
/* required comment for clearfix to work in Opera \*/
* html .ui-helper-clearfix { height:1%; }
.ui-helper-clearfix { display:block; }
/* end clearfix */
/* help button */
.ui-help-button {
background-color: #@LIGHT_LABELS_HEX@;
margin-bottom: 10px;
padding-top: 7px;
border: 1px solid #c1c3cb;
-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 line */
#top { #top {
......
components/bootloader/config.in
View file @ 000989f5
product=@NAME@ @VERSION@@STATUS@ product=@DISTRO_NAME@
based_on=ALT Linux Sisyphus based_on=ALT Linux Sisyphus
components/bootloader/gfxboot.cfg.in
View file @ 000989f5
...@@ -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
......
components/browser-qt/design/design-live.qss.in 0 → 100644
View file @ 000989f5
/* Customize any plain widget that is a child of a QMainWindow. */
/* Main area */
.AWizardFace {
border-style: none;
background-position: top left;
background-repeat: no-repeat
}
.ACenterFace {
border-style: none;
}
.ACenterFace #modules_view {
background-color: white;
}
/* Nice WindowsXP-style password character for password line edits. */
QLineEdit {
lineedit-password-character: 9679;
}
QCheckBox:hover, QRadioButton:hover {
background: none;
}
/* Fix side effect on transparent background */
QCheckBox:indicator:hover, QRadioButton:indicator:hover {
margin-left: 1px;
}
components/browser-qt/design/design.ini.in
View file @ 000989f5
...@@ -2,4 +2,3 @@ Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #f ...@@ -2,4 +2,3 @@ Palette\active=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #f
Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312 Palette\inactive=#141312, #e8e7e6, #ffffff, #ebebea, #6d6c6b, #b7b5b3, #141312, #ffffff, #141312, #ffffff, #e0dfde, #3d3c3c, #@PROGRESS_COLOR@, #ffffff, #0057ae, #644a9b, #f8f7f6, #000000, #aed4a1, #141312
Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4, #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7, #eeece9, #000000, #aed4a1, #141312 Palette\disabled=#929190, #dedcdb, #ffffff, #e2e1e0, #686766, #b0aeac, #a5a4a4, #ffffff, #979695, #f4f4f4, #d6d5d3, #3c3b3b, #d6d5d3, #929190, #97bcdf, #c1b6d7, #eeece9, #000000, #aed4a1, #141312
Style=Cleanlooks
components/browser-qt/design/design.qss.in
View file @ 000989f5
...@@ -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/indexhtml/images/bullet.png
View replaced file @ 6cd04500 View file @ 000989f5
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/twitter.png
View replaced file @ 6cd04500 View file @ 000989f5
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
components/indexhtml/index-en.html.in
View file @ 000989f5
...@@ -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>
......
components/indexhtml/index-ru.html.in
View file @ 000989f5
...@@ -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,35 @@ ...@@ -16,21 +17,35 @@
</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://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>
<li><a href="http://altlinux.org/FAQ">FAQ</a></li> <li><a href="http://altlinux.org/FAQ">FAQ</a></li>
...@@ -38,7 +53,7 @@ ...@@ -38,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>
...@@ -49,7 +64,7 @@ ...@@ -49,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>
...@@ -62,23 +77,14 @@ ...@@ -62,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>
......
components/indexhtml/index.css
View file @ 000989f5
...@@ -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;
......
components/indexhtml/index.css.in deleted 100644 → 0
View file @ 6cd04500
/* 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: 600px;
height: 52px;
border: 0px;
}
components/systemd/os-release.in
View file @ 000989f5
...@@ -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/"
configure.ac
View file @ 000989f5
...@@ -15,10 +15,8 @@ DOCDIR=documentation ...@@ -15,10 +15,8 @@ DOCDIR=documentation
AC_SUBST(THEME) AC_SUBST(THEME)
AC_SUBST(CODENAME) AC_SUBST(CODENAME)
AC_SUBST(NAME) AC_SUBST(NAME)
AC_SUBST(NAME_RU)
AC_SUBST(BRAND) AC_SUBST(BRAND)
AC_SUBST(BRAND_FNAME) AC_SUBST(BRAND_FNAME)
AC_SUBST(BRAND_FNAME_RU)
AC_SUBST(STATUS) AC_SUBST(STATUS)
AC_SUBST(STATUS_EN) AC_SUBST(STATUS_EN)
AC_SUBST(VERSION) AC_SUBST(VERSION)
...@@ -40,20 +38,20 @@ AC_SUBST(INACTIVE_COLOR) ...@@ -40,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
images/README 0 → 100644
View file @ 000989f5
background16x9.png: PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced wallpaper for 16x9 monitors (without logotypes)
background4x3.png: PNG image, 1600 x 1200, 8-bit/color RGB, non-interlaced wallpaper for 4x3 monitors (without logotypes)
boot.jpg: JPEG image data, JFIF standard 1.01 screen for Plymouth (with logotypes)
boot.png: PNG image, 800 x 600, 8-bit/color RGB, non-interlaced DVD disk menu screen (with logotypes)
console.jpg: JPEG image data, JFIF standard 1.01 ?
grub.png: PNG image, 800 x 600, 8-bit/color RGB, non-interlaced GRUB loader screen for installed system (with logotypes)
installer.png: PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced installer backgrount (only right bottom corner is used) (without logotypes)
product-logo.png: PNG image, 348 x 45, 8-bit/color RGBA, non-interlaced product logotype
wallpaper.png: PNG image, 1920 x 1080, 8-bit/color RGB, non-interlaced default wallpaper (without logotypes)
images/product-logo.png
View replaced file @ 6cd04500 View file @ 000989f5
images/product-logo.png

12.2 KB | W: | H:

images/product-logo.png

8.11 KB | W: | H:

images/product-logo.png
images/product-logo.png
images/product-logo.png
images/product-logo.png
  • 2-up
  • Swipe
  • Onion skin
mate-settings/50_mate-background.gschema.override 0 → 100644
View file @ 000989f5
[org.mate.background]
color-shading-type="solid"
primary-color="#0c0c2c2c6c6c"
picture-options="zoom"
picture-filename="/usr/share/design/current/backgrounds/default.png"
secondary-color="#0c0c2c2c6c6c"
mate-settings/60_mate-theme.gschema.override 0 → 100644
View file @ 000989f5
[org.mate.interface]
gtk-theme="Clearlooks-Phenix"
icon-theme="mate"
[org.mate.Marco.general]
theme="Clearlooks-Phenix"
notes/index-ru.html.in deleted 100644 → 0
View file @ 6cd04500
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="index.css">
</head>
<body>
<div id="top" class="ui-corner-all">
<table>
<tbody>
<tr>
<td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
<td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
</tr>
</tbody>
</table>
</div>
<div class="box ui-corner-all" id="lang">
<a href="index-en.html">English</a> |
<a href="index-uk.html">Українська</a>
</div>
<div class="box ui-corner-all">
<p>Добро пожаловать в <nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
<h2>Документация</h2>
<ul>
<li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
</ul>
<h2>Информация в Интернете</h2>
<ul>
<li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
<li><a href="http://www.altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li>
<li><a href="http://www.altlinux.org/">Онлайновая документация</a></li>
<li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
<li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
<li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
<li><a href="http://support.altlinux.ru/">Техническая поддержка через веб-сайт</a></li>
</ul>
<h2>ALT Linux Team</h2>
<p>Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
<ul>
<li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
<li><a href="http://backports.altlinux.org/">Backports</a></li>
<li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
</ul>
</div>
<p class="footer"><nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr> &copy; ALT Linux, 2011. Все права защищены.<br />
Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 11<br />
Телефон/факс: +7 (495) 662-3883
</p>
</body>
</html>
notes/release-notes.all.html.in
View file @ 000989f5
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html> <html>
<head> <head>
<meta http-equiv="content-type" content="text/html;charset=utf-8"/> <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
...@@ -12,6 +11,12 @@ ...@@ -12,6 +11,12 @@
<a href="http://www.altlinux.ru">www.altlinux.ru</a>. <a href="http://www.altlinux.ru">www.altlinux.ru</a>.
</p> </p>
<p> <p>
You can start working right now: creating and editing office documents,
browsing Internet sites, processing audio and images, and a lot of
other activities. Look through the menu to find many new useful
programs.
</p>
<p>
<em>Hint</em>: if you visit <em>Hint</em>: if you visit
<a href="http://shop.altlinux.ru">shop.altlinux.ru</a>, you'll find the <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>, you'll find the
whole assortment of ALT Linux products and services, with useful, whole assortment of ALT Linux products and services, with useful,
......
slideshow/README
View file @ 000989f5
Put some PNG image, 650 x 300 for slideshow Place for slideshow pictures (PNG image, 650 x 300)
xfce-settings/etcskel/.wm-select 0 → 100644
View file @ 000989f5
EXEC=/usr/bin/startxfce4
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