mirror of
https://github.com/medialab-prado/datamad2017.git
synced 2024-12-26 04:31:22 +01:00
Merge pull request #66 from tasomaniac/fix/https-errors
HTTPS links are used when possible.
This commit is contained in:
Oleh Zasadnyy
commit
a1ae4ef4ac
5 changed files with 10 additions and 10 deletions
12
_config.yml
12
_config.yml
|
|
@ -14,7 +14,7 @@ title: "GDG DevFest Season 2014"
|
|||
email: "devfest@gdg.org.ua"
|
||||
description: "GDG DevFest is a set of events all around the world"
|
||||
baseurl: "/zeppelin"
|
||||
url: "http://gdg-x.github.io"
|
||||
url: "https://gdg-x.github.io"
|
||||
permalink: "/blog/:title"
|
||||
googleAnalyticsTrackingId: "UA-43643469-5"
|
||||
googleAnalyticsSiteUrl: "gdg-x.github.io"
|
||||
|
|
@ -36,7 +36,7 @@ socialImageSrcTwitter: "/img/seo/sharing-twitter.png"
|
|||
socialImageSrcFacebook: "/img/seo/sharing-facebook.png"
|
||||
|
||||
# Documents
|
||||
c4pUrl: "http://bit.ly/dfua-c4p"
|
||||
c4pUrl: "https://bit.ly/dfua-c4p"
|
||||
c4sponsorsUrl: "/assets/GDG_DevFest_Partnership.pdf"
|
||||
|
||||
|
||||
|
|
@ -50,9 +50,9 @@ navigationLinks:
|
|||
- {permalink: "/logistics/", text: "Logistics"}
|
||||
- {permalink: "/hackathon/", text: "Hackathon"}
|
||||
bottomNavigationLinks:
|
||||
- {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
rightNavigationButtons:
|
||||
- {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
|
||||
# Hero Block
|
||||
heroImage: "hero.jpg"
|
||||
|
|
@ -61,7 +61,7 @@ eventDate: "September - November, 2014"
|
|||
typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
|
||||
typeoutFallback: "Season"
|
||||
heroButtons:
|
||||
- {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
|
||||
- {permalink: "/#tickets", text: "Buy tickets"}
|
||||
|
||||
# About Block
|
||||
|
|
@ -127,7 +127,7 @@ partnersC4sponsorsButton: "Become a sponsor"
|
|||
# Subscribe Block
|
||||
subscribeImage: "subscribe.jpg"
|
||||
subscribeTitle: "Subscribe for updates"
|
||||
subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc"
|
||||
subscribeAction: "https://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc"
|
||||
subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!"
|
||||
|
||||
# Tickets Block
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
</li>
|
||||
</ul>
|
||||
<div class="clearfix"></div>
|
||||
<a href="http://maps.google.com/maps?ll={{ site.eventPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.eventStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.eventAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
||||
<a href="https://maps.google.com/maps?ll={{ site.eventPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.eventStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.eventAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
{% assign endTime = site.hackathonEndTime | split: "T" %}
|
||||
<time>{{ endTime[1] }}</time>
|
||||
</div>
|
||||
<a href="http://maps.google.com/maps?ll={{ site.hackathonPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.hackathonStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.hackathonAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
||||
<a href="https://maps.google.com/maps?ll={{ site.hackathonPlaceCoordinates | replace:' ',''}}&z=17&t=m&hl=en-US&gl=US&mapclient=embed&q={{ site.hackathonStreetAddress | replace:' ','%20' | replace:',','%2C'}}%2C%20{{ site.hackathonAddressLocality | replace:' ','%20' | replace:',','%2C'}}" class="view-on-map" target="_blank">{{ site.viewOnMap }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@
|
|||
|
||||
// Google maps static
|
||||
if (typeof staticGoogleMaps !== 'undefined') {
|
||||
$('#canvas-map').addClass('image-section').css('background-image','url(http://maps.googleapis.com/maps/api/staticmap?zoom=17¢er=' + mobileCenterMapCoordinates +'&size=' + $(window).width() + 'x700&scale=2&language=en&markers=icon:' + icon +'|'+ eventPlaceCoordinates +'&maptype=roadmap&style=visibility:on|lightness:40|gamma:1.1|weight:0.9&style=element:labels|visibility:off&style=feature:water|hue:0x0066ff&style=feature:road|visibility:on&style=feature:road|element:labels|saturation:-30)');
|
||||
$('#canvas-map').addClass('image-section').css('background-image','url(https://maps.googleapis.com/maps/api/staticmap?zoom=17¢er=' + mobileCenterMapCoordinates +'&size=' + $(window).width() + 'x700&scale=2&language=en&markers=icon:' + icon +'|'+ eventPlaceCoordinates +'&maptype=roadmap&style=visibility:on|lightness:40|gamma:1.1|weight:0.9&style=element:labels|visibility:off&style=feature:water|hue:0x0066ff&style=feature:road|visibility:on&style=feature:road|element:labels|saturation:-30)');
|
||||
}
|
||||
|
||||
//Google maps
|
||||
|
|
|
|||
2
js/scripts.min.js
vendored
2
js/scripts.min.js
vendored
|
|
@ -10,7 +10,7 @@ d;void 0===d;)d=b.data("slotDetail"),b=b.next();a(this).find(".slot-detail").htm
|
|||
a(".slider-next-item").click(function(){var b=a(this).closest("div"),d=b.find(".slider-current-item").next();d.length?(d.addClass("slider-current-item").removeClass("hidden"),b.find(".slider-current-item").first().removeClass("slider-current-item").addClass("hidden")):(b.find(".slider-item").first().addClass("slider-current-item").removeClass("hidden"),b.find(".slider-current-item").last().removeClass("slider-current-item").addClass("hidden"))});a(".modal").on("hidden.bs.modal",function(){var b=a(this).find("iframe");
|
||||
b.attr("src",b.attr("src"))});a(".slot").click(function(){location.hash=a(this).attr("id")});if("undefined"!==typeof twitterFeedUrl){var h=function(){var b=a("#tweets").find(".tweet"),d=0;a(b.get(0)).removeClass("hidden");setInterval(function(){var c=++d%b.length;a(b.get(c-1)).addClass("hidden");a(b.get(c)).removeClass("hidden")},5E3)};a.getJSON(twitterFeedUrl,function(b){a.each(b,function(b,c){var e;e=c.text.replace(/(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gim,'<a href="$1" target="_blank">$1</a>');
|
||||
e=e.replace(/(^|[^\/])(www\.[\S]+(\b|$))/gim,'$1<a href="http://$2" target="_blank">$2</a>');e=e.replace(/#(\S*)/g,'<a href="https://twitter.com/search?q=%23$1" target="_blank">#$1</a>');e=e.replace(/\B@([\w-]+)/gm,'<a href="https://twitter.com/$1" target="_blank">@$1</a>');e='<div class="tweet animated fadeInUp hidden"><p class="tweet-text">'+e+'</p><p class="tweet-meta">by <a href="https://twitter.com/'+c.user.screen_name+'" target="_blank">@'+c.user.screen_name+"</a></p></div>";a("#tweets").append(e)});
|
||||
h()})}});"undefined"!==typeof staticGoogleMaps&&a("#canvas-map").addClass("image-section").css("background-image","url(http://maps.googleapis.com/maps/api/staticmap?zoom=17¢er="+mobileCenterMapCoordinates+"&size="+a(window).width()+"x700&scale=2&language=en&markers=icon:"+icon+"|"+eventPlaceCoordinates+"&maptype=roadmap&style=visibility:on|lightness:40|gamma:1.1|weight:0.9&style=element:labels|visibility:off&style=feature:water|hue:0x0066ff&style=feature:road|visibility:on&style=feature:road|element:labels|saturation:-30)");
|
||||
h()})}});"undefined"!==typeof staticGoogleMaps&&a("#canvas-map").addClass("image-section").css("background-image","url(https://maps.googleapis.com/maps/api/staticmap?zoom=17¢er="+mobileCenterMapCoordinates+"&size="+a(window).width()+"x700&scale=2&language=en&markers=icon:"+icon+"|"+eventPlaceCoordinates+"&maptype=roadmap&style=visibility:on|lightness:40|gamma:1.1|weight:0.9&style=element:labels|visibility:off&style=feature:water|hue:0x0066ff&style=feature:road|visibility:on&style=feature:road|element:labels|saturation:-30)");
|
||||
if("undefined"!==typeof googleMaps){var c,q,n,r,p,h,l=[],x=new google.maps.DirectionsService;google.maps.event.addDomListener(window,"load",function(){function m(k,f){x.route({origin:k,destination:eventPlace,travelMode:google.maps.TravelMode[f]},function(d,e){if(e==google.maps.DirectionsStatus.OK){c.setMapTypeId("zoomed");n.setMap(c);n.setDirections(d);var g=d.routes[0].legs[0];b(g.start_location);b(g.end_location);a("#distance").text(g.distance.text);a("#estimateTime").text(g.duration.text);a("#mode-select").val(f);
|
||||
a("#mode").removeClass("hidden");g=a("#mode-icon use").attr("xlink:href");g=g.substring(0,g.indexOf("#")+1)+"icon-"+f.toLowerCase();a("#mode-icon use").attr("xlink:href",g)}else e!=google.maps.DirectionsStatus.OK&&"DRIVING"!=f?m(k,"DRIVING"):(g=p.getPath(),g.push(k),g.push(eventPlace),b(k),b(eventPlace),g=new google.maps.LatLngBounds,g.extend(k),g.extend(eventPlace),c.fitBounds(g),p.setMap(c),g=Math.round(google.maps.geometry.spherical.computeDistanceBetween(k,eventPlace)/1E3),a("#distance").text(g+
|
||||
" km"),a("#estimateTime").text(""),a("#find-flight").removeClass("hidden"),a("#mode").addClass("hidden"))});d();a("#find-way").addClass("location-active");e(k);a("#find-way h3").removeClass("fadeInUp").addClass("fadeOutDown")}function u(){navigator.geolocation&&navigator.geolocation.getCurrentPosition(function(a){h=new google.maps.LatLng(a.coords.latitude,a.coords.longitude);m(h,"TRANSIT")})}function b(a){a=new google.maps.Marker({position:a,map:c,icon:icon});l.push(a)}function d(){for(var a=0;a<
|
||||
|
|
|
|||
Loading…
Reference in a new issue