Commit 1902365f authored by Andreas Valder's avatar Andreas Valder
Browse files

Merge branch 'master' into '289-hilfreichere-darstellung-von-statistiken'

# Conflicts:
#   templates/lecture.html
parents 93f6c09e 7352503e
......@@ -39,7 +39,6 @@
<div class="col-xs-12" style="padding-top: 20px">
<p>{{ moderator_editor(['lectures',lecture.id,'comment'], lecture.comment) }}</p>
</div>
{% if (chapters|length > 0) or ismod() %}
<div class="col-xs-12 table-responsive" style="padding-top: 10px;">
<p>Kapitel:
<button class="btn btn-default" id="hintnewchapter">{% if ismod() %}Neues Kapitel{% else %}Kapitelmarker vorschlagen{% endif %}</button>
......@@ -150,4 +149,4 @@ $(document).ready(function() {
});
});
</script>
{% endblock %}
{% endblock %}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment