From 0f50d8ffa69e260b8b48ba3429297e2f7a7115ae Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Tue, 23 Mar 2010 17:02:16 +0000 Subject: 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. : Remove unneded now use-modules. : New tag. : 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 --- ChangeLog | 17 +++++++++++++++++ configure.ac | 9 ++++++++- style.css | 19 +++++++++++++++++++ xml/Makefile.am | 25 ++++++++++++++++++------- xml/lingua.conf.in | 25 ++++++++++++++++++++----- xml/pl/ellinika.xml | 7 +++++++ xml/ru/ellinika.xml | 6 ++++++ xml/uk/ellinika.xml | 6 ++++++ 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 + 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. + : Remove unneded now use-modules. + : New tag. + : 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 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 ]) 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 @@ - + @@ -30,10 +30,7 @@ \n" "" )) + +(lingua:tag-ignore EL:WARNING) (xmltrans:end-tag "KATHAREVUSA" @@ -105,6 +115,11 @@ this notice is preserved.

\n" (tag attr text) (list "
" text "
")) +(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 "
    ") 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 @@ Szukaj + + + Uwaga! To jest wersja eksperymentalna. Wersję stabilną + znajdziesz tutaj. + + +