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

Major changes for new twitter bootstrap template (e.g. replaced icons)

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-01-31 10:19:56 +01:00
parent b8532fabe4
commit 82ad5e2de0
39 changed files with 757 additions and 733 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openslides/agenda/static/javascript/agenda.js
View File

@ -20,7 +20,7 @@ function hideClosedSlides(hide) {
if (hide) { if (hide) {
$('#hidelink').attr('title', 'show'); $('#hidelink').attr('title', 'show');
$('#hidelink').removeClass('hide').addClass('show'); $('#hidelink').removeClass('hide').addClass('show');
$('.close_link.closed').parent().parent().each(function() { $('.close_link .icon-checked-new').parent().parent().parent().each(function() {
hideLine($(this)); hideLine($(this));
}); });
hidden = $('#menu-overview tr:hidden').size(); hidden = $('#menu-overview tr:hidden').size();
@ -35,7 +35,8 @@ function hideClosedSlides(hide) {
} }
$(function() { $(function() {
$('.close_link a').click(function(event) { // change participant status (on/off)
$('.close_link').click(function(event) {
event.preventDefault(); event.preventDefault();
var link = $(this); var link = $(this);
$.ajax({ $.ajax({
@ -44,15 +45,15 @@ $(function() {
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if (data.closed) { if (data.closed) {
newclass = 'closed'; newclass = 'icon-checked-new';
link.parent().parent().parent().addClass('itemdoneline'); link.parent().parent().addClass('offline');
link.addClass('btn-success');
} else { } else {
newclass = 'open'; newclass = 'icon-unchecked-new';
link.parent().parent().parent().removeClass('itemdoneline'); link.parent().parent().removeClass('offline');
link.removeClass('btn-success');
} }
link.parent().removeClass('closed open').addClass(newclass); link.children('i').removeClass('icon-checked-new icon-unchecked-new').addClass(newclass);
link.attr('href', data.link); link.attr('href', data.link);
} }
}); });

30
openslides/agenda/templates/agenda/edit.html
View File

@ -23,29 +23,13 @@
</small> </small>
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{% for field in form %} {% include "form.html" %}
<div class="control-group{% if field.errors %} error{% endif%}"> <p>
<label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label> {% include "formbuttons_saveapply.html" %}
{{ field }} <a href='{% url 'item_overview' %}' class="btn">
{% if field.errors %} {% trans 'Cancel' %}
<span class="help-inline">{{ field.errors }}</span> </a>
{% endif %} </p>
{% if field.help_text %}
<span class="help-inline">{{ field.help_text }})</span>
{% endif %}
</div>
{% endfor %}
<div class="control-group">
<button class="btn btn-primary" type="submit">
{% trans 'Save' %}
</button>
<button class="btn" type="submit" name="apply">
{% trans 'Apply' %}
</button>
<a href="{% url 'item_overview' %}" class="btn">
{% trans 'Cancel' %}
</a>
</div>
<small>* {% trans "required" %}</small> <small>* {% trans "required" %}</small>
</form> </form>
{% endblock %} {% endblock %}

16
openslides/agenda/templates/agenda/item_row.html
View File

@ -3,16 +3,14 @@
{% load tags %} {% load tags %}
<td> <td>
<span class="close_link {% if item.closed %}closed{% else %}open{% endif %}">
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}" <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}"
class="btn btn-mini" title="{% trans 'Reopen item' %}"> class="close_link btn btn-mini {% if item.closed %}btn-success{% endif %}" title="{% trans 'Change status (open/closed)' %}">
<i class="icon- custom-icons"></i> <i class="{% if item.closed %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
</a> </a>
{% else %} {% else %}
<i class="icon- custom-icons"></i> <i class="icon-"></i>
{% endif %} {% endif %}
</span>
</td> </td>
<td> <td>
{% for p in item.get_ancestors %} {% for p in item.get_ancestors %}
@ -33,8 +31,8 @@
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate item' %}"> <a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i> <i class="icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
@ -46,7 +44,7 @@
</a> </a>
{% if not item.is_leaf_node %} {% if not item.is_leaf_node %}
<a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Activate summary for this item' %}"> <a href="{% url 'projector_activate_slide' item.sid 'summary' %}" class="activate_link btn btn-mini" title="{% trans 'Activate summary for this item' %}">
<img src="{% static 'images/icons/summary.png' %}"> <i class="icon-summary"></i>
</a> </a>
{% endif %} {% endif %}
{% endif %} {% endif %}

4
openslides/agenda/templates/agenda/overview.html
View File

@ -96,7 +96,7 @@
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<span> <span>
<a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}"> <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}">
<i class="icon icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i> <i class="icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
</a> </a>
<span> <span>
{% endif %} {% endif %}
@ -105,7 +105,7 @@
</tr> </tr>
{% if items %} {% if items %}
{% for item in items %} {% for item in items %}
<tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} itemdoneline{% endif %}"> <tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} offline{% endif %}">
{% include "agenda/item_row.html" %} {% include "agenda/item_row.html" %}
</tr> </tr>
{% endfor %} {% endfor %}

27
openslides/agenda/templates/agenda/widget.html
View File

@ -4,8 +4,8 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
<li class="{% if agenda.active %}activeline{% endif %}"> <li class="{% if agenda.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' agenda.key %}" class="activate_projector btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}"> <a href="{% url 'projector_activate_slide' agenda.key %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
<i class="icon icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i> <i class="icon-facetime-video {% if agenda.active %}icon-white{% endif %}"></i>
</a>&nbsp; </a>&nbsp;
<a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right"> <a href="{% url 'projctor_preview_slide' agenda.key %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span> <span></span>
@ -17,27 +17,22 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for item in items %} {% for item in items %}
<li class="{% if item.active %}activeline{% endif %}"> <li class="{% if item.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' item.sid %}" class="activate_projector btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}"> <a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i> <i class="icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
</a>&nbsp; </a>&nbsp;
<a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<span></span> <i class="icon-pencil"></i>
</a> </a>
<a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right"> <a href="{% url 'projctor_preview_slide' item.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a>
<a href="{% url 'projctor_preview_slide' item.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a> </a>
{% if not item.is_leaf_node %} {% if not item.is_leaf_node %}
<a class="activate_projector right" href="{% url 'projector_activate_slide' item.sid 'summary' %}"> <a class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %} right" href="{% url 'projector_activate_slide' item.sid 'summary' %}" title="{% trans 'Activate summary for this item' %}">
<img src="{% static 'images/icons/summary.png' %}" <i class="icon-summary {% if item.active %}icon-white{% endif %}"></i>
title="{% trans 'Activate summary for this item' %}"
style="padding-right: 2px;">
</a> </a>
{% endif %} {% endif %}
{% for p in item.get_ancestors %} {% for p in item.get_ancestors %}
<span class="indentation">&nbsp;</span> <span class="indentation"></span>
{% endfor %} {% endfor %}
<a href="{% model_url item 'view' %}">{{ item }}</a> <a href="{% model_url item 'view' %}">{{ item }}</a>
{{ item.get_title_supplement|safe }} {{ item.get_title_supplement|safe }}

23
openslides/assignment/templates/assignment/config.html
View File

@ -5,20 +5,19 @@
{% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Election settings" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Configuration" %}: {% trans "Elections" %} <h1>
{% trans "Configuration" %}
<small>{% trans "Elections" %}</small>
{% block config_submenu %}{{ block.super }}{% endblock %} {% block config_submenu %}{{ block.super }}{% endblock %}
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{{ form.as_p }} {% include "form.html" %}
<p> <p>
<button class="button" type="submit"> {% include "formbuttons_save.html" %}
<span class="icon ok">{% trans 'Save' %}</span> <a href="{% url 'config_assignment' %}" class="btn">
</button> {% trans 'Cancel' %}
<a href="{% url 'config_assignment' %}"> </a>
<button class="button" type="button" onclick="window.location='{% url 'config_assignment' %}'"> </p>
<span class="icon cancel">{% trans 'Cancel' %}</span> <small>* {% trans "required" %}</small>
</button>
</a>
</p>
</form> </form>
{% endblock %} {% endblock %}

16
openslides/assignment/templates/assignment/overview.html
View File

@ -53,15 +53,21 @@
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<a class="activate_link {% if assignment.active %}active{% endif %}" href="{% url 'projector_activate_slide' assignment.sid %}" title="{% trans 'Activate election' %}"> <a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<span></span> <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.assignment.can_manage_assignment %} {% if perms.assignment.can_manage_assignment %}
<a href="{% url 'assignment_edit' assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit election' %}"></a> <a href="{% url 'assignment_edit' assignment.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
<a href="{% url 'assignment_delete' assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete election' %}"></a> <i class="icon-pencil"></i>
</a>
<a href="{% url 'assignment_delete' assignment.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
{% endif %} {% endif %}
<a href="{% url 'print_assignment' assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a> <a href="{% url 'print_assignment' assignment.id %}" class="btn btn-mini" title="{% trans 'Print election as PDF' %}">
<i class="icon-print"></i>
</a>
</span> </span>
</td> </td>
</tr> </tr>

66
openslides/assignment/templates/assignment/poll_view.html
View File

@ -5,15 +5,30 @@
{% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}" – {{ ballotnumber }}. {% trans "ballot" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Election" %} "{{ assignment }}" – {{ ballotnumber }}. {% trans "ballot" %}{% endblock %}
{% block content %} {% block content %}
<h1>{{ assignment }} – {{ ballotnumber }}. {% trans "ballot" %}</h1> <h1>
{% if assignment.polldescription %} {{ assignment }}
<p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p> <small>
{{ ballotnumber }}. {% trans "ballot" %}
</small>
<small class="pull-right">
<a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
<!-- activate projector -->
{% if perms.projector.can_manage_projector %}
<a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
<i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
</a>
{% endif %} {% endif %}
<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i> </small>
</h1>
<form action="" method="post" class="small-form">{% csrf_token %} {% if assignment.polldescription %}
<p><b>{% trans "Short description (for ballot paper)" %}:</b> {{ assignment.polldescription }}</p>
{% endif %}
<table style="width:auto"> <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
<form action="" method="post" class="small-form">{% csrf_token %}
<table class="table table-striped table-bordered" style="width: auto;">
<tr> <tr>
<th>{% trans "Candidates" %}</th> <th>{% trans "Candidates" %}</th>
{% for value in poll.get_vote_values %} {% for value in poll.get_vote_values %}
@ -31,7 +46,7 @@
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {% endfor %}
<tr class="total"> <tr>
<td>{% trans "Invalid votes" %}</td> <td>{% trans "Invalid votes" %}</td>
{% for value in poll.get_vote_values %} {% for value in poll.get_vote_values %}
{% if forloop.first %} {% if forloop.first %}
@ -41,7 +56,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr> </tr>
<tr class="total"> <tr class="total warning">
<td>{% trans "Votes cast" %}</td> <td>{% trans "Votes cast" %}</td>
{% for value in poll.get_vote_values %} {% for value in poll.get_vote_values %}
{% if forloop.first %} {% if forloop.first %}
@ -54,26 +69,21 @@
</table> </table>
<p> <p>
<a href="{% url 'print_assignment_poll' poll.id %}"> <a href="{% url 'print_assignment_poll' poll.id %}" class="btn">
<button class="button" type="button" onclick="window.location='{% url 'print_assignment_poll' poll.id %}'"> <i class="icon-print"></i> {% trans 'Ballot paper as PDF' %}
<span class="icon pdf">{% trans 'Ballot paper as PDF' %}</span>
</button>
</a> </a>
</p> </p>
<!-- Control buttons -->
<p> <div class="control-group">
<button class="button" type="submit"> <button type="submit" class="btn btn-primary">
<span class="icon ok">{% trans 'Save' %}</span> {% trans 'Save' %}
</button> </button>
<button class="button" type="submit" name="apply"> <button type="submit" name="apply" class="btn">
<span class="icon apply">{% trans 'Apply' %}</span> {% trans 'Apply' %}
</button> </button>
<a href="{% url 'assignment_view' poll.assignment.id %}"> <a href="{% url 'assignment_view' poll.assignment.id %}" class="btn">
<button class="button" type="button" onclick="window.location='{% url 'assignment_view' poll.assignment.id %}'"> {% trans 'Cancel' %}
<span class="icon cancel">{% trans 'Cancel' %}</span> </a>
</button> </div>
</a> </form>
</p>
</form>
{% endblock %} {% endblock %}

21
openslides/assignment/templates/assignment/view.html
View File

@ -14,15 +14,18 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>{{ assignment }} <h1>
<small class="pull-right"> {{ assignment }}
<a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a> <small class="pull-right">
{% if perms.projector.can_manage_projector %} <a href="{% url 'assignment_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
<a href="{% url 'projector_activate_slide' assignment.sid %}" class="btn btn-primary btn-mini" title="{% trans 'Show election' %}"><i class="icon-facetime-video icon-white"></i></a> <!-- activate projector -->
{% endif %} {% if perms.projector.can_manage_projector %}
</small> <a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" rel="tooltip" data-original-title="{% trans 'Show motion' %}">
</h1> <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
</a>
{% endif %}
</small>
</h1>
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span9">

17
openslides/assignment/templates/assignment/widget.html
View File

@ -5,17 +5,14 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for assignment in assignments %} {% for assignment in assignments %}
<li class="{% if assignment.active %}activeline{% endif %}"> <li class="{% if assignment.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link {% if assignment.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' assignment.sid %}" class="activate_link btn {% if assignment.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if assignment.active %}icon-white{% endif %}"></i>
</a>&nbsp;
<a href="{% model_url assignment 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a> </a>
<a href="{% model_url assignment 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% url 'projctor_preview_slide' assignment.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a>
<a href="{% model_url assignment 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url 'projctor_preview_slide' assignment.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a> </a>
<a href="{% model_url assignment 'view' %}">{{ assignment }}</a> <a href="{% model_url assignment 'view' %}">{{ assignment }}</a>
</li> </li>

66
openslides/config/templates/config/general.html
View File

@ -5,7 +5,9 @@
{% block title %}{{ block.super }} – {% trans "General settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "General settings" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Configuration" %}: {% trans "General" %} <h1>
{% trans "Configuration" %}
<small>{% trans "General" %}</small>
{% block config_submenu %}{{ block.super }}{% endblock %} {% block config_submenu %}{{ block.super }}{% endblock %}
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
@ -13,13 +15,16 @@
<legend>{% trans "Event" %}</legend> <legend>{% trans "Event" %}</legend>
{% for field in form %} {% for field in form %}
{% if "id_event" in field.label_tag %} {% if "id_event" in field.label_tag %}
<p> <div class="control-group{% if field.errors %} error{% endif%}">
{{ field.errors }} <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
{{ field.required }} {{ field }}
{{ field.label_tag }} {% if field.errors %}
{{ field }} <span class="help-inline">{{ field.errors }}</span>
{{ field.help_text }} {% endif %}
</p> {% if field.help_text %}
<span class="help-inline">{{ field.help_text }}</span>
{% endif %}
</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</fieldset> </fieldset>
@ -28,13 +33,16 @@
<legend>{% trans "Welcome Widget" %}</legend> <legend>{% trans "Welcome Widget" %}</legend>
{% for field in form %} {% for field in form %}
{% if "id_welcome" in field.label_tag %} {% if "id_welcome" in field.label_tag %}
<p> <div class="control-group{% if field.errors %} error{% endif%}">
{{ field.errors }} <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
{{ field.required }} {{ field }}
{{ field.label_tag }} {% if field.errors %}
{{ field }} <span class="help-inline">{{ field.errors }}</span>
{{ field.help_text }} {% endif %}
</p> {% if field.help_text %}
<span class="help-inline">{{ field.help_text }}</span>
{% endif %}
</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</fieldset> </fieldset>
@ -43,25 +51,25 @@
<legend>{% trans "System" %}</legend> <legend>{% trans "System" %}</legend>
{% for field in form %} {% for field in form %}
{% if "id_system" in field.label_tag %} {% if "id_system" in field.label_tag %}
<p> <div class="control-group{% if field.errors %} error{% endif%}">
{{ field.errors }} <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
{{ field.required }} {{ field }}
{{ field.label_tag }} {% if field.errors %}
{{ field }} <span class="help-inline">{{ field.errors }}</span>
{{ field.help_text }} {% endif %}
</p> {% if field.help_text %}
<span class="help-inline">{{ field.help_text }}</span>
{% endif %}
</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</fieldset> </fieldset>
<p> <p>
<button class="button" type="submit"> {% include "formbuttons_save.html" %}
<span class="icon ok">{% trans 'Save' %}</span> <a href='{% url 'config_general' %}' class="btn">
</button> {% trans 'Cancel' %}
<a href="{% url 'config_general' %}">
<button class="button" type="button" onclick="window.location='{% url 'config_general' %}'">
<span class="icon cancel">{% trans 'Cancel' %}</span>
</button>
</a> </a>
</p> </p>
<small>* {% trans "required" %}</small>
</form> </form>
{% endblock %} {% endblock %}

BIN
openslides/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

679
openslides/locale/de/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

23
openslides/motion/templates/motion/config.html
View File

@ -5,20 +5,19 @@
{% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Motion settings" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Configuration" %}: {% trans "Motions" %} <h1>
{% trans "Configuration" %}
<small>{% trans "Motions" %}</small>
{% block config_submenu %}{{ block.super }}{% endblock %} {% block config_submenu %}{{ block.super }}{% endblock %}
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{{ form.as_p }} {% include "form.html" %}
<p> <p>
<button class="button" type="submit"> {% include "formbuttons_save.html" %}
<span class="icon ok">{% trans 'Save' %}</span> <a href="{% url 'config_motion' %}" class="btn">
</button> {% trans 'Cancel' %}
<a href="{% url 'config_motion' %}"> </a>
<button class="button" type="button" onclick="window.location='{% url 'config_motion' %}'"> </p>
<span class="icon cancel">{% trans 'Cancel' %}</span> <small>* {% trans "required" %}</small>
</button>
</a>
</p>
</form> </form>
{% endblock %} {% endblock %}

35
openslides/motion/templates/motion/edit.html
View File

@ -13,17 +13,18 @@
{% block content %} {% block content %}
<h1> <h1>
{% if motion %} {% if motion %}
{% trans "Edit motion" %} {% trans "Edit motion" %}
{% else %} {% else %}
{% trans "New motion" %} {% trans "New motion" %}
{% endif %} {% endif %}
<small class="pull-right"> <small class="pull-right">
<a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a> <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
</small> </small>
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{% for field in form %} {% include "form.html" %}
{% for field in managerform %}
<div class="control-group{% if field.errors %} error{% endif%}"> <div class="control-group{% if field.errors %} error{% endif%}">
<label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label> <label for="id_{{ field.name }}">{{ field.label }}{% if field.field.required %}<span class="required">*</span>{% endif %}:</label>
{{ field }} {{ field }}
@ -35,20 +36,12 @@
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}
{{ managerform.as_p }} <p>
<div class="control-group"> {% include "formbuttons_saveapply.html" %}
<button class="btn btn-primary" type="submit"> <a href='{% url 'motion_overview' %}' class="btn">
{% trans 'Save' %}
</button>
<button class="btn" type="submit" name="apply">
{% trans 'Apply' %}
</button>
<a href="{% url 'motion_overview' %}" class="btn">
{% trans 'Cancel' %} {% trans 'Cancel' %}
</a> </a>
</button> </p>
</a>
</div>
<small>* {% trans "required" %}</small> <small>* {% trans "required" %}</small>
</form> </form>
{% endblock %} {% endblock %}

21
openslides/motion/templates/motion/overview.html
View File

@ -14,7 +14,7 @@
<a href="{% url 'motion_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a> <a href="{% url 'motion_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New motion' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
{% endif %} {% endif %}
{% if perms.motion.can_manage_motion %} {% if perms.motion.can_manage_motion %}
<a href="{% url 'motion_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a> <a href="{% url 'motion_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import motions' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
{% endif %} {% endif %}
<a href="{% url 'print_motions' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a> <a href="{% url 'print_motions' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print all motions as PDF' %}"><i class="icon-print"></i> PDF</a>
</small> </small>
@ -61,8 +61,7 @@
</tr> </tr>
{% for app_info in motions %} {% for app_info in motions %}
{% with motion=app_info.motion useractions=app_info.actions %} {% with motion=app_info.motion useractions=app_info.actions %}
<tr class="{% cycle '' 'odd' %} <tr class="{% if motion.active %}activeline{% endif %}">
{% if motion.active %}activeline{% endif %}">
<td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td> <td>{% if motion.number %}{{ motion.number }}{% else %}-{% endif %}</td>
<td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td> <td><a href="{% url 'motion_view' motion.id %}">{{ motion.public_version.title }}</a></td>
{% if min_supporters > 0 %} {% if min_supporters > 0 %}
@ -81,17 +80,23 @@
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<a class="activate_link {% if motion.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}" title="{% trans 'Activate motion' %}"> <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<span></span> <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
</a> </a>
{% endif %} {% endif %}
{% if perms.motion.can_manage_motion %} {% if perms.motion.can_manage_motion %}
<a href="{% url 'motion_edit' motion.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit motion' %}"></a> <a href="{% url 'motion_edit' motion.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
<i class="icon-pencil"></i>
</a>
{% if "delete" in useractions %} {% if "delete" in useractions %}
<a href="{% url 'motion_delete' motion.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete motion' %}"></a> <a href="{% url 'motion_delete' motion.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
{% endif %} {% endif %}
{% endif %} {% endif %}
<a href="{% url 'print_motion' motion.id %}" title="{% trans 'Motion as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a> <a href="{% url 'print_motion' motion.id %}" class="btn btn-mini" title="{% trans 'Print motion as PDF' %}">
<i class="icon-print"></i>
</a>
</span> </span>
</td> </td>
</tr> </tr>

17
openslides/motion/templates/motion/poll_view.html
View File

@ -10,12 +10,19 @@
{% block content %} {% block content %}
<h1> <h1>
{{ motion.public_version.title }} {{ motion.public_version.title }}
<br>
<small> <small>
{% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %} {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %}
</small> </small>
<small class="pull-right"> <small class="pull-right">
<div class="btn-toolbar"> <div class="btn-toolbar">
<a href="{% url 'motion_view' motion.id %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to motion" %}</a> <a href="{% url 'motion_view' 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>
{% endif %}
<div class="btn-group"> <div class="btn-group">
<a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle"> <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
{% trans 'More actions' %} {% trans 'More actions' %}
@ -26,12 +33,6 @@
{% if "delete" in actions %} {% if "delete" in actions %}
<li><a href="{% url 'motion_poll_delete' poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li> <li><a href="{% url 'motion_poll_delete' poll.id %}"><i class="icon-remove"></i> {% trans 'Delete Vote' %}</a></li>
{% endif %} {% endif %}
<!-- activate projector -->
{% if perms.projector.can_manage_projector %}
<li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
</li>
{% endif %}
</ul> </ul>
</div> </div>
</div> </div>
@ -54,11 +55,11 @@
<td>{{ value.errors }}{{ value }}</td> <td>{{ value.errors }}{{ value }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
<tr class="total"> <tr>
<td>{% trans "Invalid votes" %}</td> <td>{% trans "Invalid votes" %}</td>
<td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td> <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
</tr> </tr>
<tr class="total"> <tr class="total warning">
<td>{% trans "Votes cast" %}</td> <td>{% trans "Votes cast" %}</td>
<td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td> <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
</tr> </tr>

59
openslides/motion/templates/motion/view.html
View File

@ -29,6 +29,12 @@
<div class="btn-toolbar"> <div class="btn-toolbar">
<a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a> <a href="{% url 'motion_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
<a href="{% url 'print_motion' motion.id %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</a> <a href="{% url 'print_motion' motion.id %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Print this motion as PDF' %}"><i class="icon-print"></i> PDF</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>
{% endif %}
<div class="btn-group"> <div class="btn-group">
<a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle"> <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
{% trans 'More actions' %} {% trans 'More actions' %}
@ -43,12 +49,6 @@
{% if "delete" in actions %} {% if "delete" in actions %}
<li><a href="{% url 'motion_delete' motion.id %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li> <li><a href="{% url 'motion_delete' motion.id %}"><i class="icon-remove"></i> {% trans 'Delete motion' %}</a></li>
{% endif %} {% endif %}
<!-- activate projector -->
{% if perms.projector.can_manage_projector %}
<li>
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url 'projector_activate_slide' motion.sid %}"><i class="icon-facetime-video"></i> {% trans 'Show motion' %}</a>
</li>
{% endif %}
<!-- edit poll --> <!-- edit poll -->
{% if perms.motion.can_manage_motion %} {% if perms.motion.can_manage_motion %}
{% for poll in motion.polls %} {% for poll in motion.polls %}
@ -150,8 +150,12 @@
{% endif %} {% endif %}
<!-- Log --> <!-- Log -->
{% if perms.motion.can_manage_motion %} {% if perms.motion.can_manage_motion %}
<h4>{% trans "Log" %}:</h4> <button type="button" class="btn" data-toggle="collapse" data-target="#log">
<small>{{ motion.log|linebreaks }}</small> {% trans "Show log" %}
</button>
<div id="log" class="collapse out">
<small>{{ motion.log|linebreaks }}</small>
</div>
{% endif %} {% endif %}
</div> <!--/span--> </div> <!--/span-->
@ -278,40 +282,37 @@
<!-- Formal validation --> <!-- Formal validation -->
{% if "pub" in actions or "per" in actions or "nop" in actions or "setnumber" in actions %} {% if "pub" in actions or "per" in actions or "nop" in actions or "setnumber" in actions %}
<h5>{% trans "Formal validation" %}:</h5> <h5>{% trans "Formal validation" %}:</h5>
<div class="btn-group btn-group-vertical"> {% if "pub" in actions %}
{% if "pub" in actions %} <p><a href="{% url 'motion_set_status' motion.id 'pub' %}" class="btn">{% trans 'Publish' %}</a></p>
<a href="{% url 'motion_set_status' motion.id 'pub' %}" class="btn">{% trans 'Publish' %}</a> {% endif %}
{% endif %} {% if "per" in actions %}
{% if "per" in actions %} <p><a href="{% url 'motion_permit' motion.id %}" class="btn btn-info">{% trans 'Permit' %}</a></p>
<a href="{% url 'motion_permit' motion.id %}" class="btn btn-info">{% trans 'Permit' %}</a> {% endif %}
{% endif %} {% if "nop" in actions %}
{% if "nop" in actions %} <p><a href="{% url 'motion_notpermit' motion.id %}" class="btn">{% trans 'Not permit' %}</a></p>
<a href="{% url 'motion_notpermit' motion.id %}" class="btn">{% trans 'Not permit' %}</a> {% endif %}
{% endif %} {% if "setnumber" in actions %}
{% if "setnumber" in actions %} <p><a href="{% url 'motion_set_number' motion.id %}" class="btn">{% trans 'Set number' %}</a></p>
<a href="{% url 'motion_set_number' motion.id %}" class="btn">{% trans 'Set number' %}</a> {% endif %}
{% endif %}
</div>
{% endif %} {% endif %}
<!-- Result after vote --> <!-- Result after vote -->
{% if "acc" in actions or "rej" in actions %} {% if "acc" in actions or "rej" in actions %}
<h5>{% trans "Result after vote" %}:</h5> <h5>{% trans "Result after vote" %}:</h5>
<div class="btn-group btn-group-vertical"> <div>
{% if "acc" in actions %} {% if "acc" in actions %}
<a href="{% url 'motion_set_status' motion.id 'acc' %}" class="btn btn-success"> <p><a href="{% url 'motion_set_status' motion.id 'acc' %}" class="btn btn-success">
<i class="icon-ok icon-white"></i> {% trans 'Accepted' %} <i class="icon-ok icon-white"></i> {% trans 'Accepted' %}
</a> </a></p>
{% endif %} {% endif %}
{% if "rej" in actions %} {% if "rej" in actions %}
<a href="{% url 'motion_set_status' motion.id 'rej' %}" class="btn btn-danger"> <p><a href="{% url 'motion_set_status' motion.id 'rej' %}" class="btn btn-danger">
<i class="icon-ban-circle icon-white"></i> {% trans 'Rejected' %} <i class="icon-ban-circle icon-white"></i> {% trans 'Rejected' %}
</a> </a></p>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
<!-- Result after debate --> <!-- Result after debate -->
{% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %} {% if "adj" in actions or "noc" in actions or "com" in actions or "wit" in actions %}
<br><br>
<div class="btn-group"> <div class="btn-group">
<a data-toggle="dropdown" href="#" class="btn dropdown-toggle"> <a data-toggle="dropdown" href="#" class="btn dropdown-toggle">
{% trans 'More actions' %} {% trans 'More actions' %}
@ -337,7 +338,7 @@
<hr> <hr>
<h5>{% trans "For Administration only:" %}</h5> <h5>{% trans "For Administration only:" %}</h5>
<a href="{% url 'motion_reset' motion.id %}" class="btn btn-danger"> <a href="{% url 'motion_reset' motion.id %}" class="btn btn-danger">
{% trans 'Reset' %} <i class="icon-exclamation-sign icon-white"></i> {% trans 'Reset' %}
</a> </a>
</div> <!--/well--> </div> <!--/well-->
{% endif %} {# end perms.motion.can_support_motion #} {% endif %} {# end perms.motion.can_support_motion #}

17
openslides/motion/templates/motion/widget.html
View File

@ -5,17 +5,14 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for motion in motions %} {% for motion in motions %}
<li class="{% if motion.active %}activeline{% endif %}"> <li class="{% if motion.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link {% if motion.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' motion.sid %}" class="activate_link btn {% if motion.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if motion.active %}icon-white{% endif %}"></i>
</a>&nbsp;
<a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a> </a>
<a href="{% model_url motion 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a>
<a href="{% model_url motion 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url 'projctor_preview_slide' motion.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a> </a>
<a href="{% model_url motion 'view' %}"> <a href="{% model_url motion 'view' %}">
{{ motion.public_version.title }} {{ motion.public_version.title }}

16
openslides/participant/static/javascript/participant.js
View File

@ -6,22 +6,24 @@
*/ */
$(function() { $(function() {
// change participant status (on/off)
$('.status_link').click(function(event) { $('.status_link').click(function(event) {
event.preventDefault(); event.preventDefault();
link = $(this); var link = $(this);
group = $(this).parent();
$.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.active) { if (data.active) {
group.children('.status_link.deactivate').show(); newclass = 'icon-on';
group.children('.status_link.activate').hide(); link.addClass('btn-success');
} else { } else {
group.children('.status_link.deactivate').hide(); newclass = 'icon-off';
group.children('.status_link.activate').show(); link.removeClass('btn-success');
} }
link.children('i').removeClass('icon-off icon-on').addClass(newclass);
link.attr('href', data.link);
} }
}); });
}); });

5
openslides/participant/templates/participant/config.html
View File

@ -5,7 +5,9 @@
{% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Participant settings" %}{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Configuration" %}: {% trans "Participants" %} <h1>
{% trans "Configuration" %}
<small>{% trans "Participants" %}</small>
{% block config_submenu %}{{ block.super }}{% endblock %} {% block config_submenu %}{{ block.super }}{% endblock %}
</h1> </h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
@ -16,5 +18,6 @@
{% trans 'Cancel' %} {% trans 'Cancel' %}
</a> </a>
</p> </p>
<small>* {% trans "required" %}</small>
</form> </form>
{% endblock %} {% endblock %}

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

@ -10,7 +10,7 @@
<h1>{% trans "Groups" %} <h1>{% trans "Groups" %}
<small class="pull-right"> <small class="pull-right">
<a href="{% url 'user_group_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New group' %}"><i class="icon-plus"></i> {% trans "New" %}</a> <a href="{% url 'user_group_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New group' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
<a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Participants" %}</a> <a href="{% url 'user_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to participants overview" %}</a>
</small> </small>
</h1> </h1>

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

@ -5,17 +5,14 @@
{% for group in groups %} {% for group in groups %}
{% if group.name != 'Anonymous' and group.name != 'Registered' %} {% 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 btn {% if group.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if group.active %}icon-white{% endif %}"></i>
</a>&nbsp;
<a href="{% model_url group 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a> </a>
<a href="{% model_url group 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a>
<a href="{% model_url group 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url 'projctor_preview_slide' group.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a> </a>
<a href="{% model_url group 'view' %}">{{ group }}</a> <a href="{% model_url group 'view' %}">{{ group }}</a>
</li> </li>

20
openslides/participant/templates/participant/login.html
View File

@ -3,6 +3,9 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block loginbutton %}
{% endblock %}
{% block body %} {% block body %}
<div id="login-page" class="container"> <div id="login-page" class="container">
<h2><img src="/static/img/logo-login.png"></h2> <h2><img src="/static/img/logo-login.png"></h2>
@ -44,22 +47,11 @@
{% trans 'Login' %} {% trans 'Login' %}
</button> </button>
{% if os_enable_anonymous_login %} {% if os_enable_anonymous_login %}
<button id="anonymous_login" class="btn"> <a id="anonymous_login" class="btn" href="{% url 'dashboard' %}">
{% trans 'Continue as guest' %} {% trans 'Continue as guest' %}
</button> </a>
{% endif %} {% endif %}
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
</p> </p>
</form> </form>
{% endblock %} {% endblock %}
{% block javascript %}
{% if os_enable_anonymous_login %}
<script>
$("#anonymous_login").live('click', function () {
window.location.href = "{% url 'item_overview' %}";
return false;
});
</script>
{% endif %}
</div>
{% endblock %}

38
openslides/participant/templates/participant/overview.html
View File

@ -9,25 +9,29 @@
{% block header %} {% block header %}
{% if perms.participant.can_manage_participant %} {% if perms.participant.can_manage_participant %}
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/participant.css' %}" /> <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/participant.css' %}" />
<script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block javascript %}
{% if perms.participant.can_manage_participant %}
<script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<h1>{% trans "Participants" %} <h1>{% trans "Participants" %}
<small class="pull-right"> <small class="pull-right">
<div class="btn-toolbar"> <div class="btn-toolbar">
{% if perms.participant.can_manage_participant %} {% if perms.participant.can_manage_participant %}
<a href="{% url 'user_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a> <a href="{% url 'user_new' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'New participant' %}"><i class="icon-plus"></i> {% trans "New" %}</a>
<a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-user"></i> {% trans "User groups" %}</a> <a href="{% url 'user_group_overview' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'All user groups' %}"><i class="icon-group"></i> {% trans "User groups" %}</a>
<a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-share-alt"></i> {% trans 'Import' %}</a> <a href="{% url 'user_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import participants' %}"><i class="icon-import"></i> {% trans 'Import' %}</a>
{% endif %} {% endif %}
{% if perms.participant.can_see_participant and perms.participant.can_manage_participant %} {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
<div class="btn-group pull-right"> <div class="btn-group pull-right">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a href="#" data-toggle="dropdown" class="btn btn-mini dropdown-toggle"> <a href="#" data-toggle="dropdown" class="btn btn-mini dropdown-toggle">
<i class="icon-print"></i> Print as PDF <i class="icon-print"></i> PDF
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -111,7 +115,7 @@
{% endif %} {% endif %}
</tr> </tr>
{% for user in users %} {% for user in users %}
<tr> <tr class="{% if user.active %}activeline{% endif %}">
<td>{{ user.first_name }}</td> <td>{{ user.first_name }}</td>
<td>{{ user.last_name }}</td> <td>{{ user.last_name }}</td>
<td class="optional">{{ user.structure_level }}</td> <td class="optional">{{ user.structure_level }}</td>
@ -126,20 +130,24 @@
</td> </td>
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">
<a href="{% url 'user_edit' user.id %}"> {% if perms.projector.can_manage_projector %}
<img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit participant' %}"> <a href="{% url 'projector_activate_slide' user.sid %}" class="activate_link btn {% if user.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<i class="icon-facetime-video {% if user.active %}icon-white{% endif %}"></i>
</a>
{% endif %}
<a href="{% url 'user_edit' user.id %}" title="{% trans 'Edit' %}" class="btn btn-mini">
<i class="icon-pencil"></i>
</a> </a>
{% if user != request_user %} {% if user != request_user %}
<a href="{% url 'user_delete' user.id %}"> <a href="{% url 'user_delete' user.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete participant' %}"> <i class="icon-remove"></i>
</a> </a>
{% endif %} {% endif %}
{% if user != request_user and not user.is_superuser %} {% if user != request_user and not user.is_superuser %}
<a class="status_link deactivate" href="{% url 'user_status_deactivate' user.id %}" title="{% trans 'Change status to inactive' %}"{% if not user.is_active %} style="display:none"{% endif %}> <a href="{% url 'user_status_toggle' user.id %}"
<span></span> class="status_link btn btn-mini {% if user.is_active %}btn-success{% endif %}"
</a> title="{% trans 'Change status (active/inactive)' %}">
<a class="status_link activate" href="{% url 'user_status_activate' user.id %}" title="{% trans 'Change status to active' %}"{% if user.is_active %} style="display:none"{% endif %}> <i class="{% if user.is_active %}icon-on{% else %}icon-off{% endif %}"></i>
<span></span>
</a> </a>
{% endif %} {% endif %}
</span> </span>

15
openslides/participant/templates/participant/settings.html
View File

@ -2,21 +2,10 @@
{% load i18n %} {% load i18n %}
{% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Edit profile" %}{% endblock %}
<<<<<<< .merge_file_gQQrGK
=======
{% block submenu %}
<h4 class="sectiontitle">{% trans "User Settings" %}</h4>
<ul>
<li class="selected"><a href="{% url 'user_settings' %}">{% trans "Personal Settings" %}</a></li>
<li><a href="{% url 'password_change' %}">{% trans "Password Settings" %}</a></li>
</ul>
{% endblock %}
>>>>>>> .merge_file_n8pEk9
{% block content %} {% block content %}
<h1>{% trans "Personal Settings" %}</h1> <h1>{% trans "Edit profile" %}</h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{% include "form.html" %} {% include "form.html" %}

17
openslides/participant/templates/participant/user_widget.html
View File

@ -4,17 +4,14 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for user in users %} {% for user in users %}
<li class="{% if user.active %}activeline{% endif %}"> <li class="{% if user.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' user.sid %}" class="activate_link {% if user.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' user.sid %}" class="activate_link btn {% if user.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if user.active %}icon-white{% endif %}"></i>
</a>&nbsp;
<a href="{% model_url user 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a> </a>
<a href="{% model_url user 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% url 'projctor_preview_slide' user.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a>
<a href="{% model_url user 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url 'projctor_preview_slide' user.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a> </a>
<a href="{% model_url user 'view' %}">{{ user }}</a> <a href="{% model_url user 'view' %}">{{ user }}</a>
</li> </li>

23
openslides/projector/static/javascript/dashboard.js
View File

@ -50,29 +50,6 @@ $(function() {
$( "#iframe" ).css('zoom', '0.25'); $( "#iframe" ).css('zoom', '0.25');
} }
// activate an element to show it on projector
$('.activate_projector').click(function(event) {
event.preventDefault();
var link = $(this);
$.ajax({
type: 'GET',
url: $(this).attr('href'),
dataType: 'json',
success: function(data) {
$('.activate_projector').removeClass('btn-primary');
$('.activate_projector .icon').removeClass('icon-white');
$('li').removeClass('activeline');
//$('div').removeClass('activeline');
link.addClass('btn-primary');
link.find('.icon').addClass('icon-white');
link.parent().addClass('activeline');
},
error: function () {
alert("Ajax Error");
}
});
});
$('a.overlay').click(function(event) { $('a.overlay').click(function(event) {
event.preventDefault(); event.preventDefault();
var link = $(this); var link = $(this);

8
openslides/projector/static/styles/dashboard.css
View File

@ -79,6 +79,10 @@
#countdown_time { #countdown_time {
width: 40px; width: 40px;
} }
#overlay_message_text {
width: 90%;
height: 12px;
}
/* iframe */ /* iframe */
#iframe { #iframe {
@ -88,7 +92,6 @@
-moz-transform: scale(0.25); -moz-transform: scale(0.25);
-webkit-transform: scale(0.25); -webkit-transform: scale(0.25);
-o-transform: scale(0.25); -o-transform: scale(0.25);
width: 1024px; width: 1024px;
height: 768px; height: 768px;
} }
@ -142,6 +145,3 @@ a.overlay div {
a.overlay.active div { a.overlay.active div {
background-image: url(../images/icons/accept.png); background-image: url(../images/icons/accept.png);
} }

5
openslides/projector/templates/projector/control_countdown.html
View File

@ -8,10 +8,9 @@
<input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}"> <input class="projector_countdown_spinval" id="countdown_time" name="countdown_time" type="number" min="0" value="{{ countdown_time }}">
<span class="add-on">{% trans "s" context "seconds" %}</span> <span class="add-on">{% trans "s" context "seconds" %}</span>
</div> </div>
<a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save as default' %}"> <a id="countdown_set" class="countdown_control btn btn-small" href="{% url 'countdown_set_default' %}" title="{% trans 'Save time as default' %}">
<img src="{% static 'images/icons/document-save.png' %}" alt="{% url 'countdown_set_default' %}"> <i class="icon-refresh"></i>
</a> </a>
<a id="countdown_reset" class="countdown_control btn btn-small" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}"> <a id="countdown_reset" class="countdown_control btn btn-small" href="{% url 'countdown_reset' %}" title="{% trans 'Reset countdown' %}">
<i class="icon-fast-backward"></i> <i class="icon-fast-backward"></i>
</a> </a>

