Update 'static/styles.css'

Update 'templates/_base.html'
Added leaflet script
2023-02-22 11:14:05 +01:00 · 2023-02-22 11:11:52 +01:00 · 2023-02-22 11:10:56 +01:00
3 changed files with 302 additions and 5 deletions
--- a/static/styles.css
+++ b/static/styles.css
@ -152,6 +152,41 @@ h1, h2, h3, h4 {
  height: 2.5em;
 }

+#map{
+  height: 400px;
+  z-index: 1;
+}
+
+.legend{
+  width: fit-content;
+  margin: 0 auto;
+}
+
+.legend > *{
+  vertical-align: middle;
+}
+
+.square{
+  display: inline-block;
+  height: 20px;
+  width: 20px;
+  border: black solid 1px;
+  margin-right: 3px;
+  margin-left: 3px;
+}
+
+.green{
+  background-color: #3ef06e;
+}
+
+.blue{
+  background-color: #3388ff;
+}
+
+.orange{
+  background-color: #ffeb0a;
+}
+
 section {
  background-color: #FFFFFF;
  width: 100%;
--- a/templates/_base.html
+++ b/templates/_base.html
@ -7,6 +7,12 @@
    <link rel="stylesheet" href="static/styles.css">
    <link rel="stylesheet" href="static/fonts/Lato/Lato.css">
    <link rel="icon" href="" type="image/icon type">
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css"
+    integrity="sha256-kLaT2GOSpHechhsozzB+flnD+zUyjE2LlfWPgU04xyI="
+    crossorigin=""/>
+    <script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"
+    integrity="sha256-WBkoXOwTeyKclOHuWtc+i2uENFpDZ9YPdf5Hf+D7ewM="
+    crossorigin="">
  </head>

  <body>
--- a/templates/bedingungen.html
+++ b/templates/bedingungen.html
@ -44,25 +44,281 @@
      <p>
        Für die Rückgabe per Rückversand, der Versand spätestens am Rückgabetag mittels per Mail übermittelten Versandetikett in einem geeigneten Paket zu erfolgen. Es ist darauf zu achten, dass der Laptop entsprechend für den Versand gepolstert wird, dafür benötigtes Verpackungsmaterial ist vom Kunden zu stellen. Für die Versandrückgabe inklusive Versandetikett wird ein Umkostenpreis von € 10,- verrechnet.
        Vorort-Abholung nach zu vereinbarenden Bedingungen möglich.
-        Persönliche Rückgabe ist ohne Mehrkosten nach Telefonischer Anmeldung mindestens zwei Tage vor vereinbarter Rückgabe möglich.
+        Persönliche Rückgabe ist ohne Mehrkosten nach telefonischer Anmeldung mindestens zwei Tage vor vereinbarter Rückgabe möglich.
      </p>
    </div>
  </section>
  <section>
    <div class="section-inner">
      <h2>Anfahrtskosten</h2>
+      <div id="map"></div>
+      
+      <script>
+        var map = L.map('map', {maxZoom: 18,
+        minZoom: 10,
+        maxBounds: L.latLngBounds(L.latLng(47.3770, 11.2025), L.latLng(47.1770, 11.7025)),
+        maxBoundsViscosity: 1,
+        scrollWheelZoom: false}).setView([47.2770, 11.4525], 12);
+        L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
+        }).addTo(map);
+        var zone_a = L.polygon([
+        [47.2999, 11.4829],
+        [47.2943, 11.4872],
+        [47.2799, 11.4779],
+        [47.2801, 11.4726],
+        [47.2710, 11.4726],
+        [47.2671, 11.4513],
+        [47.2680, 11.4472],
+        [47.2696, 11.4419],
+        [47.2773, 11.4222],
+        [47.2803, 11.4086],
+        [47.2802, 11.4049],
+        [47.2794, 11.4015],
+        [47.2816, 11.4004],
+        [47.2851, 11.4048],
+        [47.2859, 11.4104],
+        [47.2888, 11.4115],
+        [47.2902, 11.4136],
+        [47.2905, 11.4169],
+        [47.2883, 11.4218],
+        [47.2887, 11.4253],
+        [47.2954, 11.4251],
+        [47.2959, 11.4310],
+        [47.2963, 11.4363],
+        [47.2949, 11.4398],
+        [47.2908, 11.4445],
+        [47.2915, 11.4513],
+        [47.2940, 11.4549],
+        [47.2951, 11.4605],
+        [47.2967, 11.4668],
+        [47.3000, 11.4692],
+        [47.3010, 11.4716],
+        [47.3021, 11.4782]
+      ], {color: "green", fillColor: "#3ef06e", fillOpacity: 0.3});
+      var zone_b_1 = L.polygon([
+        [47.3021, 11.4782],
+        [47.2999, 11.4829],
+        [47.2943, 11.4872],
+        [47.2799, 11.4779],
+        [47.2801, 11.4726],
+        [47.2710, 11.4726],
+        [47.2731, 11.4837],
+        [47.2725, 11.4955],
+        [47.2731, 11.4986],
+        [47.2763, 11.5063],
+        [47.2769, 11.5103],
+        [47.2770, 11.5219],
+        [47.2781, 11.5288],
+        [47.2823, 11.5261],
+        [47.2861, 11.5257],
+        [47.2926, 11.5234],
+        [47.2962, 11.5246],
+        [47.2999, 11.5246],
+        [47.3039, 11.5227],
+        [47.3072, 11.5213],
+        [47.3095, 11.5196],
+        [47.3067, 11.5167],
+        [47.3064, 11.5078]
+      ]);
+      var zone_b_2 = L.polygon([
+        [47.2794, 11.4015], 
+        [47.2774, 11.3984],
+        [47.2782, 11.3970],
+        [47.2781, 11.3962],
+        [47.2778, 11.3960],
+        [47.2774, 11.3953],
+        [47.2769, 11.3947],
+        [47.2764, 11.3940],
+        [47.2755, 11.3930],
+        [47.2760, 11.3935],
+        [47.2758, 11.3934],
+        [47.2755, 11.3930],
+        [47.2753, 11.3927],
+        [47.2751, 11.3919],
+        [47.2749, 11.3918],
+        [47.2746, 11.3919],
+        [47.2740, 11.3918],
+        [47.2739, 11.3916],
+        [47.2734, 11.3906],
+        [47.2729, 11.3900],  
+        [47.2727, 11.3908],
+        [47.2715, 11.3898],
+        [47.2700, 11.3883],
+        [47.2699, 11.3885], 
+        [47.2698, 11.3882],
+        [47.2697, 11.3879],
+        [47.2700, 11.3876],
+        [47.2696, 11.3866],
+        [47.2694, 11.3866],  
+        [47.2688, 11.3871],
+        [47.2684, 11.3860],
+        [47.2677, 11.3848],
+        [47.2673, 11.3855],
+        [47.2672, 11.3855],
+        [47.2662, 11.3861], 
+        [47.2640, 11.3830],  
+        [47.2617, 11.3811], 
+        [47.2608, 11.3829],
+        [47.2617, 11.3840],
+        [47.2616, 11.3844],
+        [47.2622, 11.3893],
+        [47.2627, 11.3949],
+        [47.2629, 11.3964],
+        [47.2631, 11.3998],
+        [47.2618, 11.3993],
+        [47.2573, 11.4007],  
+        [47.2576, 11.4037], 
+        [47.2666, 11.4052],
+        [47.2683, 11.4061],  
+        [47.2695, 11.4077],
+        [47.2703, 11.4084],
+        [47.2707, 11.4085],
+        [47.2717, 11.4086],
+        [47.2720, 11.4089],
+        [47.2734, 11.4123],
+        [47.2719, 11.4154],
+        [47.2714, 11.4149],
+        [47.2713, 11.4143],
+        [47.2700, 11.4151],  
+        [47.2690, 11.4155],
+        [47.2650, 11.4239],
+        [47.2660, 11.4247], 
+        [47.2650, 11.4262],
+        [47.2632, 11.4277],
+        [47.2638, 11.4320],
+        [47.2638, 11.4370],
+        [47.2642, 11.4372],
+        [47.2647, 11.4420],
+        [47.2662, 11.4452], 
+        [47.2680, 11.4472],
+        [47.2696, 11.4419],
+        [47.2773, 11.4222],
+        [47.2803, 11.4086],
+        [47.2802, 11.4049],
+        [47.2794, 11.4015]
+      ]);
+      var zone_c = L.polygon([
+        [47.2617, 11.3811], 
+        [47.2608, 11.3829],
+        [47.2617, 11.3840],
+        [47.2616, 11.3844],
+        [47.2622, 11.3893],
+        [47.2627, 11.3949],
+        [47.2629, 11.3964],
+        [47.2631, 11.3998],
+        [47.2618, 11.3993],
+        [47.2573, 11.4007],   
+        [47.2576, 11.4037], 
+        [47.2666, 11.4052],
+        [47.2683, 11.4061],  
+        [47.2695, 11.4077],
+        [47.2703, 11.4084],
+        [47.2707, 11.4085],
+        [47.2717, 11.4086],
+        [47.2720, 11.4089],
+        [47.2734, 11.4123],
+        [47.2719, 11.4154],
+        [47.2714, 11.4149],
+        [47.2713, 11.4143],
+        [47.2700, 11.4151],  
+        [47.2690, 11.4155],
+        [47.2650, 11.4239],
+        [47.2660, 11.4247],
+        [47.2650, 11.4262],
+        [47.2632, 11.4277],
+        [47.2638, 11.4320],
+        [47.2638, 11.4370],
+        [47.2642, 11.4372],
+        [47.2647, 11.4420],
+        [47.2662, 11.4452],
+        [47.2680, 11.4472],
+        [47.2671, 11.4513],
+        [47.2624, 11.4510],
+        [47.2612, 11.4386],
+        [47.2574, 11.4307],
+        [47.2555, 11.4246],
+        [47.2541, 11.4172],
+        [47.2516, 11.4021],
+        [47.2491, 11.4025],
+        [47.2473, 11.3949],
+        [47.2522, 11.3917],
+        [47.2533, 11.3888],
+        [47.2528, 11.3842],
+        [47.2537, 11.3730],
+        [47.2570, 11.3767],
+        [47.2581, 11.3752],
+        [47.2644, 11.3725],
+        [47.2662, 11.3726],
+        [47.2669, 11.3733],
+        [47.2678, 11.3730],
+        [47.2682, 11.3721],
+        [47.2691, 11.3714],
+        [47.2702, 11.3700],
+        [47.2721, 11.3697],
+        [47.2735, 11.3702],
+        [47.2813, 11.3858],
+        [47.2805, 11.3926],
+        [47.2805, 11.3975],
+        [47.2816, 11.4004],
+        [47.2794, 11.4015], 
+        [47.2774, 11.3984],
+        [47.2782, 11.3970],
+        [47.2781, 11.3962],
+        [47.2778, 11.3960],
+        [47.2774, 11.3953],
+        [47.2769, 11.3947],
+        [47.2764, 11.3940],
+        [47.2755, 11.3930],
+        [47.2760, 11.3935],
+        [47.2758, 11.3934],
+        [47.2755, 11.3930],
+        [47.2753, 11.3927],
+        [47.2751, 11.3919],
+        [47.2749, 11.3918],
+        [47.2746, 11.3919],
+        [47.2740, 11.3918],
+        [47.2739, 11.3916],
+        [47.2734, 11.3906],
+        [47.2729, 11.3900],  
+        [47.2727, 11.3908],
+        [47.2715, 11.3898],
+        [47.2700, 11.3883],
+        [47.2699, 11.3885],
+        [47.2698, 11.3882],
+        [47.2697, 11.3879],
+        [47.2700, 11.3876],
+        [47.2696, 11.3866],
+        [47.2694, 11.3866],
+        [47.2688, 11.3871],
+        [47.2684, 11.3860],
+        [47.2677, 11.3848],
+        [47.2673, 11.3855],
+        [47.2672, 11.3855],
+        [47.2662, 11.3861],
+        [47.2640, 11.3830],
+        [47.2617, 11.3811]
+      ], {color: "orange", fillColor: "#ffeb0a", fillOpacity: 0.3});
+      
+      //Adding Zones in prefered order, to ensure correct coloring of borders
+      zone_c.addTo(map);
+      zone_a.addTo(map);
+      zone_b_1.addTo(map);
+      zone_b_2.addTo(map);
+      rone_c.bindTooltip("Zone C",{permanent: true, direction:"center"});
+    </script>
+      <div class="legend"><div class="square green"></div><span>Zone A</span><div class="square blue"></div><span>Zone B</span><div class="square orange"></div><span>Zone C</span></div>
      <p>
