Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • bootstrap4
  • intros
  • live_sources
  • master
  • modules
5 results

Target

Select target project
  • jannik/website
  • vincent/website
  • dominic/website
  • romank/website
  • videoaginfra/website
5 results
Select Git revision
  • bootstrap4
  • intros
  • master
  • modules
  • postgres_integration
  • s3compatible
6 results
Show changes
Show whitespace changes
Inline Side-by-side
templates/notifications.html
View file @ 766509d2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="panel-group"> <div class="panel-group">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h1 class="panel-title">Benachrichtigungen</h1> <span class="panel-title">Benachrichtigungen</span>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p>Benachrichtigungen für <code>{{ user.fsacc }}@{{ config['MAIL_SUFFIX'] }}</code> aktivieren: {{ moderator_checkbox(['users',user.id,'mail_notifications'], user.mail_notifications) }}</p> Für Veranstaltungen, bei denen du als <b>Zuständiger</b> eingetragen bist, benachrichtigen, wenn ... <p>Benachrichtigungen für <code>{{ user.fsacc }}@{{ config['MAIL_SUFFIX'] }}</code> aktivieren: {{ moderator_checkbox(['users',user.id,'mail_notifications'], user.mail_notifications) }}</p> Für Veranstaltungen, bei denen du als <b>Zuständiger</b> eingetragen bist, benachrichtigen, wenn ...
......
templates/search.html
View file @ 766509d2
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
{% from 'macros.html' import preview %} {% from 'macros.html' import preview %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="panel panel-default"> <div class="card m-1">
<div class="panel-heading"> <div class="card-header">
<h1 class="panel-title">Veranstaltungen</h1> <span class="card-title">Veranstaltungen</span>
</div> </div>
{% if courses == [] %} {% if courses == [] %}
<div class="panel-body">Nichts gefunden!</div> <div class="card-body">Nichts gefunden!</div>
{% else %} {% else %}
<ul class="list-group courselist"> <ul class="list-group courselist">
{% for course in courses %} {% for course in courses %}
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</ul> </ul>
{% endif %} {% endif %}
</div> </div>
<div class="panel panel-default"> <div class="card m-1">
<div class="panel-heading"> <div class="card-header">
<h1 class="panel-title">Videos</h1> <span class="card-title">Videos</span>
</div> </div>
{% if lectures == [] %} {% if lectures == [] %}
<div class="panel-body">Nichts gefunden!</div> <div class="card-body">Nichts gefunden!</div>
{% else %} {% else %}
<ul class="list-group videopreview"> <ul class="list-group videopreview">
{% for lecture in lectures %} {% for lecture in lectures %}
......
templates/sortlog.html
View file @ 766509d2
{% from 'macros.html' import moderator_delete %} {% from 'macros.html' import moderator_delete %}
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="panel-group"> <div class="card-group">
<div class="panel panel-default"> <div class="card">
<div class="panel-heading"> <div class="card-header">
<h1 class="panel-title">Sortierlog <span class="card-title">Sortierlog
<a class="btn btn-default" href="{{url_for('sort_now', ref=request.url)}}">Jetzt einsortieren</a> <a class="btn btn-secondary" href="{{url_for('sort_now', ref=request.url)}}">Jetzt einsortieren</a>
<button class="btn btn-default" onclick="$('button[data-path^=\'sorterrorlog.\'][data-path$=\'.deleted\']').each(function (e) { moderator.api.set($(this).data('path'),1,false); }); window.location.reload();">Alle Fehler entfernen</button> <button class="btn btn-secondary" onclick="$('button[data-path^=\'sorterrorlog.\'][data-path$=\'.deleted\']').each(function (e) { moderator.api.set($(this).data('path'),1,false); }); window.location.reload();">Alle Fehler entfernen</button>
</h1> </span>
</div> </div>
<div class="panel-body"> <div class="card-body">
<p>Hier werden die hochgeladenen Videos einsortiert und geloggt wo jede Datei einsortiert wurde.</p> <p>Hier werden die hochgeladenen Videos einsortiert und geloggt wo jede Datei einsortiert wurde.</p>
</div> </div>
{% if sorterrorlog %} {% if sorterrorlog %}
......
templates/stats.html
View file @ 766509d2
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="panel-group"> <div class="card">
<div class="panel panel-default"> <div class="card-header">
<div class="panel-heading"> <span class="card-title">Gesamt</span>
<h1 class="panel-title">Gesamt</h1>
</div> </div>
<div class="panel-body"> <div class="card-body">
<div class="row col-xs-12"> <div class="row col-xs-12">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<p class="text-center">Veranstaltungen pro Semester</p> <p class="text-center">Veranstaltungen pro Semester</p>
...@@ -27,22 +26,21 @@ ...@@ -27,22 +26,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="card">
<div class="panel-heading"> <div class="card-header">
<span class="panel-title"><a name="semesterstats"></a>Semester <select id="semesterselect" name="semester"><option value="">alle</option></select></span> <span class="card-title"><a name="semesterstats"></a>Semester <select id="semesterselect" name="semester"><option value="">alle</option></select></span>
</div> </div>
<div class="panel-body" > <div class="card-body" >
<div class=col-xs-12"> <div class=col-12">
<p class="text-center">Zuschauer pro Veranstaltung</p> <p class="text-center">Zuschauer pro Veranstaltung</p>
<div class="plot-view" data-url="{{url_for('stats_viewsperday', req="courses", filter=filter)}}"></div> <div class="plot-view" data-url="{{url_for('stats_viewsperday', req="courses", filter=filter)}}"></div>
</div> </div>
<div class=col-xs-12"> <div class=col-12">
<p class="text-center">Zuschauer pro Format</p> <p class="text-center">Zuschauer pro Format</p>
<div class="plot-view" data-url="{{url_for('stats_viewsperday', req="global", filter=filter)}}"></div> <div class="plot-view" data-url="{{url_for('stats_viewsperday', req="global", filter=filter)}}"></div>
</div> </div>
</div> </div>
</div> </div>
</div>
<script> <script>
$( document ).ready(function () { $( document ).ready(function () {
{% for s in semester if s.semester != '' %} {% for s in semester if s.semester != '' %}
......
templates/timetable.html
View file @ 766509d2
{% extends "base.html" %} {% extends "base.html" %}
{% block content %} {% block content %}
<div class="panel-group" id="accordion"> <div class="card">
<div class="panel panel-default"> <div class="hidden-print card-header">
<div class="hidden-print panel-heading">
{% if user %} {% if user %}
<h1 class="panel-title">personalisierter Drehplan für {{ user.realname }} <span class="card-title">personalisierter Drehplan für {{ user.realname }}
<a class="pull-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_user', user=user.id) }}" style="text-decoration: none"></a> <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_user', user=user.id) }}" style="text-decoration: none"></a>
</h1> </span>
{% else %} {% else %}
<h1 class="panel-title">Drehplan <span class="card-title">Drehplan
<a class="pull-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_all') }}" style="text-decoration: none"></a> <a class="float-right fa fa-calendar" aria-hidden="true" href="{{ url_for('ical_all') }}" style="text-decoration: none"></a>
</h1> </span>
{% endif %} {% endif %}
</div> </div>
<div class="hidden-print"> <div class="hidden-print">
<div style="margin-top: 10px; padding: 15px;" class="col-xs-12"> <div style="margin-top: 10px; padding: 15px;" class="col-12 text-center">
{% if user %} {% if user %}
<a href="{{url_for('timetable_user', user=user.id, kw=kw-1) }}" class="pull-left btn btn-default">{{ "<<" }}</a> <a href="{{url_for('timetable_user', user=user.id, kw=kw-1) }}" class="float-left btn btn-secondary">{{ "<<" }}</a>
<a href="{{url_for('timetable_user', user=user.id, kw=kw+1) }}" class="pull-right btn btn-default">{{ ">>" }}</a> <a href="{{url_for('timetable_user', user=user.id, kw=kw+1) }}" class="float-right btn btn-secondary">{{ ">>" }}</a>
<a href="{{url_for('timetable_user', user=user.id, kw=0) }}" style="width: 80px;" class="btn btn-default center-block">today</a> <a href="{{url_for('timetable_user', user=user.id, kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% else %} {% else %}
<a href="{{url_for('timetable', kw=kw-1) }}" class="pull-left btn btn-default">{{ "<<" }}</a> <a href="{{url_for('timetable', kw=kw-1) }}" class="float-left btn btn-secondary">{{ "<<" }}</a>
<a href="{{url_for('timetable', kw=kw+1) }}" class="pull-right btn btn-default">{{ ">>" }}</a> <a href="{{url_for('timetable', kw=kw+1) }}" class="float-right btn btn-secondary">{{ ">>" }}</a>
<a href="{{url_for('timetable', kw=0) }}" style="width: 80px;" class="btn btn-default center-block">today</a> <a href="{{url_for('timetable', kw=0) }}" style="width: 80px;" class="btn btn-secondary">today</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-12 text-center">
<input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/> <input id="weeksel" type="week" class="center-block" value="{{ weekofyear }}"/>
</div>
<script> <script>
$( function () { $( function () {
$("#weeksel").on("change", function() { $("#weeksel").on("change", function() {
...@@ -38,8 +39,8 @@ ...@@ -38,8 +39,8 @@
}); });
</script> </script>
</div> </div>
<div class="panel-body row table-responsive"> <div class="card-body row">
<table id="timetable" class="table table-bordered col-xs-12" style="width: auto; min-width: 100%;"> <table id="timetable" class="table table-bordered col-12 table-responsive" style="width: auto; min-width: 100%;">
<tr><th style="width: 30px;"></th>{% for d in days if (d.index < 5) or (d.lectures|length) > 0 %}<th style="min-width: 10em;" colspan="{{d.maxcol}}">{{ d.date.strftime("%A (%d.%m.%Y)") }}</th>{% endfor %}</tr> <tr><th style="width: 30px;"></th>{% for d in days if (d.index < 5) or (d.lectures|length) > 0 %}<th style="min-width: 10em;" colspan="{{d.maxcol}}">{{ d.date.strftime("%A (%d.%m.%Y)") }}</th>{% endfor %}</tr>
{# iterating over each 15 min block #} {# iterating over each 15 min block #}
{% for t in times %} {% for t in times %}
...@@ -95,6 +96,5 @@ ...@@ -95,6 +96,5 @@
</table> </table>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}