Mercurial > dive4elements > website

changeset 47:0c0eefd9041a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use SSIs in contact page.
author Sascha L. Teichmann <teichmann@intevation.de>
date Thu, 20 Mar 2014 13:30:41 +0100
parents 121bdb6ab99e
children 0e0937880bb6
files contact.html contact_body.html
diffstat 2 files changed, 54 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/contact.html	Tue Mar 18 12:29:26 2014 +0100
+++ b/contact.html	Thu Mar 20 13:30:41 2014 +0100
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="description" content="">
         <meta name="author" content="Ariane Brörmann">
+
+        <script src="https://code.jquery.com/jquery.js"></script>
         <!-- Bootstrap -->
         <link href="bootstrap-3.1.0/dist/css/bootstrap.min.css" rel="stylesheet">
 
@@ -15,6 +17,11 @@
         <!-- Custom styles for this template -->
         <link href="css/style.css" rel="stylesheet">
 
+        <!-- Bootstrap core JavaScript
+        ================================================== -->
+        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+        <script src="js/dive4elements.js"></script>
+
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <!--[if lt IE 9]>
@@ -24,82 +31,11 @@
     </head>
     <body>
         <div class="container">
-
-          <!-- Static navbar -->
-          <div class="navbar navbar-default" role="navigation">
-            <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-              </button>
-              <a class="navbar-brand" href="index.html"><strong>D4E</strong></a>
-            </div>
-            <div class="navbar-collapse collapse">
-              <ul class="nav navbar-nav navbar-right">
-                <li><a href="#"><span class="glyphicon glyphicon-cog"> Demoversion</span></a></li>
-                <li><a href="http://wald.intevation.org/scm/?group_id=57"><span class="glyphicon glyphicon-folder-open"> SCM-Repository</span></a></li>
-                <li><a href="http://lists.wald.intevation.org/mailman/listinfo/dive4elements-commits"><span class="glyphicon glyphicon-pencil"> Mailinglist</span></a></li>
-                <li class="active"><a href="contact.html"><span class="glyphicon glyphicon-envelope"> Kontakt</span></a></li>
-              </ul>
-            </div>
-          </div><!-- /navbar -->
-
-          <div class="row row-dive4elements">
-            <div class="col-md-6">
-              <address>
-                <strong>Intevation GmbH</strong>
-                <br />Neuer Graben 17
-                <br />49074 Osnabrück, Deutschland
-                <br />Telefon: +49-541-33 50 83 - 0
-                <br />Fax: +49-541-33 50 83 - 99
-              </address>
-              <address>Registereintrag:
-                <br />HR B 18998
-                <br />Amtsgericht Osnabrück
-              </address>
-              <address>Homepage: <a href="http://www.intevation.de">www.intevation.de</a>
-                <br />E-Mail-Adresse: <a href="mailto:geospatial@intevation.de">geospatial@intevation.de</a>
-              </address>
-              <p>Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner</p>
-            </div>
-            <div class="col-md-6">
-              <!-- Anfahrtskizze -->
-              <div style="height:250px; align:right" id="map"></div>
-              <script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>
-              <script>
-                var map = L.map('map').setView([52.271987, 8.046263], 17);
-
-                L.tileLayer.wms('http://osm.intevation.de/cgi-bin/standard.fcgi?', {
-                    layers: 'OSM-WMS-Dienst',
-                    format: 'image/png',
-                    attribution: 'Map data &copy; <a href="http://openstreetmap.org">'
-                    + 'OpenStreetMap</a>'
-                    + '<a href="http://creativecommons.org/licenses/by-sa/2.0/">'
-                    + ' (CC-BY-SA 2.0)</a>'
-                }).addTo(map);
-                // Disable attribution leaflet prefix
-                map.attributionControl.setPrefix(false);
-                L.marker([52.271987, 8.046263]).addTo(map)
-                    .bindPopup('Intevation')
-                    .openPopup();
-              </script>
-            </div>
-        </div><!-- ./row -->
-        <div class="footer">
-          © 2014 Intevation GmbH <br />
-          Dive4Elements ist lizensiert unter der <a href=
-          "http://www.gnu.org/licenses/lgpl-2.1.html">GNU LGPL v2.1</a>.
-        </div><!-- /footer -->
-      </div><!-- ./container -->
-
-      <!-- Bootstrap core JavaScript
-      ================================================== -->
-      <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-      <script src="https://code.jquery.com/jquery.js"></script>
-      <!-- Include all compiled plugins (below), or include individual files as needed -->
-      <script src="bootstrap-3.1.0/dist/js/bootstrap.min.js"></script>
-      <script src="js/dive4elements.js"></script>
+            <!--#include file="header.html" -->
+            <div class="row row-dive4elements row-dive4elements-right">
+                <!--#include file="contact_body.html" -->
+            </div><!-- /row -->
+            <!--#include file="footer.html" -->
+        </div> <!-- /container -->
     </body>
 </html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contact_body.html	Thu Mar 20 13:30:41 2014 +0100
@@ -0,0 +1,41 @@
+<div class="row row-dive4elements">
+  <div class="col-md-6">
+    <address>
+      <strong>Intevation GmbH</strong>
+      <br />Neuer Graben 17
+      <br />49074 Osnabrück, Deutschland
+      <br />Telefon: +49-541-33 50 83 - 0
+      <br />Fax: +49-541-33 50 83 - 99
+    </address>
+    <address>Registereintrag:
+      <br />HR B 18998
+      <br />Amtsgericht Osnabrück
+    </address>
+    <address>Homepage: <a href="http://www.intevation.de">www.intevation.de</a>
+      <br />E-Mail-Adresse: <a href="mailto:geospatial@intevation.de">geospatial@intevation.de</a>
+    </address>
+    <p>Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner</p>
+  </div>
+  <div class="col-md-6">
+    <!-- Anfahrtskizze -->
+    <div style="height:250px; align:right" id="map"></div>
+    <script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>
+    <script>
+      var map = L.map('map').setView([52.271987, 8.046263], 17);
+
+      L.tileLayer.wms('http://osm.intevation.de/cgi-bin/standard.fcgi?', {
+          layers: 'OSM-WMS-Dienst',
+          format: 'image/png',
+          attribution: 'Map data &copy; <a href="http://openstreetmap.org">'
+          + 'OpenStreetMap</a>'
+          + '<a href="http://creativecommons.org/licenses/by-sa/2.0/">'
+          + ' (CC-BY-SA 2.0)</a>'
+      }).addTo(map);
+      // Disable attribution leaflet prefix
+      map.attributionControl.setPrefix(false);
+      L.marker([52.271987, 8.046263]).addTo(map)
+          .bindPopup('Intevation')
+          .openPopup();
+    </script>
+  </div>
+</div>
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)