6
openslides/projector/templates/projector/control_overlay_message.html
View File

@ -5,10 +5,10 @@
<form id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post" style="display:inline-block;">{% csrf_token %} <form id="overlay_message" action="{% url 'projector_overlay_message' %}" method="post" style="display:inline-block;">{% csrf_token %}
<div class="input-append"> <div class="input-append">
<input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}"> <input id="overlay_message_text" name='message_text' type='text' value="{% get_config 'projector_message' %}">
<button type="submit" class="btn btn-primary" name="message" rel="tooltip" data-original-title="{% trans 'Apply' %}"> <button type="submit" class="btn btn-mini btn-primary" name="message" title="{% trans 'Apply' %}">
<i class="icon-refresh icon-white"></i> <i class="icon-ok icon-white"></i>
</button> </button>
<button type="submit" class="btn" name='message-clean' title="{% trans 'Clean message' %}"> <button type="submit" class="btn btn-mini" name='message-clean' title="{% trans 'Clean message' %}">
<i class="icon-remove"></i> <i class="icon-remove"></i>
</button> </button>
</div> </div>

36
openslides/projector/templates/projector/custom_slide_widget.html
View File

@ -4,35 +4,30 @@
<ul style="line-height: 180%"> <ul style="line-height: 180%">
<li class="{% if welcomepage_is_active %}activeline{% endif %}"> <li class="{% if welcomepage_is_active %}activeline{% endif %}">
<a href="{% url 'projector_activate_welcomepage' %}" class="activate_link {% if welcomepage_is_active %}active{% endif %}"> <a href="{% url 'projector_activate_welcomepage' %}" class="activate_link btn {% if welcomepage_is_active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if welcomepage_is_active %}icon-white{% endif %}"></i>
</a> </a>&nbsp;
<a href="{% url 'projctor_preview_welcomepage' %}" title="{% trans 'Preview' %}" class="icon preview right"> <a href="{% url 'projctor_preview_welcomepage' %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<span></span> <i class="icon-search"></i>
</a> </a>
{% trans 'Welcome Page' %} {% trans 'Welcome Page' %}
</li> </li>
</ul> </ul>
<hr> <hr>
<div class="pull-right">
<a href="{% url 'customslide_new' %}" class="btn btn-mini">
<i class="icon-plus"></i>{% trans 'New' %}
</a>
</div>
<ul style="line-height: 180%"> <ul style="line-height: 180%">
{% for slide in slides %} {% for slide in slides %}
<li class="{% if slide.active %}activeline{% endif %}"> <li class="{% if slide.active %}activeline{% endif %}">
<a href="{% url 'projector_activate_slide' slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' slide.sid %}" class="activate_link btn {% if slide.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
<div></div> <i class="icon-facetime-video {% if slide.active %}icon-white{% endif %}"></i>
</a> </a>&nbsp;
<a href="{% url 'customslide_edit' slide.id %}">{{ slide }}</a> <a href="{% url 'customslide_edit' slide.id %}">{{ slide }}</a>
<a href="{% url 'customslide_edit' slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini"> <a href="{% url 'customslide_delete' slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a>
<a href="{% url 'customslide_delete' slide.id %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i> <i class="icon-remove"></i>
</a> </a>
<a href="{% url 'projctor_preview_slide' slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini"> <a href="{% url 'customslide_edit' slide.id %}" title="{% trans 'Edit' %}" class="btn btn-mini right">
<i class="icon-pencil"></i>
</a>
<a href="{% url 'projctor_preview_slide' slide.sid %}" title="{% trans 'Preview' %}" class="btn btn-mini right">
<i class="icon-search"></i> <i class="icon-search"></i>
</a> </a>
</li> </li>
@ -40,3 +35,8 @@
<li>{% trans 'No items available.' %}</li> <li>{% trans 'No items available.' %}</li>
{% endfor %} {% endfor %}
</ul> </ul>
<p style="line-height: 280%">
<a href="{% url 'customslide_new' %}" class="btn btn-mini right">
<i class="icon-plus"></i>{% trans 'New' %}
</a>
</p>

