Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

app/views/local/managers/admins/criteria.blade.php

@@ -6,6 +6,9 @@
 @section('main')
 
 <div class="row">
+    <div id = "alert_placeholder">
+
+    </div>
     <div class="col-md-6">
         <!-- Form to add a new criterion -->
         <div class="panel panel-default panel-button">
@@ -938,7 +941,8 @@ $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update
 $('#DeleteButton').prop('disabled', true);
 $("#update_the_criterion").val("Create New")
 $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create')}}")
-alert("The criterion is already used in assessments. Editting the criterion will actually create a new criterion");
+$('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> The criterion is already used in assessments. Editting the criterion will actually create a new criterion </div>');
+
 
 }
 

app/views/local/managers/pCoords/criteria.blade.php

@@ -6,6 +6,9 @@
 @section('main')
 
 <div class="row">
+    <div id = "alert_placeholder">
+
+    </div>
     <div class="col-md-6">
         <!-- Form to add a new criterion -->
         <div class="panel panel-default panel-button">

app/views/local/managers/sCoords/criteria.blade.php

@@ -6,6 +6,9 @@
 @section('main')
 
 <div class="row">
+    <div id = "alert_placeholder">
+
+    </div>
     <div class="col-md-6">
         <!-- Form to add a new criterion -->
         <div class="panel panel-default panel-button">
@@ -938,7 +941,7 @@ $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@update
 $('#DeleteButton').prop('disabled', true);
 $("#update_the_criterion").val("Create New")
 $("#update_criterion").attr('action', "{{ URL::action('CriteriaController@create')}}")
-alert("The criterion is already used in assessments. Editting the criterion will actually create a new criterion");
+$('#alert_placeholder').html('<div class="alert alert-danger alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <strong>Warning!</strong> The criterion is already used in assessments. Editting the criterion will actually create a new criterion </div>');
 
 }