From 1f4db8b352f6c039272ceb1a0855e4f2c515e972 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Sun, 28 Feb 2010 17:32:55 +0000
Subject: Improve language selection support + change appearance a bit.

* .htaccess.in: Use type-map to handle automatic language
selection.
* style.css (div.contentpanel): Set vertical align.
(div.navbar > img): New selector. Center the Parthenon image.
(ul.menu): Change navigation menu appearance.
* configure.ac: Require autoconf 2.63
(AC_CONFIG_FILES): Add html-files/Makefile
* Makefile.am (SUBDIRS): Add html-files .
(html_DATA, EXTRA_DIST): Reflect changes to the root directory.

* index.html: New file.
* maint.html: Rewrite as a type-map.
* disp.html, index.scml: Remove.

* html-files/pl/maint.html: New file.
* html-files/ru/maint.html: New file.
* html-files/uk/maint.html: New file.



git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@530 941c8c0f-9102-463b-b60b-cd22ce0e6858
---
 .htaccess.in             | 10 ++++++++++
 ChangeLog                | 21 +++++++++++++++++++
 Makefile.am              |  8 ++++----
 configure.ac             |  5 +++--
 html-files/pl/maint.html | 33 ++++++++++++++++++++++++++++++
 html-files/ru/maint.html | 33 ++++++++++++++++++++++++++++++
 html-files/uk/maint.html | 33 ++++++++++++++++++++++++++++++
 index.html               | 12 +++++++++++
 maint.html               | 52 +++++++++---------------------------------------
 style.css                | 37 ++++++++++++++++++++++++++++------
 10 files changed, 189 insertions(+), 55 deletions(-)
 create mode 100644 html-files/pl/maint.html
 create mode 100644 html-files/ru/maint.html
 create mode 100644 html-files/uk/maint.html
 create mode 100644 index.html

diff --git a/.htaccess.in b/.htaccess.in
index 3e1db9a..603b2eb 100644
--- a/.htaccess.in
+++ b/.htaccess.in
@@ -1,3 +1,13 @@
+Options -Indexes
+<Files *.html>
+  SetHandler type-map
+</Files>
+
+SetEnvIf Request_URI ^/(ru|pl|uk)/ prefer-language=$1
+RedirectMatch 301 ^(?:/(ru|pl|uk)){2,}(/.*)?$ /$1$2
+LanguagePriority ru pl uk
+ForceLanguagePriority Prefer Fallback
+
 RewriteEngine on
 
 # --BEGIN MAINTENANCE RULES---
diff --git a/ChangeLog b/ChangeLog
index 82eb285..45a379c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-02-28  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* .htaccess.in: Use type-map to handle automatic language
+	selection.
+	* style.css (div.contentpanel): Set vertical align.
+	(div.navbar > img): New selector. Center the Parthenon image.
+	(ul.menu): Change navigation menu appearance.
+	* configure.ac: Require autoconf 2.63
+	(AC_CONFIG_FILES): Add html-files/Makefile
+	* Makefile.am (SUBDIRS): Add html-files .
+	(html_DATA, EXTRA_DIST): Reflect changes to the root directory.
+
+	* index.html: New file.
+	* maint.html: Rewrite as a type-map.
+	* disp.html, index.scml: Remove.
+	
+	* html-files/pl/maint.html: New file.
+	* html-files/ru/maint.html: New file.
+	* html-files/uk/maint.html: New file.
+	
+
 2008-09-24  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* src/ellinika/dico.scm (open-module): Minor change for Dico
diff --git a/Makefile.am b/Makefile.am
index 6e3a25a..5ee0b11 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2007, 2008 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2008, 2010 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,12 +17,12 @@
 AUTOMAKE_OPTIONS = gnits 1.8 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS=src elisp data scm xml po
+SUBDIRS=src elisp data scm xml html-files po
 
 htmldir = $(HTMLDIR)
 
-html_DATA = style.css .htaccess index.scml  disp.html disp.css
-EXTRA_DIST=.htaccess.in index.scml disp.html disp.css maint.html
+html_DATA = style.css .htaccess disp.css index.html maint.html
+EXTRA_DIST=.htaccess.in disp.css index.html maint.html
 
 install-html:
 	top_srcdir=`cd $(top_srcdir);pwd`; \
diff --git a/configure.ac b/configure.ac
index 0f11ede..2563fff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of Ellinika         -*- autoconf -*-
-# Copyright (C) 2004, 2005, 2007, 2008 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2008, 2010 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
 
 AC_REVISION($Revision$)
 AC_INIT(ellinika, 1.2, [gray@gnu.org.ua])
@@ -122,6 +122,7 @@ AC_CONFIG_FILES(Makefile
                 xml/pl/Makefile
                 xml/ru/Makefile
                 xml/uk/Makefile
+		html-files/Makefile
                 po/Makefile.in)
 
 AC_OUTPUT
