Merge branch 'master' of git.fsmpi.rwth-aachen.de:julianundandyfrickelnkram/videoagwebsite

importer.py

@@ -80,9 +80,10 @@ def import_from(source=None, id=None):
 					e['time'] = datetime.strptime("%s %s"%(k,j['start']) ,fmt)
 					e['duration'] = int((datetime.strptime("%s %s"%(k,j['end']) ,fmt) - e['time']).seconds/60)
 					e['place'] = query("SELECT name FROM places WHERE (campus_name = ?) OR ((NOT campus_name) AND name = ?)",j['place'],j['place'])[0]['name'];
-					e['exists'] = query("SELECT count(id) as c from lectures WHERE (time = ?) and (duration = ?) and (place = ?) and (course_id = ?)",e['time'],e['duration'],e['place'],id)[0]['c'] > 0
+					e['title'] = i['type']
+					e['exists'] = len(query("SELECT id from lectures WHERE (time = ?) and (duration = ?) and (place = ?) and (course_id = ?)",e['time'],e['duration'],e['place'],id)) > 0
 					events.append(e)
-			# it is pared.
+			# it is parsed.
 
 
 
@@ -102,7 +103,7 @@ def import_from(source=None, id=None):
 
 	for i in lectures:
 		i['hascampusmapping'] = False
-		for j in uniqueevents:
+		for j in events:
 			i['hascampusmapping'] = (i['place'] == j['place']) and (i['time'] == j['time']) and (i['duration'] == j['duration'])
 			if i['hascampusmapping']:
 				break

server.py

@@ -5,11 +5,8 @@ from datetime import date, timedelta, datetime, time, MINYEAR
 import threading
 import os
 import hashlib
-import locale
 import random
 
-locale.setlocale(locale.LC_ALL, 'de_DE.UTF-8')
-
 app = Flask(__name__)
 
 app.jinja_env.trim_blocks = True
@@ -112,7 +109,7 @@ def human_semester(s, long=False):
 
 @app.template_filter(name='date')
 def human_date(d):
-	return d.strftime('%x')
+	return d.strftime('%d.%m.%Y')
 
 @app.template_filter()
 def rfc3339(d):

templates/base.html

@@ -7,6 +7,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<script src="{{url_for('static', filename='jquery.js')}}"></script>
 		<link rel="stylesheet" type="text/css" href="{{url_for('static', filename='style.css')}}">
+		<link rel="stylesheet" href="{{url_for('static', filename='font-awesome/css/font-awesome.min.css')}}">
 		<link rel="icon" type="image/png" href="{{url_for('static', filename='favicon.png')}}">
 		<meta http-equiv="content-language" content="de-DE">
 		<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">

templates/course.html

@@ -4,6 +4,7 @@
 <div class="row">
 	<div class="col-xs-12 dropdown" style="margin-bottom: 10px;">
 		<span class="pull-right">
+			 <a class="fa fa-rss-square pull-right btn btn-default" aria-hidden="true" href="{{url_for('feed_courses')}}"></a>
 			{% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="{{ url_for('newcourse', ref=request.url) }}">Neue Veranstaltung</a> {% endif %}
 		
 		<button class="btn btn-primary dropdown-toggle pull-right" type="button" data-toggle="dropdown">Gruppierung

templates/course_id.html

@@ -31,7 +31,7 @@
 </div>
 <div class="panel panel-default">
 	<div class="panel-heading">
-		<h1 class="panel-title">Videos{% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="{{ url_for('newlecture', courseid=course.id, ref=request.url) }}">Neuer Termin</a><a class="btn btn-default" style="margin-right: 5px;" href="{{url_for('import_from', id=course['id'])}}">Campus Import</a>{% endif %}</h1>
+		<h1 class="panel-title">Videos{% if ismod() %} <a class="btn btn-default" style="margin-right: 5px;" href="{{ url_for('newlecture', courseid=course.id, ref=request.url) }}">Neuer Termin</a><a class="btn btn-default" style="margin-right: 5px;" href="{{url_for('import_from', id=course['id'])}}">Campus Import</a>{% endif %} <a class="fa fa-rss-square pull-right" aria-hidden="true" href="{{url_for('feed', courseid=course.id)}}"></a> </h1>
 	</div>
 	<ul class="list-group lectureslist">
 		{% for l in lectures %}

templates/import_campus.html

@@ -62,6 +62,9 @@
 		<ul class="list-group-item">
 			{% for i in events|sort(attribute='time') %}
 				<li class="list-group-item row">
+					<span class="col-xs-12">
+						{{i|pprint}}
+					</span>
 					<span class="col-xs-3">
 						Time: {{i.time}}
 					</span>

templates/index.html

@@ -31,7 +31,7 @@
 	<div class="col-md-6">
 		<div class="panel panel-default">
 			<div class="panel-heading">
-				<h1 class="panel-title">Neueste Videos</h1">
+				<h1 class="panel-title">Neueste Videos <a class="fa fa-rss-square pull-right" aria-hidden="true" href="{{url_for('feed')}}"></a></h1">
 			</div>
 			<ul class="list-group videopreview">
 				{% for i in latestvideos %}