From 5c6977c46d64b96bae2bbc913befe8c9a23436ce Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 4 Dec 2015 12:25:39 +0100
Subject: [PATCH] Template fixes

---
 openslides/agenda/static/templates/agenda/item-list.html | 6 +++---
 .../static/templates/assignments/assignment-list.html    | 4 ++--
 openslides/core/static/css/app.css                       | 9 ++++++++-
 openslides/locale/angular-gettext/template-en.pot        | 8 ++++----
 .../motions/static/templates/motions/motion-list.html    | 4 ++--
 openslides/users/static/templates/users/user-list.html   | 4 ++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 43a6c5bb2..420d9037f 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -51,7 +51,7 @@
               class="btn btn-default form-control"
               ng-click="autoNumbering()">
             <i class="fa fa-sort-numeric-asc"></i>
-            <translate>Auto numbering</translate>
+            <translate>Number agenda</translate>
           </a>
         </div>
       </form>
@@ -94,10 +94,10 @@
     </div>
   </div>
 
-  <i class="spacer">
+  <div class="spacer-top-lg italic">
     {{ items.length }} {{ "items" | translate }}<span ng-if="(items|filter:{selected:true}).length > 0">,
     {{(items|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
-  </i>
+  </div>
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>
diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html
index 0a45fd96d..3dd2fa2c8 100644
--- a/openslides/assignments/static/templates/assignments/assignment-list.html
+++ b/openslides/assignments/static/templates/assignments/assignment-list.html
@@ -68,10 +68,10 @@
     </div>
   </div>
 
-  <i class="spacer">
+  <div class="spacer-top-lg italic">
     {{ assignments.length }} {{ "elections" | translate }}<span ng-if="(assignments|filter:{selected:true}).length > 0">,
     {{(assignments|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
-  </i>
+  </div>
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 8b061cc67..722cf9a66 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -117,7 +117,7 @@ img {
 #nav {
     float: left;
     width: 100%;
-    height: 99px;
+    height: auto;
     background: #317796;
     color: #fff;
     overflow-y: hidden;
@@ -499,10 +499,17 @@ img {
     margin-top: 7px;
 }
 
+.spacer-top-lg {
+    margin-top: 25px;
+}
+
 .spacer-right {
     margin-right: 5px;
 }
 
+.italic {
+    font-style: italic;
+}
 .hoverActions {
     font-size: 85%;
 }
diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot
index 21039420e..1031aca04 100644
--- a/openslides/locale/angular-gettext/template-en.pot
+++ b/openslides/locale/angular-gettext/template-en.pot
@@ -86,10 +86,6 @@ msgstr ""
 msgid "Attachment"
 msgstr ""
 
-#: agenda/static/templates/agenda/item-list.html:54
-msgid "Auto numbering"
-msgstr ""
-
 #: agenda/static/templates/agenda/item-detail.html:6
 msgid "Back to agenda"
 msgstr ""
@@ -677,6 +673,10 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#: agenda/static/templates/agenda/item-list.html:54
+msgid "Number agenda"
+msgstr ""
+
 #: assignments/static/js/assignments/site.js:92
 #: assignments/static/templates/assignments/assignment-list.html:144
 msgid "Number of members to be elected"
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index 6b4058713..c899a51a7 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -74,10 +74,10 @@
     </div>
   </div>
 
-  <i class="spacer">
+  <div class="spacer-top-lg italic">
     {{ motions.length }} {{ "motions" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">,
     {{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
-  </i>
+  </div>
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index 7fd9ef00a..c20cfbc0c 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/openslides/users/static/templates/users/user-list.html
@@ -82,10 +82,10 @@
     </div>
   </div>
 
-  <i class="spacer">
+  <div class="spacer-top-lg italic">
     {{ users.length }} {{ "participants" | translate }}<span ng-if="(users|filter:{selected:true}).length > 0">,
     {{(users|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
-  </i>
+  </div>
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>