diff --git a/openslides/motions/static/css/motions/_projector.scss b/openslides/motions/static/css/motions/_projector.scss index 9ae697338..fe689a678 100644 --- a/openslides/motions/static/css/motions/_projector.scss +++ b/openslides/motions/static/css/motions/_projector.scss @@ -27,6 +27,13 @@ p.os-split-after { .diff-box { padding-top: 0; } +.diff-box-title { + margin-bottom: 10px; + .description { + font-weight: bold; + } +} + .motion-text.line-numbers-outside { padding-left: 0; margin-left: 35px; diff --git a/openslides/motions/static/js/motions/projector.js b/openslides/motions/static/js/motions/projector.js index d0ae1c106..5aca64bf0 100644 --- a/openslides/motions/static/js/motions/projector.js +++ b/openslides/motions/static/js/motions/projector.js @@ -30,13 +30,23 @@ angular.module('OpenSlidesApp.motions.projector', [ Motion.bindOne(id, $scope, 'motion'); User.bindAll({}, $scope, 'users'); - MotionChangeRecommendation.bindAll({ - where: { - motion_version_id: { - '==': id, - }, - }, - }, $scope, 'change_recommendations'); + + $scope.$watch(function () { + return MotionChangeRecommendation.lastModified(); + }, function () { + $scope.change_recommendations = []; + $scope.title_change_recommendation = null; + MotionChangeRecommendation.filter({ + 'where': {'motion_version_id': {'==': id}} + }).forEach(function(change) { + if (change.isTextRecommendation()) { + $scope.change_recommendations.push(change); + } + if (change.isTitleRecommendation()) { + $scope.title_change_recommendation = change; + } + }); + }); } ]); diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index ad41c8bf1..c0dcb0ae6 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -68,7 +68,7 @@
-

{{ motion.getTitle() }}

+

{{ motion.getTitleWithChanges(mode) }}

Motion {{ motion.identifier }} | Version {{ motion.getVersion().version_number }} @@ -89,6 +89,15 @@
+
+
+
+ New title: +
+
{{ title_change_recommendation.text }}
+
+
+