2
openslides/projector/templates/projector/dashboard.html
View File

@ -41,7 +41,7 @@
{% for name, widget in widgets.items %} {% for name, widget in widgets.items %}
{% if widget.default_column == 2 %} {% if widget.default_column == 2 %}
<div class="widget" id="widget_{{ widget.get_name }}"> <div class="widget" id="widget_{{ widget.get_name }}">
<div class="widget-header"><i class="icon-star"></i> <div class="widget-header"><i class="{% if widget %}icon-{{widget.name}}{% else %}icon-star{% endif %}"></i>
<h3>{% trans widget.get_title %}<h3> <h3>{% trans widget.get_title %}<h3>
</div> </div>
<div class="widget-content"> <div class="widget-content">

20
openslides/projector/templates/projector/live_view_widget.html
View File

@ -6,24 +6,24 @@
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<div style="float: right;"> <div style="float: right;">
<p> <p>
<a class="projector_edit" href="{% url 'projector_bigger' %}" title="{% trans 'Zoom in' %}"> <a class="projector_edit btn btn-mini" href="{% url 'projector_bigger' %}" title="{% trans 'Zoom in' %}">
<img src="{% static 'images/icons/zoom-in.png' %}" /> <i class="icon-zoom-in"></i>
</a><br> </a><br>
<a class="projector_edit" href="{% url 'projector_smaller' %}" title="{% trans 'Zoom out' %}"> <a class="projector_edit btn btn-mini" href="{% url 'projector_smaller' %}" title="{% trans 'Zoom out' %}">
<img src="{% static 'images/icons/zoom-out.png' %}" /> <i class="icon-zoom-out"></i>
</a> </a>
</p> </p>
<p> <p>
<a class="projector_edit" href="{% url 'projector_up' %}" title="{% trans 'Scroll text up' %}"> <a class="projector_edit btn btn-mini" href="{% url 'projector_up' %}" title="{% trans 'Scroll text up' %}">
<img src="{% static 'images/icons/go-up.png' %}" /> <i class="icon-arrow-up"></i>
</a><br> </a><br>
<a class="projector_edit" href="{% url 'projector_down' %}" title="{% trans 'Scroll text down' %}"> <a class="projector_edit btn btn-mini" href="{% url 'projector_down' %}" title="{% trans 'Scroll text down' %}">
<img src="{% static 'images/icons/go-down.png' %}" /> <i class="icon-arrow-down"></i>
</a> </a>
</p> </p>
<p> <p>
<a class="projector_edit" href="{% url 'projector_clean' %}" title="{% trans 'Reset projector view' %}"> <a class="projector_edit btn btn-mini" href="{% url 'projector_clean' %}" title="{% trans 'Reset projector view' %}">
<img src="{% static 'images/icons/view-reset.png' %}" /> <i class="icon-resize-small"></i>
</a> </a>
</p> </p>
</div> </div>

