Merge remote-tracking branch 'origin/master'

chaosagent · chaosagent · commit c5972d2e31f2 · 2016-06-15T19:56:53.000-07:00
diff --git a/static/js/timeline.js b/static/js/timeline.js
@@ -85,7 +85,7 @@ $(document).ready(function () {
     stopTime = startTime + 30 * 24 * 60 * 60 * 1000;
 
     $.get("/events/list/json", function (data) {
-        data = JSON.parse(data).filter(function(item) { return item.approved == true; });
+        data = JSON.parse(data).filter(function(item) { return item.approved == true && item.endTime > now; });
 
         var daysBetween = 1;
         var time = new Date(startTime);
@@ -111,7 +111,8 @@ $(document).ready(function () {
             var ctfs = [];
             lane.map(function (ctf) {
                 ctfs.push(renderCTF(ctf));
-                $("#upcoming_ctfs").append("<tr><td><a href='/events/" + ctf.id + "'>" + ctf.name + "</a></td><td><time class='timeago' datetime='" + ctf.startTimeFormat + "'>" + ctf.startTimeFormat + "</time></td></tr>");
+                var running = now > ctf.startTime && now < ctf.endTime;
+                $("#upcoming_ctfs").append("<tr><td><a href='/events/" + ctf.id + "'>" + ctf.name + "</a>" + (running ? " <div class='label label-info'>RUNNING</div>" : "") + "</td><td><time class='timeago' datetime='" + ctf.startTimeFormat + "'>" + ctf.startTimeFormat + "</time></td></tr>");
             });
             $("#ctf_schedule .dragscroll").append("<div class='ctfline'>" + ctfs.join("") + "</div>");
         });
diff --git a/templates/events/list.html b/templates/events/list.html
@@ -32,6 +32,7 @@
                 <th>Name</th>
                 <th>Description</th>
                 <th>Date</th>
+                <th>Duration</th>
                 <th>Website</th>
                 {% if enabled_actions %}
                     <th>Actions</th>
@@ -43,6 +44,7 @@
                         <td><a href="{{ url_for('events.events_detail', event_id=event.id) }}">{{ event.title }}</a></td>
                         <td>{{ event.description }}</td>
                         <td><time class="timeago" datetime="{{ event.start_time_format }}">{{ event.start_time_format }}</time></td>
+                        <td>{{ event.duration / 24 }} days</td>
                         <td><a href="{{ event.link }}" target="_blank">Website</a></td>
                         {% if enabled_actions %}
                             <td>
diff --git a/templates/layout.html b/templates/layout.html
@@ -2,8 +2,7 @@
 <html>
 <head>
     <title>{% block title %}{% endblock %} - CTF Calendar</title>
-    <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/yeti/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-yxFy3Tt84CcGRj9UI7RA25hoUMpUPoFzcdPtK3hBdNgEGnh9FdKgMVM+lbAZTKN2" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/flatly/bootstrap.min.css" integrity="sha384-XYCjB+hFAjSbgf9yKUgbysEjaVLOXhCgATTEBpCqT1R3jvG5LGRAK5ZIyRbH5vpX" crossorigin="anonymous">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet"
           integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
     <link rel="stylesheet" href="{{ url_for('static', filename='/css/calendar.css') }}"/>
diff --git a/views/events.py b/views/events.py
@@ -1,4 +1,5 @@
 import json
+import time
 
 from flask import abort, Blueprint, redirect, render_template, url_for, flash
 from flask_login import current_user, login_required
@@ -98,11 +99,11 @@ def events_detail(event_id):
 def events_approve(event_id):
     event = Event.query.get_or_404(event_id)
     if event.approved:
-        flash('Event %d already approved!' % event_id)
+        flash('\'%s\' already approved!' % event.title)
     else:
         event.approved = True
         db.session.commit()
-        flash('Event %d approved!' % event_id)
+        flash('\'%s\' approved!' % event.title)
     return redirect(url_for('.events_unapproved'))
 
 
