ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/participant/templates/participant/group_widget.html
View File

@ -3,7 +3,7 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for group in groups %} {% for group in groups %}
{% if group.name != 'Anonymous' %} {% if group.name != 'Anonymous' and group.name != 'Registered' %}
<li class="{% if group.active %}activeline{% endif %}"> <li class="{% if group.active %}activeline{% endif %}">
<a href="{% url projector_activate_slide group.sid %}" class="activate_link {% if group.active %}active{% endif %}"> <a href="{% url projector_activate_slide group.sid %}" class="activate_link {% if group.active %}active{% endif %}">
<div></div> <div></div>

2
openslides/participant/templates/participant/personal_info_widget.html
View File

@ -20,7 +20,7 @@
{% if config_motion_min_supporters %} {% if config_motion_min_supporters %}
<hr /> <hr />
<ul> <ul style="line-height: 180%">
{% trans "I support the following motions:" %} {% trans "I support the following motions:" %}
{% for motion in supported_motions %} {% for motion in supported_motions %}
<li> <li>

7
openslides/projector/templates/projector/ProjectorSlide.html
View File

@ -7,8 +7,13 @@
{% block content %} {% block content %}
{% if slide.text %} {% if slide.text %}
<h1>{{ slide.title }}</h1> <h1>{{ slide.title }}</h1>
{{ slide.text|safe|linebreaks }}
{% else %} {% else %}
<div class="item_fullscreen">{{ slide.title }}</div> <div class="item_fullscreen">{{ slide.title }}</div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block scrollcontent %}
{% if slide.text %}
<span>{{ slide.text|safe|linebreaks }}</span>
{% endif %}
{% endblock %}