diff --git a/templates/info.html b/templates/info.html index 74db11a1405a6483a72c3f3510af2826ee7248b5..939fdef9bc755d404b405a9c6617ccef8f713908 100644 --- a/templates/info.html +++ b/templates/info.html @@ -8,8 +8,10 @@ {% block content %} <div class="container"> + <div class="row"> <div class="col-12"> + <!-- Forecast7.com --> <!-- Automatic height overrides the 600px height from stylesheet.css --> <div class="card info-card box-shadow" style="height: auto;"> <div class="card-header"> @@ -24,16 +26,38 @@ </div> </div> </div> + <div class="row"> <div class="col-md-6"> + <!-- Twitter feed --> <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> + <!--<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>--> + <script> + 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); + }; + console.log("window.twttr finished.") + return t; + }(document, "script", "twitter-wjs")); + </script> </div> </div> </div> <div class="col-md-6"> + <!-- Visit Turku news feed with rssinclude.com --> <div class="card info-card box-shadow"> <div class="card-header"> <h3 class="card-title">Visit Turku -uutiset</h3> @@ -59,29 +83,11 @@ $('#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(); }) + + twttr.ready(function (twttr) { + console.log("twttr.ready"); + //twttr.events.bind('loaded', function () { console.log("twttr loaded."); }); + twttr.events.bind('loaded', function () { $('#twitter').disableExternalLinks(); }); }); }); </script>