Update dates for 2016. Remove sensor option for maps - was throwing a warning.

static/js/markerclusterer.js

@@ -1,11 +1,11 @@
 // ==ClosureCompiler==
 // @compilation_level ADVANCED_OPTIMIZATIONS
-// @externs_url http://closure-compiler.googlecode.com/svn/trunk/contrib/externs/maps/google_maps_api_v3_3.js
+// @externs_url https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/maps/google_maps_api_v3.js
 // ==/ClosureCompiler==
 
 /**
  * @name MarkerClusterer for Google Maps v3
- * @version version 1.0.1
+ * @version version 1.0
  * @author Luke Mahe
  * @fileoverview
  * The library creates and manages per-zoom-level clusters for large amounts of
@@ -17,6 +17,9 @@
  */
 
 /**
+ * @license
+ * Copyright 2010 Google Inc. All Rights Reserved.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -43,7 +46,7 @@
  *                cluster.
  *     'zoomOnClick': (boolean) Whether the default behaviour of clicking on a
  *                    cluster is to zoom into it.
- *     'averageCenter': (boolean) Wether the center of each cluster should be
+ *     'averageCenter': (boolean) Whether the center of each cluster should be
  *                      the average of all markers in the cluster.
  *     'minimumClusterSize': (number) The minimum number of markers to be in a
  *                           cluster before the markers are hidden and a count
@@ -56,6 +59,7 @@
  *       'textColor': (string) The text color.
  *       'textSize': (number) The text size.
  *       'backgroundPosition': (string) The position of the backgound x, y.
+ *       'iconAnchor': (Array) The anchor position of the icon x, y.
  * @constructor
  * @extends google.maps.OverlayView
  */
