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

Merge pull request #1042 from emanuelschuetze/1.5b2-fixes

Browse Source 
1.5b2 fixes
This commit is contained in:
Oskar Hahn 2013-11-12 05:07:17 -08:00
commit d9cf05ef55
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/motion/templates/motion/poll_form.html
View File

@ -1,6 +1,7 @@
{% extends 'base.html' %}
{% load i18n %}
{% load tags %}
{% block title %}
{% trans "Motion" %} {{ motion.identifier }}, {{ poll }} – {{ block.super }}
@ -18,8 +19,8 @@
<a href="{% url 'motion_detail' motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a>
<!-- activate projector -->
{% if perms.projector.can_manage_projector %}
<a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
<i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
<a href="{{ motion|absolute_url:'projector' }}" class="activate_link btn {% if motion.is_active_slide %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
<i class="icon-facetime-video {% if motion.is_active_slide %}icon-white{% endif %}"></i>
</a>
{% endif %}
</div>

10
openslides/motion/templates/motion/slide.html
View File

@ -1,4 +1,5 @@
{% load i18n %}
{% load humanize %}
{% load staticfiles %}
<div id="sidebar">
@ -10,11 +11,12 @@
<!-- poll results -->
{% with motion.polls.all as polls %}
{% if polls.exists and polls.0.has_votes %}
<h4>{% trans "Poll result" %}:</h4>
{% for poll in polls %}
{% for poll in polls reversed %}
{% if poll.has_votes %}
{% if polls|length > 1 %}
<p>{{ forloop.counter }}. {% trans "Vote" %}:</p>
<h4>{{ poll.poll_number|ordinal|safe }} {% trans "Vote" %}:</h4>
{% else %}
<h4>{% trans "Poll result" %}:</h4>
{% endif %}
{% with poll.get_options.0 as option %}
<div class="results">
@ -27,7 +29,7 @@
</div>
{% endwith %}
{% else %}
{% if poll|length == 1 %}
{% if poll|length == 1 %}
<i>{% trans "No poll results available." %}</i>
{% endif %}
{% endif %}

2
openslides/projector/static/styles/projector.css
View File

@ -92,7 +92,7 @@ li {
.well h4 {
margin: 20px 0 2px 0;
}
.well h4 .first {
.well h4.first {
margin-top: 0;
}
.well .results hr {

2
openslides/static/styles/base.css
View File

@ -147,7 +147,7 @@ input, textarea {
width: 320px;
}
.small-form input {
width: 33px;
width: 55px;
}
textarea {
height: 100px;