From c3932bc91cd5cb266c1f9e45ca061a38cab1ae61 Mon Sep 17 00:00:00 2001
From: RoopeLehtonen <rosale@utu.fi>
Date: Mon, 26 Feb 2018 21:46:48 +0200
Subject: [PATCH] Changed AccuWeather for Forecast7.com widget. Link disabling
not working properly yet.
---
templates/foli/index.html | 20 +++----
templates/info.html | 108 +++++++++++++++++++++++++++-----------
2 files changed, 86 insertions(+), 42 deletions(-)
diff --git a/templates/foli/index.html b/templates/foli/index.html
index 795d065..2fed184 100644
--- a/templates/foli/index.html
+++ b/templates/foli/index.html
@@ -11,7 +11,7 @@
<h1>Föli - Turun seudun joukkoliikenne</h1>
<h2>Hinnat</h2>
- <div class="card foli-card" style="margin-bottom: 20px; margin-top: 20px;">
+ <div class="card foli-card box-shadow" style="margin-bottom: 20px; margin-top: 20px;">
<div class="card-body">
<p style="margin: 0;">
Bussissa voit ostaa kertalipun tai ladata matkakortin käteisellä. Samalla lipulla tai matkakortilla
@@ -21,7 +21,7 @@
</div>
<div class="card-columns">
<!-- Single ticket prices -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Kertaliput</h3>
</div>
@@ -57,7 +57,7 @@
</table>
</div>
<!-- Foli card prices -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Arvokortit</h3>
</div>
@@ -148,7 +148,7 @@
</div>
</div>
<!-- Foli season pass prices -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Kausikortit</h3>
</div>
@@ -270,7 +270,7 @@
</table>
</div>
<!-- Foli double card prices -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Tuplakortit</h3>
</div>
@@ -308,7 +308,7 @@
</table>
</div>
<!-- Tourist cards -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Matkailijakortit</h3>
</div>
@@ -345,7 +345,7 @@
</table>
</div>
<!-- Mobile tickets -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Mobiililippu</h3>
</div>
@@ -358,7 +358,7 @@
</div>
</div>
<!-- Sale and service locations -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Myynti- ja palvelupisteet</h3>
</div>
@@ -390,7 +390,7 @@
</div>
</div>
<!-- Foli card top-up locations -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-header">
<h3 class="card-title">Latauspisteet</h3>
</div>
@@ -403,7 +403,7 @@
</div>
</div>
<!-- Additional information -->
- <div class="card foli-card">
+ <div class="card foli-card box-shadow">
<div class="card-body">
Kortin lunastusmaksu 5,00 € (sis. alv 24 %)<br />
Matkalippujen hinnat sis. alv 10 %
diff --git a/templates/info.html b/templates/info.html
index bbf3062..74db11a 100644
--- a/templates/info.html
+++ b/templates/info.html
@@ -8,38 +8,82 @@
{% block content %}
<div class="container">
- <div class="row">
- <div class="col-md-6">
- <div class="card info-card">
- <a class="twitter-timeline" data-height="600" data-dnt="true" data-theme="light" href="https://twitter.com/Turkukaupunki?ref_src=twsrc%5Etfw">Tweets by Turkukaupunki</a>
- <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
- </div>
- </div>
- <div class="col-md-6">
- <div class="card info-card">
- <div class="card-header">
- <h3 class="card-title">Visit Turku -uutiset</h3>
- </div>
- <script type="text/javascript" src="http://output92.rssinclude.com/output?type=js&id=1172169&hash=c1c032487ad85904644bb22308686454"></script>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-6">
- <div class="card info-card" style="overflow: auto;">
- <div class="card-header">
- <h3 class="card-title">AccuWeather - sää</h3>
- </div>
- <a href="https://www.accuweather.com/en/fi/turku/134768/weather-forecast/134768" class="aw-widget-legal">
- </a><div id="awtd1519238716374" class="aw-widget-36hour" data-locationkey="134768" data-unit="c" data-language="fi" data-useip="false" data-uid="awtd1519238716374" data-editlocation="false"></div>
- <script type="text/javascript" src="https://oap.accuweather.com/launch.js"></script>
- </div>
- </div>
- <div class="col-md-6">
- <!-- Empty spot for another card. -->
- </div>
- </div>
+ <div class="row">
+ <div class="col-12">
+ <!-- Automatic height overrides the 600px height from stylesheet.css -->
+ <div class="card info-card box-shadow" style="height: auto;">
+ <div class="card-header">
+ <h3 class="card-title">Forecast7.com -sää</h3>
+ </div>
+ <div id="forecast7">
+ <a class="weatherwidget-io" href="https://forecast7.com/en/60d4522d27/turku/" data-label_1="TURKU" data-label_2="Sää" data-theme="original">TURKU Sää</a>
+ <script>
+ !function (d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (!d.getElementById(id)) { js = d.createElement(s); js.id = id; js.src = 'https://weatherwidget.io/js/widget.min.js'; fjs.parentNode.insertBefore(js, fjs); } }(document, 'script', 'weatherwidget-io-js');
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6">
+ <div class="card info-card box-shadow">
+ <div id="twitter">
+ <a class="twitter-timeline" data-height="600" data-dnt="true" data-theme="light" href="https://twitter.com/Turkukaupunki?ref_src=twsrc%5Etfw">Tweets by Turkukaupunki</a>
+ <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <div class="card info-card box-shadow">
+ <div class="card-header">
+ <h3 class="card-title">Visit Turku -uutiset</h3>
+ </div>
+ <div id="visitTurku">
+ <script type="text/javascript" src="http://output92.rssinclude.com/output?type=js&id=1172169&hash=c1c032487ad85904644bb22308686454"></script>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
{% endblock content %}
+
+{% block scripts %}
+{{- super() }}
+
+<script>
+
+ $(document).ready(function () {
+ console.log("Document ready.");
+
+ $('#visitTurku').disableExternalLinks(); //Working
+ $('#forecast7').disableExternalLinks(); //Not working
+ $('#twitter').disableExternalLinks(); //Not working
+
+ // First, load the widgets.js file asynchronously
+ window.twttr = (function (d, s, id) {
+ console.log("window.twttr");
+ var js, fjs = d.getElementsByTagName(s)[0],
+ t = window.twttr || {};
+ if (d.getElementById(id)) return;
+ js = d.createElement(s);
+ js.id = id;
+ js.src = "https://platform.twitter.com/widgets.js";
+ fjs.parentNode.insertBefore(js, fjs);
+
+ t._e = [];
+ t.ready = function (f) {
+ t._e.push(f);
+ };
+
+ return t;
+ }(document, "script", "twitter-wjs"));
+
+ twttr.events.ready(function (twttr) {
+ console.log("twttr.events.ready");
+ twttr.events.bind('loaded', function () { $('#twitter').disableExternalLinks(); })
+ });
+ });
+</script>
+
+{% endblock scripts %}
\ No newline at end of file
--
GitLab