Merge branch '346-admin-panel-change-names-to-icons-on-edit-remove-save-buttons' into 'master'

Resolve "Admin panel: change names to icons on edit/remove/save buttons"

Closes #346

See merge request piotr.gawron/minerva!248

frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js

@@ -115,7 +115,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment) {
   if (comment.isRemoved()) {
     remove = "YES (" + comment.getRemoveReason() + ")";
   } else {
-    remove = "<button name='removeComment' data='" + comment.getId() + "'>REMOVE</button>";
+    remove = "<button name='removeComment' data='" + comment.getId() + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
   }
 
   var author = comment.getAuthor();

frontend-js/src/main/js/gui/admin/ConfigurationAdminPanel.js

@@ -120,6 +120,11 @@ ConfigurationAdminPanel.prototype.optionToTableRow = function (option, editable)
   var value = option.getValue();
   var row = [];
   var editOption;
+  var disabled = '';
+  if (!editable) {
+    disabled = " disabled ";
+  }
+
   if (option.getValueType() === "STRING" ||
     option.getValueType() === "INTEGER" ||
     option.getValueType() === "DOUBLE" ||
@@ -146,11 +151,7 @@ ConfigurationAdminPanel.prototype.optionToTableRow = function (option, editable)
   }
   row[0] = option.getCommonName();
   row[1] = editOption;
-  if (editable) {
-    row[2] = "<button name='saveOption' data='" + option.getType() + "'>SAVE</button>";
-  } else {
-    row[2] = "<button name='saveOption' data='" + option.getType() + "' disabled>SAVE</button>";
-  }
+  row[2] = "<button name='saveOption' data='" + option.getType() + "' " + disabled + "><i class='fa fa-save' style='font-size:17px'></i></button>";
   return row;
 };
 

frontend-js/src/main/js/gui/admin/EditProjectDialog.js

@@ -643,7 +643,7 @@ EditProjectDialog.prototype.userToTableRow = function (user, columns) {
     }
   }
 
-  row.push("<button name='saveUser' data='" + login + "'>SAVE</button>");
+  row.push("<button name='saveUser' data='" + login + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>");
 
   return row;
 };
@@ -700,8 +700,8 @@ EditProjectDialog.prototype.overlayToTableRow = function (overlay, users) {
   row[4] = defaultOverlayCheckbox;
   row[5] = creatorSelect;
   row[6] = downloadSourceButton;
-  row[7] = "<button name='saveOverlay' data='" + id + "'>SAVE</button>";
-  row[8] = "<button name='removeOverlay' data='" + id + "'>REMOVE</button>";
+  row[7] = "<button name='saveOverlay' data='" + id + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>";
+  row[8] = "<button name='removeOverlay' data='" + id + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
 
   return row;
 };
@@ -725,7 +725,7 @@ EditProjectDialog.prototype.mapToTableRow = function (map, users) {
   row[2] = "<input name='defaultCenterX-" + id + "' value='" + centerX + "'/>";
   row[3] = "<input name='defaultCenterY-" + id + "' value='" + centerY + "'/>";
   row[4] = "<input name='defaultZoomLevel-" + id + "' value='" + zoomLevel + "'/>";
-  row[5] = "<button name='saveMap' data='" + id + "'>SAVE</button>";
+  row[5] = "<button name='saveMap' data='" + id + "'><i class=\"fa fa-save\" style=\"font-size:17px\"></i></button>";
 
   return row;
 };

frontend-js/src/main/js/gui/admin/MapsAdminPanel.js

@@ -181,8 +181,8 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row) {
   row[3] = organism;
   row[4] = status;
 
-  row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'>EDIT</button>";
-  row[6] = "<button name='removeProject' data='" + project.getProjectId() + "'>REMOVE</button>";
+  row[5] = "<button name='showEditDialog' data='" + project.getProjectId() + "'><i class='fa fa-edit' style='font-size:17px'></i></button>";
+  row[6] = "<button name='removeProject' data='" + project.getProjectId() + "'><i class='fa fa-trash-o' style='font-size:17px'></button>";
 
   return row;
 };

frontend-js/src/main/js/gui/admin/UsersAdminPanel.js

@@ -235,8 +235,8 @@ UsersAdminPanel.prototype.userToTableRow = function (user, row) {
   row[1] = user.getName();
   row[2] = user.getSurname();
   row[3] = user.getEmail();
-  row[4] = "<button name='showEditDialog' data='" + user.getLogin() + "'>EDIT</button>";
-  row[5] = "<button name='removeUser' data='" + user.getLogin() + "'>REMOVE</button>";
+  row[4] = "<button name='showEditDialog' data='" + user.getLogin() + "'><i class='fa fa-edit' style='font-size:17px'></i></button>";
+  row[5] = "<button name='removeUser' data='" + user.getLogin() + "'><i class='fa fa-trash-o' style='font-size:17px'></i></button>";
 
   return row;
 };