Fixes #1367 + bugs

Author: BrunoSpy

module/Administration/public/assets/js/models.js

@@ -354,4 +354,8 @@ var models = function(url, urlapp){
 			displayMessages(data);
 		});
 	});
+
+	$('#add-alert, #add-file, #action-container').on('hidden.bs.modal', function(e){
+		$('body').addClass('modal-open');
+	});
 };

module/Administration/view/administration/categories/fields.phtml

@@ -26,7 +26,7 @@
 			echo "<td>".$field->getType()->getName()."</td>";
             echo "<td>";
                 if(!$this->isMultipleAllowed($field)){
-                    echo '<span class="glyphicon glyphicon-grey icon-remove"></span>';
+                    echo '<span class="glyphicon glyphicon-remove" style="color:lightgrey"></span>';
                 } else {
                     if($field->isMultiple()){
                         echo '<span class="glyphicon glyphicon-ok"></span>';

module/Administration/view/administration/models/formalarm.phtml

@@ -30,7 +30,7 @@ echo $this->formHidden($this->form->get('listable')->setAttribute('value', false
 echo $this->formHidden($this->form->get('searchable')->setAttribute('value', false));
 
 foreach ($this->form->get('custom_fields')->getElements() as $element){
-	echo $this->customFieldGroup($element);
+	echo $this->controlgroup($element);
 }
 
 ?>

module/Application/view/application/file/form.phtml

@@ -36,7 +36,7 @@ $form->prepare();
     <div id="action-buttons" class="control-group">
         <div class="controls">
             <button class="btn btn-primary">Envoyer</button>
-            <a id="cancel-form-upload" class="btn" href="#" data-dismiss="modal" aria-hidden="true">Annuler</a>
+            <button id="cancel-form-upload" class="btn" href="#" data-dismiss="modal" aria-hidden="true">Annuler</button>
         </div>
     </div>