diff --git a/branding.spec b/branding.spec index a749cf5..ae317f5 100644 --- a/branding.spec +++ b/branding.spec @@ -7,7 +7,7 @@ Name: branding-%brand-%theme Version: 6.0.0 -Release: alt17 +Release: alt18 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid BuildRequires: design-bootloader-source >= 5.0-alt2 @@ -411,13 +411,16 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \ %ghost %indexhtmldir/index.html %indexhtmldir/index-*.html %indexhtmldir/index.css -%indexhtmldir/img +%indexhtmldir/images %_desktopdir/indexhtml.desktop %changelog -* Fri Sep 30 2011 Anton V. Boyarshinov 6.0.0-alt17 +* Fri Sep 30 2011 Anton V. Boyarshinov 6.0.0-alt18 - theme-livecd.qrc for livecd +* Mon Sep 19 2011 Andrey Cherepanov 6.0.0-alt17 +- New design of indexhtml + * Fri Sep 09 2011 Anton V. Boyarshinov 6.0.0-alt16 - gtk theme fix from mex3@ diff --git a/components.mk b/components.mk index 704cc75..252f344 100644 --- a/components.mk +++ b/components.mk @@ -60,10 +60,10 @@ components/indexhtml/index.css: INDEXHTML_DIR=$(datadir)/doc/indexhtml indexhtml: components/indexhtml/index.css - for i in notes/index*.html components/indexhtml/*.css;do \ + for i in components/indexhtml/*.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 + cp -a components/indexhtml/images $(INDEXHTML_DIR) + install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop diff --git a/components/indexhtml/images/altlinux-logo.png b/components/indexhtml/images/altlinux-logo.png new file mode 100644 index 0000000..a0e0514 Binary files /dev/null and b/components/indexhtml/images/altlinux-logo.png differ diff --git a/components/indexhtml/img/bullet.png b/components/indexhtml/images/bullet.png similarity index 100% rename from components/indexhtml/img/bullet.png rename to components/indexhtml/images/bullet.png diff --git a/components/indexhtml/images/community.png b/components/indexhtml/images/community.png new file mode 100644 index 0000000..41c1a2a Binary files /dev/null and b/components/indexhtml/images/community.png differ diff --git a/components/indexhtml/images/documentation.png b/components/indexhtml/images/documentation.png new file mode 100644 index 0000000..392b15f Binary files /dev/null and b/components/indexhtml/images/documentation.png differ diff --git a/components/indexhtml/images/dotted-background.png b/components/indexhtml/images/dotted-background.png new file mode 100644 index 0000000..5cb7137 Binary files /dev/null and b/components/indexhtml/images/dotted-background.png differ diff --git a/components/indexhtml/images/facebook.png b/components/indexhtml/images/facebook.png new file mode 100644 index 0000000..d651bfd Binary files /dev/null and b/components/indexhtml/images/facebook.png differ diff --git a/components/indexhtml/images/lines.png b/components/indexhtml/images/lines.png new file mode 100644 index 0000000..0d10d82 Binary files /dev/null and b/components/indexhtml/images/lines.png differ diff --git a/components/indexhtml/images/magnifier.png b/components/indexhtml/images/magnifier.png new file mode 100644 index 0000000..13bdca2 Binary files /dev/null and b/components/indexhtml/images/magnifier.png differ diff --git a/components/indexhtml/images/twitter.png b/components/indexhtml/images/twitter.png new file mode 100644 index 0000000..d33059e Binary files /dev/null and b/components/indexhtml/images/twitter.png differ diff --git a/components/indexhtml/images/vkontakte.png b/components/indexhtml/images/vkontakte.png new file mode 100644 index 0000000..e93d115 Binary files /dev/null and b/components/indexhtml/images/vkontakte.png differ diff --git a/components/indexhtml/img/alt-linux-team.png b/components/indexhtml/img/alt-linux-team.png deleted file mode 100644 index 81b3081..0000000 Binary files a/components/indexhtml/img/alt-linux-team.png and /dev/null differ diff --git a/components/indexhtml/img/gradient-top.png b/components/indexhtml/img/gradient-top.png deleted file mode 100644 index 33b9358..0000000 Binary files a/components/indexhtml/img/gradient-top.png and /dev/null differ diff --git a/components/indexhtml/img/null.gif b/components/indexhtml/img/null.gif deleted file mode 100644 index 0e5bb0b..0000000 Binary files a/components/indexhtml/img/null.gif and /dev/null differ diff --git a/components/indexhtml/index-en.html.in b/components/indexhtml/index-en.html.in new file mode 100644 index 0000000..822a48a --- /dev/null +++ b/components/indexhtml/index-en.html.in @@ -0,0 +1,101 @@ + + + + +@NAME@ @VERSION@ @STATUS@ + + + + + +
+ + + + + +
@NAME@ @VERSION@ @STATUS@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
DocumentationCompanyCommunity
+ + + + + +
We will be glade to meet you on the following social networks:
+ + + + +
+ +
+ diff --git a/components/indexhtml/index-ru.html.in b/components/indexhtml/index-ru.html.in new file mode 100644 index 0000000..43892f4 --- /dev/null +++ b/components/indexhtml/index-ru.html.in @@ -0,0 +1,101 @@ + + + + +Альт Линукс 6.0 Кентавр + + + + + +
+ + +
+ English +
+ + +
Альт Линукс 6.0 Кентавр
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
ДокументацияКомпанияСообщество
+ + + + + +
Мы рады встретиться с вами в социальных сетях:
+ + + + +
+ +
+ diff --git a/components/indexhtml/index.css b/components/indexhtml/index.css new file mode 100644 index 0000000..a21c9bf --- /dev/null +++ b/components/indexhtml/index.css @@ -0,0 +1,130 @@ +/* CSS file for indexhtml page in ALT Linux distros */ +body { + font-family: Verdana,'DejaVu Sans',Helvetica,sans; + text-align: left; + font-size: 12px; + background: #f8f8f8; + background-image: url('images/dotted-background.png'); +} +div#content { + background: white; + border: solid 6px #d0d0d0; + border-radius: 8px; + -webkit-border-radius: 8px; + -moz-border-radius: 7px; + -khtml-border-radius: 12px; + padding: 0; + position: relative; + width: 780px; + margin: 40px auto; +} +div#languages { + text-align: right; + font-size: x-small; + padding: 12px; +} +div#title { + font-weight: normal; + font-size: 18pt; + font-family: Verdana, Helvetica; + text-align: center; + margin-top: 0; + margin-bottom: 12px; + background: #657fbe; + padding: 6px 0 6px 0; + border-top: solid 1px #657fbe; + border-bottom: solid 1px #657fbe; + background-image: url('images/lines.png'); +} +div#top-site { + font-size: 120%; + font-weight: normal; + font-family: Verdana, Helvetica; + text-align: center; + padding: 4px; +} +div#main { + padding: 12px; +} +th { + vertical-align: bottom; + text-align: center; + padding-top: 5px; +} +img.icon { + width: 48px; + height: 48px; +} +img.icon_big { + width: 60px; + height: 60px; +} +img.banner { + width: 130px; + height: 30px; + margin: 6px; +} +li { + line-height: 1.35em; +} +td#central_pane { + border-left: dotted 1px #ccc; + border-right: dotted 1px #ccc; + text-align: center; +} +.column { + text-align: center; +} +td#search { + text-align: center; + padding: 12px; +} +input#search_string { + position: relative; + vertical-align: top; + margin-top: 12px; + font-size: 130%; + background: white; + border: solid 1px #657fbe; + 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; +} diff --git a/components/indexhtml/indexhtml.desktop.in b/components/indexhtml/indexhtml.desktop.in index 97d24ff..88655ac 100644 --- a/components/indexhtml/indexhtml.desktop.in +++ b/components/indexhtml/indexhtml.desktop.in @@ -4,8 +4,8 @@ Type=Application Exec=xdg-open /usr/share/doc/indexhtml/index.html StartupNotify=false Icon=altlinux -Name=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@: start page +Name=Information about @NAME@ @VERSION@ @STATUS@ Categories=System;Documentation; # Translations -Name[ru]=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@: cтартовая страница +Name[ru]=Сведения о @NAME@ @VERSION@ @STATUS@ diff --git a/configure.ac b/configure.ac index beb3bc7..e72abaa 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,8 @@ AC_CONFIG_FILES([ components/browser-qt/design/design.ini components/browser-qt/design/design.qss components/bootloader/gfxboot.cfg + components/indexhtml/index-ru.html + components/indexhtml/index-en.html kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc notes/release-notes.ru.html notes/release-notes.all.html