template: fix timer.js to use counter down model

Kátia Nakamura · Kátia Nakamura · commit 076f3e85473b · 2018-05-06T22:27:19.000+02:00
diff --git a/pyconbalkan/core/static/css/style.css b/pyconbalkan/core/static/css/style.css
@@ -243,4 +243,20 @@ ul.countdown li div {
 
 #attend {
     width: auto;
+}
+
+.blue {
+    font-weight: 900;
+    color: #53A8DC;
+}
+
+.yellow {
+    font-weight: 900;
+    color: #F9D768;
+}
+
+.white {
+    color: #FFFFFF;
+    font-size: 32px;
+    font-weight: bold;
 }
diff --git a/pyconbalkan/core/static/js/timer.js b/pyconbalkan/core/static/js/timer.js
@@ -1,6 +1,3 @@
-// Set the date we're counting down to
-var countDownDate = new Date("May 15, 2018 00:00:01").getTime();
-
 // Update the count down every 1 second
 var x = setInterval(function() {
 
diff --git a/pyconbalkan/core/templates/home.html b/pyconbalkan/core/templates/home.html
@@ -4,7 +4,7 @@
 <!--[if IE 9]> <html lang="en" class="ie9"> <![endif]-->
 <!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->
 <head>
-    <title>PyCon Balkan 2018</title>
+    <title>{{ conference.event }} {{ conference.name }} {{ conference.year }}</title>
     <!-- Meta -->
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -20,8 +20,9 @@
     <link rel="stylesheet" href="{% static 'css/style.css' %}">
 
     <!-- Timer JS -->
+    <!-- Set the date we're counting down to -->
+    <script type="text/javascript"> var countDownDate = parseInt("{{ count_down.count_down|date:"U" }}".concat("000"));</script>
     <script src="{% static 'js/timer.js' %}" type="text/javascript"></script>
-    <script src="{% static 'js/index.js' %}" type="text/javascript"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -30,28 +31,6 @@
     <![endif]-->
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,900"
           rel="stylesheet">
-    <style>
-        body {
-            font-family: Montserrat, sans-serif;
-        }
-        .blue {
-            font-weight: 900;
-            color: #53A8DC;
-        }
-        .yellow {
-            font-weight: 900;
-            color: #F9D768;
-        }
-        .black {
-            font-size: 48px;
-            font-weight: bold;
-        }
-        .white {
-            color: #FFFFFF;
-            font-size: 36px;
-            font-weight: bold;
-        }
-    </style>
 </head>
 
 <body>
@@ -62,9 +41,10 @@
     <div class="col-md-11 offset-0">
         <nav class="navbar navbar-light navbar-expand-md bg-faded justify-content-center">
             <div class="navbar navbar-header mr-auto">
-                <a class="navbar-brand" href="#"><img src="{% static 'img/logo.jpg' %}"></a>
+                <a class="navbar-brand" href="/#"><img src="{% static 'img/logo.jpg' %}"></a>
             </div>
             <ul class="nav navbar-nav ml-auto w-100 justify-content-end mb-5 pb-3">
+                <li><a class="btn btn-light btn-sm round" href="/#" role="button">Home</a></li>
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">News</a></li>#}
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">CFP</a></li>#}
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">Sponsoring</a></li>#}
@@ -75,6 +55,7 @@
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">FAQ</a></li>#}
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">About</a></li>#}
 {#                <li><a class="btn btn-light btn-sm round" href="#" role="button">Contact</a></li>#}
+                <li><a class="btn btn-light btn-sm round" href="/organizers" role="button">Organizers</a></li>
                 <li><a class="btn btn-light btn-sm round" href="/coc" role="button">CoC</a></li>
             </ul>
         </nav>
