Fixed missing <p> tags for motion import and some improvements.
This commit is contained in:
parent
160333beea
commit
b73c50a4f9
@ -121,7 +121,7 @@
|
||||
<a ng-show="isSelectMode" os-perms="agenda.can_manage"
|
||||
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected agenda items?' | translate }}"
|
||||
ng-bootbox-confirm-action="deleteMultiple()"
|
||||
class="btn btn-default btn-sm">
|
||||
class="btn btn-default btn-sm btn-danger">
|
||||
<i class="fa fa-trash fa-lg"></i>
|
||||
<translate>Delete selected items</translate>
|
||||
</a>
|
||||
|
@ -64,7 +64,7 @@
|
||||
<a ng-show="isSelectMode" os-perms="assignments.can_manage"
|
||||
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected elections?' | translate }}"
|
||||
ng-bootbox-confirm-action="deleteMultiple()"
|
||||
class="btn btn-default btn-sm">
|
||||
class="btn btn-default btn-sm btn-danger">
|
||||
<i class="fa fa-trash fa-lg"></i>
|
||||
<translate>Delete selected elections</translate>
|
||||
</a>
|
||||
|
@ -131,7 +131,7 @@
|
||||
<!-- delete button -->
|
||||
<a ng-show="isSelectMode"
|
||||
os-perms="mediafiles.can_manage" ng-click="deleteMultiple()"
|
||||
class="btn btn-default btn-sm">
|
||||
class="btn btn-default btn-sm btn-danger">
|
||||
<i class="fa fa-trash fa-lg"></i>
|
||||
<translate>Delete selected mediafiles</translate>
|
||||
</a>
|
||||
|
@ -986,6 +986,9 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
if ($scope.change_recommendations.length === 0) {
|
||||
$scope.setProjectionMode($scope.projectionModes[0]);
|
||||
}
|
||||
if ($scope.change_recommendations.length > 0) {
|
||||
$scope.inlineEditing.disable();
|
||||
}
|
||||
});
|
||||
$scope.$watch(function () {
|
||||
return Projector.lastModified();
|
||||
@ -1570,6 +1573,12 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
if (!motion.text) {
|
||||
motion.importerror = true;
|
||||
motion.text_error = gettext('Error: Text is required.');
|
||||
} else if (!motion.text.startsWith('<p>')) {
|
||||
motion.text = '<p>' + motion.text + '</p>';
|
||||
}
|
||||
// Reason
|
||||
if (motion.reason && !motion.reason.startsWith('<p>')) {
|
||||
motion.reason = '<p>' + motion.reason + '</p>';
|
||||
}
|
||||
// submitter
|
||||
if (motion.submitter) {
|
||||
|
@ -33,7 +33,7 @@
|
||||
<a href="" ng-click="setProjectionMode(mode); $event.stopPropagation();">
|
||||
<i class="fa" ng-class="mode.mode == $parent.projectionMode.mode ? 'fa-check-square-o' : 'fa-square-o'"></i>
|
||||
<span ng-if="mode.mode!='agreed'">{{ mode.label | translate }}</span>
|
||||
<span ng-if="mode.mode=='agreed'"><translate translate-context="decision making">Resolution</translate></span
|
||||
<span ng-if="mode.mode=='agreed'"><translate translate-context="decision making">Resolution</translate></span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="divider" ng-show="projectors.length > 1 && change_recommendations.length > 0"></li>
|
||||
|
@ -128,7 +128,7 @@
|
||||
<a ng-show="selectedAction == 'delete'"
|
||||
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected motions?' | translate }}"
|
||||
ng-bootbox-confirm-action="deleteMultiple()"
|
||||
class="btn btn-default btn-sm">
|
||||
class="btn btn-default btn-sm btn-danger">
|
||||
<i class="fa fa-trash fa-lg"></i>
|
||||
<translate>Delete selected motions</translate>
|
||||
</a>
|
||||
|
@ -79,7 +79,7 @@
|
||||
<a ng-show="selectedAction == 'delete'"
|
||||
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}"
|
||||
ng-bootbox-confirm-action="deleteMultiple()"
|
||||
class="btn btn-default btn-sm">
|
||||
class="btn btn-default btn-sm btn-danger">
|
||||
<i class="fa fa-trash fa-lg"></i>
|
||||
<translate>Delete selected participants</translate>
|
||||
</a>
|
||||
|
Loading…
Reference in New Issue
Block a user