From 3bcf4fd9c3741ae5b6937d95e9335b6b769d0a96 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Thu, 26 Apr 2012 17:50:46 +0200
Subject: [PATCH] Added missing 'required' helptext to all forms.

---
 openslides/agenda/templates/agenda/edit.html                 | 3 +++
 openslides/application/templates/application/edit.html       | 2 +-
 openslides/application/templates/application/import.html     | 4 +++-
 openslides/assignment/templates/assignment/edit.html         | 3 +++
 openslides/locale/de/LC_MESSAGES/django.po                   | 2 +-
 openslides/participant/templates/participant/edit.html       | 3 +++
 openslides/participant/templates/participant/group_edit.html | 3 +++
 openslides/participant/templates/participant/import.html     | 4 +++-
 openslides/static/styles/base.css                            | 2 +-
 9 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index e9a133621..8230b728a 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -8,6 +8,7 @@
     <h1>{%trans "Edit item" %}</h1>
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
+        <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -19,5 +20,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {%trans "required" %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html
index 692f06844..d517eda4d 100644
--- a/openslides/application/templates/application/edit.html
+++ b/openslides/application/templates/application/edit.html
@@ -15,7 +15,6 @@
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         {{ managerform.as_p }}
-        <small>* {%trans "required" %}</small>
         <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
@@ -29,6 +28,7 @@
         </button>
         </a>
         </p>
+        <small>* {%trans "required" %}</small>
     </form>
 
 {% endblock %}
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index a1e84d078..b23693f20 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -18,6 +18,7 @@
 
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
         {{ form.as_p }}
+        <p>
         <button class="button" type="submit">
             <span class="icon import">{%trans 'Import' %}</span>
         </button>
@@ -26,6 +27,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {%trans "required" %}</small>
     </form>
-    </p>
 {% endblock %}
diff --git a/openslides/assignment/templates/assignment/edit.html b/openslides/assignment/templates/assignment/edit.html
index 7786da704..5543b30f8 100644
--- a/openslides/assignment/templates/assignment/edit.html
+++ b/openslides/assignment/templates/assignment/edit.html
@@ -13,6 +13,7 @@
 
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
+        <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -24,5 +25,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {% trans "required." %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index 9e89b0558..12bf61a9d 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -932,7 +932,7 @@ msgstr "Formale Gültigkeitsprüfung"
 
 #: application/templates/application/view.html:146
 msgid "Publish"
-msgstr "Veröffentlen"
+msgstr "Veröffentlichen"
 
 #: application/templates/application/view.html:149
 msgid "Permit"
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index f6af8a28e..5f978ebcc 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -17,6 +17,7 @@
         {% if edituser %}
         <p><a href="{% url user_reset_password edituser.id %}">{% trans 'Reset to First Password' %}</a></p>
         {% endif %}
+        <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -28,5 +29,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {% trans "required." %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/participant/templates/participant/group_edit.html b/openslides/participant/templates/participant/group_edit.html
index 4ddcdc054..862717316 100644
--- a/openslides/participant/templates/participant/group_edit.html
+++ b/openslides/participant/templates/participant/group_edit.html
@@ -13,6 +13,7 @@
 
     <form action="" method="post">{% csrf_token %}
         {{ form.as_p }}
+        <p>
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -24,5 +25,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {% trans "required." %}</small>
     </form>
 {% endblock %}
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 56bc1e270..4a297c79a 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -18,6 +18,7 @@
 
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
         {{ form.as_p }}
+        <p>
         <button class="button" type="submit">
             <span class="icon import">{%trans 'Import' %}</span>
         </button>
@@ -26,6 +27,7 @@
             <span class="icon cancel">{%trans 'Cancel' %}</span>
         </button>
         </a>
+        </p>
+        <small>* {% trans "required." %}</small>
     </form>
-    </p>
 {% endblock %}
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 36eafe7b0..cd1e2f24f 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -513,7 +513,7 @@ ul.results {
 #footer {
     border-top:1px solid #CCCCCC;
     font-size:12px;
-    margin:40px 0 0;
+    margin:20px 0 0;
     padding:5px 0;
     clear: both;
 }