14
openslides/projector/templates/projector/overlay_widget.html
View File

@ -4,19 +4,21 @@
<ul> <ul>
{% for overlay in overlays %} {% for overlay in overlays %}
<li> <li>
<a id="{{ overlay.def_name }}_inactive" href="{% url 'projector_overlay_activate' overlay.def_name %}" class="overlay"{% if overlay.active %} style="display:none"{% endif %}> <a id="{{ overlay.def_name }}"
<div></div> href="{% if overlay.active %}{% url 'projector_overlay_deactivate' overlay.def_name %}{% else %}{% url 'projector_overlay_activate' overlay.def_name %}{% endif %}"
</a> class="overlay btn btn-mini">
<a id="{{ overlay.def_name }}_active" href="{% url 'projector_overlay_deactivate' overlay.def_name %}" class="overlay active"{% if not overlay.active %} style="display:none"{% endif %}> <i class="{% if overlay.active %}icon-checked-new{% else %}icon-unchecked-new{% endif %}"></i>
<div></div>
</a> </a>
{{ overlay }}:
{# TODO: Call the html via overlay.html #} {# TODO: Call the html via overlay.html #}
{% if overlay.def_name == "Countdown" %} {% if overlay.def_name == "Countdown" %}
<p>{{ overlay }}:<br>
{% include 'projector/control_countdown.html' %} {% include 'projector/control_countdown.html' %}
</p>
{% endif %} {% endif %}
{% if overlay.def_name == "Message" %} {% if overlay.def_name == "Message" %}
{{ overlay }}:<br>
{% include 'projector/control_overlay_message.html' %} {% include 'projector/control_overlay_message.html' %}
{% endif %} {% endif %}
</li> </li>

16
openslides/static/javascript/utils.js
View File

@ -28,11 +28,19 @@ $(function () {
data: '', data: '',
success: function(data) { success: function(data) {
$('.activate_link').removeClass('btn-primary'); $('.activate_link').removeClass('btn-primary');
$('.icon').removeClass('icon-white'); $('.activate_link i').removeClass('icon-white');
$('tr').removeClass('activeline'); // is table line
link.parent().parent().parent().addClass('activeline'); if ( link.parent().parent().parent().is("tr") ) {
$('tr').removeClass('activeline');
link.parent().parent().parent().addClass('activeline');
}
// is widget list item
if ( link.parent().is("li") ) {
$('li').removeClass('activeline');
link.parent().addClass('activeline');
}
link.addClass('btn-primary'); link.addClass('btn-primary');
link.find('.icon').addClass('icon-white'); link.children('i').addClass('icon-white');
} }
}); });
}); });

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

