Skip to content

Commit

Permalink
Add/Remove Admin & bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
clj13001 committed Apr 25, 2017
1 parent bad7654 commit 366d905
Show file tree
Hide file tree
Showing 21 changed files with 604 additions and 564 deletions.
2 changes: 0 additions & 2 deletions WebContent/html/webpages/administration/adminApprove.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@ String ticketStr = Ticket.arrayToString(tickets);
/*
Managing the event listeners on the page.
*/
// Adds event listeners to all table records, so you can approve/reject it.
$("tr.entry").click(ticketAction);
// Exits modal when x is clicked.
$("#closeForm").click(closeModal);
Expand Down
16 changes: 8 additions & 8 deletions WebContent/html/webpages/administration/adminLocation.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -296,20 +296,20 @@ var locations = makeLocationArray();
//Populate locations into table!
populateLocations();
//geocode listeners
// geocode listeners
$("#addZip").keyup(geocodeTown);
$("#modifyZip").keyup(geocodeTown);
//adds event listeners to all table records
// adds event listeners to all table records
$("tr.entry").click(modifyModal);
//Exits modal when x is clicked.
// Exits modal when x is clicked.
$("#closeModifyForm").click(closeModifyModal);
//Open the add modal
// Open the add modal
$("#add").click(addModal);
//Event listener exits modal when x is clicked.
// Event listener exits modal when x is clicked.
$("#closeAddForm").click(closeAddModal);
//Event listener exits modal when esc key pressed.
// Event listener exits modal when esc key pressed.
window.onkeydown = function(e){if (e.keyCode == 27){closeAddModal();closeModifyModal();}}
//Event listener exits modal when click outside modal.
// Event listener exits modal when click outside modal.
window.onclick = function(e){var add = document.getElementById('addModal'); var modify = document.getElementById('modifyModal'); if(e.target == add || e.target == modify) {closeAddModal();closeModifyModal();}}
// Event listener for table records.
Expand Down Expand Up @@ -341,7 +341,7 @@ $('#tabledisplay').bootstrapTable({onClickRow: function(row,$element){
$('#thedeletebutton').attr('title','Cannot delete because devices and/or employees are at this location!');
}
else{
$('#thedeletebutton').attr('disabled',false);
$('#thedeletebutton').removeAttr('disabled');
$('#thedeletebutton').removeAttr('title');
}
$("#modifyModal").show();
Expand Down
75 changes: 0 additions & 75 deletions WebContent/html/webpages/administration/adminThings.jsp

This file was deleted.

240 changes: 0 additions & 240 deletions WebContent/html/webpages/administration/approveAdmin.jsp

This file was deleted.

Loading

0 comments on commit 366d905

Please sign in to comment.