Merge branch 'master' of github.com:OpenSlides/OpenSlides
This commit is contained in:
commit
05c029d8e5
@ -3,7 +3,7 @@
|
||||
|
||||
<ul style="line-height: 180%">
|
||||
{% for group in groups %}
|
||||
{% if group.name != 'Anonymous' %}
|
||||
{% if group.name != 'Anonymous' and group.name != 'Registered' %}
|
||||
<li class="{% if group.active %}activeline{% endif %}">
|
||||
<a href="{% url projector_activate_slide group.sid %}" class="activate_link {% if group.active %}active{% endif %}">
|
||||
<div></div>
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
{% if config_motion_min_supporters %}
|
||||
<hr />
|
||||
<ul>
|
||||
<ul style="line-height: 180%">
|
||||
{% trans "I support the following motions:" %}
|
||||
{% for motion in supported_motions %}
|
||||
<li>
|
||||
|
@ -7,8 +7,13 @@
|
||||
{% block content %}
|
||||
{% if slide.text %}
|
||||
<h1>{{ slide.title }}</h1>
|
||||
{{ slide.text|safe|linebreaks }}
|
||||
{% else %}
|
||||
<div class="item_fullscreen">{{ slide.title }}</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
{% block scrollcontent %}
|
||||
{% if slide.text %}
|
||||
<span>{{ slide.text|safe|linebreaks }}</span>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
Loading…
Reference in New Issue
Block a user