@ -32,6 +32,9 @@ body {
font-size: 20px; font-size: 20px;
color: #999999; color: #999999;
} }
footer {
margin-bottom: 20px;
}
/* Headings and Links */ /* Headings and Links */
h1 { h1 {
@ -79,7 +82,7 @@ a:hover {
/** Utils **/ /** Utils **/
tr.itemdoneline td, li.itemdoneline { tr.offline td, li.offline {
background-color: #EAEAEA !important; background-color: #EAEAEA !important;
} }
tr.activeline td, li.activeline { tr.activeline td, li.activeline {
@ -97,6 +100,12 @@ tr.total td {
.nobr { .nobr {
white-space: nowrap; white-space: nowrap;
} }
.right {
float: right;
}
.indentation {
margin-left: 12px;
}
/* show optional column */ /* show optional column */
.optional { .optional {
display: auto; display: auto;
@ -122,6 +131,9 @@ textarea {
form .required label:after { form .required label:after {
content: " *"; content: " *";
} }
legend + .control-group {
margin-top: 0px !important;
}
/** Left sitebar navigation **/ /** Left sitebar navigation **/
@ -213,7 +225,13 @@ form .required label:after {
background-position: 0 -24px; background-position: 0 -24px;
} }
.icon-agenda { .icon-agenda {
background-position: -264px 0; /* background-position: -264px 0;*/
background-position: 0;
background-image: url("../img/glyphicons_045_calendar.png");
}
.leftmenu ul li.active a span.ico i.icon-agenda {
background-position: 0;
background-image: url("../img/glyphicons_045_calendar_white.png");
} }
.icon-motion, .icon-motions { .icon-motion, .icon-motions {
background-position: -24px -24px; background-position: -24px -24px;
@ -227,17 +245,51 @@ form .required label:after {
.icon-config { .icon-config {
background-position: -360px -144px; background-position: -360px -144px;
} }
.icon-welcome {
background-position: 0 -24px;
}
.icon-live_view {
background-position: -432px -48px;
}
.icon-overlays {
background-position: -120px 0px;
}
.icon-custom_slide {
background-position: -120px 0px;
}
/** More glyphicons free icons **/ /** More glyphicons free icons **/
.custom-icons { .icon-on, .icon-checked-new {
background-image: url("../img/glyphicons_152_check.png");
background-position: 0; background-position: 0;
} }
.icon-check_new, .close_link.closed i { .status_link .icon-off, .icon-unchecked-new {
background-image: url("../img/glyphicons_152_check.png");
}
.icon-uncheck_new, .close_link.open i {
background-image: url("../img/glyphicons_153_unchecked.png"); background-image: url("../img/glyphicons_153_unchecked.png");
background-position: 0;
} }
.icon-summary {
background-image: url("../img/glyphicons_154_more_windows.png");
background-position: 0;
}
.icon-summary.icon-white {
background-image: url("../img/glyphicons_154_more_windows_white.png");
background-position: 0;
}
.icon-login {
background-image: url("../img/glyphicons_044_keys.png");
background-position: 0;
}
.icon-group {
background-image: url("../img/glyphicons_043_group.png");
background-position: 0;
}
.icon-import {
background-image: url("../img/glyphicons_358_file_import.png");
background-position: 0;
}
/** Responsive **/ /** Responsive **/
@media (max-width: 767px) { @media (max-width: 767px) {

6
openslides/templates/base.html
View File

@ -28,6 +28,7 @@
<div id="header"> <div id="header">
<a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}"></a> <a href="/" class="logo" title="{% trans 'Home' %}"><img src="{% static 'img/logo.png' %}"></a>
<!--<a class="title" href="#">{% get_config 'event_name' %}</a>--> <!--<a class="title" href="#">{% get_config 'event_name' %}</a>-->
{% block loginbutton %}
<div class="btn-group pull-right"> <div class="btn-group pull-right">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<a href="#" data-toggle="dropdown" class="btn btn-small dropdown-toggle"> <a href="#" data-toggle="dropdown" class="btn btn-small dropdown-toggle">
@ -36,15 +37,16 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{% url 'user_settings' as url_usersettings %} {% url 'user_settings' as url_usersettings %}
<li><a href="{% url 'user_settings' %}"><i class="icon-cog"></i> {% trans "Profile" %}</a></li> <li><a href="{% url 'user_settings' %}"><i class="icon-cog"></i> {% trans "Edit profile" %}</a></li>
<li><a href="{% url 'password_change' %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li> <li><a href="{% url 'password_change' %}"><i class="icon-lock"></i> {% trans "Change password" %}</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a href="{% url 'user_logout' %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li> <li><a href="{% url 'user_logout' %}"><i class="icon-off"></i> {% trans "Logout" %}</a></li>
</ul> </ul>
{% else %} {% else %}
<a href="{% url 'user_login' %}" class="btn">{% trans "Login" %}</a> <a href="{% url 'user_login' %}" class="btn"><i class="icon-login"></i> {% trans "Login" %}</a>
{% endif %} {% endif %}
</div> </div>
{% endblock %}
</div> <!--/#header--> </div> <!--/#header-->
</div> <!--/.span12--> </div> <!--/.span12-->
</div> </div>

2
openslides/templates/formbuttons_save.html
View File

@ -2,4 +2,4 @@
<button class="btn btn-primary" type="submit"> <button class="btn btn-primary" type="submit">
{% trans 'Save' %} {% trans 'Save' %}
</button> </button>