aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-03-23 17:02:16 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2010-03-23 17:02:16 +0000
commit0f50d8ffa69e260b8b48ba3429297e2f7a7115ae (patch)
tree8f2248c99f8e3b31adac9eae983bec910ced6ff8
parent4d8b444c994469b2e27dcdee02aaf61ca379ae47 (diff)
downloadellinika-0f50d8ffa69e260b8b48ba3429297e2f7a7115ae.tar.gz
ellinika-0f50d8ffa69e260b8b48ba3429297e2f7a7115ae.tar.bz2
Provide a WARNING block for use in the development version.
* style.css (div.warning): New class. * xml/pl/ellinika.xml: Provide a WARNING block for use in the development version. * xml/uk/ellinika.xml: Likewise. * xml/ru/ellinika.xml: Likewise. * xml/lingua.conf.in: Provide a WARNING block for use in development versions. <GUILE>: Remove unneded now use-modules. <IFEXP>: New tag. <EL:WARNING>: New tag. {THIS-REF}: New postprocessor handler. * xml/Makefile.am (conf.sed): Provide replacements for =IF..= keywords. * configure.ac (PROD_URL, EXP_URL, STATE): New AC_VARs. git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@546 941c8c0f-9102-463b-b60b-cd22ce0e6858
-rw-r--r--ChangeLog17
-rw-r--r--configure.ac9
-rw-r--r--style.css19
-rw-r--r--xml/Makefile.am25
-rw-r--r--xml/lingua.conf.in25
-rw-r--r--xml/pl/ellinika.xml7
-rw-r--r--xml/ru/ellinika.xml6
-rw-r--r--xml/uk/ellinika.xml6
8 files changed, 101 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 3102cd9..9692bf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2010-03-23 Sergey Poznyakoff <gray@gnu.org.ua>
+ Provide a WARNING block for use in the development version.
+
+ * style.css (div.warning): New class.
+ * xml/pl/ellinika.xml: Provide a WARNING block for
+ use in the development version.
+ * xml/uk/ellinika.xml: Likewise.
+ * xml/ru/ellinika.xml: Likewise.
+ * xml/lingua.conf.in: Provide a WARNING block for
+ use in development versions.
+ <GUILE>: Remove unneded now use-modules.
+ <IFEXP>: New tag.
+ <EL:WARNING>: New tag.
+ {THIS-REF}: New postprocessor handler.
+ * xml/Makefile.am (conf.sed): Provide replacements for
+ =IF..= keywords.
+ * configure.ac (PROD_URL, EXP_URL, STATE): New AC_VARs.
+
* disp.css: Rename to maint.css
* Makefile.am: Likewise.
* xml/uk/ellinika.xml: Simplify <AUTHOR> declaration.
diff --git a/configure.ac b/configure.ac
index 4ebc336..4bd4feb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,14 @@ AC_ARG_VAR([BASE_HREF],
[Set default <base href>])
AC_ARG_VAR([TARGET_DIR],
[(Deprecated) Set target subdirectory (under prefix)])
-
+
+AC_ARG_VAR([PROD_URL],
+ [URL for the production site])
+AC_ARG_VAR([EXP_URL],
+ [URL for the experimental site])
+AC_ARG_VAR([STATE],
+ [EXP for experimental, PROD for production])
+
AC_SUBST(SCRIPT_SUFFIX)
AC_SUBST(SCRIPT_DIR)
AC_SUBST(CGIDIR)
diff --git a/style.css b/style.css
index a0a7f61..62565d0 100644
--- a/style.css
+++ b/style.css
@@ -436,4 +436,23 @@ select {
border: 1px solid gray;
}
+div.warning {
+ display: block;
+ z-index: 100;
+ position: fixed;
+ top: 2px;
+ left: 2px;
+ border: 1px solid gray;
+ background-color: yellow;
+ width: 100%;
+}
+
+div.warning p {
+ text-align: center;
+ padding: 0;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 2px;
+ margin-bottom: 2px;
+}
diff --git a/xml/Makefile.am b/xml/Makefile.am
index ccb5d01..356c334 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -21,13 +21,24 @@ CLEANFILES=conf.sed
noinst_DATA= lingua.conf
conf.sed: Makefile
- echo 's,=TMPDIR=,$(top_builddir)/../tmp,' > conf.sed
- echo 's,=OUTDIR=,$(top_builddir)/../html,' >> conf.sed
- echo 's,=TARGET_DIR=,$(TARGET_DIR),' >> conf.sed
- echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),' >> conf.sed
- echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),' >> conf.sed
- echo 's,=BASE_HREF=,$(BASE_HREF),' >> conf.sed
- echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),' >> conf.sed
+ echo 's,=TMPDIR=,$(top_builddir)/../tmp,g' > conf.sed
+ echo 's,=OUTDIR=,$(top_builddir)/../html,g' >> conf.sed
+ echo 's,=TARGET_DIR=,$(TARGET_DIR),g' >> conf.sed
+ echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g' >> conf.sed
+ echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g' >> conf.sed
+ echo 's,=BASE_HREF=,$(BASE_HREF),g' >> conf.sed
+ echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed
+ echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed
+ echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed
+ if test "$(STATE)" = "EXP"; then \
+ echo 's,=IFEXP=,,' >> conf.sed; \
+ echo 's,=END IFEXP=,,' >> conf.sed; \
+ echo '/=IFPROD=/,/=END IFPROD=/d' >> conf.sed; \
+ else \
+ echo 's,=IFPROD=,,' >> conf.sed; \
+ echo 's,=END IFPROD=,,' >> conf.sed; \
+ echo '/=IFEXP=/,/=END IFEXP=/d' >> conf.sed; \
+ fi
lingua.conf: $(srcdir)/lingua.conf.in conf.sed
sed -f conf.sed $(srcdir)/lingua.conf.in > $@
diff --git a/xml/lingua.conf.in b/xml/lingua.conf.in
index 9ea3534..3cace9a 100644
--- a/xml/lingua.conf.in
+++ b/xml/lingua.conf.in
@@ -8,7 +8,7 @@
<DIRECTORY SOUND="=TARGET_DIR=/sound" />
<AUTHOR EMAIL="=PACKAGE_BUGREPORT=" HOMEPAGE="http://gray.gnu.org.ua" />
-
+
<DICT PROG="dict.=SCRIPT_SUFFIX=" />
<BASE HREF="=BASE_HREF=" />
<SEARCH ARGS="(list (lingua:gettext &quot;Search&quot;))">
@@ -30,10 +30,7 @@
</SEARCH>
<GUILE>
<![CDATA[
-(use-modules (xmltools xmltrans)
- (xmltools gamlet)
- (xmltrans lingua)
- (xmltools dict)
+(use-modules (xmltools dict)
(ice-9 format))
(define-macro (install-nea)
@@ -46,6 +43,17 @@
(lingua:LANG args)))))
(xmltrans:set-attr "LINGUA" "NEA" nea)))
+ (xmltrans:end-tag
+ "IFEXP"
+ (tag attr text)
+=IFEXP=
+ text
+=END IFEXP=
+=IFPROD=
+ #f
+=END IFPROD=
+ )
+
(xmltrans:end-tag
"FOOTER"
(tag attr text)
@@ -74,6 +82,8 @@ this notice is preserved.</p>\n"
"</div>"
))
+
+(lingua:tag-ignore EL:WARNING)
(xmltrans:end-tag
"KATHAREVUSA"
@@ -105,6 +115,11 @@ this notice is preserved.</p>\n"
(tag attr text)
(list "<div class=\"permanent-article\">" text "</div>"))
+(gamlet:set-handler "THIS-REF"
+ (lambda (. args)
+ (display "http://ellinika.gnu.org.ua/")
+ (display (gamlet:current-output-file-name))))
+
(gamlet:set-handler "INFO"
(lambda (. args)
(display "<ul class=\"menu\">")
diff --git a/xml/pl/ellinika.xml b/xml/pl/ellinika.xml
index 9e3e6af..fc7e3a0 100644
--- a/xml/pl/ellinika.xml
+++ b/xml/pl/ellinika.xml
@@ -24,6 +24,13 @@
<MSGSTR ID="Search">Szukaj</MSGSTR>
</LOCALIZATION>
+<WARNING>
+ <IFEXP>
+ <PARA>Uwaga! To jest wersja eksperymentalna. Wersję stabilną
+ znajdziesz <XREF LIT="{THIS-REF}">tutaj</XREF>.</PARA>
+ </IFEXP>
+</WARNING>
+
<COPYRIGHT>
<FOOTER VCS-ID="$Id$">
Copyright <![CDATA[&copy;]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff
diff --git a/xml/ru/ellinika.xml b/xml/ru/ellinika.xml
index 60866eb..76e8a82 100644
--- a/xml/ru/ellinika.xml
+++ b/xml/ru/ellinika.xml
@@ -24,6 +24,12 @@
<MSGSTR ID="Search">Поиск</MSGSTR>
</LOCALIZATION>
+<WARNING>
+ <IFEXP>
+ <PARA>Предупреждение! Это - экспериментальная версия. Официальная версия <XREF LIT="{THIS-REF}">тут</XREF>.</PARA>
+ </IFEXP>
+</WARNING>
+
<COPYRIGHT>
<FOOTER VCS-ID="$Id$">
Copyright <![CDATA[&copy;]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff
diff --git a/xml/uk/ellinika.xml b/xml/uk/ellinika.xml
index 2e79899..d5b4218 100644
--- a/xml/uk/ellinika.xml
+++ b/xml/uk/ellinika.xml
@@ -24,6 +24,12 @@
<MSGSTR ID="Search">Пошук</MSGSTR>
</LOCALIZATION>
+<WARNING>
+ <IFEXP>
+ <PARA>Увага! Це експериментальна версія сайту. Офіційна версія <XREF LIT="{THIS-REF}">тут</XREF>.</PARA>
+ </IFEXP>
+</WARNING>
+
<COPYRIGHT>
<FOOTER VCS-ID="$Id$">
Copyright <![CDATA[&copy;]]> 2004, 2005, 2006, 2007, 2010 Sergey Poznyakoff

Return to:

Send suggestions and report system problems to the System administrator.