ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2289 from emanuelschuetze/motionpdf

Browse Source 
Minor motion PDF improvements.
This commit is contained in:
Norman Jäckel 2016-08-19 22:42:56 +02:00 committed by GitHub
commit 5ea9cbf4d1
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openslides/core/static/js/core/site.js
View File

@ -18,7 +18,10 @@ angular.module('OpenSlidesApp.core.site', [
'ui.tinymce', 'ui.tinymce',
'luegg.directives', 'luegg.directives',
]) ])
.factory('PdfMakeDocumentProvider', function() { .factory('PdfMakeDocumentProvider', [
'gettextCatalog',
'Config',
function(gettextCatalog, Config) {
/** /**
* Provides the global Document * Provides the global Document
* @constructor * @constructor
@ -39,14 +42,14 @@ angular.module('OpenSlidesApp.core.site', [
margin: [80, 50, 80, 0], //margin: [left, top, right, bottom] margin: [80, 50, 80, 0], //margin: [left, top, right, bottom]
columns: [ columns: [
{ {
text: 'OpenSlides | Presentation and assembly system', text: Config.get('general_event_name').value + ' · ' + Config.get('general_event_description').value ,
fontSize:10, fontSize:10,
width: '70%' width: '70%'
}, },
{ {
fontSize: 6, fontSize: 6,
width: '30%', width: '30%',
text: 'Stand: ' + date.toLocaleDateString() + " " + date.toLocaleTimeString(), text: gettextCatalog.getString('As of') + date.toLocaleDateString() + " " + date.toLocaleTimeString(),
alignment: 'right' alignment: 'right'
}] }]
}; };
@ -62,7 +65,7 @@ angular.module('OpenSlidesApp.core.site', [
alignment: 'center', alignment: 'center',
fontSize: 8, fontSize: 8,
color: '#555', color: '#555',
text: "Seite: " + currentPage.toString() text: gettextCatalog.getString('Page') + ' ' + currentPage.toString() + ' / ' + pageCount.toString()
}; };
}, },
/** /**
@ -90,7 +93,8 @@ angular.module('OpenSlidesApp.core.site', [
return { return {
createInstance: createInstance createInstance: createInstance
}; };
}) }
])
.factory('PdfMakeConverter', function() { .factory('PdfMakeConverter', function() {
/** /**
* Converter component for HTML->JSON for pdfMake * Converter component for HTML->JSON for pdfMake

2
openslides/motions/static/js/motions/site.js
View File

@ -83,7 +83,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
width: "5%" width: "5%"
}, },
headerText = { headerText = {
text: "Abstimmung", text: gettextCatalog.getString('Vote'),
width: "15%" width: "15%"
}, },
/** /**

2
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -5,7 +5,7 @@
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>All motions</translate> <translate>All motions</translate>
</a> </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> <i class="fa fa-file-pdf-o fa-lg"></i>
<translate>PDF</translate> <translate>PDF</translate>
</a> </a>