Commit 01cf86f2 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

upgrade to fa 5.1

parent f67c36ac
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": {
"version": "5.11.2",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz",
"integrity": "sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ=="
},
"@nodelib/fs.scandir": { "@nodelib/fs.scandir": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz",
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
"uglifyjs": "^2.4.10" "uglifyjs": "^2.4.10"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.11.2",
"autocomplete.js": "^0.36.0", "autocomplete.js": "^0.36.0",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"csv-stringify": "^5.3.1", "csv-stringify": "^5.3.1",
......
...@@ -4,6 +4,7 @@ var fs = require('fs'); ...@@ -4,6 +4,7 @@ var fs = require('fs');
var CleanCSS = require('clean-css'); var CleanCSS = require('clean-css');
var files = [ var files = [
{source: "node_modules/@fortawesome/fontawesome-free/css/all.css", targetBase: "../../minerva/resources/css/"},
{source: "node_modules/spectrum-colorpicker/spectrum.css"}, {source: "node_modules/spectrum-colorpicker/spectrum.css"},
{source: "node_modules/bootstrap/dist/css/bootstrap.css"}, {source: "node_modules/bootstrap/dist/css/bootstrap.css"},
{source: "node_modules/jquery-ui/themes/base/jquery.ui.all.css", targetBase: "../../minerva/resources/jquery-ui/"}, {source: "node_modules/jquery-ui/themes/base/jquery.ui.all.css", targetBase: "../../minerva/resources/jquery-ui/"},
......
...@@ -81,6 +81,11 @@ h5 { ...@@ -81,6 +81,11 @@ h5 {
float: right; float: right;
} }
.minerva-header .minerva-admin-link {
padding-right: 15px;
float: right;
}
.minerva-checkbox-grid li { .minerva-checkbox-grid li {
display: block; display: block;
float: left; float: left;
...@@ -211,7 +216,7 @@ h5 { ...@@ -211,7 +216,7 @@ h5 {
.minerva-extend-session-button { .minerva-extend-session-button {
background-color: #CC0000; background-color: #CC0000;
margin-left: 10px; margin-left: 10px;
border: 0px; border: 0;
} }
.minerva-extend-session-button:hover { .minerva-extend-session-button:hover {
...@@ -479,7 +484,7 @@ h5 { ...@@ -479,7 +484,7 @@ h5 {
} }
table.minerva-publication-table td { table.minerva-publication-table td {
padding: 0px; padding: 0;
} }
input.minerva-input-text, input.minerva-input-password { input.minerva-input-text, input.minerva-input-password {
...@@ -1252,4 +1257,4 @@ input[type=file] { ...@@ -1252,4 +1257,4 @@ input[type=file] {
a { a {
color: #337ab7; color: #337ab7;
} }
\ No newline at end of file
...@@ -68,11 +68,11 @@ Header.prototype._createHeaderGui = function (guiParams) { ...@@ -68,11 +68,11 @@ Header.prototype._createHeaderGui = function (guiParams) {
var link = Functions.createElement({ var link = Functions.createElement({
type: "a", type: "a",
style: "padding-right:15px; float:right", className: "minerva-admin-link",
content: '<i class="fa fa-lock" style="font-size:17px"></i>&nbsp;', content: '<i class="fa fa-lock" style="font-size:17px"></i>&nbsp;',
href: self.getServerConnector().getServerBaseUrl() + "admin.xhtml?id=" + projectId,
xss: false xss: false
}); });
link.href = self.getServerConnector().getServerBaseUrl() + "admin.xhtml?id=" + projectId;
self.getElement().appendChild(link); self.getElement().appendChild(link);
if (guiParams.optionsMenu) { if (guiParams.optionsMenu) {
......
...@@ -166,7 +166,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) { ...@@ -166,7 +166,7 @@ CommentsAdminPanel.prototype.commentToTableRow = function (comment, disable) {
if (comment.isRemoved()) { if (comment.isRemoved()) {
remove = "YES (" + comment.getRemoveReason() + ")"; remove = "YES (" + comment.getRemoveReason() + ")";
} else { } else {
remove = "<button name='removeComment' data='" + comment.getId() + "'" + disabled + "><i class='fa fa-trash-o' style='font-size:17px'></button>"; remove = "<button name='removeComment' data='" + comment.getId() + "'" + disabled + "><i class='fa fa-trash-alt'></button>";
} }
var author = comment.getAuthor(); var author = comment.getAuthor();
......
...@@ -444,7 +444,7 @@ EditGenomeDialog.prototype.geneMappingToTableRow = function (geneMapping) { ...@@ -444,7 +444,7 @@ EditGenomeDialog.prototype.geneMappingToTableRow = function (geneMapping) {
row[0] = geneMapping.getName(); row[0] = geneMapping.getName();
row[1] = geneMapping.getSourceUrl(); row[1] = geneMapping.getSourceUrl();
row[2] = geneMapping.getProgressStatus(); row[2] = geneMapping.getProgressStatus();
row[3] = "<button name='removeMapping' data='" + geneMapping.getId() + "'><i class='fa fa-trash-o' style='font-size:17px'></button>"; row[3] = "<button name='removeMapping' data='" + geneMapping.getId() + "'><i class='fa fa-trash-alt'></button>";
return row; return row;
}; };
/** /**
......
...@@ -1022,7 +1022,7 @@ EditProjectDialog.prototype.overlayToTableRow = function (overlay, users) { ...@@ -1022,7 +1022,7 @@ EditProjectDialog.prototype.overlayToTableRow = function (overlay, users) {
row[6] = downloadSourceButton; row[6] = downloadSourceButton;
row[7] = "<button name='removeOverlay' data='" + id + "'" + disabled + "><i class='fa fa-trash-o' style='font-size:17px'></button>"; row[7] = "<button name='removeOverlay' data='" + id + "'" + disabled + "><i class='fa fa-trash-alt'></button>";
return row; return row;
}; };
......
...@@ -237,8 +237,8 @@ GenomeAdminPanel.prototype.genomeToTableRow = function (genome, user) { ...@@ -237,8 +237,8 @@ GenomeAdminPanel.prototype.genomeToTableRow = function (genome, user) {
if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.IS_ADMIN))) { if (user.hasPrivilege(self.getConfiguration().getPrivilegeType(PrivilegeType.IS_ADMIN))) {
disabled = ""; disabled = "";
} }
row[5] = "<button name='editGenome' data='" + genome.getId() + "'" + disabled + "><i class='fa fa-edit' style='font-size:17px'></i></button>"; row[5] = "<button name='editGenome' data='" + genome.getId() + "'" + disabled + "><i class='fa fa-edit'></i></button>";
row[6] = "<button name='removeGenome' data='" + genome.getId() + "'" + disabled + "><i class='fa fa-trash-o' style='font-size:17px'></button>"; row[6] = "<button name='removeGenome' data='" + genome.getId() + "'" + disabled + "><i class='fa fa-trash-alt'></button>";
return row; return row;
}; };
......
...@@ -234,7 +234,7 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) { ...@@ -234,7 +234,7 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) {
var icon; var icon;
if (project.hasLogEntries()) { if (project.hasLogEntries()) {
icon = "<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:black'></i>"; icon = "<i class='fa fa-exclamation-triangle' style='font-size:18px; padding-right:10px;color:black'></i>";
if (isAdmin) { if (isAdmin) {
status += "<a name='showLogEntries' href='#' data='" + project.getProjectId() + "'>" + icon + "</a>"; status += "<a name='showLogEntries' href='#' data='" + project.getProjectId() + "'>" + icon + "</a>";
} else { } else {
...@@ -275,12 +275,12 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) { ...@@ -275,12 +275,12 @@ MapsAdminPanel.prototype.projectToTableRow = function (project, row, user) {
disabledRemove = ""; disabledRemove = "";
} }
row[7] = "<button name='showEditDialog' data='" + project.getProjectId() + "'" + disabledEdit + "><i class='fa fa-edit' style='font-size:17px'></i></button>"; row[7] = "<button name='showEditDialog' data='" + project.getProjectId() + "'" + disabledEdit + "><i class='fa fa-edit'></i></button>";
if (self.getConfiguration().getOption(ConfigurationType.DEFAULT_MAP).getValue() === projectId) { if (self.getConfiguration().getOption(ConfigurationType.DEFAULT_MAP).getValue() === projectId) {
disabledRemove = " disabled "; disabledRemove = " disabled ";
} }
row[8] = "<button name='removeProject' data='" + project.getProjectId() + "'" + disabledRemove + "><i class='fa fa-trash-o' style='font-size:17px'></button>"; row[8] = "<button name='removeProject' data='" + project.getProjectId() + "'" + disabledRemove + "><i class='fa fa-trash-alt'></button>";
return row; return row;
}; };
......
...@@ -197,7 +197,7 @@ PluginAdminPanel.prototype.pluginToTableRow = function (plugin) { ...@@ -197,7 +197,7 @@ PluginAdminPanel.prototype.pluginToTableRow = function (plugin) {
row[0] = plugin.getName(); row[0] = plugin.getName();
row[1] = plugin.getVersion(); row[1] = plugin.getVersion();
row[2] = plugin.getUrls(); row[2] = plugin.getUrls();
row[3] = "<button name='removePlugin' data='" + plugin.getHash() + "' ><i class='fa fa-trash-o' style='font-size:17px'></button>"; row[3] = "<button name='removePlugin' data='" + plugin.getHash() + "' ><i class='fa fa-trash-alt'></button>";
return row; return row;
}; };
......
...@@ -345,12 +345,12 @@ UsersAdminPanel.prototype.userToTableRow = function (user, row) { ...@@ -345,12 +345,12 @@ UsersAdminPanel.prototype.userToTableRow = function (user, row) {
} }
} }
row[5] = "<button name='showEditDialog' data='" + user.getLogin() + "'><i class='fa fa-edit' style='font-size:17px'></i></button>"; row[5] = "<button name='showEditDialog' data='" + user.getLogin() + "'><i class='fa fa-edit'></i></button>";
var disabled = ""; var disabled = "";
if (user.getLogin() === "anonymous") { if (user.getLogin() === "anonymous") {
disabled = " disabled "; disabled = " disabled ";
} }
row[6] = "<button name='removeUser' " + disabled + " data='" + user.getLogin() + "'><i class='fa fa-trash-o' style='font-size:17px'></i></button>"; row[6] = "<button name='removeUser' " + disabled + " data='" + user.getLogin() + "'><i class='fa fa-trash-alt'></i></button>";
return row; return row;
}; };
......
...@@ -262,7 +262,7 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled) ...@@ -262,7 +262,7 @@ OverlayPanel.prototype.createOverlayRow = function (overlay, checked, disabled)
if (disabled) { if (disabled) {
var warningDiv = Functions.createElement({ var warningDiv = Functions.createElement({
type: "div", type: "div",
content: "<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:orange'></i>", content: "<i class='fa fa-exclamation-triangle' style='font-size:18px; padding-right:10px;color:orange'></i>",
xss: false xss: false
}); });
warningDiv.title = "You did not consent to terms of the license of Google Maps Platform. Click the \"Edit\" button to do so."; warningDiv.title = "You did not consent to terms of the license of Google Maps Platform. Click the \"Edit\" button to do so.";
...@@ -331,7 +331,7 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled) ...@@ -331,7 +331,7 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled)
result[1] += overlay.getDeprecatedColumns()[j] + ", "; result[1] += overlay.getDeprecatedColumns()[j] + ", ";
} }
result[1] += " This format will be not supported in minerva 16 and higher. Please re-upload data set using new format.'>" + result[1] += " This format will be not supported in minerva 16 and higher. Please re-upload data set using new format.'>" +
"<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:orange'></i>" + overlay.getName() + "</div>" "<i class='fa fa-exclamation-triangle' style='font-size:18px; padding-right:10px;color:orange'></i>" + overlay.getName() + "</div>"
} else { } else {
result[1] = overlay.getName(); result[1] = overlay.getName();
} }
...@@ -339,7 +339,7 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled) ...@@ -339,7 +339,7 @@ OverlayPanel.prototype.overlayToDataRow = function (overlay, checked, disabled)
if (overlay.getInputDataAvailable()) { if (overlay.getInputDataAvailable()) {
if (disabled) { if (disabled) {
result[2] = "<div title='You did not consent to terms of the license of Google Maps Platform. Click the \"Edit\" button to do so.'>" + result[2] = "<div title='You did not consent to terms of the license of Google Maps Platform. Click the \"Edit\" button to do so.'>" +
"<i class='fa fa-exclamation-triangle' style='font-size:18px; font-weight:400; padding-right:10px;color:orange'></i></div>"; "<i class='fa fa-exclamation-triangle' style='font-size:18px; padding-right:10px;color:orange'></i></div>";
} else { } else {
var checkedString = ""; var checkedString = "";
if (checked) { if (checked) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment