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

Merge pull request #2941 from FinnStutzenstein/CsvImport

Browse Source 
Fixed missing <p> tags for motion import and some improvements.
This commit is contained in:
Norman Jäckel 2017-02-10 14:24:36 +01:00 committed by GitHub
commit cfdaabd18a
7 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -121,7 +121,7 @@
<a ng-show="isSelectMode" os-perms="agenda.can_manage" <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="{{ 'Are you sure you want to delete all selected agenda items?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" 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> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected items</translate> <translate>Delete selected items</translate>
</a> </a>

2
openslides/assignments/static/templates/assignments/assignment-list.html
View File

@ -64,7 +64,7 @@
<a ng-show="isSelectMode" os-perms="assignments.can_manage" <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="{{ 'Are you sure you want to delete all selected elections?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" 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> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected elections</translate> <translate>Delete selected elections</translate>
</a> </a>

2
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
View File

@ -131,7 +131,7 @@
<!-- delete button --> <!-- delete button -->
<a ng-show="isSelectMode" <a ng-show="isSelectMode"
os-perms="mediafiles.can_manage" ng-click="deleteMultiple()" 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> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected mediafiles</translate> <translate>Delete selected mediafiles</translate>
</a> </a>

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

@ -986,6 +986,9 @@ angular.module('OpenSlidesApp.motions.site', [
if ($scope.change_recommendations.length === 0) { if ($scope.change_recommendations.length === 0) {
$scope.setProjectionMode($scope.projectionModes[0]); $scope.setProjectionMode($scope.projectionModes[0]);
} }
if ($scope.change_recommendations.length > 0) {
$scope.inlineEditing.disable();
}
}); });
$scope.$watch(function () { $scope.$watch(function () {
return Projector.lastModified(); return Projector.lastModified();
@ -1570,6 +1573,12 @@ angular.module('OpenSlidesApp.motions.site', [
if (!motion.text) { if (!motion.text) {
motion.importerror = true; motion.importerror = true;
motion.text_error = gettext('Error: Text is required.'); 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 // submitter
if (motion.submitter) { if (motion.submitter) {

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

@ -33,7 +33,7 @@
<a href="" ng-click="setProjectionMode(mode); $event.stopPropagation();"> <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> <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'">{{ 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> </a>
</li> </li>
<li class="divider" ng-show="projectors.length > 1 && change_recommendations.length > 0"></li> <li class="divider" ng-show="projectors.length > 1 && change_recommendations.length > 0"></li>

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

@ -128,7 +128,7 @@
<a ng-show="selectedAction == 'delete'" <a ng-show="selectedAction == 'delete'"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected motions?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected motions?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" 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> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected motions</translate> <translate>Delete selected motions</translate>
</a> </a>

2
openslides/users/static/templates/users/user-list.html
View File

@ -79,7 +79,7 @@
<a ng-show="selectedAction == 'delete'" <a ng-show="selectedAction == 'delete'"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" 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> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected participants</translate> <translate>Delete selected participants</translate>
</a> </a>