-        Zone A: € 10,-<br>
-        Zone B: € 25,-<br>
-        Zone C: € 40,-<br>
        <br>
        <b>Zone A</b><br>
        Innsbruck: Arzl, Olympisches Dorf, Mühlau<sup>1</sup> / Rum, Neu-Rum, Thaur<br>
-        Erstmalige Anfahrt innerhalb Zone A kostenlos!<br>
+        Anfahrtskosten: € 10,- – Erstmalige Anfahrt kostenlos!<br>
        <b>Zone B</b><br>
        Innsbruck: Saggen, Mariahilf-St. Nikolaus, Dreiheiligen, Innenstadt, Reichenau / Hall in Tirol, Absam<br>
+        Anfahrtkosten: € 25,-<br>
        <b>Zone C</b><br>
        Innsbruck: Hötting-Mitte<sup>1</sup>, Pradl, Wilten<sup>2</sup><br>
+        Anfahrtkosten: € 40,-<br>
        <br>
        <sup>1</sup> Ausgenommen Hungerburg<br>
        <sup>2</sup> Ausgenommen Mentlberg und Sieglanger<br>
Author	SHA1	Message	Date
lukas	69e637ffb7	Update 'static/styles.css'	2023-02-22 11:14:05 +01:00
lukas	bc81755bae	Update 'templates/_base.html' Added leaflet script	2023-02-22 11:11:52 +01:00
lukas	76cbee4708	Update 'templates/bedingungen.html' Added leafletmap, changed formating	2023-02-22 11:10:56 +01:00