@@ -161,12 +165,7 @@ function MarkerClusterer(map, opt_markers, opt_options) {
   // Add the map event listeners
   var that = this;
   google.maps.event.addListener(this.map_, 'zoom_changed', function() {
-    // Determines map type and prevent illegal zoom levels
     var zoom = that.map_.getZoom();
-    var minZoom = that.map_.minZoom || 0;
-    var maxZoom = Math.min(that.map_.maxZoom || 100,
-                         that.map_.mapTypes[that.map_.getMapTypeId()].maxZoom);
-    zoom = Math.min(Math.max(zoom,minZoom),maxZoom);
 
     if (that.prevZoom_ != zoom) {
       that.prevZoom_ = zoom;
@@ -179,7 +178,7 @@ function MarkerClusterer(map, opt_markers, opt_options) {
   });
 
   // Finally, add the markers
-  if (opt_markers && (opt_markers.length || Object.keys(opt_markers).length)) {
+  if (opt_markers && opt_markers.length) {
     this.addMarkers(opt_markers, false);
   }
 }
@@ -191,9 +190,7 @@ function MarkerClusterer(map, opt_markers, opt_options) {
  * @type {string}
  * @private
  */
-MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ =
-    'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/' +
-    'images/m';
+MarkerClusterer.prototype.MARKER_CLUSTER_IMAGE_PATH_ = '/static/img/m';
 
 
 /**
@@ -404,14 +401,8 @@ MarkerClusterer.prototype.getCalculator = function() {
  * @param {boolean=} opt_nodraw Whether to redraw the clusters.
  */
 MarkerClusterer.prototype.addMarkers = function(markers, opt_nodraw) {
-  if (markers.length) {
-    for (var i = 0, marker; marker = markers[i]; i++) {
-      this.pushMarkerTo_(marker);
-    }
-  } else if (Object.keys(markers).length) {
-    for (var marker in markers) {
-      this.pushMarkerTo_(markers[marker]);
-    }
+  for (var i = 0, marker; marker = markers[i]; i++) {
+    this.pushMarkerTo_(marker);
   }
   if (!opt_nodraw) {
     this.redraw();
@@ -1052,12 +1043,14 @@ function ClusterIcon(cluster, styles, opt_padding) {
 
 /**
  * Triggers the clusterclick event and zoom's if the option is set.
+ *
+ * @param {google.maps.MouseEvent} event The event to propagate
  */
-ClusterIcon.prototype.triggerClusterClick = function() {
+ClusterIcon.prototype.triggerClusterClick = function(event) {
   var markerClusterer = this.cluster_.getMarkerClusterer();
 
   // Trigger the clusterclick event.
-  google.maps.event.trigger(markerClusterer, 'clusterclick', this.cluster_);
+  google.maps.event.trigger(markerClusterer, 'clusterclick', this.cluster_, event);
 
   if (markerClusterer.isZoomOnClick()) {
     // Zoom into the cluster.
@@ -1082,8 +1075,18 @@ ClusterIcon.prototype.onAdd = function() {
   panes.overlayMouseTarget.appendChild(this.div_);
 
   var that = this;
-  google.maps.event.addDomListener(this.div_, 'click', function() {
-    that.triggerClusterClick();
+  var isDragging = false;
+  google.maps.event.addDomListener(this.div_, 'click', function(event) {
+    // Only perform click when not preceded by a drag
+    if (!isDragging) {
+      that.triggerClusterClick(event);
+    }
+  });
+  google.maps.event.addDomListener(this.div_, 'mousedown', function() {
+    isDragging = false;
+  });
+  google.maps.event.addDomListener(this.div_, 'mousemove', function() {
+    isDragging = true;
   });
 };
 
@@ -1097,8 +1100,14 @@ ClusterIcon.prototype.onAdd = function() {
  */
 ClusterIcon.prototype.getPosFromLatLng_ = function(latlng) {
   var pos = this.getProjection().fromLatLngToDivPixel(latlng);
-  pos.x -= parseInt(this.width_ / 2, 10);
-  pos.y -= parseInt(this.height_ / 2, 10);
+
+  if (typeof this.iconAnchor_ === 'object' && this.iconAnchor_.length === 2) {
+    pos.x -= this.iconAnchor_[0];
+    pos.y -= this.iconAnchor_[1];
+  } else {
+    pos.x -= parseInt(this.width_ / 2, 10);
+    pos.y -= parseInt(this.height_ / 2, 10);
+  }
   return pos;
 };
 
@@ -1194,6 +1203,7 @@ ClusterIcon.prototype.useStyle = function() {
   this.anchor_ = style['anchor'];
   this.textSize_ = style['textSize'];
   this.backgroundPosition_ = style['backgroundPosition'];
+  this.iconAnchor_ = style['iconAnchor'];
 };
 
 
@@ -1224,6 +1234,10 @@ ClusterIcon.prototype.createCss = function(pos) {
         this.anchor_[0] < this.height_) {
       style.push('height:' + (this.height_ - this.anchor_[0]) +
           'px; padding-top:' + this.anchor_[0] + 'px;');
+    } else if (typeof this.anchor_[0] === 'number' && this.anchor_[0] < 0 &&
+        -this.anchor_[0] < this.height_) {
+      style.push('height:' + this.height_ + 'px; line-height:' + (this.height_ + this.anchor_[0]) +
+          'px;');
     } else {
       style.push('height:' + this.height_ + 'px; line-height:' + this.height_ +
           'px;');
@@ -1299,12 +1313,3 @@ Cluster.prototype['getMarkers'] = Cluster.prototype.getMarkers;
 ClusterIcon.prototype['onAdd'] = ClusterIcon.prototype.onAdd;
 ClusterIcon.prototype['draw'] = ClusterIcon.prototype.draw;
 ClusterIcon.prototype['onRemove'] = ClusterIcon.prototype.onRemove;
-
-Object.keys = Object.keys || function(o) {  
-    var result = [];  
-    for(var name in o) {  
-        if (o.hasOwnProperty(name))  
-          result.push(name);  
-    }  
-    return result;  
-};

web/templates/base.html

@@ -4,110 +4,110 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="en" class="no-js" >
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-
-	<!-- Favicon -->
-	<link rel="shortcut icon" href="{% static "img/favicon.ico" %}" type="image/x-icon">
-	<link rel="icon" href="{% static "img/favicon.ico" %}" type="image/x-icon">
-
-	<!-- TODO: check this -->
-	<link rel="stylesheet" type="text/css" href="http://assets.cookieconsent.silktide.com/current/style.min.css" />
-
-	<!-- Custom font -->
-	<link href="http://fonts.googleapis.com/css?family=Lato:300,400,400italic,600,700|Raleway:300,400,500,600,700|Crete+Round:400italic" rel="stylesheet" type="text/css" />
-
-	<!-- Stylesheets -->
-	{% compress css %}
-		<link href="{% static 'lib/bootstrap-sass/stylesheets/bootstrap.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
-		<link href="{% static 'scss/bootstrap-social.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
-		<link href="{% static 'scss/style.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
-		<link href="{% static 'css/cookiecuttr.css' %}" media="screen" rel="stylesheet" />
-		{% block custom_css %}{% endblock %}
-	{% endcompress %}
-
-	<!-- Theme stylesheets -->
-	<link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/style.css" type="text/css" />
-	<link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/dark.css" type="text/css" />
-	<link rel="stylesheet" href="{% static 'css/font-icons.css' %}" type="text/css" />
-	<link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/responsive.css" type="text/css" />
-	<link rel="stylesheet" href="{{ settings.THEME_ASSETS_BASE_URL }}stylesheets/customizations.css" type="text/css" />
-	<!--[if lt IE 9]>
-		<script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
-	<![endif]-->
-	<link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/colors.css" type="text/css" />
-
-	<!-- TODO: remove font-awesome? -->
-	<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
-    
-    <link href="{% static 'css/custom.css' %}" media="screen" rel="stylesheet" />
-
-	<!-- Early scripts; the rest are included at the end -->
-	<script type="text/javascript" src="{% static 'js/modernizr.271.min.js' %}"></script>
-
-	<!-- Title, keywords, description -->
-	<meta name="description" content="October 10 - 18, 2015: a week to celebrate coding in Europe, encouraging citizens to learn more about technology, and connecting communities and organizations who can help you learn coding." />
-	<meta property="og:image" content="/img/codeweekEU-logo-600.png" />
-	{% block social %}{% endblock %}
-	<title>Europe Code Week {% block title %}{% endblock title %}</title>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+
+  <!-- Favicon -->
+  <link rel="shortcut icon" href="{% static "img/favicon.ico" %}" type="image/x-icon">
+  <link rel="icon" href="{% static "img/favicon.ico" %}" type="image/x-icon">
+
+  <!-- TODO: check this -->
+  <link rel="stylesheet" type="text/css" href="http://assets.cookieconsent.silktide.com/current/style.min.css" />
+
+  <!-- Custom font -->
+  <link href="http://fonts.googleapis.com/css?family=Lato:300,400,400italic,600,700|Raleway:300,400,500,600,700|Crete+Round:400italic" rel="stylesheet" type="text/css" />
+
+  <!-- Stylesheets -->
+  {% compress css %}
+    <link href="{% static 'lib/bootstrap-sass/stylesheets/bootstrap.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
+    <link href="{% static 'scss/bootstrap-social.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
+    <link href="{% static 'scss/style.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
+    <link href="{% static 'css/cookiecuttr.css' %}" media="screen" rel="stylesheet" />
+    {% block custom_css %}{% endblock %}
+  {% endcompress %}
+
+  <!-- Theme stylesheets -->
+  <link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/style.css" type="text/css" />
+  <link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/dark.css" type="text/css" />
+  <link rel="stylesheet" href="{% static 'css/font-icons.css' %}" type="text/css" />
+  <link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/responsive.css" type="text/css" />
+  <link rel="stylesheet" href="{{ settings.THEME_ASSETS_BASE_URL }}stylesheets/customizations.css" type="text/css" />
+  <!--[if lt IE 9]>
+    <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
+  <![endif]-->
+  <link rel="stylesheet" href="http://codeweekeu.s3.amazonaws.com/assets/stylesheets/colors.css" type="text/css" />
+
+  <!-- TODO: remove font-awesome? -->
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" rel="stylesheet">
+
+  <link href="{% static 'css/custom.css' %}" media="screen" rel="stylesheet" />
+
+  <!-- Early scripts; the rest are included at the end -->
+  <script type="text/javascript" src="{% static 'js/modernizr.271.min.js' %}"></script>
+
+  <!-- Title, keywords, description -->
+  <meta name="description" content="October 15 - 23, 2016: a week to celebrate coding in Europe, encouraging citizens to learn more about technology, and connecting communities and organizations who can help you learn coding." />
+  <meta property="og:image" content="/img/codeweekEU-logo-600.png" />
+  {% block social %}{% endblock %}
+  <title>Europe Code Week {% block title %}{% endblock title %}</title>
 </head>
 
 
 <body class="stretched no-transition">
 
-	<!-- Document Wrapper -->
-	<div id="wrapper" class="clearfix">
+  <!-- Document Wrapper -->
+  <div id="wrapper" class="clearfix">
 
-		{% block main_navigation %}
-			{% include 'layout/top_navigation.html' %}
-		{% endblock %}
+    {% block main_navigation %}
+      {% include 'layout/top_navigation.html' %}
+    {% endblock %}
 
-		{% block messages %}
-			{% include 'layout/messages.html' %}
-		{% endblock messages %}
+    {% block messages %}
+      {% include 'layout/messages.html' %}
+    {% endblock messages %}
 
-		{% block content %} {% endblock content %}
+    {% block content %} {% endblock content %}
 
-	</div>
+  </div>
 
-	{% include 'layout/footer.html' %}
+  {% include 'layout/footer.html' %}
 
-	<!-- Scripts -->
-	<script type="text/javascript" src="{{ settings.THEME_ASSETS_BASE_URL }}js/jquery.js"></script>
-	<script type="text/javascript" src="http://codeweekeu.s3.amazonaws.com/assets/js/plugins.js"></script>
+  <!-- Scripts -->
+  <script type="text/javascript" src="{{ settings.THEME_ASSETS_BASE_URL }}js/jquery.js"></script>
+  <script type="text/javascript" src="http://codeweekeu.s3.amazonaws.com/assets/js/plugins.js"></script>
     <script type="text/javascript" src="http://codeweekeu.s3.amazonaws.com/assets/js/functions.js"></script>
-	{% compress js %}
+  {% compress js %}
     <!-- joseihf: Dropdown doesn´t works
-		<script type="text/javascript" src="{% static 'lib/bootstrap-sass/javascripts/bootstrap/dropdown.js' %}"></script>
-		<script type="text/javascript" src="{% static 'lib/bootstrap-sass/javascripts/bootstrap/collapse.js' %}"></script>
+    <script type="text/javascript" src="{% static 'lib/bootstrap-sass/javascripts/bootstrap/dropdown.js' %}"></script>
+    <script type="text/javascript" src="{% static 'lib/bootstrap-sass/javascripts/bootstrap/collapse.js' %}"></script>
     -->
-		<script type="text/javascript" src="{% static 'js/jquery.cookie.js' %}"></script>
-		<script type="text/javascript" src="{% static 'js/jquery.cookiecuttr.js' %}"></script>
-		<script type="text/javascript" src="{% static 'js/base.js' %}"></script>
-		<script type="text/javascript">
-			Codeweek.Base.init();
-		</script>
-	{% endcompress %}
-
-	{% block custom_js %}{% endblock custom_js %}
-
-	<script type="text/javascript">
-		(function (i, s, o, g, r, a, m) {
-			i['GoogleAnalyticsObject'] = r;
-			i[r] = i[r] || function () {
-				(i[r].q = i[r].q || []).push(arguments)
-			}, i[r].l = 1 * new Date();
-			a = s.createElement(o),
-					m = s.getElementsByTagName(o)[0];
-			a.async = 1;
-			a.src = g;
-			m.parentNode.insertBefore(a, m)
-		})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-		ga('create', 'UA-49168926-1', 'codeweek.eu');
-		ga('require', 'displayfeatures');
-		ga('send', 'pageview');
-	</script>
-	<!-- End Scripts -->
+    <script type="text/javascript" src="{% static 'js/jquery.cookie.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/jquery.cookiecuttr.js' %}"></script>
+    <script type="text/javascript" src="{% static 'js/base.js' %}"></script>
+    <script type="text/javascript">
+      Codeweek.Base.init();
+    </script>
+  {% endcompress %}
+
+  {% block custom_js %}{% endblock custom_js %}
+
+  <script type="text/javascript">
+    (function (i, s, o, g, r, a, m) {
+      i['GoogleAnalyticsObject'] = r;
+      i[r] = i[r] || function () {
+        (i[r].q = i[r].q || []).push(arguments)
+      }, i[r].l = 1 * new Date();
+      a = s.createElement(o),
+          m = s.getElementsByTagName(o)[0];
+      a.async = 1;
+      a.src = g;
+      m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+    ga('create', 'UA-49168926-1', 'codeweek.eu');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
+  </script>
+  <!-- End Scripts -->
 </body>
 </html>