# HG changeset patch
# User raimund renkert <raimund.renkert@intevation.de>
# Date 1311179400 -7200
# Node ID 877be748424529038b6973114da9b62161161865
# Parent  ecf2f68230a2438ca1b0453abbbdc9ee7631f085# Parent  6db0677a64502fe609b951a47405359248402527
Merged.

diff -r ecf2f68230a2 -r 877be7484245 ChangeLog
--- a/ChangeLog	Wed Jul 20 18:27:32 2011 +0200
+++ b/ChangeLog	Wed Jul 20 18:30:00 2011 +0200
@@ -23,6 +23,16 @@
 
 2011-07-20  Stephan Holl  <stephan.holl@intevation.de>
 
+	* 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  <stephan.holl@intevation.de>
+
 Modified and beautified the documentation:
 
 	* INSTALL.txt, doku/Makefile, doku/source/conf.py,
diff -r ecf2f68230a2 -r 877be7484245 website/.htaccess
--- a/website/.htaccess	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/.htaccess	Wed Jul 20 18:30:00 2011 +0200
@@ -1,2 +1,2 @@
-DirectoryIndex switch.php
-ErrorDocument 404 /404.html
+DirectoryIndex index-de.html
+ErrorDocument 404 /404-de.html
diff -r ecf2f68230a2 -r 877be7484245 website/buildhtml.mk
--- a/website/buildhtml.mk	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/buildhtml.mk	Wed Jul 20 18:30:00 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 ecf2f68230a2 -r 877be7484245 website/development-de.htm4
--- a/website/development-de.htm4	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/development-de.htm4	Wed Jul 20 18:30:00 2011 +0200
@@ -35,13 +35,6 @@
 <h2>Mailinglisten</h2>
 
 <dl>
-  <dt><b>MXD2map-announce</b></dt>
-  <dd>Bekanntmachungsliste<br>
-    <a
-href="http://lists.wald.intevation.org/mailman/listinfo/mxd2map-announce/">Abonnieren</a>
-| <a href="http://lists.wald.intevation.org/pipermail/mxd2map-announce/">Archiv</a>
-  </dd>
-
   <dt><b>MXD2map-devel</b></dt>
   <dd>Entwicklerliste (englisch)<br>
     <a
@@ -50,7 +43,7 @@
   </dd>
 
   <dt><b>MXD2map-commits</b></dt>
-  <dd>SVN-Commits für Entwickler (englisch)<br>
+  <dd>HG-Commits für Entwickler (englisch)<br>
     <a
 href="http://lists.wald.intevation.org/mailman/listinfo/MXD2map-commits/">Abonnieren</a>
 | <a href="http://lists.wald.intevation.org/pipermail/MXD2map-commits/">Archiv</a>
diff -r ecf2f68230a2 -r 877be7484245 website/download-de.htm4
--- a/website/download-de.htm4	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/download-de.htm4	Wed Jul 20 18:30:00 2011 +0200
@@ -12,25 +12,18 @@
 
 <div id="intro">
 <h2>Download</h2>
-<p>MXD2map hier kostenlos herunterladen</p>
+<p>Es gibt noch keine offizielle Version von MXD2map. Der aktuelle
+Quellcode ist jedoch über das öffentliche <a target="_new" href="http://hg.intevation.de/mxd2map">Quellcode-Repository</a> verfügbar.</p>
 </div>
 
 <div id="main">
 
-<h2>MXD2map</h2>
-
-<p>TODO</p>
-
-<div class="dlbutton2">
+<!--div class="dlbutton2">
  <img src="img/dl_arrow.png" alt="" />
  <a href="DOWNLOAD_URL" class="dlbutton2">MXD2map 1.0 alpha1<br />
  <span class="version"><small>Größe: DL_SIZE | Veröffentlicht: DL_DATE</small></span>
  </a>
-</div>
+</div-->
 
 
-<h4>Installation</h4>
-
-<p>TODO</p>
-
 </div>
diff -r ecf2f68230a2 -r 877be7484245 website/index-de.htm4
--- a/website/index-de.htm4	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/index-de.htm4	Wed Jul 20 18:30:00 2011 +0200
@@ -28,7 +28,7 @@
     <p>Entdecken Sie, was in MXD2map steckt! Lernen Sie, was 
     MXD2map ist und lassen Sie sich die Funktionen zeigen.
     </p>
-    <p><a href="about-de.hml">Über MXD2map >></a></p>
+    <p><a href="about-de.html">Über MXD2map >></a></p>
 </div>
 
 <div class="column2">
diff -r ecf2f68230a2 -r 877be7484245 website/switch.php
--- a/website/switch.php	Wed Jul 20 18:27:32 2011 +0200
+++ b/website/switch.php	Wed Jul 20 18:30:00 2011 +0200
@@ -1,11 +1,11 @@
 <?PHP
 switch ($_SERVER["HTTP_HOST"]) {
- case "www.mapwoc.de":
- case "mapwoc.de":
+ case "www.mxd2map.org":
+ case "mxd2map.org":
    $target = "index-de.html";
    break;
  default:
-   $target = "index.html";
+   $target = "index-de.html";
  }
 readfile($target);
 ?>