[Frida-commits] r89 - trunk/homepage

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Mar 16 23:10:18 CET 2012


Author: cli
Date: 2012-03-16 23:10:17 +0100 (Fri, 16 Mar 2012)
New Revision: 89

Added:
   trunk/homepage/footer.en.html.m4
Removed:
   trunk/homepage/ueber-frida.html.m4
Modified:
   trunk/homepage/Makefile
   trunk/homepage/footer.html.m4
   trunk/homepage/index.en.html.m4
Log:
Re-adding English version of Frida website.

Modified: trunk/homepage/Makefile
===================================================================
--- trunk/homepage/Makefile	2012-03-15 09:52:13 UTC (rev 88)
+++ trunk/homepage/Makefile	2012-03-16 22:10:17 UTC (rev 89)
@@ -1,7 +1,7 @@
 # $Id$
 # $Date$
 
-HTML_FILES=index.html download.html svn.html \
+HTML_FILES=index.html index.en.html download.html svn.html \
            lizenz.html datenpflege.html
 
 HTML_DIR=html

Copied: trunk/homepage/footer.en.html.m4 (from rev 88, trunk/homepage/footer.html.m4)
===================================================================
--- trunk/homepage/footer.en.html.m4	                        (rev 0)
+++ trunk/homepage/footer.en.html.m4	2012-03-16 22:10:17 UTC (rev 89)
@@ -0,0 +1,201 @@
+<!-- END of body content -->
+
+m4_define(`LINK',`m4_ifelse($1, NO_LINK_FOR,`
+» $2
+',`<a href="$1">$2</a>')')
+
+
+	</td>
+        <td width=2 bgcolor="#eeeeee"> </td>
+    </tr>
+    <tr valign="top">
+        <td bgcolor="#eeeeee" colspan=3> </td>
+    </tr>
+    </table>
+</td>
+
+<!-- Menu Cell -->
+<td width="15%" valign=top>
+    <table width="100%" border=0 cellspacing=0 cellpadding=0>
+
+    <tr><td colspan="3" align="right">
+	<small>LINK(`index.html', `->deutsch')</small>
+    </td></tr>
+
+    
+    <tr valign="middle">
+		<td colspan="3"> <!--img src="./images/logo.png"--> </td>
+	</tr>
+
+    <!-- Menu Head -->
+
+    <tr valign="middle">
+        <td width=2 bgcolor="#eeb600"> </td>
+	<td bgcolor="#eeb600">
+
+<!-- The main part of the header -->
+
+		<b>Info</b>
+
+        </td>
+	<td width=2 bgcolor="#eeb600"> </td>
+    </tr>
+    <!-- End Menu Head -->
+
+    <!-- Menu Body -->
+
+    <tr>
+        <td width=2 bgcolor="#edd078"> </td>
+	<td bgcolor="#edd078">
+
+
+<table cellpadding=0 cellspacing=5>
+
+<tr><td>
+	LINK(`index.en.html', `About Frida')
+</td></tr>
+
+<tr><td>
+	LINK(`datenpflege.html', `Support [german]')
+</td></tr>
+
+<tr><td>
+	LINK(`download.html', `Download [german]')
+</td></tr>
+
+<tr><td>
+	LINK(`lizenz.html', `License [german]')
+</td></tr>
+
+<tr><td>
+	LINK(`svn.html', `SVN [german]')
+</td></tr>
+
+</table>
+
+        </td>
+	<td width=2 bgcolor="#edd078"> </td>
+    </tr>
+    <!-- End Menu Body -->
+
+
+
+
+    <!-- Space-->
+    <tr><td> </td><td> </td><td> </td></tr>
+
+
+
+    <!-- Menu Head -->
+
+    <tr valign="middle">
+        <td width=2 bgcolor="#eeb600"> </td>
+	<td bgcolor="#eeb600">
+
+<!-- The main part of the header -->
+
+		<b>Interaktive Karte</b>
+
+        </td>
+	<td width=2 bgcolor="#eeb600"> </td>
+    </tr>
+    <!-- End Menu Head -->
+
+    <!-- Menu Body -->
+
+    <tr>
+        <td width=2 bgcolor="#edd078"> </td>
+	<td bgcolor="#edd078">
+
+
+<table cellpadding=0 cellspacing=5>
+
+<tr><td>
+	LINK(`http://www.openstreetmap.org/?mlat=52.271334&mlon=8.052950&zoom=12', `Stadtplan Osnabrück in OpenStreetMap')
+</td></tr>
+
+</table>
+
+        </td>
+	<td width=2 bgcolor="#edd078"> </td>
+    </tr>
+    <!-- End Menu Body -->
+
+    <!-- Space-->
+    <tr><td> </td><td> </td><td> </td></tr>
+
+    <!-- Menu Head -->
+
+    <tr valign="middle">
+        <td width=2 bgcolor="#eeb600"> </td>
+	<td bgcolor="#eeb600">
+
+<!-- The main part of the header -->
+
+		<b>Verweise</b>
+
+        </td>
+	<td width=2 bgcolor="#eeb600"> </td>
+    </tr>
+    <!-- End Menu Head -->
+
+    <!-- Menu Body -->
+
+    <tr>
+        <td width=2 bgcolor="#edd078"> </td>
+	<td bgcolor="#edd078">
+
+
+<table cellpadding=0 cellspacing=5>
+
+<tr><td>
+	<a href="http://freegis.org">FreeGIS</a>
+</td></tr>
+<tr><td>
+	<a href="http://grass.fbk.eu/">GRASS</a>
+</td></tr>
+<tr><td>
+	<a href="http://thuban.intevation.org">Thuban</a>
+</td></tr>
+<tr><td>
+	<a href="http://mapserver.org/">UMN MapServer</a>
+</td></tr>
+<tr><td>
+	<a href="http://intevation.de/">Intevation GmbH</a>
+</td></tr>
+<tr><td>
+	<a href="http://www.osnabrueck.de/">Stadt Osnabrück</a>
+</td></tr>
+
+
+</table>
+
+        </td>
+	<td width=2 bgcolor="#edd078"> </td>
+    </tr>
+    <!-- End Menu Body -->
+
+    <!-- Space-->
+    <tr><td> </td><td> </td><td> </td></tr>
+
+
+    </table>
+</td>
+</tr>
+</table>
+
+
+<small>
+Letzte Aktualisierung: CURRENT_DATE
+ 
+ 
+ 
+<a href="mailto:frida at intevation.de">frida at intevation.de</a>
+<br>
+Diese Seiten werden bereitgestellt von der
+<a href="http://intevation.de/">Intevation GmbH</a>.
+</small>
+
+</body>
+
+</html>

Modified: trunk/homepage/footer.html.m4
===================================================================
--- trunk/homepage/footer.html.m4	2012-03-15 09:52:13 UTC (rev 88)
+++ trunk/homepage/footer.html.m4	2012-03-16 22:10:17 UTC (rev 89)
@@ -1,7 +1,7 @@
 <!-- END of body content -->
 
 m4_define(`LINK',`m4_ifelse($1, NO_LINK_FOR,`
-»$2
+» $2
 ',`<a href="$1">$2</a>')')
 
 
@@ -17,6 +17,11 @@
 <!-- Menu Cell -->
 <td width="15%" valign=top>
     <table width="100%" border=0 cellspacing=0 cellpadding=0>
+
+    <tr><td colspan="3" align="right">
+	<small>LINK(`index.en.html', `->english')</small>
+    </td></tr>
+
     
     <tr valign="middle">
 		<td colspan="3"> <!--img src="./images/logo.png"--> </td>

Modified: trunk/homepage/index.en.html.m4
===================================================================
--- trunk/homepage/index.en.html.m4	2012-03-15 09:52:13 UTC (rev 88)
+++ trunk/homepage/index.en.html.m4	2012-03-16 22:10:17 UTC (rev 89)
@@ -0,0 +1,40 @@
+m4_define(`PAGE_TITLE',`Frida: Freie Vektor-Geodaten Osnabrück')
+
+m4_include(header.html.m4)
+
+<img src="./images/titelbild.png" alt="Osnabrück" style="float: left; padding: 25px">
+
+<p>
+This project developed a free dataset of geographic vector information
+for the German city Osnabrück (State Lower Saxony).
+
+<p>
+The data is free in the sence of Free Software 
+and licensed under the GNU General Public License (GNU GPL v>=2).
+Since 2007 it is additionally available under the
+<a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a> from <a href="http://www.openstreetmap.de">OpenStreetMap</a>.
+
+<p>
+Frida was a great success, the geographical data has been used 
+by many projects e.g. Thuban, GRASS and others
+to demonstrate the capabilities of Free Software for handling geographic
+data and teach GIS.
+
+<p>
+Detailed free geographic vector data almost unavailable
+for Europe at all in 2002. Only the USA released significant data 
+paid by taxes to the public.
+
+<p>
+We hope that Europeans will also release more data to the public
+under liberal terms, since it would benefit the use of geographic information 
+in our society for private and commercial purposes.
+
+<p>
+Successful efforts like Frida will help to convince the European governments
+to change their mind. So OpenStreetMap is very welcome and Frida's data
+was transfered to them. Please join OpenStreetMap to further improve 
+the data situation for Osnabrück and other parts of the world.
+</p>
+
+m4_include(footer.en.html.m4) 

Deleted: trunk/homepage/ueber-frida.html.m4
===================================================================


More information about the Frida-commits mailing list