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

Reworked new template, especially agenda and dashboard.

Browse Source
This commit is contained in:
Emanuel Schuetze 2013-01-08 23:05:35 +01:00
parent 369f418b0e
commit 586425354d
16 changed files with 106 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,19 +37,23 @@ function hideClosedSlides(hide) {
$(function() { $(function() {
$('.close_link a').click(function(event) { $('.close_link a').click(function(event) {
event.preventDefault(); event.preventDefault();
slide = $(this); var link = $(this);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: slide.attr('href'), url: $(this).attr('href'),
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
if (data.closed) { if (data.closed) {
newclass = 'closed'; newclass = 'closed';
link.parent().parent().parent().addClass('itemdoneline');
} else { } else {
newclass = 'open'; newclass = 'open';
link.parent().parent().parent().removeClass('itemdoneline');
} }
slide.parent().removeClass('closed open').addClass(newclass); link.parent().removeClass('closed open').addClass(newclass);
slide.attr('href', data.link);
link.attr('href', data.link);
} }
}); });
}); });

5
openslides/agenda/static/styles/agenda.css
View File

@ -18,3 +18,8 @@
.close_link.closed span { .close_link.closed span {
background-image: url(../images/icons/close.png); background-image: url(../images/icons/close.png);
} }
tr.topline td {
border-bottom: 1px solid #333333;
background-color: #CDCDCD;
}

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

@ -42,10 +42,8 @@
<button class="btn" type="submit" name="apply"> <button class="btn" type="submit" name="apply">
{% trans 'Apply' %} {% trans 'Apply' %}
</button> </button>
<a href='{% url 'item_overview' %}'> <a href="{% url 'item_overview' %}" class="btn">
<button class="btn" type="button" onclick="window.location='{% url 'item_overview' %}'"> {% trans 'Cancel' %}
{% trans 'Cancel' %}</span>
</button>
</a> </a>
</div> </div>
<small>* {% trans "required" %}</small> <small>* {% trans "required" %}</small>

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

@ -3,14 +3,15 @@
{% load tags %} {% load tags %}
<td> <td>
<span class="close_link{% if item.closed %} closed{% endif %}"> <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 %}" title="{% trans 'Mark item as done' %}"> <a href="{% if item.closed %}{% url 'item_open' item.id %}{% else %}{% url 'item_close' item.id %}{% endif %}"
<span></span> class="btn btn-mini" title="{% trans 'Reopen item' %}">
</a> <i class="icon- custom-icons"></i>
{% elif item.closed %} </a>
<img src="{% static 'images/icons/close.png' %}" title="{% trans 'Item closed' %}"> {% else %}
{% endif %} <i class="icon- custom-icons"></i>
{% endif %}
</span> </span>
</td> </td>
<td> <td>
@ -24,7 +25,7 @@
{{ item.get_title_supplement|safe }} {{ item.get_title_supplement|safe }}
</td> </td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<td> <td class="optional">
{{ item.comment|first_line }} {{ item.comment|first_line }}
</td> </td>
{% endif %} {% endif %}
@ -32,16 +33,20 @@
<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 item.active %}active{% endif %}" href="{% url 'projector_activate_slide' item.sid %}" 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 'Activate item' %}">
<span></span> <i class="icon 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 %}
<a href="{% model_url item 'edit' %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit item' %}"></a> <a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="btn btn-mini">
<a href="{% model_url item 'delete' %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete item' %}"></a> <i class="icon-pencil"></i>
</a>
<a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="btn btn-mini">
<i class="icon-remove"></i>
</a>
{% if not item.is_leaf_node %} {% if not item.is_leaf_node %}
<a class="activate_link" href="{% url 'projector_activate_slide' item.sid 'summary' %}"> <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' %}" title="{% trans 'Activate summary for this item' %}"> <img src="{% static 'images/icons/summary.png' %}">
</a> </a>
{% endif %} {% endif %}
{% endif %} {% endif %}

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

