# HG changeset patch # User Stephan Holl # Date 1309438784 -7200 # Node ID 87afe66f7d88e7af196bc498bcb179c0064117d7 # Parent ba2252ceb6f9f156fa010c05927dfcf36f21e5d9# Parent 7ed49420ee5a6b815653c7c9c37cebabde6c183c Merged with raimunds changes diff -r 7ed49420ee5a -r 87afe66f7d88 .hgignore --- a/.hgignore Thu Jun 30 14:31:01 2011 +0200 +++ b/.hgignore Thu Jun 30 14:59:44 2011 +0200 @@ -2,3 +2,6 @@ ^mapserver/logs/ ^tmp/ ^doku/build/ + +syntax: glob +website/*.html diff -r 7ed49420ee5a -r 87afe66f7d88 ChangeLog --- a/ChangeLog Thu Jun 30 14:31:01 2011 +0200 +++ b/ChangeLog Thu Jun 30 14:59:44 2011 +0200 @@ -1,3 +1,8 @@ +2011-06-29 Stephan Holl + * ttf-fonts/DejaVuSans.ttf: New. + * ttf-fonts/fonts.txt: Added FreeSans-Font as fallback for + displaying Labels + 2011-06-30 Raimund Renkert * src/java/de/intevation/mxd/writer/MapScriptWriter.java: diff -r 7ed49420ee5a -r 87afe66f7d88 ttf-fonts/DejaVuSans.ttf Binary file ttf-fonts/DejaVuSans.ttf has changed diff -r 7ed49420ee5a -r 87afe66f7d88 ttf-fonts/fonts.txt --- a/ttf-fonts/fonts.txt Thu Jun 30 14:31:01 2011 +0200 +++ b/ttf-fonts/fonts.txt Thu Jun 30 14:59:44 2011 +0200 @@ -1,5 +1,7 @@ # Make sure that your alias-names do _not_ contain spaces since the # parser dies not handle that correctly. +# FreeSans is a default fallback-font. +FreeSans DejaVuSans.ttf ESRIMeteorological01 esri_105.ttf ESRIDefaultMarker esri_11.ttf ESRIOrdnanceSurvey esri_121.ttf diff -r 7ed49420ee5a -r 87afe66f7d88 website/.htaccess --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/.htaccess Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,2 @@ +DirectoryIndex switch.php +ErrorDocument 404 /404.html diff -r 7ed49420ee5a -r 87afe66f7d88 website/404-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/404-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,19 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `404.html') +m4_define(`TITLE',`404') +PAGE_START + +
+

Seite nicht gefunden

+

Fehler 404

+
+ +
+


+


+


+
diff -r 7ed49420ee5a -r 87afe66f7d88 website/404.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/404.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,19 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `404-de.html') +m4_define(`TITLE',`404') +PAGE_START + +
+

Page not found

+

Error 404

+
+ +
+


+


+


+
diff -r 7ed49420ee5a -r 87afe66f7d88 website/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/Makefile.am Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,21 @@ +# Makefile.am - Documentation for the MXD2map Website +# Copyright (C) 2011 Intevation GmbH +# +# This file is part of MXD2map. +# +# MXD2map is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# MXD2map is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + +EXTRA_DIST = README buildhtml.mk style.css \ + template.m4 template_header.m4 diff -r 7ed49420ee5a -r 87afe66f7d88 website/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/README Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,78 @@ +---------------------------------------------------------------------- + MXD2map Web Site +---------------------------------------------------------------------- + +INTRODUCTION: + +Getting the source: + +You can work on the website independently of the rest of MXD2map. +First check out the website from SVN repository: + + svn checkout svn+ssh://USER@svn.wald.intevation.org/MXD2map/trunk/doc/website + +where USER is you name at wald.intevation.org. +If you are not a member of the MXD2map project at wald.intevation.org, +you can also checkout anonymously: + + svn checkout https://svn.wald.intevation.org/MXD2map/trunk/doc/website + +but of course you can not update the official website www.MXD2map.org +this way. + + +File organisation: + +The .html files are build from the *.htm4 files using GNU m4. The +*.htm4 files consist of mainly simple plain HTML and some macros +implementing the overall page layout. + +The structure of the .htm4 files should be rather self explaining. + + +BUILDING: + +Building the web site is _not_ incorporated into the autotools based +build process. +WARNING: you might need a latin1 locale for m4 to work correctly. + +To build to web sites use the file `buildhtml.mk': + + make -f buildhtml.mk + + +INSTALLING: + +To install the generated web site you need a MXD2map docwriter or +developer account on wald.intevation.org. + +Installing is done from within the "doc/website" directory, +just type: + + make -f buildhtml.mk online + +You will have to enter the ssh password of your account at wald.intevation.org. + +If you are interested on web site management on wald.intevation.org +in general, please read the online manual: +http://wald.intevation.org/docman/view.php/1/34/project-websites.txt + +If you need the website as offline version for some other +purposes just run: + + make -f buildhtml.mk tar + +After thar you have the file "www.MXD2map.org.tar.gz". + +TEMPLATES: + +template.m4 : Contains the definition of the main macros PAGE_START + and PAGE_BOXES as well as some helper macros normally + not used in the .htm4 files. Authors should not need to + change this file. + +template_header.m4: Contains the actual page layout. This file is + included by `template.m4'. Authors should not + need to change this file, but if additional + languages are added the navigation must be added + in here. diff -r 7ed49420ee5a -r 87afe66f7d88 website/about-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/about-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,56 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `about.html') +m4_define(`about-de.html', `0') +m4_define(`TITLE', `Über MXD2map') +m4_define(`MAIN', `about') + +PAGE_START + +
+