diff --git a/html-files/pl/maint.html b/html-files/pl/maint.html
new file mode 100644
index 0000000..603121c
--- /dev/null
+++ b/html-files/pl/maint.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Ελληνική Γλώσσα</title>
+ <link rev="made" href="mailto:gray@gnu.org.ua" />
+ <link rel="stylesheet" type="text/css" href="/disp.css" /> 
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="robots" content="noindex,nofollow">
+</head>
+<body>
+
+<div id="main">
+
+<span>
+<img src="/graphics/parthenon-gnu.png" align="top"
+     alt=" [A GNU in front of the Parthenon] " />
+</span>
+<span class="header">
+<h1>Ελληνική Γλώσσα</h1>
+</span>
+<div>
+
+<div class="lang">
+<span class="header">
+Przepraszamy, witryna tymczasowo niedostępna. Zapraszamy wkrótce.
+</span>
+</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/html-files/ru/maint.html b/html-files/ru/maint.html
new file mode 100644
index 0000000..e4f712e
--- /dev/null
+++ b/html-files/ru/maint.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Ελληνική Γλώσσα</title>
+ <link rev="made" href="mailto:gray@gnu.org.ua" />
+ <link rel="stylesheet" type="text/css" href="/disp.css" /> 
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="robots" content="noindex,nofollow">
+</head>
+<body>
+
+<div id="main">
+
+<span>
+<img src="/graphics/parthenon-gnu.png" align="top"
+     alt=" [A GNU in front of the Parthenon] " />
+</span>
+<span class="header">
+<h1>Ελληνική Γλώσσα</h1>
+</span>
+<div>
+
+<div class="lang">
+<span class="header">
+Извините, сайт временно не работает. Зайдите, пожалуйста, позже.
+</span>
+</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/html-files/uk/maint.html b/html-files/uk/maint.html
new file mode 100644
index 0000000..218a782
--- /dev/null
+++ b/html-files/uk/maint.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>Ελληνική Γλώσσα</title>
+ <link rev="made" href="mailto:gray@gnu.org.ua" />
+ <link rel="stylesheet" type="text/css" href="/disp.css" /> 
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="robots" content="noindex,nofollow">
+</head>
+<body>
+
+<div id="main">
+
+<span>
+<img src="/graphics/parthenon-gnu.png" align="top"
+     alt=" [A GNU in front of the Parthenon] " />
+</span>
+<span class="header">
+<h1>Ελληνική Γλώσσα</h1>
+</span>
+<div>
+
+<div class="lang">
+<span class="header">
+Пробачте, сайт тимчасово не працює. Зайдіть, будь ласка, пізніше.
+</span>
+</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..0ef05a5
--- /dev/null
+++ b/index.html
@@ -0,0 +1,12 @@
+URI: pl/index.html
+Content-language: pl
+Content-type: text/html; charset=UTF-8
+
+URI: uk/index.html
+Content-language: uk
+Content-type: text/html; charset=UTF-8
+
+URI: ru/index.html
+Content-language: en
+Content-type: text/html; charset=UTF-8
+
diff --git a/maint.html b/maint.html
index 03ac3cd..da5742e 100644
--- a/maint.html
+++ b/maint.html
@@ -1,46 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Ελληνική Γλώσσα</title>
- <link rev="made" href="mailto:gray@gnu.org.ua" />
- <link rel="stylesheet" type="text/css" href="/disp.css" /> 
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="robots" content="noindex,nofollow">
-</head>
-<body>
+URI: pl/maint.html
+Content-language: pl
+Content-type: text/html; charset=UTF-8
 
-<div id="main">
+URI: uk/maint.html
+Content-language: uk
+Content-type: text/html; charset=UTF-8
 
-<span>
-<img src="/graphics/parthenon-gnu.png" align="top"
-     alt=" [A GNU in front of the Parthenon] " />
-</span>
-<span class="header">
-<h1>Ελληνική Γλώσσα</h1>
-</span>
-<div>
+URI: ru/maint.html
+Content-language: en
+Content-type: text/html; charset=UTF-8
 
-<div class="lang">
-<span class="header">
-Συγγνώμη, η σελίδα προσωρινά δεν λειτουργεί. Σασ παρακαλώ, ξαναπηγαίνετε
-μέσα σε λίγα λεπτά.
-</span>
-</div>
-
-<div class="lang">
-<span class="header">
-Przepraszamy, witryna tymczasowo niedostępna. Zapraszamy wkrótce.
-</span>
-</div>
-
-<div class="lang">
-<span class="header">
-Пробачте, сайт тимчасово не працює. Зайдіть, будь ласка, пізніше.
-</span>
-</div>
-
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/style.css b/style.css
index d7b6ea0..45806c6 100644
--- a/style.css
+++ b/style.css
@@ -26,6 +26,7 @@ div.contentpanel {
 	padding-right: 2em;
 	border-right: 1px black solid;
 	width: 80%;
+	vertical-align: top;
 }
 
 div.navbar {
@@ -35,6 +36,12 @@ div.navbar {
 	padding-left: 0.5em;
 }
 
+div.navbar > img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 div.bottom {
 	width: 100%;
 	margin-top: 2%;
@@ -70,6 +77,23 @@ ul.menu {
 	padding-left: 1em;
 }
 
+ul.menu li {
+	list-style-type: none;
+}
+
+ul.menu li > a {
+	text-decoration: none;
+	display: block;
+	color: #0028bd;
+	padding-left: 1em;
+	margin-left: -1em;
+}
+
+ul.menu li > a:hover {
+	background-color: blue;
+	color: white;
+}
+ 
 li.group {
 	list-style-type: none;
 	margin-left: -1em;
@@ -114,10 +138,6 @@ input {
 
 .nostyle { display: none }
 
-.hidden-info {
-        font-size: smaller;
-}
-
 /*
     References
  */
@@ -168,7 +188,7 @@ table.frame td {
 
 table.noframe {
 	border-style: none;
-	display: inline;
+	display: inline-table;
 }
 
 tr.odd { background-color: #CCCCEE; }
@@ -374,7 +394,12 @@ table.news-summary {
 	display: table-cell;
 }
 
+.hidden-info {
+	font-size: smaller;
+}
 
-
+select {
+        border: 1px solid gray;
+}
 
 
-- 
cgit v1.2.1