From 84731a07d569eb4c823d3033498ff040c22c693a Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 15 Apr 2012 16:13:26 +0200
Subject: [PATCH] Updated application view submenu.

---
 .../application/base_application.html         |  2 +-
 .../templates/application/view.html           | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html
index 2d342b2a6..cb962944d 100644
--- a/openslides/application/templates/application/base_application.html
+++ b/openslides/application/templates/application/base_application.html
@@ -15,6 +15,6 @@
         {% if perms.application.can_manage_application %}
             <li class="{% active request '/application/import' %}"><a href="{%  url application_import %}">{%trans 'Import applications' %}</a></li>
         {% endif %}
-        <li><a href="{% url print_applications %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'Print all applications' %}</a></li>
+        <li><a href="{% url print_applications %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'All applications as PDF' %}</a></li>
     </ul>
 {% endblock %}
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index 3842b3593..f242a2699 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -6,19 +6,28 @@
 
 {% block title %}{{ block.super }} - {% trans "Application" %} "{{ version.title }}"{% endblock %}
 
+{% if perms.application.can_manage_application %}
+{% block submenu %}
+    {{ block.super }}
+    <br>
+    <h3>{%trans "Application No." %} {{ application.number }}</h3>
+    <ul>
+    <li><a href="{% url application_view application.id  %}">{%trans 'Application' %} {{ application.number }}</a></li>
+    {% if "edit" in actions %}
+    <li><a href="{% url application_edit application.id  %}">{%trans 'Edit Application' %}</a></li>
+    {% endif %}
+    {% if "delete" in actions %}
+    <li><a href="{% url application_delete application.id  %}">{%trans 'Delete Application' %}</a></li>
+    {% endif %}
+    <li><a href="{% url print_application application.id  %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'Application as PDF' %}</a></li>
+    </ul>
+{% endblock %}
+{% endif %}
 
 {% block content %}
-    <div id="sidebar">
-
+<div id="sidebar">
     <div class="box">
-    <h4 style="float:left;">{% trans "Submitter" %}:</h4>
-    <h4 style="text-align: right;">
-    {% if "delete" in actions %}
-        <a href="{% url application_delete application.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete Application' %}"></a>
-    {% endif %}
-    <a href="{% url print_application application.id %}"><img src="{% static 'images/icons/application-pdf.png' %}" title="{% trans 'Print Application' %}"></a>
-    </h4>
-    <span clear="all"></span>
+    <h4>{% trans "Submitter" %}:</h4>
     {{ application.submitter.profile }}
     {% if user == application.submitter %}
     <img src="{% static 'images/icons/user-information.png' %}" title="{% trans 'You!' %}">
@@ -111,11 +120,6 @@
     {{ application.creation_time }}
 
     <p></p>
-    {% if "edit" in actions %}
-        <a href="{% url application_edit application.id %}">
-            <span class="button"><span class="icon edit">{%trans 'Edit' %}</span></span>
-        </a>
-    {% endif %}
     {% if "wit" in actions and user == application.submitter %}
     <p></p>
         <a href='{% url application_set_status application.id 'wit' %}'>
@@ -208,10 +212,10 @@
     </a>
     </div>
     {% endif %} {# end perms.application.can_support_application #}
-    </div> <!-- end sidebar -->
+</div> <!-- end sidebar -->
 
 
-    <div id="main">
+<div id="main">
     <h1>
     {% if application.number != None %}
         {% trans "Application No." %} {{ application.number }}
@@ -305,5 +309,5 @@
     <h2>{% trans "Log" %}:</h2>
     {{ application.log|linebreaks }}
     {% endif %}
-    </div>
+</div>
 {% endblock %}