Über MXD2map

+

MXD2map wird zur Erzeugung von UMN +MapServer-Konfigurationsdateien aus ArcGIS MXD-Dateien verwendet. +

+
+ +
+

Was ist MXD2map?

+

MXD2map ist ein Konverter zum automatischen Publizieren von OGC-Webdiensten +aus ESRI ArcGIS MXD-Dateien. Als WMS-Server wird der UMN MapServer +verwendet. +

+

+MXD2map kombiniert die folgenden Vorteile: +

    +
  • Kartengestaltung in gewohnter Arbeitsumgebung über ArcGIS Desktop
    • +
  • Konvertieren des Projektes in eine UMN MapServer Konfigurationsdatei
    • +
  • Intranetweites Publizieren eigener Daten direkt über den WMS-Dienst
    • +
+

+ +

+MXD2map wird vom Bundesamt für Seeschifffahrt und Hydrographie in Hamburg +unterstützt. + +

+ +

MXD2map Komponenten

+
    +
  • UMN MapServer Java MapScript
    • +
  • GDAL/OGR
    • +
  • Apache Webserver
    • +
  • ESRI ArcGIS Engine oder ArcGISDesktop
    • +
+ +

Funktionensweise

+Funktionsweise MXD + +
+ +
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/about.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/about.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,35 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `about-de.html') +m4_define(`TITLE', `About MXD2map') +m4_define(`MAIN', `about') + +PAGE_START + +
+

About MXD2map

+

MXD2map is ...

+
+ +
+

What is MXD2map?

+ +

TODO

+ +

MXD2map Components

+

TODO

+ +

System Requirements

+

TODO

+ +

Features & Screenshots

+

TODO

+ +
+ +
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/buildhtml.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/buildhtml.mk Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,53 @@ +# Build html from m4 macrofiles +# $Id$ +# +# (c)2005,2006 by Intevation GmbH +# Author(s): Sascha Wilde +# +# This is Free Software licensed under the GPL + +# Preprocessor configuration +PP = m4 +PPFLAGS = --prefix-builtins + +# Build configuration +TARGETS = $(patsubst %.htm4,%.html,$(wildcard *.htm4)) +SUBDIRS = + +# Installation configuration +INSTALL_DIR = ./mxd2map-www +ADD_INST_TYPES = *.css *.php *.png +ADD_INST_DIRS = img + +CURDIR=$(shell pwd) + +.SUFFIXES: .html .htm4 + +.htm4.html: + $(PP) -DNO_LINK_FOR=$@ $(PPFLAGS) $< > $@ + +all: $(TARGETS) subdirs + +$(TARGETS): template.m4 template_header.m4 \ + header.m4 style.css + +subdirs: $(SUBDIRS) + @for dir in $^ ; do \ + $(MAKE) -C $$dir SUBDIRS="" ; \ + done + +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/ + +install: all + mkdir -p $(INSTALL_DIR) ;\ + cp -uf $(TARGETS) $(INSTALL_DIR) ;\ + cp -uf $(ADD_INST_TYPES) $(INSTALL_DIR) + cp -urf *$(ADD_INST_DIRS) $(INSTALL_DIR) + find $(INSTALL_DIR) -name ".hg" | xargs rm -rf + +tar: install + echo $(CURDIR) + ( cd $(INSTALL_DIR) ; tar -czv -f $(CURDIR)/www.mxd2map.org.tar.gz . ) diff -r 7ed49420ee5a -r 87afe66f7d88 website/contact-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/contact-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,38 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `contact.html') +m4_define(`TITLE', `Kontakt') +m4_define(`MAIN', `contact') + +PAGE_START + +
+

Kontakt

+

Treten Sie in Kontakt mit uns.

+
+ +
+ +

MXD2map-Community

+

Abonnieren Sie die (englischsprachige) Entwickler-Mailingliste, um +mit den Entwicklern in Kontakt zu treten: +mxd2map-devel-Liste +abonnieren +(Archiv) +

+ +

Professioneller Support und Presse

+

+ +Sie haben Interesse an MXD2map für Ihr Unternehmen/Behörde? Die +Intevation GmbH macht Ihnen gerne ein Angebot. Schreiben Sie an: +intevation@intevation.de +

+ +
+ diff -r 7ed49420ee5a -r 87afe66f7d88 website/contact.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/contact.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,27 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `contact-de.html') +m4_define(`TITLE', `Kontakt') +m4_define(`MAIN', `contact') + +PAGE_START + +
+

Contact

+

+
+ +
+ +

MXD2map Community

+

TODO: Mailinglisten

+ +

Professional Support and Press

+

TODO: Intevation, +mxd2map@intevation.de

+ +
+ diff -r 7ed49420ee5a -r 87afe66f7d88 website/development-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/development-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,62 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `development.html') + +m4_define(`TITLE', `Entwicklung') +m4_define(`MAIN', `development') + +PAGE_START + +
+

Entwicklung

+

MXD2map ist aktuell in der Entwicklung.

+
+ +
+

Entwicklungsplattform

+ +

Sie interessieren sich für die Entwicklung von MXD2map? +Quellcode und mehr finden Sie auf der +MXD2map-Entwicklungsplattform. + + +

Quellcode

+

Der MXD2map-Quellcode ist Freie Software und ist verfügbar in einem mercurial(hg)-Repository: +
+http://hg.intevation.org/mxd2map

+ +

Quellcode auschecken:
+hg clone http://hg.intevation.org/mxd2map

+ +

Mailinglisten

+ +
+
MXD2map-announce
+
Bekanntmachungsliste
+ Abonnieren +| Archiv +
+ +
MXD2map-devel
+
Entwicklerliste (englisch)
+ Abonnieren +| Archiv +
+ +
MXD2map-commits
+
SVN-Commits für Entwickler (englisch)
+ Abonnieren +| Archiv +
+
+

+Hinweis: Wenn Sie an eine Mailingliste schreiben wollen, sollten Sie diese abonniert haben. Dadurch vermeiden Sie, dass Ihre E-Mail u.U. sehr lange auf die Bestätigung eines Moderators wartet. +

+
diff -r 7ed49420ee5a -r 87afe66f7d88 website/development.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/development.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,58 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `development-de.html') +m4_define(`TITLE', `Development') +m4_define(`MAIN', `development') + +PAGE_START + +
+

Development

+

MXD2map is currently under development.

+
+ +
+

Development Platform

+ +

You are interested in development of MXD2map? +Sourcecode and more are at the +MXD2map +development platform. + + +

Sourcecode

+ +

TODO

+ + +

Mailing lists

+ +

TODO

+ +
+
MXD2map-announce
+
Bekanntmachungsliste
+ Subscribe +| Archive +
+ +
MXD2map-devel
+
Developer list (Englisch)
+ Subscribe +| Archive +
+ +
MXD2map-commits
+
Commits for developers (Englisch)
+ Subscribe +| Archive +
+
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/donate-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/donate-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,76 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `donate.html') +m4_define(`TITLE', `Spenden') +m4_define(`MAIN', `donate') + +PAGE_START + + + +
+

Spenden

+

Ihre Spende unterstützt die Pflege und Weiterentwicklung von MXD2map +sowie hilft uns die Freie Software Initiative MXD2map voranzutreiben. +Wir sind dankbar für jede finanzielle Unterstützung. Helfen auch Sie!

+
+ +
+ +

Tragen Sie zu MXD2map bei!

+ +

Geben Sie einen kleinen Betrag über die Spendenbutton +auf dieser Seite! Versehen Sie Ihre Spende mit einem kurzen Kommentar, +für welche Verbesserung Sie wieder etwas geben würden und was Ihnen +besonders an MXD2map gefällt. Auch einstellige +Euro-Beträge können helfen und motivieren.

+ +

Bei einem mittleren Betrag, kontaktieren Sie einen der Projektbeteiligten +und zahlen Sie gegen Rechnung. Eventuell können Sie einen bestimmten Schritt wie +Aktualisierung, Beseitigung eines Fehlers oder Hinzufügen einer Funktion +beauftragen. Achten Sie darauf, dass jede beauftragte Verbesserung +dem MXD2map Hauptstrom zu Gute kommt.

+ +

Als Unternehmen oder Behörde beauftragen Sie die umfangreicheren +Maßnahmen zur Sicherung einer nachhaltigen und eigenständigen +Fortführung des Projekts. +Sie erhalten damit MXD2map dauerhaft für Ihre Organisation. +Einher geht der +Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im +Allgemeinen verbessert wird.

+ +
+ + diff -r 7ed49420ee5a -r 87afe66f7d88 website/donate.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/donate.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,72 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `donate-de.html') +m4_define(`TITLE', `Donate') +m4_define(`MAIN', `donate') + +PAGE_START + + + +
+

Donate

+

Your donation supports the maintenance and further development of +MXD2map and helps us to push the Free Software initiative MXD2map. We +are gratful for every financial aid. +

+
+ +
+

Contribute to MXD2map!

+ +

Give a small amount via the payment opportunity of this web page. +Add a short comment along with a payment and explain for which +improvements you would again pay. Even smallest amounts help and +motivate.

+ +

For an average amount, contact one of the project members and +receive an official invoice. You could also contract for some specific +step, update, bug fix or new features. Take care that your contracted +improvements will be integrated into the main development of +MXD2map.

+ +

As a company or authority, contract for more extensive measures +that will ensure continuation of the project. This way you will +ensure sustainable availability of MXD2map for your organisation. +Such measures do provide the collateral benefit of generally improving +security for data exchange.

+ +
+ + diff -r 7ed49420ee5a -r 87afe66f7d88 website/download-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/download-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,36 @@ +m4_dnl -*-html-*- vim:filetype=html: +m4_include(`template.m4') +m4_dnl $Id:$ + +m4_define(`DE') +m4_define(`EN_FILE', `download.html') + +m4_define(`TITLE', `Download') +m4_define(`MAIN', `download') + +PAGE_START + +
+

Download

+

MXD2map hier kostenlos herunterladen

+
+ +
+ +

MXD2map

+ +

TODO

+ +
+ + MXD2map 1.0 alpha1
+ Größe: DL_SIZE | Veröffentlicht: DL_DATE + +
+ + +

Installation

+ +

TODO

+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/download.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/download.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,35 @@ +m4_dnl -*-html-*- vim:filetype=html: +m4_include(`template.m4') +m4_dnl $Id:$ + +m4_define(`EN') +m4_define(`DE_FILE', `download-de.html') +m4_define(`TITLE', `Download') +m4_define(`MAIN', `download') + +PAGE_START + +
+

Download

+

Free software, free download

+
+ +
+ +

MXD2map

+ +

TODO

+ +
+ + MXD2map 1.0 alpha1
+ Size: DL_SIZE | Released: DL_DATE + +
+ + +

Installation

+ +

TODO

+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/favicon.png Binary file website/favicon.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/header.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/header.m4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,40 @@ + m4_ifdef(`FANCY_HEADER', ` +
+
+ m4_ifelse(LANG_DE, `1', ` + + + MXD2map
herunterladen + ', ` + + + Download
MXD2map + ') +
+
', ` + m4_ifdef(`NO_HEADER',, ` +
+
m4_ifelse(LANG_DE, `1', `', `')Home » + m4_ifelse(LANG_DE, `1', ` + m4_ifelse(MAIN, `about', `Über MXD2map') + m4_ifelse(MAIN, `download', `Download') + m4_ifelse(MAIN, `development', `Entwicklung') + m4_ifelse(MAIN, `contact', `Kontakt') + m4_ifelse(MAIN, `donate', `Spenden') + m4_ifelse(MAIN, `license', `Lizenz') + m4_ifelse(MAIN, `impressum', `Impressum') + ') + m4_ifelse(LANG_DE, `0', ` + m4_ifelse(MAIN, `about', `About MXD2map') + m4_ifelse(MAIN, `download', `Download') + m4_ifelse(MAIN, `development', `Development') + m4_ifelse(MAIN, `contact', `Contact') + m4_ifelse(MAIN, `donate', `Donate') + m4_ifelse(MAIN, `license', `License') + m4_ifelse(MAIN, `impressum', `Impressum') + ') +
+
+
+ ')') diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/dl_arrow.png Binary file website/img/dl_arrow.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/donate_button.png Binary file website/img/donate_button.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/download_button.png Binary file website/img/download_button.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/english.png Binary file website/img/english.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/funktionsweise-MXD-konverter.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/img/funktionsweise-MXD-konverter.png Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,1 @@ +../../doku/funktionsweise/funktionsweise-MXD-konverter.png \ No newline at end of file diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/funktionsweise-MXD-konverter_small.png Binary file website/img/funktionsweise-MXD-konverter_small.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/german.png Binary file website/img/german.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/heart.png Binary file website/img/heart.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/inmenudonate.png Binary file website/img/inmenudonate.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/inmenulogo.png Binary file website/img/inmenulogo.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/last.png Binary file website/img/last.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/logo_single.png Binary file website/img/logo_single.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/logo_single_100.png Binary file website/img/logo_single_100.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/logo_wide.png Binary file website/img/logo_wide.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/menu_bg.png Binary file website/img/menu_bg.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/menubar.png Binary file website/img/menubar.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/page_bg.png Binary file website/img/page_bg.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/sub_bg.png Binary file website/img/sub_bg.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/img/sub_tail.png Binary file website/img/sub_tail.png has changed diff -r 7ed49420ee5a -r 87afe66f7d88 website/impressum-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/impressum-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,32 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `impressum.html') +m4_define(`TITLE', `Impressum') +m4_define(`MAIN', `impressum') + +PAGE_START + +
+

Impressum

+

+Die MXD2map-Webseiten werden von der Intevation GmbH +bereitgestellt. +

+
+ +
+

Intevation GmbH

+

+Neuer Graben 17
+49074 Osnabrück
+Deutschland
+www.intevation.de
+Vertretungsberechtigt: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
+Registereintrag: HR B 18998, Amtsgericht Osnabrück
+Umsatzsteuer-Identifikation: de 204 854 484
+

+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/impressum.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/impressum.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,31 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `impressum-de.html') +m4_define(`TITLE', `Impressum') +m4_define(`MAIN', `impressum') + +PAGE_START + +
+

Impressum / Legal notice

+

+The web pages of MXD2map are hosted by Intevation GmbH. +

+
+ +
+ +

Intevation GmbH

+

Neuer Graben 17
+49074 Osnabrück
+Germany
+www.intevation.net
+Authorised: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
+Registered as: HR B 18998, Amtsgericht Osnabrück
+VAT ID: de 204 854 484
+

+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/index-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/index-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,48 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id: index.htm4,v 1.30 2006/01/12 16:04:03 jan Exp $ + +m4_define(`DE') +m4_define(`EN_FILE', `index.html') +m4_define(`TITLE', ` - ein Konverter zur Erzeugung von UMN +MapServer-Konfigurationen') + +m4_define(`FANCY_HEADER') + +PAGE_START + +
+ +

MXD2map - ein Konverter für MXD-Dateien!

+

+ Erzeugen Sie sich UMN MapServer-Konfigurationen aus Ihren + MXD-Dateien.
+ Starten Sie durch - in eine freie Zukunft! +

+
+ +
+ +
+

MXD2map kennen lernen

+

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

+

Über MXD2map >>

+
+ +
+

Für Entwickler

+

Testen Sie MXD2map und geben Sie Feedback!

+

Entwicklung >>

+
+ +
+

In Kontakt treten

+

MXD2map ist Freie Software. Helfen Sie mit beim Aufbau der +Gemeinschaft und nehmen Sie Kontakt mit uns auf! +

+

Kontakt >>

+
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/index.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/index.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,46 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id: index.htm4,v 1.30 2006/01/12 16:04:03 jan Exp $ + +m4_define(`EN') +m4_define(`DE_FILE', `index-de.html') +m4_define(`TITLE', `MXD2map - Konvertieren von Webseiten') + +m4_define(`FANCY_HEADER') + +PAGE_START + +
+ +

MXD2map...

+

...massive automated passive Web Observation Center is a Free + tool to check website integrity. + ... TODO. +

+
+ +
+ +
+

MXD2map kennen lernen

+

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

+

Über MXD2map >>

+
+ +
+

Für Entwickler

+

Testen Sie MXD2map und geben Sie Feedback!

+

Entwicklung >>

+
+ +
+

In Kontakt treten

+

MXD2map ist Freie Software. Helfen Sie mit beim Aufbau der +Gemeinschaft und nehmen Sie Kontakt mit uns auf! +

+

Kontakt >>

+
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/license-de.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/license-de.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,44 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`DE') +m4_define(`EN_FILE', `license.html') +m4_define(`license-de.html', `0') + +m4_define(`TITLE', `Lizenz') +m4_define(`MAIN', `license') + +PAGE_START + +
+

Lizenz

+

MXD2map ist Freie Software und steht unter der GNU Lesser General +Public License (GNU LGPL). Die Software darf ohne +Restriktionen benutzt, verändert und (geändert) weitergegeben werden. +

+
+ +
+

Copyright Erklärungen

+
+
+Copyright (C) 2011 Bundesamt für Seeschifffahrt und Hydrographie (BSH)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License version 2,
+or, at your option, any later version as published by the Free
+Software Foundation
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/license.htm4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/license.htm4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,43 @@ +m4_dnl -*-html-*- +m4_include(`template.m4') +m4_dnl $Id$ + +m4_define(`EN') +m4_define(`DE_FILE', `license-de.html') +m4_define(`TITLE', `License') +m4_define(`MAIN', `license') + +PAGE_START + +
+

License

+

MXD2map is Free Software and is available under the GNU General +Public License (GNU GPL). +The software is free to use without restrictions, may be +modified and that modifications may be distributed. +

+
+ +
+

Copyright Statements

+
+
+Copyright (C) 2011 German Federal Office for Information Security (BSI)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2,
+or, at your option, any later version as published by the Free
+Software Foundation
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+
+ +
diff -r 7ed49420ee5a -r 87afe66f7d88 website/style.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/style.css Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,629 @@ +/* Styles for the MXD2map Website */ + +body { + font-family: arial, helvetica, sans-serif; + font-size: 13px; + background: #FFFFFF url('img/page_bg.png') repeat-x; + color: #333333; + margin: 0px; + padding:0px; +} + +a { + color: #b51a22; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +img { + border: 0px; +} + +.imageframe { + border-color: #DEDEDE #AAAAAA #888888 #CECECE; + border-style: double; + border-width: 1px; + padding: 5px; +} + +.imgfloatleft { + float: left; + margin: 0px 20px 30px 0px; +} + +td { + vertical-align: top; +} + +.odd td { + background: #E6E6E6; +} + +.wrapper { + width: 900px; + margin: 0 auto; + text-align: left; +} + +.language_select { + float:right; + height: 100%; +} + +.logo { + margin-top: 20px; + margin-left: 15px; +} + +.header { + padding: 6px 0 6px 0; + margin-bottom: 0px; + height: 1em; +} + +.fancy_intro { + background: url('img/logo_wide.png') no-repeat; + background-position: 350px 17px; + height:125px; + margin: 30px 20px 25px 20px; + border-bottom:1px solid gray; + overflow: hidden; + width:860px; + padding-bottom: 15px; +} + +.mini_intro { + clear: both; + font-size: 12px; + line-height: 38px; + margin-top: 8px; +} + +#download_button { + position: relative; + width: 250px; + z-index: 0; +} + +#download_button a { + background: url('img/download_button.png'); + background-repeat: no-repeat; + display: block; + height: 116px; + width: 260px; + color: #FFFFFF; + font-weight: bold; + text-decoration: none; + font-size: 19px; +} + +#download_button a:hover { + background-position: 0px -116px; +} + +#download_button .text { + position: relative; + top: 23px; + left: 25px; +} + +#breadcrum { + float:left; +} + +#download_button_mini { + float:right; + text-align:right; + width: 189px; + line-height: 100%; +} + +#download_button_mini .links { + position: relative; + top: -13px; + font-size: 10px; + text-align: right; +} + +#download_button_mini .dmini_button { + background: url('img/download_button_mini.png'); + background-repeat: no-repeat; + display: block; + height: 50px; + width: 189px; + text-align:left; + font-size: 11px; + line-height:50px; + color: #FFFFFF; + font-weight:bold; + text-decoration:none; +} + +#download_button_mini .dmini_button:hover { + background-position: 0px -50px; +} + +#download_button_mini .text { + position: relative; + left: 12px; +} + +.download_button_links { + font-size:11px; + position: relative; + left: 25px; + top: 43px; + width: 250px; +} + +#donate_button { + position: relative; + left: 695px; + top: 85px; + width: 200px; +} + +#donate_button a { + background: url('img/donate_button.png'); + background-repeat: no-repeat; + display: block; + height: 79px; + width: 200px; + color: #FFFFFF; + font-weight: bold; + text-decoration: none; + font-size: 14px; +} + +#donate_button a:hover { + background-position: 0px -79px; +} + +#donate_button .text { + position:relative; + top:20px; + left:10px; +} + +.h_text { + position: relative; + top: -125px; + left: 669px; + width: 180px; + font-size: 11px; + border-left: 1px solid #CCCCCC; + padding-left: 10px; + margin-top: 12px; + height: 220px; +} + +.h_text .heading { + font-size: 23px; + font-family: georgia, times, serif; + padding-bottom: 9px; +} + +.h_text .serif_word { + font-size: 13px; + font-weight: bold; +} + + + +.h_text .limiter { + border-bottom: 3px dotted #CCCCCC; + width: 190px; + height: 10px; + margin-bottom: 3px; +} +.center { + text-align: center; +} + +.content { + width: 100%; + margin-top: 40px; +} + +#intro { + padding: 0px 250px 20px 20px; +} + +/*#intro span { + background: url('img/logo.png') no-repeat scroll 50px 0px transparent; + height: 56px; + margin: 0px; + width: 250px; + float: right; + margin: 0px; + line-height: 24px; + margin: 10px 200px 0 0; +}*/ + +#intro h2 { + font-family: georgia, times, serif; + font-size: 30px; + font-weight: normal; + color: #333333; + margin: 0px; +} + +#intro p { + color: #555555; + font-size: 14px; + font-weight: normal; + line-height: 26px; + margin: 10px 0 0; + padding: 0; +} + +.column1, .column2, .column3 { + display: inline; + float: left; + margin-right: 25px; + position: relative; + width: 270px; +} + +.column3 { + margin-right: 0px; +} + +.column1 img, .column2 img, .column3 img { + width: 270px; +} + + +#main { + float: left; + padding: 0px 0px 0px 20px; + width: 600px; +} + +#full { + float: left; + padding: 0px 20px 0px 20px; + width: 860px; +} + +#main h2, #full h2 { + font-size: 22px; + font-weight: normal; + color: #333333; + margin: 30px 0px 10px 0px; + padding: 0px; + clear: both; +} + +#main h4, #full h4 { + font-size: 18px; + color: #333333; + font-family: georgia, serif; + font-style: italic; + font-weight: normal; +} + +#main p, #full p, #main li, #full li{ + color: #444444; + line-height: 20px; + margin: 0px 0px 10px; +} + +.cleanlist li { + font-size: 13px; + list-style: none; + padding: 0px; + clear: both; +} + +.screenshots img { + width: 250px; +} + +#sidebar { + -moz-border-radius: 10px 10px 10px 10px; + background: #FDF1CD; + border: 1px solid #CCCCCC; + float: right; + margin-top: 34px; + padding: 20px 20px 15px; + width: 220px; +} + +#sidebar h3 { + color: #333333; + margin: 1px 0px 10px 0px; +} + +#sidebarsimple { + float: right; + margin-top: 34px; +} + +.newslist { + margin: 0px; + padding: 0px; +} + +.newslist li { + font-size: 13px; + list-style: none; + padding: 0; +} + +.newslist li a { + /*color: #555555;*/ + display: block; + font-size: 12px; + font-weight: bold; + list-style: none; + margin: 0px; + padding: 10px 0px 10px 0px; + text-decoration: none; + border-bottom: 1px solid #EFEFEF; +} + +.newslist li p { + color: #777777; + font-size: 10px; + font-weight: normal; + margin: 4px 0px 0px; + padding: 0px; +} + +#menu { + height:45px; + z-index: 1; +} + +#menu .active a { + background-position: 0px -180px; +} + +#menu ul { + list-style: none; + padding: 0px; + margin: 0px; +} + +#menu li { + float: left; + margin-right: 0px; + margin-left:0px; + padding: 0px; + text-align: center; +} + +#menu .mlogo { + border:0px; +} + +#menu .mlogo a { + display:block; + width: 198px; + height: 52px; + position: relative; + top: -4px; + background: url('img/inmenulogo.png'); +} + +#menu .mlogo a:hover { + background: url('img/inmenulogo.png'); + background-position: 0px -52px; +} + +#menu .last { + width:40px; + height: 45px; + background: url('img/last.png'); +} + +#menu .mdonate a { + display: block; + width: 110px; + height: 45px; + float:right; + background: url('img/inmenudonate.png'); + color: #FFFFFF; + text-indent: -23px; +} + +#menu .mdonate a:hover { + background: url('img/inmenudonate.png'); + background-position: 0px -45px; +} + +#menu li a { + background: #CCCCCC url('img/menubar.png') 0px -90px; + color: #FFFFFF; + line-height: 45px; + width: 148px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 11px; + height: 45px; + overflow: hidden; +} + +#menu li a:hover { + background: #FFFFFF url('img/menubar.png') 0px -135px; + color:#FFFFFF; +} + +#menu ul li ul { + width: 201px; + list-style: none; + position: absolute; + display: none; +} + +#menu ul li ul li, +#menu .active ul li ul li { + width: 148px; +} + +#menu ul li .subcap { + background: url('img/sub_tail.png'); + display: block; + width: 149px; + height: 5px; +} + +#menu ul li ul li a, +#menu .active ul li ul li a { + background: url('img/sub_bg.png'); + line-height: 25px; + width: 142px; + height: 22px; + font-weight: normal; + color: #2A2A2A; + text-align: left; + display: block; + padding-left: 5px; + border-left: 1px solid #8B7E57; + border-right: 1px solid #8B7E57; +} + +#menu ul li ul li a:hover, +#menu .active ul li a:hover { + background: #FBCA4C; + color: #2A2A2A; + text-decoration: none; + font-weight: bold; +} + +#menu li:hover ul ul, +#menu li:hover ul ul ul { + display: none; +} + +#menu li:hover ul, +#menu li li:hover ul, +#menu li li li:hover ul { + display: block; + z-index:3; +} + +.donate_header { + display: block; + position: relative; + top: -40px; + height: 170px; + background: url('img/heart.png') no-repeat; + background-position: 550px 10px; + font-size: 26px; + border-bottom: 1px solid #CCCCCC; + margin-bottom: 0px; + z-index: -100; +} + +.donate_header .text { + position:relative; + left: 180px; + top: 40px; + text-align:center; +} + +.donate_header b { + color: #D50D35; +} + +.download_header { + height:160px; + background: url('img/download_bg.png') no-repeat; + background-position: 690px 10px; + font-size:26px; + border-bottom: 1px solid #CCCCCC; + margin-bottom:8px; +} + +.download_header .text { + position:relative; + left: 120px; + top: 40px; + text-align:center; +} + +.download_header b { + color: #D50D35; +} + +.dlbutton2 a { + background-color: #6AC221; + -moz-border-radius: 10px 10px 10px 10px; + display: block; + font-size: 150%; + font-weight: bold; + margin: 10px 20px 20px; + padding: 10px; + text-align: center; + color: #FFFFFF; +} + +.dlbutton2 a:hover { + background: #81C72B; + text-decoration: none; +} + +.dlbutton2 img { + float:right; + position: relative; + right: 45px; + top: 8px; +} + +.version { + color: #FFFFFF; + font-size: 75%; + font-weight: normal; +} + +#footer { + background: #EBEBEB; + font-size: 11px; + padding-bottom: 20px; + color: #333333; + text-align: center; + margin-top: 30px; + height: 15em; + width: 100%; +} + +#sitemap { + margin: auto; + width: 900px; + text-align: left; +} + +#sitemap ul { + list-style:none; + float: left; + width: 130px; + margin-left: 20px; + padding: 0px; +} + +#sitemap li { + font-size: 12px; + line-height: 19px; + padding: 0px; +} + +#sitemap li { + font-size: 12px; + line-height: 19px; + padding: 0px; +} + +#sitemap ul li a { + color: #555555; + text-decoration: none; +} + +#sitemap ul li a:hover { + text-decoration: underline; +} diff -r 7ed49420ee5a -r 87afe66f7d88 website/switch.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/switch.php Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,11 @@ + diff -r 7ed49420ee5a -r 87afe66f7d88 website/template.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/template.m4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,18 @@ + +m4_dnl $Id: template.m4,v 1.3 2005/05/02 09:03:34 wilde Exp $ + +m4_dnl ------------------------------------------------------------ +m4_dnl Macros to use in Pages + +m4_define(`I18N',`m4_ifdef(`$1',`$2')') + +m4_define(`LANG_LINK',`m4_ifdef(`$1',`$2',`m4_ifelse(`$3',`EN_FILE',`$2',`$3',`DE_FILE',`$2',`$2')')') + +m4_define(`MENU', `m4_ifelse(`$4',`$5', `m4_ifelse(`$6', `1', `
  • $2', `
  • $3')', `m4_ifelse(`$6', `1', `
  • $2', `
  • $3')')') + +m4_define(`PAGE_TITLE',`m4_define(`__TMPL_PAGE_TITLE',`$1')') +m4_define(`PAGE_ROOT',`m4_define(`__TMPL_ROOT',`$1')') +m4_define(`PAGE_START',`m4_include(`template_header.m4')') diff -r 7ed49420ee5a -r 87afe66f7d88 website/template_header.m4 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/template_header.m4 Thu Jun 30 14:59:44 2011 +0200 @@ -0,0 +1,103 @@ +m4_dnl -*-html-*- +m4_dnl THIS IS INCLUDED BY `template.m4' +m4_dnl DONT USE THIS FILE DIRECTLY +m4_ifdef(`__TMPL_ROOT',,`m4_define(`__TMPL_ROOT',`')') + +m4_define(`__TITLE',m4_dnl +I18N(`EN',`MXD2map')`'m4_dnl +I18N(`DE',`MXD2map')) + +m4_ifdef(`__TMPL_PAGE_TITLE',,`m4_define(`__TMPL_PAGE_TITLE',`MXD2map - 'TITLE)') + +m4_define(`LINK', + `m4_ifelse($1, NO_LINK_FOR, + `$2', + `$2')') + + + + + + + + __TMPL_PAGE_TITLE + + + +
    +
    +
    + + LANG_LINK(`DE',`Deutsch', DE_FILE) +
    +
    + m4_ifdef(`EN_FILE', `m4_define(`LANG_DE', `1')', `m4_define(`LANG_DE', `0')') + + m4_include(`header.m4') +
    + m4_divert(999) +
    +
    +
    + + + + + +m4_divert