Merge c1612e8 into 5decb99

codeeu · Jun 29, 2016 · 8c346da · 8c346da
2 parents 5decb99 + c1612e8
commit 8c346da
Show file tree

Hide file tree

Showing 8 changed files with 843 additions and 847 deletions.
diff --git a/web/templates/base.html b/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>
diff --git a/web/templates/layout/all_events.html b/web/templates/layout/all_events.html
@@ -1,30 +1,30 @@
 {% load endless %}
 {% paginate 6 latest_events %}
 
-	{% for event in latest_events %}
-					<div class="col-sm-6 col-md-6 col-lg-4">
-						<div class="thumbnail">
-							<div class="title"><a href="{% url 'web.view_event' event.id event.slug %}">{{ event.title }}</a></div>
-							<a href="{% url 'web.view_event' event.id event.slug %}" class="img-link">
-								<img src="//maps.googleapis.com/maps/api/staticmap?markers={{ event.geoposition }}&zoom=9&size=390x80&sensor=false">
-							</a>
+  {% for event in latest_events %}
+          <div class="col-sm-6 col-md-6 col-lg-4">
+            <div class="thumbnail">
+              <div class="title"><a href="{% url 'web.view_event' event.id event.slug %}">{{ event.title }}</a></div>
+              <a href="{% url 'web.view_event' event.id event.slug %}" class="img-link">
+                <img src="//maps.googleapis.com/maps/api/staticmap?markers={{ event.geoposition }}&zoom=9&size=390x80">
+              </a>
 
-							<div class="caption">
-								<p>{{ event.description|truncatewords:20 }}</p>
+              <div class="caption">
+                <p>{{ event.description|truncatewords:20 }}</p>
 
 
-								<a href="{% url 'web.view_event' event.id event.slug %}"
-								   class="btn btn-primary btn-directional fa-arrow-right btn-sm"
-								   role="button">View</a>
+                <a href="{% url 'web.view_event' event.id event.slug %}"
+                   class="btn btn-primary btn-directional fa-arrow-right btn-sm"
+                   role="button">View</a>
 
-								<span class="countdown pull-right">
-									{% include 'layout/time_to_event.html' %}
-								</span>
+                <span class="countdown pull-right">
+                  {% include 'layout/time_to_event.html' %}
+                </span>
 
-							</div>
-						</div>
+              </div>
+            </div>
                       </div>
-	{% endfor %}
+  {% endfor %}
 
 <div class="endless_events">
     {% show_more "More Events" %}

diff --git a/web/templates/min.html b/web/templates/min.html
@@ -3,75 +3,75 @@
 <!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">
-
-	<!-- Stylesheets -->
-	{% compress css %}		
-		<link href="{% static 'scss/style.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
-		{% block custom_css %}{% endblock %}
-	{% endcompress %}
+  <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">
+
+  <!-- Stylesheets -->
+  {% compress css %}
+    <link href="{% static 'scss/style.scss' %}" media="screen" rel="stylesheet" type="text/x-scss" />
+    {% block custom_css %}{% endblock %}
+  {% endcompress %}
 <link rel="stylesheet" href="{% static 'css/font-icons.css' %}" type="text/css" />
 
-	<!--[if lt IE 9]>
-		<script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
-	<![endif]-->
+  <!--[if lt IE 9]>
+    <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script>
+  <![endif]-->
+
 
-
     <link href="{% static 'css/custom.css' %}" media="screen" rel="stylesheet" />
 
 
 
-	<!-- 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>
+  <!-- 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 content %} {% endblock content %}
+    {% block content %} {% endblock content %}
 
-	</div>
+  </div>
 
 
-	<!-- Scripts -->
-	<script type="text/javascript" src="{{ settings.THEME_ASSETS_BASE_URL }}js/jquery.js"></script>
-	{% compress js %}
+  <!-- Scripts -->
+  <script type="text/javascript" src="{{ settings.THEME_ASSETS_BASE_URL }}js/jquery.js"></script>
+  {% compress js %}
 
 
-	{% endcompress %}
+  {% endcompress %}
 
-	{% block custom_js %}{% endblock custom_js %}
+  {% 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">
+    (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>