template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
Before Width: | Height: | Size: 299 B |
|
@ -5,20 +5,6 @@
|
||||||
* :license: GNU GPL, see LICENSE for more details.
|
* :license: GNU GPL, see LICENSE for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* agenda item open/closed */
|
|
||||||
.close_link span {
|
|
||||||
background-image: url(../images/icons/close-grey.png);
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close_link.closed span {
|
|
||||||
background-image: url(../images/icons/close.png);
|
|
||||||
}
|
|
||||||
|
|
||||||
tr.topline td {
|
tr.topline td {
|
||||||
border-bottom: 1px solid #333333;
|
border-bottom: 1px solid #333333;
|
||||||
background-color: #CDCDCD;
|
background-color: #CDCDCD;
|
||||||
|
|
|
@ -24,9 +24,6 @@ $(function() {
|
||||||
line.parent().parent().children('td').addClass('elected')
|
line.parent().parent().children('td').addClass('elected')
|
||||||
}
|
}
|
||||||
line.attr('href', data.link);
|
line.attr('href', data.link);
|
||||||
},
|
|
||||||
error: function () {
|
|
||||||
alert("Ajax Error");
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -48,22 +45,24 @@ $(function() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
// change publish status of ballot
|
||||||
$('.publish_link').click(function(event) {
|
$('.publish_link').click(function(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
link = $(this);
|
var link = $(this);
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
url: link.attr('href'),
|
url: $(this).attr('href'),
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
if (data.published) {
|
if (data.published) {
|
||||||
link.addClass('published');
|
newclass = 'icon-checked-new_white';
|
||||||
//link.attr('title', gettext('Unpublish ballot'))
|
link.addClass('btn-primary');
|
||||||
} else {
|
} else {
|
||||||
link.removeClass('published');
|
newclass = 'icon-unchecked-new';
|
||||||
//link.attr('title', 'Publish ballot')
|
link.removeClass('btn-primary');
|
||||||
}
|
}
|
||||||
|
link.children('i').removeClass('icon-checked-new_white icon-unchecked-new').addClass(newclass);
|
||||||
|
link.attr('href', data.link);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});});
|
||||||
});
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ td.elected {
|
||||||
}
|
}
|
||||||
|
|
||||||
td.elected a.election_link {
|
td.elected a.election_link {
|
||||||
background-image: url(../images/icons/voting-yes.png);
|
background-image: url(../img/voting-yes.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
|
@ -21,7 +21,7 @@ td.elected a.election_link {
|
||||||
}
|
}
|
||||||
|
|
||||||
td a.election_link {
|
td a.election_link {
|
||||||
background-image: url(../images/icons/voting-yes-grey.png);
|
background-image: url(../img/voting-yes-grey.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
|
@ -30,15 +30,3 @@ td a.election_link {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.publish_link span {
|
|
||||||
background-image: url(../images/icons/off.png);
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
a.publish_link.published span {
|
|
||||||
background-image: url(../images/icons/on.png);
|
|
||||||
}
|
|
||||||
|
|
|
@ -77,7 +77,9 @@
|
||||||
| <b>{% trans "elected" %}</b>
|
| <b>{% trans "elected" %}</b>
|
||||||
{% if perms.assignment.can_manage_assignment %}
|
{% if perms.assignment.can_manage_assignment %}
|
||||||
{% if assignment.status == "sea" or assignment.status == "vot" %}
|
{% if assignment.status == "sea" or assignment.status == "vot" %}
|
||||||
<a href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
|
<a class="btn btn-mini" href="{% url 'assignment_user_not_elected' assignment.id person.person_id %}" rel="tooltip" data-original-title="{% trans 'Mark candidate as not elected' %}">
|
||||||
|
<i class="icon-ban-circle"></i>
|
||||||
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -107,9 +109,9 @@
|
||||||
<label>{{ field.label }}:</label>
|
<label>{{ field.label }}:</label>
|
||||||
<div class="input-append">
|
<div class="input-append">
|
||||||
{{ field }}
|
{{ field }}
|
||||||
<button class="btn btn-primary" type="submit">{% trans 'Apply' %}</button>
|
<button class="btn btn-primary" type="submit" title="{% trans 'Apply' %}"><i class="icon-ok icon-white"></i></button>
|
||||||
{% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
|
{% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
|
||||||
<a href="{% url 'user_new' %}" target="_blank" class="btn"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
|
<a href="{% url 'user_new' %}" target="_blank" class="btn" title="{% trans 'Add new participant' %}"><i class="icon-add-user"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -126,7 +128,10 @@
|
||||||
<ul>
|
<ul>
|
||||||
{% for person in blocked_candidates %}
|
{% for person in blocked_candidates %}
|
||||||
<li>
|
<li>
|
||||||
{{ person }}<a href="{% url 'assignment_delother' assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
|
{{ person }}
|
||||||
|
<a class="btn btn-mini" href="{% url 'assignment_delother' assignment.id person.person_id %}" title="{% trans 'Remove candidate' %}">
|
||||||
|
<i class="icon-ban-circle"></i>
|
||||||
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% empty %}
|
{% empty %}
|
||||||
<li>{% trans "No blocked candidates available." %}</li>
|
<li>{% trans "No blocked candidates available." %}</li>
|
||||||
|
@ -155,10 +160,14 @@
|
||||||
{{ poll.get_ballot }}. {% trans 'ballot' %}
|
{{ poll.get_ballot }}. {% trans 'ballot' %}
|
||||||
{% if perms.assignment.can_manage_assignment %}
|
{% if perms.assignment.can_manage_assignment %}
|
||||||
<br>
|
<br>
|
||||||
<a class="publish_link {% if poll.published %}published{% endif %}"
|
<a class="publish_link btn btn-mini {% if poll.published %}btn-primary{% endif %}"
|
||||||
href="{% url 'assignment_poll_publish_status' poll.id %}"
|
href="{% url 'assignment_poll_publish_status' poll.id %}"
|
||||||
title="{% trans 'Publish/unpublish results' %}">
|
rel="tooltip" data-original-title="{% trans 'Publish/unpublish results' %}">
|
||||||
<span></span>
|
{% if poll.published %}
|
||||||
|
<i class="icon-checked-new_white"></i>
|
||||||
|
{% else %}
|
||||||
|
<i class="icon-unchecked-new"></i>
|
||||||
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
<a href="{% url 'assignment_poll_view' poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
|
<a href="{% url 'assignment_poll_view' poll.id %}" class="btn btn-mini" title="{% trans 'Edit' %}"><i class="icon-pencil"></i></a>
|
||||||
<a href="{% url 'assignment_poll_delete' poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
|
<a href="{% url 'assignment_poll_delete' poll.id %}" class="btn btn-mini" title="{% trans 'Delete' %}"><i class="icon-remove"></i></a>
|
||||||
|
@ -178,10 +187,10 @@
|
||||||
<td>
|
<td>
|
||||||
{% if candidate in assignment.elected %}
|
{% if candidate in assignment.elected %}
|
||||||
{% if perms.assignment.can_manage_assignment %}
|
{% if perms.assignment.can_manage_assignment %}
|
||||||
<a class="election_link elected" href="{% url 'assignment_user_not_elected assignment.id' candidate.person_id %}"></a>
|
<a class="election_link elected" href="{% url 'assignment_user_not_elected' assignment.id candidate.person_id %}"></a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a class="elected">
|
<a class="elected">
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -194,11 +203,11 @@
|
||||||
{% for vote in poll_list %}
|
{% for vote in poll_list %}
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
|
{% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
|
||||||
<img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
|
<img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
|
||||||
<img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
|
<img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
|
||||||
{% elif 'Votes' in vote %}
|
{% elif 'Votes' in vote %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
|
||||||
{% elif vote == None %}
|
{% elif vote == None %}
|
||||||
{% trans 'was not a <br> candidate'%}
|
{% trans 'was not a <br> candidate'%}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -217,7 +226,7 @@
|
||||||
{% if poll.published or perms.assignment.can_manage_assignment %}
|
{% if poll.published or perms.assignment.can_manage_assignment %}
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if poll.has_votes %}
|
{% if poll.has_votes %}
|
||||||
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
|
<img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
|
||||||
{{ poll.print_votesinvalid }}
|
{{ poll.print_votesinvalid }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
@ -233,7 +242,7 @@
|
||||||
{% if poll.published or perms.assignment.can_manage_assignment %}
|
{% if poll.published or perms.assignment.can_manage_assignment %}
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if poll.has_votes %}
|
{% if poll.has_votes %}
|
||||||
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
|
<img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
|
||||||
<strong>{{ poll.print_votescast }}</strong>
|
<strong>{{ poll.print_votescast }}</strong>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
<td class="candidate{% if candidate in assignment.elected %} elected{% endif %}">
|
<td class="candidate{% if candidate in assignment.elected %} elected{% endif %}">
|
||||||
{% if candidate in assignment.elected %}
|
{% if candidate in assignment.elected %}
|
||||||
<a class="elected">
|
<a class="elected">
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ candidate }}
|
{{ candidate }}
|
||||||
|
@ -75,11 +75,11 @@
|
||||||
<td style="white-space:nowrap;"{% if candidate in assignment.elected %} class="elected"{% endif %}>
|
<td style="white-space:nowrap;"{% if candidate in assignment.elected %} class="elected"{% endif %}>
|
||||||
{% if not assignment_publish_winner_results_only or candidate in assignment.elected %}
|
{% if not assignment_publish_winner_results_only or candidate in assignment.elected %}
|
||||||
{% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
|
{% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
|
||||||
<img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
|
<img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
|
||||||
<img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
|
<img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
|
||||||
{% elif 'Votes' in vote %}
|
{% elif 'Votes' in vote %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
|
||||||
{% elif vote == None %}
|
{% elif vote == None %}
|
||||||
{% trans 'was not a <br> candidate'%}
|
{% trans 'was not a <br> candidate'%}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
{% for poll in polls %}
|
{% for poll in polls %}
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if poll.has_votes %}
|
{% if poll.has_votes %}
|
||||||
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
|
<img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}">
|
||||||
{{ poll.print_votesinvalid }}
|
{{ poll.print_votesinvalid }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
@ -112,7 +112,7 @@
|
||||||
|
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if poll.has_votes %}
|
{% if poll.has_votes %}
|
||||||
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}">
|
<img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}">
|
||||||
<strong>{{ poll.print_votescast }}</strong>
|
<strong>{{ poll.print_votescast }}</strong>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% load tags %}
|
|
||||||
{% load i18n %}
|
|
||||||
{% load staticfiles %}
|
|
||||||
|
|
||||||
{% block submenu %}
|
|
||||||
{% url 'motion_overview' as url_motionoverview %}
|
|
||||||
<h4>{% trans "Motions" %}</h4>
|
|
||||||
<ul>
|
|
||||||
<li class="{% if request.path == url_motionoverview %}selected{% endif %}"><a href="{% url 'motion_overview' %}">{% trans "All motions" %}</a></li>
|
|
||||||
{% if perms.motion.can_create_motion or perms.motion.can_manage_motion %}
|
|
||||||
<li class="{% active request '/motion/new' %}"><a href="{% url 'motion_new' %}">{% trans "New motion" %}</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{% if perms.motion.can_manage_motion %}
|
|
||||||
<li class="{% active request '/motion/import' %}"><a href="{% url 'motion_import' %}">{% trans 'Import motions' %}</a></li>
|
|
||||||
{% endif %}
|
|
||||||
<li><a href="{% url 'print_motions' %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'All motions as PDF' %}</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{# second submenu #}
|
|
||||||
{% if motion %}
|
|
||||||
<br>
|
|
||||||
<h3>{% trans "Motion No." %}
|
|
||||||
{% if motion.number != None %}
|
|
||||||
{{ motion.number }}
|
|
||||||
{% else %}
|
|
||||||
<i>[-]</i>
|
|
||||||
{% endif %}
|
|
||||||
</h3>
|
|
||||||
<ul>
|
|
||||||
{# view motion #}
|
|
||||||
{% url 'motion_view' motion.id as url_motionview %}
|
|
||||||
<li class="{% if request.path == url_motionview %}selected{% endif %}"><a href="{% url 'motion_view' motion.id %}">{% trans 'View motion' %}</a></li>
|
|
||||||
{# edit motion #}
|
|
||||||
{% if "edit" in actions %}
|
|
||||||
{% url 'motion_edit' motion.id as url_motionedit %}
|
|
||||||
<li class="{% if request.path == url_motionedit %}selected{% endif %}"><a href="{% url 'motion_edit' motion.id %}"><img src="{% static 'images/icons/edit.png' %}"> {% trans 'Edit motion' %}</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{# delete motion #}
|
|
||||||
{% if "delete" in actions %}
|
|
||||||
<li><a href="{% url 'motion_delete' motion.id %}"><img src="{% static 'images/icons/delete.png' %}"> {% trans 'Delete motion' %}</a></li>
|
|
||||||
{% endif %}
|
|
||||||
{# PDF #}
|
|
||||||
<li><a href="{% url 'print_motion' motion.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {% trans 'Motion as PDF' %}</a></li>
|
|
||||||
{# activate and polls #}
|
|
||||||
{% if perms.projector.can_manage_projector %}
|
|
||||||
<li>
|
|
||||||
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Show Motion' %}</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
{% if perms.motion.can_manage_motion %}
|
|
||||||
{% for poll in motion.polls %}
|
|
||||||
{% url 'motion_poll_view' poll.id as url_motionpollview %}
|
|
||||||
<li class="{% if request.path == url_motionpollview %}selected{% endif %}"><a href="{% url 'motion_poll_view' poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "Vote" %}</a></li>
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
|
||||||
{# Agenda Item #}
|
|
||||||
{% if perms.agenda.can_manage_agenda %}
|
|
||||||
<li>
|
|
||||||
<a href="{% url 'motion_create_agenda' motion.id %}">{% trans 'New agenda item' %}</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
|
@ -43,7 +43,7 @@
|
||||||
<ul class="dropdown-menu pull-right">
|
<ul class="dropdown-menu pull-right">
|
||||||
<!-- edit -->
|
<!-- edit -->
|
||||||
{% if "edit" in actions %}
|
{% if "edit" in actions %}
|
||||||
<li><a href="{% url 'motion_edit' motion.id %}"><i class="icon-edit"></i> {% trans 'Edit motion' %}</a></li>
|
<li><a href="{% url 'motion_edit' motion.id %}"><i class="icon-pencil"></i> {% trans 'Edit motion' %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- delete -->
|
<!-- delete -->
|
||||||
{% if "delete" in actions %}
|
{% if "delete" in actions %}
|
||||||
|
@ -70,11 +70,11 @@
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span8">
|
<div class="span8">
|
||||||
{% if motion.public_version != motion.last_version %}
|
{% if motion.public_version != motion.last_version %}
|
||||||
⋅
|
<span class="label label-warning"><i class="icon-warning-sign icon-white"></i>
|
||||||
{% if version == motion.public_version %}
|
{% if version == motion.public_version %}
|
||||||
{% trans "This is not the newest version." %} <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
|
{% trans "This is not the newest version." %}</span> <a href="{% url 'motion_view_newest' motion.id %}">{% trans "Go to version" %} {{ motion.last_version.aid }}.</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
{% trans "This is not the authorized version." %} <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
|
{% trans "This is not the authorized version." %}</span> <a href="{% url 'motion_view' motion.id %}">{% trans "Go to version" %} {{ motion.public_version.aid }}.</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -107,17 +107,17 @@
|
||||||
<td style="white-space:nowrap;">
|
<td style="white-space:nowrap;">
|
||||||
{% if motion.status != "pub" %}
|
{% if motion.status != "pub" %}
|
||||||
{% if revision == motion.permitted %}
|
{% if revision == motion.permitted %}
|
||||||
<img title="{% trans 'Version authorized' %}" src="{% static 'images/icons/accept.png' %}">
|
<span class="badge badge-success" title="{% trans 'This version is authorized' %}"><i class="icon-ok icon-white"></i></span>
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if perms.motion.can_manage_motion %}
|
{% if perms.motion.can_manage_motion %}
|
||||||
<a href="{% url 'motion_version_permit' revision.id %}"><img title="{% trans 'Permit Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
|
<a class="btn btn-mini" href="{% url 'motion_version_permit' revision.id %}" title="{% trans 'Permit this version' %}"><i class="icon-ok"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
|
{% if not revision.rejected and revision.id > motion.permitted.id and perms.motion.can_manage_motion %}
|
||||||
<a href="{% url 'motion_version_reject' revision.id %}"><img title="{% trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
|
<a class="btn btn-mini" href="{% url 'motion_version_reject' revision.id %}" title="{% trans 'Reject this version' %}"><i class="icon-ban-circle"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if revision.rejected %}
|
{% if revision.rejected %}
|
||||||
<img title="{% trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
|
<span class="badge badge-important" title="{% trans 'This version is rejected' %}"><i class="icon-ban-circle icon-white"></i></span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
@ -216,12 +216,12 @@
|
||||||
<br>
|
<br>
|
||||||
{% if poll.has_votes %}
|
{% if poll.has_votes %}
|
||||||
{% with poll.get_options.0 as option %}
|
{% with poll.get_options.0 as option %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }}<br>
|
||||||
<img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
|
<img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }}<br>
|
||||||
<img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
|
<img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
|
||||||
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
|
<img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
|
||||||
<div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
|
<div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 10em;">
|
||||||
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
|
<img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
|
||||||
</div>
|
</div>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% if perms.motion.can_manage_motion %}
|
{% if perms.motion.can_manage_motion %}
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
<p><b>{% trans "Status" %}:</b><br>
|
<p><b>{% trans "Status" %}:</b><br>
|
||||||
{% if motion.status != "pub" %}
|
{% if motion.status != "pub" %}
|
||||||
{% if motion.status == "acc" %}
|
{% if motion.status == "acc" %}
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}">
|
<img src="{% static 'img/voting-yes.png' %}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if motion.status == "rej" %}
|
{% if motion.status == "rej" %}
|
||||||
<img src="{% static 'images/icons/voting-no.png' %}">
|
<img src="{% static 'img/voting-no.png' %}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% trans motion.get_status_display %}
|
{% trans motion.get_status_display %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -34,12 +34,12 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% with poll.get_options.0 as option %}
|
{% with poll.get_options.0 as option %}
|
||||||
<div class="results">
|
<div class="results">
|
||||||
<img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
|
<img src="{% static 'img/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ option.Yes }} <br>
|
||||||
<img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
|
<img src="{% static 'img/voting-no.png' %}" title="{% trans 'No' %}"> {{ option.No }} <br>
|
||||||
<img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
|
<img src="{% static 'img/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ option.Abstain }}<br>
|
||||||
<img src="{% static 'images/icons/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
|
<img src="{% static 'img/voting-invalid.png' %}" title="{% trans 'Invalid' %}"> {{ poll.print_votesinvalid }}<br>
|
||||||
<hr>
|
<hr>
|
||||||
<img src="{% static 'images/icons/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
|
<img src="{% static 'img/voting-total.png' %}" title="{% trans 'Votes cast' %}"> {{ poll.print_votescast }}
|
||||||
</div>
|
</div>
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -4,19 +4,3 @@
|
||||||
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
|
* :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
|
||||||
* :license: GNU GPL, see LICENSE for more details.
|
* :license: GNU GPL, see LICENSE for more details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
a.status_link span {
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
background-position: center;
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.status_link.deactivate span {
|
|
||||||
background-image: url(../images/icons/on.png);
|
|
||||||
}
|
|
||||||
|
|
||||||
a.status_link.activate span {
|
|
||||||
background-image: url(../images/icons/off.png);
|
|
||||||
}
|
|
||||||
|
|
|
@ -17,20 +17,30 @@
|
||||||
<table class="table table-striped table-bordered">
|
<table class="table table-striped table-bordered">
|
||||||
<tr>
|
<tr>
|
||||||
<th>{% trans "Group" %}</th>
|
<th>{% trans "Group" %}</th>
|
||||||
<th>{% trans "Actions" %}</th>
|
<th style="width: 1px;">{% trans "Actions" %}</th>
|
||||||
</tr>
|
</tr>
|
||||||
{% for group in groups %}
|
{% for group in groups %}
|
||||||
<tr class="{% cycle '' 'odd' %}">
|
<tr class="{% if group.active %}activeline{% endif %}">
|
||||||
<td><a href="{% model_url group 'view' %}">{{ group.name }}</a></td>
|
<td>
|
||||||
<td><a href="{% url 'user_group_edit' group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit group' %}"></a>
|
<a href="{% model_url group 'view' %}">{{ group.name }}</a>
|
||||||
{% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
|
</td>
|
||||||
<a href="{% url 'user_group_delete' group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete group' %}"></a>
|
<td>
|
||||||
{% endif %}
|
<span style="width: 1px; white-space: nowrap;">
|
||||||
|
{% if perms.projector.can_manage_projector %}
|
||||||
|
<a href="{% url 'projector_activate_slide' group.sid %}" class="activate_link btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
|
||||||
|
<i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
<a href="{% url 'user_group_edit' group.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
|
||||||
|
<i class="icon-pencil"></i>
|
||||||
|
</a>
|
||||||
|
{% if group.name|lower != 'anonymous' and group.name|lower != 'registered' %}
|
||||||
|
<a href="{% url 'user_group_delete' group.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
|
||||||
|
<i class="icon-remove"></i>
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
|
||||||
{% empty %}
|
|
||||||
<tr>
|
|
||||||
<td colspan="5"><i>{% trans "No groups available." %}</i></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
|
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 563 B |
Before Width: | Height: | Size: 562 B |
Before Width: | Height: | Size: 532 B |
Before Width: | Height: | Size: 484 B |
Before Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 511 B |
Before Width: | Height: | Size: 269 B |
Before Width: | Height: | Size: 255 B |
Before Width: | Height: | Size: 370 B |
Before Width: | Height: | Size: 867 B |
Before Width: | Height: | Size: 884 B |
After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
@ -18,7 +18,7 @@ body{
|
||||||
/*** HEADER ***/
|
/*** HEADER ***/
|
||||||
#header {
|
#header {
|
||||||
position:relative;
|
position:relative;
|
||||||
background:url("../images/presentation-header-bg.png") repeat-x scroll center top #3D3020;
|
background:url("../img/presentation-header-bg.png") repeat-x scroll center top #3D3020;
|
||||||
height:100px;
|
height:100px;
|
||||||
}
|
}
|
||||||
#logo {
|
#logo {
|
||||||
|
@ -58,7 +58,7 @@ body{
|
||||||
top:110px;
|
top:110px;
|
||||||
right:40px;
|
right:40px;
|
||||||
padding-left:30px;
|
padding-left:30px;
|
||||||
background: url(../images/icons/clock.png) no-repeat scroll 0px 4px;
|
background: url(../img/glyphicons_054_clock.png) no-repeat scroll 0px 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#currentTime.ajax_error {
|
#currentTime.ajax_error {
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<div id="ajaxswitcher"></div>
|
<div id="ajaxswitcher"></div>
|
||||||
|
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<div id="logo"><img src="{% static 'images/logo-projector.png' %}"></div>
|
<div id="logo"><img src="{% static 'img/logo-projector.png' %}"></div>
|
||||||
<div class="event_name">{% get_config 'event_name' %}</div>
|
<div class="event_name">{% get_config 'event_name' %}</div>
|
||||||
<div class="event_description">{% get_config 'event_description' %}</div>
|
<div class="event_description">{% get_config 'event_description' %}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 924 B |
Before Width: | Height: | Size: 821 B |
Before Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 644 B |
Before Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 654 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 640 B |
Before Width: | Height: | Size: 848 B |
Before Width: | Height: | Size: 597 B |
Before Width: | Height: | Size: 601 B |
Before Width: | Height: | Size: 413 B |
Before Width: | Height: | Size: 756 B |
Before Width: | Height: | Size: 726 B |
Before Width: | Height: | Size: 722 B |
Before Width: | Height: | Size: 614 B |
Before Width: | Height: | Size: 636 B |
Before Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 803 B |
Before Width: | Height: | Size: 694 B |
Before Width: | Height: | Size: 489 B |
Before Width: | Height: | Size: 757 B |
Before Width: | Height: | Size: 688 B |
Before Width: | Height: | Size: 808 B |
Before Width: | Height: | Size: 720 B |
Before Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 842 B |
Before Width: | Height: | Size: 707 B |
Before Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 794 B |
Before Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 866 B |
Before Width: | Height: | Size: 825 B |
Before Width: | Height: | Size: 741 B |
After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 912 B After Width: | Height: | Size: 912 B |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
@ -304,6 +304,12 @@ legend + .control-group {
|
||||||
background-image: url("../img/glyphicons_256_delete.png");
|
background-image: url("../img/glyphicons_256_delete.png");
|
||||||
background-position: 0;
|
background-position: 0;
|
||||||
}
|
}
|
||||||
|
.icon-add-user {
|
||||||
|
background-image: url("../img/glyphicons_006_user_add.png");
|
||||||
|
background-position: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** Responsive **/
|
/** Responsive **/
|
||||||
@media (max-width: 767px) {
|
@media (max-width: 767px) {
|
||||||
|
|