From 7772f60bd431b34268a84bc1eae501e132f54f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Mon, 12 Dec 2016 12:51:27 +0100 Subject: [PATCH 1/2] Added global config for motion preamble. --- CHANGELOG | 1 + openslides/motions/static/js/motions/docx.js | 9 +++++---- openslides/motions/static/js/motions/pdf.js | 9 +++++++++ openslides/motions/static/js/motions/site.js | 2 -- .../static/templates/docx/motions.docx | Bin 7927 -> 7100 bytes .../templates/motions/motion-detail.html | 3 +++ .../templates/motions/slide_motion.html | 3 +++ 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 925a060b2..9898678af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ Motions: - Added blocks for motions which can set as agenda item. Set states for multiple motions of a motion block by following the recommendations of each motion. +- Used global config variable for preamble. Users: - Added field is_committee and new default group Committees. diff --git a/openslides/motions/static/js/motions/docx.js b/openslides/motions/static/js/motions/docx.js index a02d5bb9d..1720903ac 100644 --- a/openslides/motions/static/js/motions/docx.js +++ b/openslides/motions/static/js/motions/docx.js @@ -11,7 +11,7 @@ angular.module('OpenSlidesApp.motions.docx', []) 'gettextCatalog', 'FileSaver', function ($http, $q, Config, gettextCatalog, FileSaver) { - + var PAGEBREAK = ''; var TAGS_NO_PARAM = ['b', 'strong', 'em', 'i']; @@ -30,8 +30,8 @@ angular.module('OpenSlidesApp.motions.docx', []) var d = today.getDate(); var m = today.getMonth()+1; //January is 0! var y = today.getFullYear(); - if (d<10) { d='0'+d; } - if (m<10) { m='0'+m; } + if (d<10) { d='0'+d; } + if (m<10) { m='0'+m; } return d+'.'+m+'.'+y; }(); data.pagebreak_main = motions.length === 0 ? '' : PAGEBREAK; @@ -44,7 +44,7 @@ angular.module('OpenSlidesApp.motions.docx', []) return data; }; - + var getCategoriesData = function (categories) { return _.map(categories, function (category) { return { @@ -83,6 +83,7 @@ angular.module('OpenSlidesApp.motions.docx', []) signature_translation: signature_translation, status_translation: status_translation, status: motion.getStateName(), + preamble: gettextCatalog.getString(Config.get('motions_preamble').value), text: html2docx(motion.getText()), reason_translation: motion.getReason().length === 0 ? '' : reason_translation, reason: html2docx(motion.getReason()), diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index 12bc7e41e..bd4be314d 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -248,6 +248,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) }]; }; + // motion preamble + var motionPreamble = function () { + return { + text: Config.translate(Config.get('motions_preamble').value), + style: 'textItem', + }; + }; + // motion text (with line-numbers) var motionText = function() { @@ -299,6 +307,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) subtitle, metaTable(), motionTitle(), + motionPreamble(), motionText(), ]; if (motionReason()) { diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index aa0a438f1..60a08a736 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1396,8 +1396,6 @@ angular.module('OpenSlidesApp.motions.site', [ var isAmendment = $scope.$parent.motion && $scope.$parent.motion.id; // Set default values for create form - // ... set preamble config value as text - $scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value); // ... for amendments add parent_id if (isAmendment) { if (Config.get('motions_amendments_apply_text').value) { diff --git a/openslides/motions/static/templates/docx/motions.docx b/openslides/motions/static/templates/docx/motions.docx index 200f37e9c3591f23aeca758248357ebfb7560ffa..6d5ca993601f63b48f3a21e3c0236a1273960f4e 100644 GIT binary patch delta 6029 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 delta 6863 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
+ +

{{ config('motions_preamble') | translate }}

+
diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index 961991b45..7fda65301 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -75,6 +75,9 @@
+ +

{{ config('motions_preamble') | translate }}

+
From 32b7ddedce40ad7d0a28c2f218ec35109e64d125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Mon, 12 Dec 2016 14:21:22 +0100 Subject: [PATCH 2/2] Template fixes for motion preamble (#2760). --- openslides/core/static/css/app.css | 4 +++- openslides/motions/config_variables.py | 2 +- openslides/motions/static/js/motions/pdf.js | 2 +- openslides/motions/static/js/motions/site.js | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index dcb8e9615..ad3a4edc1 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -1159,7 +1159,9 @@ img { .spacer-left-lg { margin-left: 10px; } - +.no-padding { + padding: 0px; +} .lead-div { margin-bottom: 20px; } diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py index 7085b3bb1..0e8550f0f 100644 --- a/openslides/motions/config_variables.py +++ b/openslides/motions/config_variables.py @@ -49,7 +49,7 @@ def get_config_variables(): yield ConfigVariable( name='motions_preamble', - default_value='The assembly may decide,', + default_value='The assembly may decide:', label='Motion preamble', weight=320, group='Motions', diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index bd4be314d..2ee5fe0ed 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -252,7 +252,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) var motionPreamble = function () { return { text: Config.translate(Config.get('motions_preamble').value), - style: 'textItem', + margin: [0, 10, 0, 0] }; }; diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 60a08a736..c597ba05e 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -481,6 +481,9 @@ angular.module('OpenSlidesApp.motions.site', [ required: true } }, + { + template: '

' + Config.translate(Config.get('motions_preamble').value) + '

' + }, { key: 'text', type: 'editor', @@ -1942,7 +1945,7 @@ angular.module('OpenSlidesApp.motions.site', [ gettext('Serially numbered'); gettext('Set it manually'); gettext('Motion preamble'); - gettext('The assembly may decide,'); + gettext('The assembly may decide:'); gettext('Default line numbering'); /// Line numbering: Outside gettext('Outside');