@ -63,7 +63,7 @@
</h1> </h1>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %} <input type="checkbox" id="hide_closed_items"> {% trans "Hide closed items" %}
</label> </label>
<small><i>{{ items|length }} <small><i>{{ items|length }}
@ -74,7 +74,7 @@
<th width="10px"></th> <th width="10px"></th>
<th>{% trans "Item" %}</th> <th>{% trans "Item" %}</th>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<th width="200">{% trans "Comment" %}</th> <th width="200" class="optional">{% trans "Comment" %}</th>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
<th width="50">{% trans "Actions" %}</th> <th width="50">{% trans "Actions" %}</th>
@ -86,26 +86,26 @@
<tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}"> <tr class="topline{% if active_sid == 'agenda' %} activeline{% endif %}">
<td></td> <td></td>
<td> <td>
<strong>{% trans "Agenda" %}</strong> {% trans "Agenda" %}
</td> </td>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<td></td> <td class="optional"></td>
{% endif %} {% endif %}
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
<td> <td>
{% if perms.projector.can_manage_projector %} {% if perms.projector.can_manage_projector %}
<span> <span>
<a class="activate_link{% if active_sid == 'agenda' %} active{% endif %}" href="{% url 'projector_activate_slide' 'agenda' %}" title="{% trans 'Activate item' %}"> <a href="{% url 'projector_activate_slide' 'agenda' %}" class="activate_link btn {% if active_sid == 'agenda' %}btn-primary{% endif %} btn-mini" title="{% trans 'Activate agenda' %}">
<span></span> <i class="icon icon-facetime-video {% if active_sid == 'agenda' %}icon-white{% endif %}"></i>
</a> </a>
</span> <span>
{% endif %} {% endif %}
</td> </td>
{% endif %} {% endif %}
</tr> </tr>
{% if items %} {% if items %}
{% for item in items %} {% for item in items %}
<tr class="itemline draggable{% cycle ' odd' '' %}{% if item.active %} activeline{% endif %}"> <tr class="draggable{% if item.active %} activeline{% endif %}{% if item.closed %} itemdoneline{% endif %}">
{% include "agenda/item_row.html" %} {% include "agenda/item_row.html" %}
</tr> </tr>
{% endfor %} {% endfor %}

26
openslides/agenda/templates/agenda/view.html
View File

@ -5,7 +5,31 @@
{% block title %}{{ block.super }} – {{ item.title }}{% endblock %} {% block title %}{{ block.super }} – {{ item.title }}{% endblock %}
{% block content %} {% block content %}
<h1>{{ item }}</h1> <h1>
{{ item }}
<small class="pull-right">
<div class="btn-toolbar">
<a href="{% url 'item_overview' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
<div class="btn-group">
<a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
{% trans 'More actions' %}
<span class="caret"></span>
</a>
{% if perms.agenda.can_manage_agenda %}
<ul class="dropdown-menu pull-right">
<li><a href="{% url 'item_edit' item.id %}"><i class="icon-edit"></i> {% trans 'Edit item' %}</a></li>
<li><a href="{% url 'item_delete' item.id %}"><i class="icon-remove"></i> {% trans 'Delete item' %}</a></li>
</ul>
{% endif %}
</div>
{% if perms.projector.can_manage_projector %}
<a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link btn btn-mini {% if item.active %}btn-primary{% endif %}" rel="tooltip" data-original-title="{% trans 'Show item' %}">
<i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
</a>
{% endif %}
</div>
</small>
</h1>
<p>{{ item.text|safe|linebreaks }}</p> <p>{{ item.text|safe|linebreaks }}</p>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}

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

@ -4,9 +4,9 @@
<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_link {% if agenda.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' agenda.key %}" class="activate_link btn {% if agenda.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show agenda' %}">
<div></div> <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
</a> </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>
</a> </a>
@ -17,9 +17,9 @@
<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_link {% if item.active %}active{% endif %}"> <a href="{% url 'projector_activate_slide' item.sid %}" class="activate_link btn {% if item.active %}btn-primary{% endif %} btn-mini" title="{% trans 'Show item' %}">
<div></div> <i class="icon icon-facetime-video {% if item.active %}icon-white{% endif %}"></i>
</a> </a>&nbsp;
<a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right"> <a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
<span></span> <span></span>
</a> </a>

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

@ -52,10 +52,10 @@
<th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "#" %}</a></th> <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "#" %}</a></th>
<th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th> <th><a href="?sort=title{% if 'title' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Motion title" %}</a></th>
{% if min_supporters > 0 %} {% if min_supporters > 0 %}
<th><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th> <th class="optional"><a href="?sort=supporter{% if 'supporter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Number of supporters" %}</a></th>
{% endif %} {% endif %}
<th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th> <th><a href="?sort=status{% if 'status' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Status" %}</a></th>
<th><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th> <th class="optional"><a href="?sort=submitter{% if 'submitter' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Submitter" %}</a></th>
<th class="optional"><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th> <th class="optional"><a href="?sort=time{% if 'time' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{% trans "Creation Time" %}<a></th>
<th style="width: 1px;">{% trans "Actions" %}</th> <th style="width: 1px;">{% trans "Actions" %}</th>
</tr> </tr>
@ -66,7 +66,7 @@
<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 %}
<td>{{ motion.count_supporters }}</td> <td class="optional">{{ motion.count_supporters }}</td>
{% endif %} {% endif %}
<td>{% if motion.status != "pub" %} <td>{% if motion.status != "pub" %}
{{ motion.get_status_display }}<br> {{ motion.get_status_display }}<br>
@ -76,7 +76,7 @@
{% if not forloop.last %}<br>{%endif%} {% if not forloop.last %}<br>{%endif%}
{% endfor %} {% endfor %}
</td> </td>
<td>{{ motion.submitter }}</td> <td class="optional">{{ motion.submitter }}</td>
<td class="optional">{{ motion.creation_time }}</td> <td class="optional">{{ motion.creation_time }}</td>
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">

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

