Merge branch 'master' of github.com:OpenSlides/OpenSlides

This commit is contained in:
Oskar Hahn 2012-12-04 00:20:41 +01:00
commit 05c029d8e5
3 changed files with 8 additions and 3 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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 %}