From b1ed56176e20753115afe26a929b0e694d756590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <hg@normanjaeckel.de>
Date: Sat, 23 Jun 2012 10:43:01 +0200
Subject: [PATCH] Edit and View Links and Symbols in Widgets fixed (#206)

---
 .../agenda/templates/agenda/widget.html       |  8 ++++++-
 .../templates/application/widget.html         |  8 ++++++-
 .../templates/assignment/widget.html          | 24 +++++++++++++++++++
 openslides/assignment/views.py                |  7 ++++--
 openslides/projector/api.py                   | 10 --------
 .../templates/projector/model_widget.html     | 18 --------------
 .../projector/templates/projector/widget.html |  5 +++-
 openslides/static/styles/base.css             |  3 +++
 8 files changed, 50 insertions(+), 33 deletions(-)
 create mode 100644 openslides/assignment/templates/assignment/widget.html
 delete mode 100644 openslides/projector/templates/projector/model_widget.html

diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index 23cf8a393..e81142940 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -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>
diff --git a/openslides/application/templates/application/widget.html b/openslides/application/templates/application/widget.html
index c7b3c29f3..56e8b6bdf 100644
--- a/openslides/application/templates/application/widget.html
+++ b/openslides/application/templates/application/widget.html
@@ -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 %}
diff --git a/openslides/assignment/templates/assignment/widget.html b/openslides/assignment/templates/assignment/widget.html
new file mode 100644
index 000000000..7a56f3354
--- /dev/null
+++ b/openslides/assignment/templates/assignment/widget.html
@@ -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>
+
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 7bb37b44f..27d76e58b 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -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()})
+    ]
diff --git a/openslides/projector/api.py b/openslides/projector/api.py
index 295a4b370..3efe3cdb3 100644
--- a/openslides/projector/api.py
+++ b/openslides/projector/api.py
@@ -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(),
-            }
-        )
diff --git a/openslides/projector/templates/projector/model_widget.html b/openslides/projector/templates/projector/model_widget.html
deleted file mode 100644
index f889fe37b..000000000
--- a/openslides/projector/templates/projector/model_widget.html
+++ /dev/null
@@ -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>
-
diff --git a/openslides/projector/templates/projector/widget.html b/openslides/projector/templates/projector/widget.html
index 67a21db1b..1697ab5c7 100644
--- a/openslides/projector/templates/projector/widget.html
+++ b/openslides/projector/templates/projector/widget.html
@@ -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">
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index e98085627..2e76d57f5 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -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;
 }