From aad74bdbb4a40725523f845cc095308ca3d21914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 15 Dec 2017 08:27:16 +0100 Subject: [PATCH] Remove HTML tags from description in assigment PDF. Fix usage of clearfix in assignment templates. --- openslides/assignments/static/js/assignments/pdf.js | 2 +- .../static/templates/assignments/assignment-detail.html | 4 ++-- .../static/templates/assignments/slide_assignment.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openslides/assignments/static/js/assignments/pdf.js b/openslides/assignments/static/js/assignments/pdf.js index ed83d19e8..5a9845769 100644 --- a/openslides/assignments/static/js/assignments/pdf.js +++ b/openslides/assignments/static/js/assignments/pdf.js @@ -47,7 +47,7 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) style: 'textItem' }, { - text: assignment.description, + text: $(assignment.description).text(), style: 'textItem', margin: [10, 0, 0, 0] } diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html index b441a726e..7f3a743f5 100644 --- a/openslides/assignments/static/templates/assignments/assignment-detail.html +++ b/openslides/assignments/static/templates/assignments/assignment-detail.html @@ -75,12 +75,12 @@
-
+

Description

-
+

Candidates

diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html index 00f7bc750..ed3401e54 100644 --- a/openslides/assignments/static/templates/assignments/slide_assignment.html +++ b/openslides/assignments/static/templates/assignments/slide_assignment.html @@ -11,11 +11,11 @@
+ class="zoomcontent clearfix">
-
+

Candidates