Commit 349b0144 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1262: Show user profile as logon indicator

Task-Url: https://pm.winseda.de/issues/1262
parent d84a3726
......@@ -137,11 +137,11 @@ CollectionsEditor.prototype.getColregStatus = function() {
dataType: "json",
success: function(data) {
if (data.pojo.accessible===true && data.pojo.statusCode===200) {
$("#colreg-status").html("<i class=\"fa fa-check\"></i> " +
$("#colreg-status").html("<i class=\"fas fa-check-circle\"></i> " +
data.pojo.roundtime + "ms");
$("#colreg-status").addClass("color-success");
} else {
$("#colreg-status").html("<i class=\"fa fa-exclamation\"></i> " +
$("#colreg-status").html("<i class=\"fas fa-exclamation-circle\"></i> " +
__translator.translate("~eu.dariah.de.minfba.common.api.status_code") + ": " +
data.pojo.statusCode + ", " + data.pojo.roundtime + "ms");
$("#colreg-status").addClass("color-warning");
......@@ -160,22 +160,24 @@ CollectionsEditor.prototype.getColregStatus = function() {
if (data.pojo.active) {
$("#btn-resync-colreg").addClass("disabled");
$("#btn-resync-colreg .fa").addClass("fa-spin");
$("#colreg-last-sync").html("<i class=\"fa fa-refresh fa-spin fa-fw\"></i> " + data.pojo.last);
$("#colreg-last-sync").html("<i class=\"fas fa-sync-alt fa-spin fa-fw\"></i> " + data.pojo.last);
} else {
$("#btn-resync-colreg").removeClass("disabled");
$("#btn-resync-colreg .fa").removeClass("fa-spin");
$("#colreg-last-sync").removeClass("color-success");
if (data.pojo.last==undefined || data.pojo.last==null) {
$("#colreg-last-sync").html("<i class=\"fa fa-minus\"></i>");
$("#colreg-last-sync").html("<i class=\"fas fa-minus-circle\"></i>");
} else {
$("#colreg-last-sync").html("<i class=\"fa fa-check\"></i> " + data.pojo.last);
$("#colreg-last-sync").addClass("color-success");
$("#colreg-last-sync").html("<i class=\"fas fa-check-circle\"></i> " + data.pojo.last);
}
}
if (data.pojo.next==undefined || data.pojo.next==null) {
$("#colreg-next-sync").html("<i class=\"fa fa-minus\"></i>");
$("#colreg-next-sync").html("<i class=\"fas fa-minus-circle\"></i>");
} else {
$("#colreg-next-sync").html("<i class=\"fa fa-clock-o\"></i> " + data.pojo.next);
$("#colreg-next-sync").html("<i class=\"fas fa-clock\"></i> " + data.pojo.next);
}
},
error: function(jqXHR, textStatus) {
......
......@@ -127,22 +127,24 @@ DatamodelEditor.prototype.getDmeStatus = function() {
if (data.pojo.active) {
$("#btn-sync").addClass("disabled");
$("#btn-sync .fa").addClass("fa-spin");
$("#dme-last-sync").html("<i class=\"fa fa-refresh fa-spin fa-fw\"></i> " + data.pojo.last);
$("#dme-last-sync").html("<i class=\"fas fa-sync-alt fa-spin fa-fw\"></i> " + data.pojo.last);
} else {
$("#btn-sync").removeClass("disabled");
$("#btn-sync .fa").removeClass("fa-spin");
$("#dme-last-sync").removeClass("color-success");
if (data.pojo.last==undefined || data.pojo.last==null) {
$("#dme-last-sync").html("<i class=\"fa fa-minus\"></i>");
$("#dme-last-sync").html("<i class=\"fas fa-minus-circle\"></i>");
} else {
$("#dme-last-sync").html("<i class=\"fa fa-check\"></i> " + data.pojo.last);
$("#dme-last-sync").html("<i class=\"fas fa-check-circle\"></i> " + data.pojo.last);
$("#dme-last-sync").addClass("color-success");
}
}
if (data.pojo.next==undefined || data.pojo.next==null) {
$("#dme-next-sync").html("<i class=\"fa fa-minus\"></i>");
$("#dme-next-sync").html("<i class=\"fas fa-minus-circle\"></i>");
} else {
$("#dme-next-sync").html("<i class=\"fa fa-clock-o\"></i> " + data.pojo.next);
$("#dme-next-sync").html("<i class=\"fas fa-clock\"></i> " + data.pojo.next);
}
},
......
......@@ -831,7 +831,7 @@ QueryHandler.prototype.handleImages = function(collectionId, endpointId, dataset
$("#search-results-resources .venobox").venobox();
},
error: function(jqXHR, textStatus, errorThrown) {
if ($("#search-results-image-carousel-" + this.index + " .carousel-inner .item").length==0) {
if ($("#search-results-image-carousel-" + this.index + " .carousel-inner .carousel-item").length==0) {
$("#search-results-image-carousel-" + this.index).remove();
}
},
......@@ -856,7 +856,7 @@ QueryHandler.prototype.loadImage = function(tmbsrc, src, resultIndex, imageIndex
if (onlyImage) {
carouselContainer.html(image);
} else {
carouselContainer.find(".carousel-inner").append("<div class=\"item"+ (imageIndex==0 ? " active" : "") +"\">" + image + "</div>");
carouselContainer.find(".carousel-inner").append("<div class=\"carousel-item"+ (imageIndex==0 ? " active" : "") +"\">" + image + "</div>");
}
};
......
Supports Markdown
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