From 2ffe281452426dc0ee8a5b660f713aabe1bc1a2a Mon Sep 17 00:00:00 2001
From: Andreas Valder <andreasv@fsmpi.rwth-aachen.de>
Date: Tue, 9 Aug 2016 23:50:39 +0200
Subject: [PATCH] multible "tabs" working added a git ignore
---
.gitignore | 1 +
server.py | 8 ++++++
templates/faq.html | 65 +++++++++++++++++++++++++++++++++++++++++++
templates/header.html | 18 ++++++------
templates/videos.html | 6 ++++
5 files changed, 90 insertions(+), 8 deletions(-)
create mode 100644 .gitignore
create mode 100644 templates/faq.html
create mode 100644 templates/videos.html
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/server.py b/server.py
index 25cd235..70b7342 100755
--- a/server.py
+++ b/server.py
@@ -6,6 +6,14 @@ app = Flask(__name__)
def index():
return render_template('index.html', latestvideos=[{'talk':{'title':'talktitle','thumbnail':'https://videoag.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-Geophysical_models_IV.jpg','id':123,'comment':'comment','date':'date'},'event':{'title':'eventtitle'}},{'talk':{'title':'talktitle','thumbnail':'https://videoag.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-Geophysical_models_IV.jpg','id':123,'comment':'comment','date':'date'},'event':{'title':'eventtitle'}},{'talk':{'title':'talktitle','thumbnail':'https://videoag.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-Geophysical_models_IV.jpg','id':123,'comment':'comment','date':'date'},'event':{'title':'eventtitle'}},{'talk':{'title':'talktitle','thumbnail':'https://videoag.fsmpi.rwth-aachen.de/pub/thumbnails/16ss-hyp-160802-Geophysical_models_IV.jpg','id':123,'comment':'comment','date':'date'},'event':{'title':'eventtitle'}}])
+@app.route('/videos')
+def videos():
+ return render_template('videos.html', active_page='videos')
+
+@app.route('/faq')
+def faq():
+ return render_template('faq.html', active_page='faq')
+
if __name__ == '__main__':
app.debug = True
app.run()
diff --git a/templates/faq.html b/templates/faq.html
new file mode 100644
index 0000000..3e07b95
--- /dev/null
+++ b/templates/faq.html
@@ -0,0 +1,65 @@
+{% from 'macros.html' import preview %}
+{% extends "base.html" %}
+{% block content %}
+<div class="container">
+ <br />
+ <br />
+ <br />
+
+ <div class="alert alert-warning alert-dismissible" role="alert" id="kontakt">
+ Unter <a href="mailto:video@fsmpi.rwth-aachen.de">video@fsmpi.rwth-aachen.de</a> stehen wir für alle Fragen bereit.
+ </div>
+
+ <br />
+
+ <div class="panel-group" id="accordion">
+ <div class="faqHeader">Allgemein</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#speed">Der Download ist zu langsam.</a>
+ </h4>
+ </div>
+ <div id="speed" class="panel-collapse collapse in">
+ <div class="panel-body">
+ <p>Wir beschränken die Downloadgeschwindigkeit nicht! Eventuell hast du im Uninetz eine bessere Anbindung.</p>
+ <p>Falls du unbedingt einen <strong>Download-Manager</strong> benutzen willst/musst, stelle diesen bitte so ein, dass er maximal <strong>5 gleichzeitige Verbindungen</strong> (oder auch weniger) zu unserem Videoserver benutzt.</p>
+ <p>Unser Server hat keine (nein, absolut keine!) Bandbreitenbegrenzung, also bekommst du schon für einen einzigen Download die volle Geschwindigkeit und wirst selbst mit solchen Programmen keine schnelleren Downloads erfahren. Zu viele Verbindungen sorgen nur für exzessive Systemlast und damit langsamere Downloads für alle, dich eingeschlossen.</p>
+ </div>
+ </div>
+ </div>
+ <div class="faqHeader">Abspielprobleme</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#playbackfile">Ich kann ein heruntergeladenes Video nicht abspielen.</a>
+ </h4>
+ </div>
+ <div id="playbackfile" class="panel-collapse collapse">
+ <div class="panel-body">
+ <p>Ein beliebter Videoplayer ist VLC, denn er kann so ziemlich alle üblichen Audio- und Videoformate abspielen. VLC gibt es unter <a href="https://www.videolan.org">https://www.videolan.org</a> zum Download.</p>
+ </div>
+ </div>
+ </div>
+ <div class="faqHeader">Technisches</div>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#encoding">Wie encoded ihr eurere Videos?</a>
+ </h4>
+ </div>
+ <div id="encoding" class="panel-collapse collapse">
+ <div class="panel-body">
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<style>
+.faqHeader {
+ font-size: 27px;
+ margin: 20px;
+}
+</style>
+{% endblock %}
diff --git a/templates/header.html b/templates/header.html
index bc2d3dd..fe8abf8 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,3 +1,9 @@
+{% set navigation_bar = [
+('/', 'index', 'Home', 'home'),
+('/videos', 'videos', 'Videos', 'film'),
+('/faq#help', 'faq', 'Mitmachen', '')
+] -%}
+{% set active_page = active_page|default('index') -%}
<nav class="navbar navbar-default navbar-static-top">
<div class="container-fluid">
<div class="row">
@@ -27,15 +33,11 @@
<div class="row">
<div class="col-md-6">
<ul class="nav nav-pills">
- <li class="active">
- <a href="/"><span class="glyphicon glyphicon-home"></span> Home</a>
- </li>
- <li>
- <a href="/videos"><span class="glyphicon glyphicon-film"></span> Videos</a>
- </li>
- <li>
- <a href="/contribute">Mitmachen</a>
+ {% for href, id, caption, gly in navigation_bar %}
+ <li{% if id == active_page %} class="active"{% endif %}>
+ <a href="{{ href|e }}">{% if gly != '' %}<span class="glyphicon glyphicon-{{ gly }}"></span> {% endif %}{{ caption }}</a>
</li>
+ {% endfor %}
</ul>
</div>
<div class="col-xs-5">
diff --git a/templates/videos.html b/templates/videos.html
new file mode 100644
index 0000000..1d8ca65
--- /dev/null
+++ b/templates/videos.html
@@ -0,0 +1,6 @@
+{% from 'macros.html' import preview %}
+{% extends "base.html" %}
+{% block content %}
+<div class="container-fluid">
+</div>
+{% endblock %}
--
GitLab