@ -51,6 +51,8 @@
<input type="hidden" name="next" value="{{ next }}" /> <input type="hidden" name="next" value="{{ next }}" />
</p> </p>
</form> </form>
{% endblock %}
{% block javascript %}
{% if os_enable_anonymous_login %} {% if os_enable_anonymous_login %}
<script> <script>
$("#anonymous_login").live('click', function () { $("#anonymous_login").live('click', function () {

2
openslides/participant/views.py
View File

@ -507,7 +507,7 @@ def user_settings(request):
form_user = UsersettingsForm(instance=request.user, initial={'language': language}) form_user = UsersettingsForm(instance=request.user, initial={'language': language})
return { return {
'form': form, 'form': form_user,
'edituser': request.user, 'edituser': request.user,
} }

BIN
openslides/static/img/glyphicons_152_check.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

BIN
openslides/static/img/glyphicons_153_unchecked.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 204 B

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

@ -23,14 +23,16 @@ $(function () {
var link = $(this); var link = $(this);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: $(this).attr('href'), url: link.attr('href'),
dataType: 'json', dataType: 'json',
data: '', data: '',
success: function(data) { success: function(data) {
$('.activate_link').removeClass('active'); $('.activate_link').removeClass('btn-primary');
$('.icon').removeClass('icon-white');
$('tr').removeClass('activeline'); $('tr').removeClass('activeline');
link.parent().parent().parent().addClass('activeline'); link.parent().parent().parent().addClass('activeline');
link.addClass('active'); link.addClass('btn-primary');
link.find('.icon').addClass('icon-white');
} }
}); });
}); });

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

@ -79,6 +79,12 @@ a:hover {
/** Utils **/ /** Utils **/
tr.activeline td, li.activeline {
background-color: #bed4de !important;
}
tr.itemdoneline td, li.itemdoneline {
background-color: #EAEAEA !important;
}
.nopadding { .nopadding {
padding: 0; padding: 0;
} }
@ -222,6 +228,16 @@ form .required label:after {
background-position: -360px -144px; background-position: -360px -144px;
} }
/** More glyphicons free icons **/
.custom-icons {
background-position: 0;
}
.icon-check_new, .close_link.closed i {
background-image: url("../img/glyphicons_152_check.png");
}
.icon-uncheck_new, .close_link.open i {
background-image: url("../img/glyphicons_153_unchecked.png");
}
/** Responsive **/ /** Responsive **/
@media (max-width: 767px) { @media (max-width: 767px) {

4
openslides/utils/utils.py
View File

@ -38,8 +38,8 @@ def gen_confirm_form(request, message, url):
%s %s
<form action="%s" method="post"> <form action="%s" method="post">
<input type="hidden" value="%s" name="csrfmiddlewaretoken"> <input type="hidden" value="%s" name="csrfmiddlewaretoken">
<button type="submit" class="btn">%s</button> <button type="submit" class="btn btn-mini">%s</button>
<button class="btn">%s</button> <button class="btn btn-mini">%s</button>
</form> </form>
""" """
% (message, url, csrf(request)['csrf_token'], _("Yes"), _("No"))) % (message, url, csrf(request)['csrf_token'], _("Yes"), _("No")))

2
openslides/utils/views.py
View File

@ -121,7 +121,7 @@ class QuestionMixin(object):
def confirm_form(self): def confirm_form(self):
option_fields = "\n".join([ option_fields = "\n".join([
'<button type="submit" class="btn" name="%s">%s</button>' % (option[0], unicode(option[1])) '<button type="submit" class="btn btn-mini" name="%s">%s</button>' % (option[0], unicode(option[1]))
for option in self.get_answer_options()]) for option in self.get_answer_options()])
messages.warning( messages.warning(
self.request, self.request,