Skip to content

B
branding-etersoft-ximper
Commit 3effbee7 authored by Stanislav Ievlev's avatar Stanislav Ievlev
Browse files
Options

Merge branch 'master' into office-server

Conflicts: components.mk components/ahttpd/styles/alterator.css.in images/logo.png
parents f96ce02e 011f0254
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 43 deletions
Makefile.in
View file @ 3effbee7
...@@ -15,4 +15,4 @@ all: ...@@ -15,4 +15,4 @@ all:
mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc" mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
include components.mk include components.mk
install: browser-qt ahttpd boot install: browser-qt ahttpd boot indexhtml
branding.spec
View file @ 3effbee7
...@@ -197,17 +197,6 @@ popd ...@@ -197,17 +197,6 @@ popd
mkdir -p %buildroot/usr/share/install2/slideshow mkdir -p %buildroot/usr/share/install2/slideshow
install slideshow/* %buildroot/usr/share/install2/slideshow/ install slideshow/* %buildroot/usr/share/install2/slideshow/
#indexhtml
%define _altdocsdir %_defaultdocdir/alt-docs
%define _indexhtmldir %_altdocsdir/indexhtml
pushd indexhtml
mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
cp -r * %buildroot%_indexhtmldir/
rm -f %buildroot%_indexhtmldir/*.in %buildroot%_indexhtmldir/indexhtml.desktop
touch %buildroot%_indexhtmldir/index.html
install -m644 indexhtml.desktop %buildroot%_desktopdir/
popd
#xfce-settings #xfce-settings
pushd xfce-settings pushd xfce-settings
mkdir -p %buildroot/etc/skel/.config/xfce4/desktop mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
...@@ -300,10 +289,14 @@ echo $lang > lang ...@@ -300,10 +289,14 @@ echo $lang > lang
%files slideshow %files slideshow
/usr/share/install2/slideshow /usr/share/install2/slideshow
%define indexhtmldir %_datadir/doc/alt-docs/indexhtml
%files indexhtml %files indexhtml
%ghost %_indexhtmldir/index.html %ghost %indexhtmldir/index.html
%_indexhtmldir/* %indexhtmldir/index-*.html
%_desktopdir/* %indexhtmldir/index.css
%indexhtmldir/img
%_desktopdir/indexhtml.desktop
%changelog %changelog
* Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt26 * Tue Sep 08 2009 Stanislav Ievlev <inger@altlinux.org> 5.0.0-alt26
......
components.mk
View file @ 3effbee7
...@@ -14,8 +14,7 @@ browser-qt:components/browser-qt/design/bg.png ...@@ -14,8 +14,7 @@ browser-qt:components/browser-qt/design/bg.png
ahttpd: ahttpd:
install -d $(datadir)/alterator/design/styles install -d $(datadir)/alterator/design/styles
cp -a components/ahttpd/images $(datadir)/alterator/design cp -a components/ahttpd/images $(datadir)/alterator/design
cp -a images/logo.png $(datadir)/alterator/design/images/logo.png install -Dpm644 images/product-logo.png $(datadir)/alterator/design/images/product-logo.png
#[ ! -f images/logo.png ] || convert images/logo.png -fill '#ffffff' -font /usr/share/fonts/ttf/dejavu/DejaVuSans-Bold.ttf -style Normal -weight Normal -pointsize 24 -gravity northwest -draw 'text 0,0 "$(VERSION) $(NAME)"' $(datadir)/alterator/design/images/logo.png
cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles cp -a components/ahttpd/styles/*.css $(datadir)/alterator/design/styles
# bootloader and bootsplash # bootloader and bootsplash
...@@ -40,3 +39,14 @@ boot: ...@@ -40,3 +39,14 @@ boot:
install -d -m 755 $(datadir)/gfxboot/$(THEME) install -d -m 755 $(datadir)/gfxboot/$(THEME)
install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME) install -m 644 design-bootloader-source/message $(sysconfdir)/../boot/splash/$(THEME)
install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME) install -m 644 design-bootloader-source/bootlogo $(datadir)/gfxboot/$(THEME)
# index html page, start page for all local browsers
INDEXHTML_DIR=$(datadir)/doc/alt-docs/indexhtml
indexhtml:
for i in notes/index*.html components/indexhtml/*.css;do \
install -Dpm644 $$i $(INDEXHTML_DIR)/`basename $$i`; \
done
install -Dpm644 /dev/null $(INDEXHTML_DIR)/index.html
cp -a components/indexhtml/img $(INDEXHTML_DIR)
install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/img/product-logo.png
install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
components/ahttpd/styles/alterator.css.in
View file @ 3effbee7
...@@ -372,7 +372,7 @@ div.alterator-accordion h3.ui-state-active { ...@@ -372,7 +372,7 @@ div.alterator-accordion h3.ui-state-active {
} }
#product-logo { #product-logo {
background: url(/design/images/logo.png) no-repeat; background: url(/design/images/product-logo.png) no-repeat;
width: 415px; width: 415px;
height: 52px; height: 52px;
border: 0px; border: 0px;
......
indexhtml/index.css.in → components/indexhtml/index.css.in
View file @ 3effbee7
/* Stylesheet for index file */ /* Stylesheet for index file */
body { body {
font-family: Verdana,'DejaVu Sans',Helvetica,sans; background-color: #@MIDDLE_COLOR_HEX@;
text-align: left; color: #@MIDDLE_LABELS_HEX@;
font-size: 12px; margin: 0px;
background: #@LIGHT_COLOR_HEX@; padding: 10px;
background-image: url('img/bg.png'); font-family : Tahoma, Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 9pt;
} }
.shadow { position:relative; display:block; color:black; } .shadow { position:relative; display:block; color:black; }
...@@ -107,3 +108,24 @@ div#lang { ...@@ -107,3 +108,24 @@ div#lang {
padding: 0.2em; padding: 0.2em;
border: 1px solid #@DARK_COLOR_HEX@; border: 1px solid #@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: 415px;
height: 52px;
border: 0px;
}
configure.ac
View file @ 3effbee7
...@@ -48,11 +48,11 @@ AC_CONFIG_FILES([ ...@@ -48,11 +48,11 @@ AC_CONFIG_FILES([
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
indexhtml/indexhtml.desktop notes/index-ru.html
indexhtml/index-ru.html notes/index-uk.html
indexhtml/index-uk.html notes/index-en.html
indexhtml/index-en.html components/indexhtml/indexhtml.desktop
indexhtml/index.css components/indexhtml/index.css
gnome-settings/gtkrc gnome-settings/gtkrc
gnome-settings/index.theme gnome-settings/index.theme
gnome-settings/metacity-theme-1.xml gnome-settings/metacity-theme-1.xml
......
indexhtml/index-en.html.in → notes/index-en.html.in
View file @ 3effbee7
...@@ -9,6 +9,17 @@ ...@@ -9,6 +9,17 @@
<body> <body>
<div id="top">
<table>
<tbody>
<tr>
<td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
<td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
</tr>
</tbody>
</table>
</div>
<div id=lang> <div id=lang>
<a href="index-ru.html">Русский</a> | <a href="index-ru.html">Русский</a> |
<a href="index-uk.html">Українська</a> <a href="index-uk.html">Українська</a>
...@@ -16,11 +27,6 @@ ...@@ -16,11 +27,6 @@
<div id="content"> <div id="content">
<table border="0" cellspacing="10"><tr>
<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
</tr></table>
<div id="main"> <div id="main">
<div id="pane"> <div id="pane">
......
indexhtml/index-ru.html.in → notes/index-ru.html.in
View file @ 3effbee7
...@@ -9,6 +9,17 @@ ...@@ -9,6 +9,17 @@
<body> <body>
<div id="top">
<table>
<tbody>
<tr>
<td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
<td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
</tr>
</tbody>
</table>
</div>
<div id=lang> <div id=lang>
<a href="index-en.html">English</a> | <a href="index-en.html">English</a> |
<a href="index-uk.html">Українська</a> <a href="index-uk.html">Українська</a>
...@@ -16,11 +27,6 @@ ...@@ -16,11 +27,6 @@
<div id="content"> <div id="content">
<table border="0" cellspacing="10"><tr>
<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
</tr></table>
<div id="main"> <div id="main">
<div id="pane"> <div id="pane">
......
indexhtml/index-uk.html.in → notes/index-uk.html.in
View file @ 3effbee7
...@@ -9,6 +9,17 @@ ...@@ -9,6 +9,17 @@
<body> <body>
<div id="top">
<table>
<tbody>
<tr>
<td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
<td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
</tr>
</tbody>
</table>
</div>
<div id=lang> <div id=lang>
<a href="index-en.html">English</a> | <a href="index-en.html">English</a> |
<a href="index-ru.html">Русский</a> <a href="index-ru.html">Русский</a>
...@@ -16,11 +27,6 @@ ...@@ -16,11 +27,6 @@
<div id="content"> <div id="content">
<table border="0" cellspacing="10"><tr>
<td><img src="img/altlinux-logo.png" width="95" height="84" style="margin-right: 15px;"></td>
<td width="99%" valign="bottom"><h1 class="shadow" title="@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</nobr></h1></td>
</tr></table>
<div id="main"> <div id="main">
<div id="pane"> <div id="pane">
......
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