From 8a329a81e6069dc9f807d7f20bb6908fbe659845 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 19 Aug 2016 22:13:12 +0200
Subject: [PATCH] Minor motion PDF improvements.

---
 openslides/core/static/js/core/site.js             | 14 +++++++++-----
 openslides/motions/static/js/motions/site.js       |  2 +-
 .../static/templates/motions/motion-detail.html    |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 33af57eb2..8366bbe6d 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -18,7 +18,10 @@ angular.module('OpenSlidesApp.core.site', [
     'ui.tinymce',
     'luegg.directives',
 ])
-.factory('PdfMakeDocumentProvider', function() {
+.factory('PdfMakeDocumentProvider', [
+    'gettextCatalog',
+    'Config',
+    function(gettextCatalog, Config) {
         /**
          * Provides the global Document
          * @constructor
@@ -39,14 +42,14 @@ angular.module('OpenSlidesApp.core.site', [
                         margin: [80, 50, 80, 0], //margin: [left, top, right, bottom]
                         columns: [
                           {
-                            text: 'OpenSlides | Presentation and assembly system',
+                            text: Config.get('general_event_name').value + ' · ' + Config.get('general_event_description').value ,
                             fontSize:10,
                             width: '70%'
                           },
                           {
                             fontSize: 6,
                             width: '30%',
-                            text: 'Stand: ' + date.toLocaleDateString() + " " + date.toLocaleTimeString(),
+                            text: gettextCatalog.getString('As of') + date.toLocaleDateString() + " " + date.toLocaleTimeString(),
                             alignment: 'right'
                         }]
                     };
@@ -62,7 +65,7 @@ angular.module('OpenSlidesApp.core.site', [
                         alignment: 'center',
                         fontSize: 8,
                         color: '#555',
-                        text: "Seite: " + currentPage.toString()
+                        text: gettextCatalog.getString('Page') + ' ' + currentPage.toString() + ' / ' + pageCount.toString()
                     };
                 },
                 /**
@@ -90,7 +93,8 @@ angular.module('OpenSlidesApp.core.site', [
         return {
             createInstance: createInstance
         };
-    })
+    }
+])
 .factory('PdfMakeConverter', function() {
         /**
          * Converter component for HTML->JSON for pdfMake
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index c8ae39fd6..b5d3cf109 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -83,7 +83,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
                                     width: "5%"
                                 },
                                 headerText = {
-                                    text: "Abstimmung",
+                                    text: gettextCatalog.getString('Vote'),
                                     width: "15%"
                                 },
                                 /**
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index db5bb7e37..cbf62a254 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -5,7 +5,7 @@
         <i class="fa fa-angle-double-left fa-lg"></i>
         <translate>All motions</translate>
       </a>
-      <a ng-click="makePDF()" class="btn btn-primary btn-sm">
+      <a ng-click="makePDF()" class="btn btn-default btn-sm">
         <i class="fa fa-file-pdf-o fa-lg"></i>
         <translate>PDF</translate>
       </a>