aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-10-08 19:58:07 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-10-08 19:58:07 +0000
commit2b15a905dbb0e7c70b16e05e6247b7cc68fd8772 (patch)
tree9952db8093a94d80d7a73d1b38e3e84fa11796cd
parent887a98a7f37c770bdf8b35d9157a531cb50e461f (diff)
downloadellinika-2b15a905dbb0e7c70b16e05e6247b7cc68fd8772.tar.gz
ellinika-2b15a905dbb0e7c70b16e05e6247b7cc68fd8772.tar.bz2
* configure.ac (SCRIPT_DIR): Initialize to relative directory
name. * .htaccess.in: Remove hardcoded directory name. * style.css: Update for XHTML 1.0 * xml/lingua.conf.in: Use TARGET_DIR where appropriate * xml/ru/arithmi.xml, xml/pl/arithmi.xml: Minor fixes. git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@493 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r--.htaccess.in2
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac4
-rw-r--r--style.css14
-rw-r--r--xml/lingua.conf.in14
-rw-r--r--xml/pl/arithmi.xml13
-rw-r--r--xml/ru/arithmi.xml7
7 files changed, 42 insertions, 19 deletions
diff --git a/.htaccess.in b/.htaccess.in
index 15a841d..3e1db9a 100644
--- a/.htaccess.in
+++ b/.htaccess.in
@@ -1,7 +1,7 @@
RewriteEngine on
# --BEGIN MAINTENANCE RULES---
-RewriteCond /home/gray/public_html/ellinika/.maintenance -f
+RewriteCond @HTMLDIR@/.maintenance -f
RewriteCond %{REQUEST_FILENAME} !.*/maint.html
RewriteCond %{REQUEST_FILENAME} !.*\.css
RewriteCond %{REQUEST_FILENAME} !.*\.png
diff --git a/ChangeLog b/ChangeLog
index 9a7c350..a2c15b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-10-08 Sergey Poznyakoff <gray@gnu.org.ua>
+ * configure.ac (SCRIPT_DIR): Initialize to relative directory
+ name.
+ * .htaccess.in: Remove hardcoded directory name.
+ * style.css: Update for XHTML 1.0
+ * xml/lingua.conf.in: Use TARGET_DIR where appropriate
+ * xml/ru/arithmi.xml, xml/pl/arithmi.xml: Minor fixes.
+
* configure.ac (SCRIPT_DIR): Fix
* xml/uk/intro.xml, xml/uk/perigrafh.xml: Update
diff --git a/configure.ac b/configure.ac
index 7af2253..c25499b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,11 +82,11 @@ AC_SUBST(SCRIPT_DIR)
AC_SUBST(CGIDIR)
if test $APACHE_IFACE = "CGI"; then
SCRIPT_SUFFIX=cgi
- SCRIPT_DIR=/cgi-bin
+ SCRIPT_DIR=cgi-bin
CGIDIR='$(prefix)/cgi-bin'
else
SCRIPT_SUFFIX=scm
- SCRIPT_DIR=/scm
+ SCRIPT_DIR=scm
CGIDIR='$(prefix)/scm'
fi
diff --git a/style.css b/style.css
index 1c730e6..91c07f5 100644
--- a/style.css
+++ b/style.css
@@ -9,6 +9,10 @@ body {
color: #000000;
}
+.center {
+ text-align: center;
+}
+
div.main {
background-color: #FFFFFF;
border-style: none;
@@ -48,7 +52,7 @@ div.copyright {
table.bottom-navbar { border-style: none }
table.bottom-navbar th { border-style: none }
-table.bottom-navbar td { border-style: none }
+table.bottom-navbar td { border-style: none; width: 33%; }
div.section {
padding-bottom: 2em;
@@ -135,11 +139,16 @@ a:hover {
Tables
*/
+table {
+ text-align: left;
+}
+
table.frame {
margin: 1em 1em 1em 0;
- border: 1px #aaaaaa solid;
+/* border: 1px #aaaaaa solid;*/
border-collapse: collapse;
empty-cells: show;
+ display: inline;
}
table.frame th {
@@ -154,6 +163,7 @@ table.frame td {
table.noframe {
border-style: none;
+ display: inline;
}
tr.odd { background-color: #CCCCEE; }
diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in
index c376f99..f24d6ac 100644
--- a/xml/lingua.conf.in
+++ b/xml/lingua.conf.in
@@ -5,25 +5,29 @@
<DIRECTORY TMP="=TMPDIR=" />
<DIRECTORY OUT="=OUTDIR=" />
<DIRECTORY TARGET="=TARGET_DIR=" />
- <DIRECTORY SOUND="/sound" />
-
+ <DIRECTORY SOUND="=TARGET_DIR=/sound" />
+
<DICT PROG="dict.=SCRIPT_SUFFIX=" />
<BASE HREF="=BASE_HREF=" />
<SOUNDREF>
<![CDATA[
- <img src="graphics/audio.png" width="16" height="16" alt="[ sound ]" />]]>
+ <img src="=TARGET_DIR=/graphics/audio.png" width="16" height="16" alt="[ sound ]" />]]>
</SOUNDREF>
<SEARCH ARGS="(list (lingua:gettext &quot;Search&quot;))">
<![CDATA[
<form method="get"
action="http://www.google.com/custom"
enctype="application/x-www-form-urlencoded">
- ~A <img src="graphics/google.png" alt="[Google]" width="75" height="32" />
- <input type="text" size="30" maxlength="255" name="q" value="">
+ <div>
+ <label for="searchinput">
+ ~A <img src="=TARGET_DIR=/graphics/google.png" alt="[Google]" width="75" height="32" />
+ <input id="searchinput" type="text" size="30" maxlength="255" name="q" value="" />
+ </label>
<input type="hidden" name="cof" value="L:http://ellinika.gnu.org.ua/graphics/parthenon-gnu.png;LW:180;LH:140;T:black;ALC:#ff3300;LC:#000099;BGC:white;AH:left;VLC:#660066;GL:0;" />
<input type="hidden" id="searchEllinika" name="sitesearch" checked="checked" value="ellinika.gnu.org.ua" />
<input type="hidden" name="domains" value="ellinika.gnu.org.ua" />
+ </div>
</form>]]>
</SEARCH>
<GUILE>
diff --git a/xml/pl/arithmi.xml b/xml/pl/arithmi.xml
index 0f36738..7286cee 100644
--- a/xml/pl/arithmi.xml
+++ b/xml/pl/arithmi.xml
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2004,2006 Sergey Poznyakoff
+ Copyright (C) 2004, 2006, 2007 Sergey Poznyakoff
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
@@ -23,13 +23,13 @@ się omownie:
<TABULAR BESTFIT="1" NOFRAME="1">
<ROW>
- <ITEM>ένας ένας</ITEM> <ITEM>по одному</ITEM>
+ <ITEM>ένας ένας</ITEM> <ITEM>po jednemu</ITEM>
</ROW>
<ROW>
- <ITEM>ανά δύο</ITEM> <ITEM>по два</ITEM>
+ <ITEM>ανά δύο</ITEM> <ITEM>po dwa</ITEM>
</ROW>
<ROW>
- <ITEM>ανά τρία</ITEM> <ITEM>по три</ITEM>
+ <ITEM>ανά τρία</ITEM> <ITEM>po trzy</ITEM>
</ROW>
</TABULAR>
@@ -216,12 +216,13 @@ Kupiłem tylko jedną marynarkę. (liczebnik)
<PARA>Liczebnik χίλια ma w liczbie mnogiej formę χιλιάδες.</PARA>
<PARA>Pojęcie <TRANS>oba,obydwa</TRANS> tłumaczy się przez
-<EXAMPLE>οι δύο, τα δύο</EXAMPLE>.
+<EXAMPLE>οι δύο, τα δύο</EXAMPLE>.</PARA>
<KATHAREVUSA>
+<PARA>
Katarewusa ma do tego słowo <EXAMPLE>ἀμφότεροι,‐αι,‐α</EXAMPLE>.
-</KATHAREVUSA>
</PARA>
+</KATHAREVUSA>
</SECTION>
<SECTION>
diff --git a/xml/ru/arithmi.xml b/xml/ru/arithmi.xml
index 11caead..43d6b71 100644
--- a/xml/ru/arithmi.xml
+++ b/xml/ru/arithmi.xml
@@ -1,6 +1,6 @@
<!--
- Copyright (C) 2004 Sergey Poznyakoff
+ Copyright (C) 2004, 2007 Sergey Poznyakoff
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2
@@ -211,12 +211,13 @@
</PARA>
<PARA>Понятие <TRANS>оба</TRANS> передаётся выражением
-<EXAMPLE>οι δύο, τα δύο</EXAMPLE>.
+<EXAMPLE>οι δύο, τα δύο</EXAMPLE>.</PARA>
<KATHAREVUSA>
+<PARA>
В кафаревусе <TRANS>оба</TRANS> передаётся словом <EXAMPLE>ἀμφότεροι,‐αι,‐α</EXAMPLE>.
-</KATHAREVUSA>
</PARA>
+</KATHAREVUSA>
</SECTION>
<SECTION>

Return to:

Send suggestions and report system problems to the System administrator.