Commit 1544643f authored by Hinrikus Wolf's avatar Hinrikus Wolf

Merge branch 'master' of git.fsmpi.rwth-aachen.de:redl/redeleitsystem

parents 9cd4cfc1 601276b4
......@@ -143,7 +143,8 @@ def topic_show():
topic = Topic.query.filter_by(id=topic_id).first()
form = AddStatementForm()
form.topic.data = topic.id
return render_layout("admin_topic_show.html", topic=topic, form=form)
statements = topic.sorted_statements()
return render_layout("admin_topic_show.html", topic=topic, form=form, statements=statements)
return redirect(url_for(".index"))
......
......@@ -83,7 +83,6 @@
background-color: #00BCD4;
color: #37474F;
}
.rede-navigation .mdl-navigation__link .material-icons {
font-size: 24px;
color: rgba(255, 255, 255, 0.56);
......@@ -105,3 +104,8 @@
.md-48 {
font-size: 48px;
}
.rede-href {
text-decoration: none;
vertical-align: text-top;
}
......@@ -42,11 +42,17 @@
</tbody>
</table>
</div>
<div class="mdl-separator rede-separator"></div>
<div class="mdl-cell mdl-cell--3-col mdl-cell--3-col-tablet mdl-cell--4-col-phone mdl-grid mdl-grid--no-spacing">
{{ render_form(form, action_url=url_for(".statement_new"), action_text="Add", title="Add Statement", class_="mdl-card mdl-shadow--2dp mdl-cell mdl-cell--12-col mdl-cell--8-col-tablet mdl-cell--4-col-phone") }}
<div class="mdl-cell mdl-card mdl-shadow--2dp mdl-cell--12-col mdl-cell--8-col-tablet mdl-cell--4-col-phone">
<ul class="mdl-menu">
<li class="mdl-menu__item"><a class="mdl-navigation__link" href="{{ url_for(".statement_undo") }}"><i class="material-icons" role="presentation">undo</i>Undo</a></li>
<ul>
{% if topic.sorted_statements()|length() > 0 %}
<li>
<a href="{{ url_for(".statement_done", id=topic.sorted_statements()[0].id, topic_id=topic.id) }}" class="rede-href"><i class="material-icons" role="presentation">redo</i> Next</a>
</li>
{% endif %}
<li><a href="{{ url_for(".statement_undo") }}" class="rede-href"><i class="material-icons" role="presentation">undo</i> Previous</a></li>
</ul>
</div>
</div>
......
Markdown is supported
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