Merge pull request #2405 from emanuelschuetze/fixAlerts

Fixed syntax of all uib-alerts.

openslides/agenda/static/templates/agenda/item-detail.html

@@ -135,9 +135,9 @@
 
   <!-- Select speakers form -->
   <div class="form-group spacer">
-    <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+    <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
       {{ alert.msg }}
-    </uib-alert>
+    </div>
     <div os-perms="agenda.can_manage">
       <select chosen
           ng-model="speakerSelectBox.selected"

openslides/agenda/static/templates/agenda/item-list.html

@@ -205,9 +205,9 @@
         <!-- quickEdit columns -->
         <td ng-show="item.quickEdit" os-perms="agenda.can_manage" colspan="3">
           <h4>{{ item.getTitle() }} <span class="text-muted">&ndash; QuickEdit</span></h4>
-          <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+          <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
             {{ alert.msg }}
-          </uib-alert>
+          </div>
           <div class="row">
             <div class="col-xs-6">
               <label for="inputItemNumber" translate>Item number</label>

openslides/assignments/static/templates/assignments/assignment-detail.html

@@ -94,9 +94,9 @@
     </ol>
 
     <div class="form-group">
-      <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+      <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
         {{ alert.msg }}
-      </uib-alert>
+      </div>
       <div os-perms="assignments.can_nominate_other">
         <select chosen ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected)"
             ng-options="user.id as user.get_full_name() for user in users"

openslides/assignments/static/templates/assignments/assignment-form.html

@@ -1,9 +1,9 @@
 <h1 ng-if="model.id" translate>Edit election</h1>
 <h1 ng-if="!model.id" translate>New election</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <form name="assignmentForm" ng-submit="save(model)">
   <formly-form model="model" fields="formFields">

openslides/assignments/static/templates/assignments/assignment-list.html

@@ -167,9 +167,9 @@
         <!-- quickEdit columns -->
         <td ng-if="assignment.quickEdit" colspan="4">
           <h4>{{ assignment.title }} <span class="text-muted">&ndash; Quick Edit</span></h4>
-            <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+            <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
               {{ alert.msg }}
-            </uib-alert>
+            </div>
             <div class="row">
               <div class="col-xs-6">
                 <label for="inputTitle" translate>Title</label>

openslides/assignments/static/templates/assignments/assignmentpoll-form.html

@@ -1,8 +1,8 @@
 <h1><translate>Ballot</translate> {{ ballot }}</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <p>
   <translate>Special values</translate>:

openslides/core/static/templates/core/customslide-form.html

@@ -1,9 +1,9 @@
 <h1 ng-if="model.id" translate>Edit agenda item</h1>
 <h1 ng-if="!model.id" translate>New agenda item</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <form name="customslideForm" ng-submit="save(model)">
   <formly-form model="model" fields="formFields">

openslides/core/static/templates/core/login-form.html

@@ -3,9 +3,9 @@
     <img src="/static/img/openslides-logo.png" alt="OpenSlides" class="login-logo center-block">
   </div>
   <div class="modal-body loginForm">
-    <uib-alert ng-repeat="alert in alerts" type="{{ alert.type }}" close="closeAlert($index)">
+    <div uib-alert ng-repeat="alert in alerts" ng-class="'alert-' + (alert.type || 'warning')" close="closeAlert($index)">
       <span ng-bind-html="alert.msg"><span>
-    </uib-alert>
+    </div>
     <div class="input-group form-group">
       <div class="input-group-addon"><i class="fa fa-user"></i></div>
       <input os-focus-me type="text" ng-model="username" class="form-control input-lg"

openslides/mediafiles/static/templates/mediafiles/mediafile-form.html

@@ -1,9 +1,9 @@
 <h1 ng-if="mediafile.id" translate>Edit file</h1>
 <h1 ng-if="!mediafile.id" translate>New file</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <form name="mediafileForm" ng-submit="save(mediafile)">
   <!-- file -->

openslides/motions/static/templates/motions/category-sort.html

@@ -20,9 +20,9 @@
       <translate>Numbering</translate>
     </a>
   </div>
-  <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+  <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
     {{ alert.msg }}
-  </uib-alert>
+  </div>
   <div ui-tree="treeOptions" data-max-depth="1" data-empty-placeholder-enabled="false">
     <ol ui-tree-nodes ng-model="items">
       <li ui-tree-node ng-repeat="item in items">

openslides/motions/static/templates/motions/motion-form.html

@@ -2,9 +2,9 @@
 <h1 ng-if="!model.id && !parent" translate>New motion</h1>
 <h1 ng-if="parent"><translate>New amendment of motion</translate> {{ parent.identifier || parent.getTitle() }}</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <form name="motionForm" ng-submit="save(model)" novalidate>
   <formly-form model="model" fields="formFields">

openslides/motions/static/templates/motions/motionpoll-form.html

@@ -1,8 +1,8 @@
 <h1><translate>Vote</translate> {{ voteNumber }}</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <p>
   <translate>Special values</translate>:

openslides/users/static/templates/users/group-edit.html

@@ -1,8 +1,8 @@
 <h1 ng-if="group" translate>Edit name</h1>
 <h1 ng-if="!group" translate>Create new group</h1>
-<uib-alert ng-show="alert.show" type="danger" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" class="alert-danger" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 <label for="name_1">
   <span ng-if="group">
     <translate>Please enter a new name for {{ group.name }}:</translate>

openslides/users/static/templates/users/user-change-password.html

@@ -16,9 +16,9 @@
       <i class="fa fa-exclamation-triangle"></i>
       <translate>You override the personally set password of</translate> {{ user.get_short_name() }}!
     </h3>
-    <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+    <div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
       {{ alert.msg }}
-    </uib-alert>
+    </div>
     <div class="form-group">
       <label for="inputOldPassword" translate>New password</label>
       <div class="input-group">

openslides/users/static/templates/users/user-form.html

@@ -1,9 +1,9 @@
 <h1 ng-if="model.id" translate>Edit participant</h1>
 <h1 ng-if="!model.id" translate>New participant</h1>
 
-<uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}
-</uib-alert>
+</div>
 
 <form name="userForm" ng-submit="save(model)">
   <formly-form model="model" fields="formFields">