diff --git a/templates/base.html b/templates/base.html
index e843cc8f416796e3319225ac8e4324e287740fe5..4ac3bad76935eb1eaaa4257b52d2f7bf24e4f486 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,15 +5,13 @@
{% from 'macros.html' import moderator_editor, moderator_checkbox, moderator_delete %}
<!DOCTYPE html>
-<html>
+<html lang="de">
<head>
{% block header %}
<title>Video AG {% block title %}{% for endpoint, caption, iconlib, gly, visible in navbar if ((visible or ismod()) and (endpoint == request.endpoint)) %}- {{ caption }}{% else%}{% endfor %}{% endblock %}</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<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">
- <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{url_for('static', filename='bootstrap/bootstrap.css')}}" rel="stylesheet">
@@ -73,7 +71,7 @@
<li class="col-xs-12 col-sm-4 pull-right">
<form action="{{ url_for('search') }}" role="search">
<div class="input-group" style="margin-top: 3px">
- <input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}" width="100px">
+ <input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">
<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
</div>
</form>
@@ -152,6 +150,7 @@
<span>{{ gethostname() }}</span>
</li>
{% endif %}
+ </ul>
</div>
</footer>
{% endblock %}
@@ -171,7 +170,6 @@
</div>
</div>
{% endblock %}
- </body>
{% if ismod() %}
<script>
$( function () {
@@ -185,4 +183,5 @@
$('[data-toggle="tooltip"]').tooltip({ 'trigger': 'hover' });
});
</script>
+ </body>
</html>
diff --git a/templates/index.html b/templates/index.html
index 67099cb8d3c3beea05acfea5bea095cafe7e26ed..40cd84a70a7e76a6b67368047570d89cf3863057 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -75,10 +75,10 @@
{% for item in featured %}
<div class="panel panel-default">
<div class="panel-heading">
- <h1 class="panel-title">
+ <span class="panel-title">
{{ moderator_editor(('featured',item.id,'title'), item.title) }} {{ moderator_checkbox(('featured',item.id,'visible'), item.visible) }}
{% if ismod() %}
- <div class="btn-group pull-right" role="group">
+ <span class="btn-group pull-right" role="group">
{% if not loop.first %}
<a class="btn btn-default" href="{{ url_for('edit', **{'featured.'+item.id|string+'.order': featured[loop.index0-1].order, 'featured.'+featured[loop.index0-1].id|string+'.order': item.order, 'ref': request.url})}}"><span class="glyphicon glyphicon-arrow-up"></span></a>
{% else %}
@@ -90,9 +90,9 @@
<button class="btn btn-default disabled"><span class="glyphicon glyphicon-arrow-down"></span></button>
{% endif %}
{{ moderator_delete(['featured',item.id,'deleted']) }}
- </div>
+ </span>
{% endif %}
- </h1>
+ </span>
</div>
{{ featured_content(item) }}
</div>
@@ -101,14 +101,14 @@
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
- <h1 class="panel-title">Nächste Aufnahmen</h1">
+ <h1 class="panel-title">Nächste Aufnahmen</h1>
</div>
{% if upcomming|length > 0 %}
<ul class="list-group">
{% for g in upcomming|groupby('date') %}
<li class="list-group-item">
+ <strong>{{ g.grouper|date }}</strong>
<ul class="list-group" style="margin: 0px;">
- <strong>{{ g.grouper|date }}</strong>
{% for i in g.list %}
<li class="list-group-item list-group-item-condensed">
{{i.time|time}} <a href="{{url_for('course', id=i.course_id)}}">{{i.course.title}}</a>: <a href="{{url_for('course', id=i.course_id)}}#lecture-{{i.id}}">{{i.title}}</a>
@@ -127,7 +127,7 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
- <h1 class="panel-title">Neueste Videos <a class="fa fa-rss-square pull-right" aria-hidden="true" href="{{url_for('feed')}}" style="text-decoration: none"></a></h1">
+ <h1 class="panel-title">Neueste Videos <a class="fa fa-rss-square pull-right" aria-hidden="true" href="{{url_for('feed')}}" style="text-decoration: none"></a></h1>
</div>
<ul class="list-group videopreview">
{% for i in latestvideos %}