Skip to content

B
branding-etersoft-ximper
Commit d2be01d2 authored by Mikhail Efremov's avatar Mikhail Efremov
Browse files
Options

Merge branch 'simply' of git.alt:/people/cas/packages/branding into simply

parents 0bae3131 0f3cad35
Hide whitespace changes
Inline Side-by-side
Showing with 309 additions and 224 deletions
branding.spec
View file @ d2be01d2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
Name: branding-simply-linux Name: branding-simply-linux
Version: 6.0.0 Version: 6.0.0
Release: alt21 Release: alt24
BuildArch: noarch BuildArch: noarch
BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
...@@ -297,8 +297,8 @@ install slideshow/slideshow.conf %buildroot/etc/alterator/ ...@@ -297,8 +297,8 @@ install slideshow/slideshow.conf %buildroot/etc/alterator/
%define _altdocsdir %_defaultdocdir/alt-docs %define _altdocsdir %_defaultdocdir/alt-docs
%define _indexhtmldir %_defaultdocdir/indexhtml %define _indexhtmldir %_defaultdocdir/indexhtml
install components/indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/ install components/indexhtml/*.html %buildroot%_defaultdocdir/indexhtml/
mkdir -p %buildroot%_defaultdocdir/indexhtml/img mkdir -p %buildroot%_defaultdocdir/indexhtml/images
install components/indexhtml/img/* %buildroot%_defaultdocdir/indexhtml/img/ install components/indexhtml/images/* %buildroot%_defaultdocdir/indexhtml/images/
#install -m644 components/indexhtml.desktop %buildroot%_desktopdir/ #install -m644 components/indexhtml.desktop %buildroot%_desktopdir/
#menu #menu
...@@ -383,14 +383,14 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf ...@@ -383,14 +383,14 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
%define indexhtmldir %_defaultdocdir/indexhtml %define indexhtmldir %_defaultdocdir/indexhtml
%files indexhtml %files indexhtml
#%ghost %_indexhtmldir/index.html #%%ghost %%_indexhtmldir/index.html
#%_indexhtmldir/* #%%_indexhtmldir/*
#%_desktopdir/* #%%_desktopdir/*
%ghost %indexhtmldir/index.html %ghost %indexhtmldir/index.html
%indexhtmldir/index-*.html %indexhtmldir/index-*.html
%indexhtmldir/index.css %indexhtmldir/index.css
%indexhtmldir/img %indexhtmldir/images
%_desktopdir/indexhtml.desktop %_desktopdir/indexhtml.desktop
%files menu %files menu
...@@ -399,6 +399,16 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf ...@@ -399,6 +399,16 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
/etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu /etc/xdg/menus/xfce-applications-merged/50-xfce-applications.menu
%changelog %changelog
* Tue Sep 13 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt24
- Add project web-site
- Fix ALT Linux web-site in English version
* Tue Sep 13 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt23
- Fix build
* Tue Sep 13 2011 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt22
- New indexhtml design with more links
* Thu Aug 25 2011 Mikhail Efremov <sem@altlinux.org> 6.0.0-alt21 * Thu Aug 25 2011 Mikhail Efremov <sem@altlinux.org> 6.0.0-alt21
- menu: Change 'Xfce about' icon. - menu: Change 'Xfce about' icon.
- desktop: Fix trash icon position. - desktop: Fix trash icon position.
......
components.mk
View file @ d2be01d2
...@@ -56,6 +56,6 @@ indexhtml: ...@@ -56,6 +56,6 @@ indexhtml:
install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \ install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
done done
install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
cp -a components/indexhtml/img $(INDEXHTML_DIR) cp -a components/indexhtml/images $(INDEXHTML_DIR)
install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/img/product-logo.png install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
components/indexhtml/index-en.html.in
View file @ d2be01d2
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<head> <!-- Disto name in title -->
<title>Simply Linux @VERSION@ @STATUS@</title> <title>@NAME@ @VERSION@ @STATUS@</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="index.css">
</head>
<link href="index.css" rel="stylesheet" type="text/css">
</head>
<body> <body>
<div id=lang>
<a href="index-ru.html">Русский</a>
</div>
<div id="content"> <div id="content">
<table border="0" cellspacing="10"><tr> <!-- Language selection -->
<td width="99%" valign="bottom"><h1 class="shadow" title="Simply Linux @VERSION@ @STATUS@"><nobr>Simply Linux @VERSION@ @STATUS@</nobr></h1></td> <div id="languages">
</tr></table> <a href="index-ru.html">Русский</a>
</div>
<div id="main">
<div id="pane"> <!-- Disto name -->
<div class="footer">Search on community resources</div> <div id="title">@NAME@ @VERSION@ @STATUS@</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"> <div id="top-site">Project Website: <a href="http://www.simplylinux.ru">http://www.simplylinux.ru</a></div>
<h2>ALT Linux Team</h2>
<img src="img/alt-linux-team.png" width="144" height="55"> <div id="main">
<!-- Links columns -->
<table border="0" width="100%">
<tr>
<th width="33%"><img src="images/documentation.png" alt="Documentation"></th>
<th width="33%"><img src="images/altlinux-logo.png" alt="Company" class="icon_big"></th>
<th width="34%"><img src="images/community.png" alt="Community" class="icon"></th>
</tr>
<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> <tr>
<td width="33%" class="column"> <!-- First column: documentation -->
<ul> <ul>
<li><a href="http://www.altlinux.org/">Community Wiki</a></li> <li><a href="file:///usr/share/doc/documentation/index.html">User Manual</a></li>
<li><a href="http://forum.altlinux.org/">Community Forum</a></li> <li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Local Documentation</a></li>
<li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Mailing lists</a></li> <li><a href="http://docs.altlinux.org">Online Documentation</a></li>
<li><a href="http://shop.altlinux.ru/index.php?categoryID=559">Books</a></li>
<li><a href="http://altlinux.org/">Wiki</a></li>
<li><a href="http://altlinux.org/FAQ">FAQ</a></li>
</ul> </ul>
</div> </td>
</div>
<p align="justify">Welcome to <nobr>Simply Linux @VERSION@ @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> <td width="33%" id="central_pane"> <!-- Second column: Company -->
<div id="documentation">
<h2>Documentation</h2>
<ul> <ul>
<li><a href="../@DOCDIR@/index.html">User manual</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://support.altlinux.ru">Technical Support</a></li>
<li><a href="http://www.altlinux.com/en/go/about-company/contacts/">Contacts</a></li>
<li><a href="http://www.altlinux.com/en/go/download/">Download</a></li>
<li><a href="http://torrent.altlinux.org/">Torrents</a></li>
</ul> </ul>
</div> </td>
<div id="web"> <td width="34%" class="column"> <!-- Third column: community -->
<h2>In Internet</h2>
<ul> <ul>
<li><a href="http://www.simplylinux.ru">Simply Linux Site</a></li> <li><a href="http://lists.altlinux.org">Mailing Lists</a></li>
<li><a href="http://altlinux.org/FAQ">Frequently Asked QUestion</a></li> <li><a href="http://forum.altlinux.org">User Forum</a></li>
<li><a href="http://bugs.altlinux.org/">Report a bug</a></li> <li><a href="http://bugs.altlinux.org">Report a Bug</a></li>
<li><a href="http://planet.altlinux.org">ALT Linux Planet</a></li>
<li><a href="http://packages.altlinux.org">Software Repository</a></li>
<li><a href="http://git.altlinux.org">Сборочная среда</a></li>
</ul> </ul>
</div> </td>
</tr>
<tr><td colspan="3" id="search">
<!-- Search pane -->
<form action="http://www.google.com/search" method="get">
<img src="images/magnifier.png" alt="Search on online resources">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" size="35">
<input id="search_button" type="submit" name="sa" value="Search in Internet">
</form>
</td></tr>
<!-- Social networks -->
<tr><td colspan="3" id="social">We will be glade to meet you in social networks:</td></tr>
<tr>
<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="VKontakte" class="banner"></a></th>
</tr>
</table>
<!-- Copyright information -->
<div id="footer">
<table border="0" width="100%">
<tr>
<td id="left_footer">&copy; 2011 ALT Linux. All rights reserved.</td>
<td id="right_footer">
Tel/fax: +7 (495) 662-3883<br>
119334, Russian Federation, Moscow, 5-th Donskoy proezd, 15, build 6.
</td>
</tr></table>
</div> </div>
</div> </div>
</div>
</body> </body>
</html>
components/indexhtml/index-ru.html.in
View file @ d2be01d2
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html> <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<head> <!-- Disto name in title -->
<title>@NAME@ @VERSION@ @STATUS@</title> <title>Simply Linux. Выпуск 4 (6.0)</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="index.css">
</head>
<link href="index.css" rel="stylesheet" type="text/css">
</head>
<body> <body>
<div id=lang>
<a href="index-en.html">English</a>
</div>
<div id="content"> <div id="content">
<table border="0" cellspacing="10"><tr> <!-- Language selection -->
<td width="99%" valign="bottom"><h1 class="shadow" title="Simply Linux @VERSION@ @STATUS@"><nobr>Simply Linux @VERSION@ @STATUS@</nobr></h1></td> <div id="languages">
</tr></table> <a href="index-en.html">English</a>
</div>
<div id="main">
<div id="pane">
<div class="footer">Поиск по ресурсам сообщества</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"> <!-- Disto name -->
<h2>ALT Linux Team</h2> <div id="title">Simply Linux. Выпуск 4 (6.0)</div>
<img src="img/alt-linux-team.png" width="144" height="55"> <div id="top-site">Веб-сайт проекта: <a href="http://www.simplylinux.ru">http://www.simplylinux.ru</a></div>
<p align="justify" style="padding: 15px;">Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p> <div id="main">
<!-- Links columns -->
<table border="0" width="100%">
<tr>
<th width="33%"><img src="images/documentation.png" alt="Документация"></th>
<th width="33%"><img src="images/altlinux-logo.png" alt="Компания" class="icon_big"></th>
<th width="34%"><img src="images/community.png" alt="Сообщество" class="icon"></th>
</tr>
<tr>
<td width="33%" class="column"> <!-- First column: documentation -->
<ul> <ul>
<li><a href="http://www.altlinux.org/">Wiki сообщества</a></li> <li><a href="file:///usr/share/doc/documentation/index.html">Руководство пользователя</a></li>
<li><a href="http://forum.altlinux.org/">Форум сообщества</a></li> <li><a href="file:///usr/share/doc/alt-docs/modules/index.html">Локальная документация</a></li>
<li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li> <li><a href="http://docs.altlinux.org">Онлайновая документация</a></li>
<!-- <li><a href="http://backports.altlinux.org/">Backports</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/FAQ">FAQ</a></li>
</ul> </ul>
</div> </td>
</div>
<p align="justify">Добро пожаловать в <nobr>Simply Linux @VERSION@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p> <td width="33%" id="central_pane"> <!-- Second column: Company -->
<div id="documentation">
<h2>Документация</h2>
<ul> <ul>
<li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li> <li><a href="http://www.altlinux.ru">Сайт компании</a></li>
<li><a href="http://shop.altlinux.ru">Интернет-магазин</a></li>
<li><a href="http://support.altlinux.ru">Техническая поддержка</a></li>
<li><a href="http://www.altlinux.ru/go/about-company/contacts/">Контакты</a></li>
<li><a href="http://www.altlinux.ru/products/downloads/">Загрузить</a></li>
<li><a href="http://torrent.altlinux.org/">Торренты</a></li>
</ul> </ul>
</div> </td>
<div id="web"> <td width="34%" class="column"> <!-- Third column: community -->
<h2>Информация в Интернете</h2>
<ul> <ul>
<li><a href="http://www.simplylinux.ru">Сайт проекта</a></li> <li><a href="http://lists.altlinux.org">Списки рассылки</a></li>
<li><a href="http://altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li> <li><a href="http://forum.altlinux.org">Форум пользователей</a></li>
<!-- <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li> --> <li><a href="http://bugs.altlinux.org">Сообщить об ошибке</a></li>
<li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li> <li><a href="http://planet.altlinux.org">Планета</a></li>
<li><a href="http://packages.altlinux.org">Репозиторий</a></li>
<li><a href="http://git.altlinux.org">Сборочная среда</a></li>
</ul> </ul>
</div> </td>
</tr>
<tr><td colspan="3" id="search">
<!-- Search pane -->
<form action="http://www.google.com/search" method="get">
<img src="images/magnifier.png" alt="Поиск по ресурсам ALT Linux">
<input type="hidden" name="cx" value="009267546552065786736:rwjixpf6cv8">
<input id="search_string" type="text" name="q" size="35">
<input id="search_button" type="submit" name="sa" value="Поиск в Интернете">
</form>
</td></tr>
<!-- Social networks -->
<tr><td colspan="3" id="social">Мы рады встретиться с вами в социальных сетях:</td></tr>
<tr>
<th><a href="http://twitter.com/#!/altlinuxru" class="image"><img src="images/twitter.png" alt="Twitter" class="banner"></a></th>
<th><a href="http://www.facebook.com/groups/simplylinux/" class="image"><img src="images/facebook.png" alt="Facebook" class="banner"></a></th>
<th><a href="http://vkontakte.ru/club16711511" class="image"><img src="images/vkontakte.png" alt="ВКонтакте" class="banner"></a></th>
</tr>
</table>
<!-- Copyright information -->
<div id="footer">
<table border="0" width="100%">
<tr>
<td id="left_footer">&copy; ALT Linux, 2011. Все права защищены.</td>
<td id="right_footer">
Телефон/факс: +7 (495) 662-3883<br>
Москва, 5-й Донской проезд, д. 15, стр. 6
</td>
</tr></table>
</div> </div>
</div> </div>
</div>
</body> </body>
</html>
components/indexhtml/index.css
View file @ d2be01d2
/* Stylesheet for index file */ /* CSS file for indexhtml page in ALT Linux distros */
body { body {
font-family: Verdana,'DejaVu Sans',Helvetica,sans; font-family: Verdana,'DejaVu Sans',Helvetica,sans;
text-align: left; text-align: left;
font-size: 12px; font-size: 12px;
background: #FFF; background: #f8f8f8;
background-image: url('img/bg.png'); background-image: url('images/dotted-background.png');
} }
div#content {
.shadow { position:relative; display:block; color:black; } background: white;
.shadow nobr { position:absolute; display:block; top:0px; } border: solid 6px #d0d0d0;
.shadow:before { display:block; padding:2px; content: attr(title); color:#CCC; } border-radius: 8px;
-webkit-border-radius: 8px;
h1 { -moz-border-radius: 7px;
font-size: 28px; -khtml-border-radius: 12px;
font-weight: bold; padding: 0;
color: black; position: relative;
/*text-shadow: #CCC 2px 2px 3px;*/ width: 780px;
vertical-align: baseline; margin: 40px auto;
} }
div#languages {
h2 h3 { text-align: right;
color: black; font-size: x-small;
} padding: 12px;
}
p { text-align: justify; } div#title {
font-weight: normal;
a:link, a:visited { font-size: 18pt;
text-decoration: none; font-family: Verdana, Helvetica;
color: #39c; text-align: center;
} margin-top: 0;
margin-bottom: 12px;
a:hover { background: #d3eaf9;
text-decoration: underline; padding: 6px 0 6px 0;
color: #f60; border-top: solid 1px #81c3eb;
} border-bottom: solid 1px #81c3eb;
background-image: url('images/lines.png');
ul li { }
padding-left: 3px; div#top-site {
text-align: left; font-size: 120%;
list-style: square url('img/bullet.png'); font-weight: normal;
} font-family: Verdana, Helvetica;
text-align: center;
li.spacebefore { margin-top: 1em;} padding: 4px;
}
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 { div#main {
background: #FFF; padding: 12px;
width: 100%; }
border: 1px solid #CCC; th {
padding: 2mm; vertical-align: bottom;
padding-left: 5mm; text-align: center;
} padding-top: 5px;
}
div#pane { img.icon {
float: right; width: 48px;
width: 260px; height: 48px;
text-align: center; }
margin: 15px; img.icon_big {
padding: 0px; width: 60px;
} height: 60px;
}
div#team { img.banner {
background: #E5FFE5; width: 130px;
width: 100%; height: 30px;
text-align: center; margin: 6px;
margin: 0px; }
padding: 0px; li {
border: 1px solid #66CC66; line-height: 1.35em;
} }
td#central_pane {
.footer { border-left: dotted 1px #ccc;
font-size: 9px; border-right: dotted 1px #ccc;
color: #666; text-align: center;
} }
.column {
div.columns { float: left; } text-align: center;
}
div#firstcolumn { width: 27em; } td#search {
text-align: center;
div.indent { padding-left: 5mm; } padding: 12px;
}
div.spacer { clear: both; } input#search_string {
position: relative;
div#lang { vertical-align: top;
text-align: center; margin-top: 12px;
background: #fff; font-size: 130%;
padding: 0.2em; background: white;
border: 1px solid #CCC; border: solid 1px #81c3eb;
border-radius: 2px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
-khtml-border-radius: 2px;
}
input#search_button {
margin-top: 12px;
vertical-align: top;
font-size: 130%;
}
td#social {
text-align: center;
border-bottom: dotted 1px #ccc;
font-size: xx-small;
color: #999;
}
td#left_footer, td#right_footer {
font-size: xx-small;
color: #999;
vertical-align: bottom;
padding-top: 15px;
}
td#right_footer {
text-align: right;
}
ul li {
text-align: left;
list-style: square url('bullet.png');
}
a:link, a:visited {
text-decoration: none;
color: #2e7194;
}
a:hover {
text-decoration: none;
color: #f60;
border-bottom: 1px dotted #f60;
}
a.image:hover, a.image:link, a.image:visited {
text-decoration: none;
border: 0;
} }
components/indexhtml/indexhtml.desktop.in
View file @ d2be01d2
...@@ -4,8 +4,8 @@ Type=Application ...@@ -4,8 +4,8 @@ Type=Application
Exec=xdg-open /usr/share/doc/indexhtml/index.html Exec=xdg-open /usr/share/doc/indexhtml/index.html
StartupNotify=false StartupNotify=false
Icon=altlinux Icon=altlinux
Name=@NAME@ @VERSION@ @STATUS@: start page Name=Information about @NAME@ @VERSION@ @STATUS@
Categories=System;Documentation; Categories=System;Documentation;
# Translations # Translations
Name[ru]=@NAME@ @VERSION@ @STATUS@: cтартовая страница Name[ru]=Сведения о @NAME@ @VERSION@ @STATUS@
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