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

Edit and View Links and Symbols in Widgets fixed (#206)

This commit is contained in:
Norman Jäckel 2012-06-23 10:43:01 +02:00
parent b12ae6b0a0
commit b1ed56176e
8 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,13 +20,19 @@
<a href="{% url projector_activate_slide item.sid %}" class="activate_link {% if item.active %}active{% endif %}">
<div></div>
</a>
<a href="{% model_url item 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
<span></span>
</a>
<a href="{% model_url item 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url projctor_preview_slide item.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a>
{% for p in item.get_ancestors %}
<span class="indentation">&nbsp;</span>
{% endfor %}
<a href="{% model_url item 'edit' %}">{{ item }}</a>
<a href="{% model_url item 'view' %}">{{ item }}</a>
</li>
{% endfor %}
</ul>

8
openslides/application/templates/application/widget.html
View File

@ -8,10 +8,16 @@
<a href="{% url projector_activate_slide application.sid %}" class="activate_link {% if application.active %}active{% endif %}">
<div></div>
</a>
<a href="{% model_url application 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
<span></span>
</a>
<a href="{% model_url application 'edit' %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url projctor_preview_slide application.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a>
<a href="{% model_url application 'edit' %}">
<a href="{% model_url application 'view' %}">
{% if application.number %}
{% trans 'Application' %} {{ application.number }}:
{% endif %}

24
openslides/assignment/templates/assignment/widget.html Normal file
View File

@ -0,0 +1,24 @@
{% load staticfiles %}
{% load i18n %}
{% load tags %}
<ul style="line-height: 180%">
{% for assignment in assignments %}
<li class="{% if assignment.active %}activeline{% endif %}">
<a href="{% url projector_activate_slide assignment.sid %}" class="activate_link {% if assignment.active %}active{% endif %}">
<div></div>
</a>
<a href="{% model_url assignment 'delete' %}" title="{% trans 'Delete' %}" class="icon delete right">
<span></span>
</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 href="{% model_url assignment 'view' %}">{{ assignment }}</a>
</li>
{% endfor %}
</ul>

7
openslides/assignment/views.py
View File

@ -31,7 +31,7 @@ from utils.pdf import stylesheet
from utils.views import FormView, DeleteView, PDFView, RedirectView
from utils.template import Tab
from projector.api import get_model_widget
from projector.projector import Widget
from poll.views import PollFormView
@ -619,4 +619,7 @@ def register_tab(request):
def get_widgets(request):
return [get_model_widget(name='assignments', model=Assignment)]
return [
Widget(name='assignments', template='assignment/widget.html',
context={'assignments': Assignment.objects.all()})
]

10
openslides/projector/api.py
View File

@ -122,13 +122,3 @@ def projector_message_set(message, sid=None):
def projector_message_delete():
config['projector_message'] = ''
def get_model_widget(name, model):
return Widget(
name=name,
template='projector/model_widget.html',
context={
'slides': model.objects.all(),
}
)

18
openslides/projector/templates/projector/model_widget.html
View File

@ -1,18 +0,0 @@
{% load staticfiles %}
{% load i18n %}
{% load tags %}
<ul style="line-height: 180%">
{% for slide in slides %}
<li class="{% if slide.active %}activeline{% endif %}">
<a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
<div></div>
</a>
<a href="{% url projctor_preview_slide slide.sid %}" title="{% trans 'Preview' %}" class="icon preview right">
<span></span>
</a>
<a href="{% model_url slide 'edit' %}">{{ slide }}</a>
</li>
{% endfor %}
</ul>

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

@ -8,7 +8,10 @@
<a href="{% url projector_activate_slide slide.sid %}" class="activate_link {% if slide.active %}active{% endif %}">
<div></div>
</a>
<a href="{% url customslide_delete slide.id %}" title="{% trans 'Delete slide' %}" class="icon delete right">
<a href="{% url customslide_delete slide.id %}" title="{% trans 'Delete' %}" class="icon delete right">
<span></span>
</a>
<a href="{% url customslide_edit slide.id %}" title="{% trans 'Edit' %}" class="icon edit right">
<span></span>
</a>
<a href="{% url projctor_preview_slide slide.sid %}" title="{% trans 'Preview' %}" class="icon preview right">

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

@ -581,6 +581,9 @@ ul.results {
.preview {
background:url("../images/icons/preview.png") no-repeat 0px 0px;
}
.edit {
background:url("../images/icons/edit.png") no-repeat 0px 0px;
}
.delete {
background:url("../images/icons/delete.png") no-repeat 0px 0px;
}