From e90a01335034f8675c4b3cbbfa946a1d0350f599 Mon Sep 17 00:00:00 2001
From: Andreas <andreasv@fsmpi.rwth-aachen.de>
Date: Mon, 24 Apr 2017 04:13:25 +0200
Subject: [PATCH] fixed html syntax errors on the course page
---
templates/course.html | 16 +++++---
templates/lecture.html | 2 +-
templates/macros.html | 84 +++++++++++++++++++-----------------------
3 files changed, 48 insertions(+), 54 deletions(-)
diff --git a/templates/course.html b/templates/course.html
index ba850fc..9868782 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -10,12 +10,16 @@
{% block content %}
<div class="panel panel-default">
<div class="panel-heading">
- <h1 class="panel-title">{{ moderator_editor(['courses',course.id,'title'], course.title)}} {% if ismod() %}<i>(<a href={{ url_for('course', id=course.id) }}>{{course.id}}</a>)</i>{% endif %}
- <ul class="pull-right list-inline">
- <li>{{ moderator_delete(['courses',course.id,'deleted']) }}</li>
- <li>{{ moderator_permissioneditor('course',course.id,course.perm, global_permissions) }}</li>
- </ul>
- </h1>
+ <span class="panel-title">
+ {{ moderator_editor(['courses',course.id,'title'], course.title)}}
+ {% if ismod() %}
+ <i>(<a href={{ url_for('course', id=course.id) }}>{{course.id}}</a>)</i>
+ {% endif %}
+ </span>
+ <ul class="pull-right list-inline">
+ <li>{{ moderator_delete(['courses',course.id,'deleted']) }}</li>
+ <li>{{ moderator_permissioneditor('course',course.id,course.perm, global_permissions) }}</li>
+ </ul>
</div>
<div class="row panel-body">
<div class="col-xs-12">
diff --git a/templates/lecture.html b/templates/lecture.html
index 43fd65e..a3aa240 100644
--- a/templates/lecture.html
+++ b/templates/lecture.html
@@ -19,7 +19,7 @@
{% block content %}
<div class="panel panel-default">
<div class="panel-heading">
- <h1 class="panel-title"><strong><a href="{{url_for('course', handle=course.handle)}}#lecture-{{lecture.id}}">{{ course.title }}</strong></a>: {{ lecture.title}}</h1>
+ <span class="panel-title"><strong><a href="{{url_for('course', handle=course.handle)}}#lecture-{{lecture.id}}">{{ course.title }}</strong></a>: {{ lecture.title}}</span>
</div>
<div class="panel-body">
<div class="row" style="padding: 0px;">
diff --git a/templates/macros.html b/templates/macros.html
index b865885..a886bf3 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -124,28 +124,24 @@ $(function() {
{% endmacro %}
{% macro video_download_btn(videos) %}
- {% if not ismod() %}
+{% if not ismod() %}
<span class="btn btn-default dropdown-toggle{% if not videos|selectattr('downloadable')|list and not ismod() %} disabled{% endif %}" type="button" data-toggle="dropdown">Download <span class="caret"></span></span>
<ul class="dropdown-menu">
{% for v in videos|sort(attribute='prio', reverse=True) if (v.downloadable or ismod() ) %}
- <li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
+ <li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
{% endfor %}
</ul>
{% endif %}
{% if not ismod() %}
-<noscript>
-{% else %}
-<span>
+ <noscript>
{% endif %}
- <ul class="pull-right list-unstyled" style="margin-left:10px;">
- {% for v in videos|sort(attribute='prio', reverse=True) if (v.downloadable or ismod() ) %}
- <li>{{moderator_delete(['videos',v.id,'deleted'])}} {{ moderator_checkbox(['videos',v.id,'visible'], v.visible) }} <a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
- {% endfor %}
- </ul>
+<ul class="pull-right list-unstyled" style="margin-left:10px;">
+{% for v in videos|sort(attribute='prio', reverse=True) if (v.downloadable or ismod() ) %}
+ <li>{{moderator_delete(['videos',v.id,'deleted'])}} {{ moderator_checkbox(['videos',v.id,'visible'], v.visible) }} <a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
+{% endfor %}
+</ul>
{% if not ismod() %}
-</noscript>
-{% else %}
-</span>
+ </noscript>
{% endif %}
{% endmacro %}
@@ -175,40 +171,34 @@ $('#embedcodebtn').popover(
</a>
{% endif %}
</div>
- <span class="col-sm-3 col-xs-12">
- <ul class="list-unstyled">
- <li>{% if videos|selectattr("live")|list|length %}<span class="label label-danger">Live</span> {% endif %}{{ moderator_editor(['lectures',lecture.id,'title'], lecture.title) }}</li>
- {% if lecture.speaker or ismod() %}<li>Gehalten von {{ moderator_editor(['lectures',lecture.id,'speaker'], lecture.speaker) }}</li>{% endif %}
- <li>{{ moderator_editor(['lectures',lecture.id,'time'], lecture.time) }} </li>
- <li>Dauer: {{ moderator_editor(['lectures',lecture.id,'duration'], lecture.duration) }} min</li>
- {% if ismod() %}
- <li>ID: <a href="{{url_for('course',handle=lecture.course.handle)}}#lecture-{{lecture.id}}">{{lecture.id}}</a></i>
- {% endif %}
- </ul>
- </span>
- <span class="col-sm-3 col-xs-12">
- <ul class="list-unstyled">
- <li>{{ moderator_editor(['lectures',lecture.id,'comment'], lecture.comment) }}</li>
- {% if ismod() %}
- <li>{{ moderator_editor(['lectures',lecture.id,'internal'], lecture.internal) }}</li>
- <li>Sichtbar: {{ moderator_checkbox(['lectures',lecture.id,'visible'], lecture.visible) }}</li>
- <li>Hörsaal: {{ moderator_editor(['lectures',lecture.id,'place'], lecture.place) }} </li>
- {% endif %}
- </ul>
- </span>
- <div class="col-sm-4 col-xs-12">
- <ul class="list-inline">
- <li class="dropdown">
- {{ video_download_btn(videos) }}
- </li>
- <li class="pull-right">
- {{ moderator_permissioneditor('lecture', lecture.id, lecture.perm, global_permissions) }}
- </li>
- <li class="pull-right">
- {{ moderator_delete(['lectures',lecture.id,'deleted']) }}
- </li>
- </ul>
- </div>
+ <ul class="list-unstyled col-sm-3 col-xs-12">
+ <li>{% if videos|selectattr("live")|list|length %}<span class="label label-danger">Live</span> {% endif %}{{ moderator_editor(['lectures',lecture.id,'title'], lecture.title) }}</li>
+ {% if lecture.speaker or ismod() %}<li>Gehalten von {{ moderator_editor(['lectures',lecture.id,'speaker'], lecture.speaker) }}</li>{% endif %}
+ <li>{{ moderator_editor(['lectures',lecture.id,'time'], lecture.time) }} </li>
+ <li>Dauer: {{ moderator_editor(['lectures',lecture.id,'duration'], lecture.duration) }} min</li>
+ {% if ismod() %}
+ <li>ID: <a href="{{url_for('course',handle=lecture.course.handle)}}#lecture-{{lecture.id}}">{{lecture.id}}</a></li>
+ {% endif %}
+ </ul>
+ <ul class="list-unstyled col-sm-3 col-xs-12">
+ <li>{{ moderator_editor(['lectures',lecture.id,'comment'], lecture.comment) }}</li>
+ {% if ismod() %}
+ <li>{{ moderator_editor(['lectures',lecture.id,'internal'], lecture.internal) }}</li>
+ <li>Sichtbar: {{ moderator_checkbox(['lectures',lecture.id,'visible'], lecture.visible) }}</li>
+ <li>Hörsaal: {{ moderator_editor(['lectures',lecture.id,'place'], lecture.place) }} </li>
+ {% endif %}
+ </ul>
+ <ul class="list-inline col-sm-4 col-xs-12">
+ <li class="dropdown">
+ {{ video_download_btn(videos) }}
+ </li>
+ <li class="pull-right">
+ {{ moderator_permissioneditor('lecture', lecture.id, lecture.perm, global_permissions) }}
+ </li>
+ <li class="pull-right">
+ {{ moderator_delete(['lectures',lecture.id,'deleted']) }}
+ </li>
+ </ul>
</div>
</li>
{% endmacro %}
--
GitLab