# HG changeset patch # User Raimund Renkert # Date 1311177692 -7200 # Node ID 6db0677a64502fe609b951a47405359248402527 # Parent cdbf2f2dca3588de408cdbd99c6dde70a495c08b# Parent 123ebb293f3a98e06e80519feebb625fb5e938ad Merged with Stephans commits. diff -r cdbf2f2dca35 -r 6db0677a6450 ChangeLog --- a/ChangeLog Wed Jul 20 17:56:29 2011 +0200 +++ b/ChangeLog Wed Jul 20 18:01:32 2011 +0200 @@ -13,6 +13,16 @@ 2011-07-20 Stephan Holl + * website/.htaccess, + website/buildhtml.mk, + website/development-de.htm4, + website/download-de.htm4, + website/index-de.htm4, + website/switch.php: more contetn to the website, added + htaccess-switch to support the german-version only atm. + +2011-07-20 Stephan Holl + Modified and beautified the documentation: * INSTALL.txt, doku/Makefile, doku/source/conf.py, diff -r cdbf2f2dca35 -r 6db0677a6450 website/.htaccess --- a/website/.htaccess Wed Jul 20 17:56:29 2011 +0200 +++ b/website/.htaccess Wed Jul 20 18:01:32 2011 +0200 @@ -1,2 +1,2 @@ -DirectoryIndex switch.php -ErrorDocument 404 /404.html +DirectoryIndex index-de.html +ErrorDocument 404 /404-de.html diff -r cdbf2f2dca35 -r 6db0677a6450 website/buildhtml.mk --- a/website/buildhtml.mk Wed Jul 20 17:56:29 2011 +0200 +++ b/website/buildhtml.mk Wed Jul 20 18:01:32 2011 +0200 @@ -16,7 +16,7 @@ # Installation configuration INSTALL_DIR = ./mxd2map-www -ADD_INST_TYPES = *.css *.php *.png +ADD_INST_TYPES = *.css *.php *.png .htaccess ADD_INST_DIRS = img CURDIR=$(shell pwd) @@ -39,7 +39,7 @@ online: all echo "Going to put current contents online for www.mxd2mapp.org ..." rsync -urvP --exclude='.hg' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \ - $(USER)@wald.intevation.org:/mxd2map/htdocs/ + sholl@wald.intevation.org:/mxd2map/htdocs/ install: all mkdir -p $(INSTALL_DIR) ;\ @@ -51,3 +51,10 @@ tar: install echo $(CURDIR) ( cd $(INSTALL_DIR) ; tar -czv -f $(CURDIR)/www.mxd2map.org.tar.gz . ) + +clean: + rm -f *.html + +clean-en: + rm -f 404.html about.html contact.html development.html donate.html download.html impressum.html index.html license.html + diff -r cdbf2f2dca35 -r 6db0677a6450 website/development-de.htm4 --- a/website/development-de.htm4 Wed Jul 20 17:56:29 2011 +0200 +++ b/website/development-de.htm4 Wed Jul 20 18:01:32 2011 +0200 @@ -35,13 +35,6 @@

Mailinglisten

-
MXD2map-announce
-
Bekanntmachungsliste
- Abonnieren -| Archiv -
-
MXD2map-devel
Entwicklerliste (englisch)
MXD2map-commits
-
SVN-Commits für Entwickler (englisch)
+
HG-Commits für Entwickler (englisch)
Abonnieren | Archiv diff -r cdbf2f2dca35 -r 6db0677a6450 website/download-de.htm4 --- a/website/download-de.htm4 Wed Jul 20 17:56:29 2011 +0200 +++ b/website/download-de.htm4 Wed Jul 20 18:01:32 2011 +0200 @@ -12,25 +12,18 @@

Download

-

MXD2map hier kostenlos herunterladen

+

Es gibt noch keine offizielle Version von MXD2map. Der aktuelle +Quellcode ist jedoch über das öffentliche Quellcode-Repository verfügbar.

-

MXD2map

- -

TODO

- -
+ -

Installation

- -

TODO

-
diff -r cdbf2f2dca35 -r 6db0677a6450 website/index-de.htm4 --- a/website/index-de.htm4 Wed Jul 20 17:56:29 2011 +0200 +++ b/website/index-de.htm4 Wed Jul 20 18:01:32 2011 +0200 @@ -28,7 +28,7 @@

Entdecken Sie, was in MXD2map steckt! Lernen Sie, was MXD2map ist und lassen Sie sich die Funktionen zeigen.

-

Über MXD2map >>

+

Über MXD2map >>

diff -r cdbf2f2dca35 -r 6db0677a6450 website/switch.php --- a/website/switch.php Wed Jul 20 17:56:29 2011 +0200 +++ b/website/switch.php Wed Jul 20 18:01:32 2011 +0200 @@ -1,11 +1,11 @@