diff --git a/html/admin/css/dashboardView.css b/html/admin/css/dashboardView.css index 841a08b96f..a645e6b9ee 100644 --- a/html/admin/css/dashboardView.css +++ b/html/admin/css/dashboardView.css @@ -317,6 +317,7 @@ input[type="radio"]:checked + label span { min-height: 150px; float: left; margin-left: 10px; + margin-bottom: 8px; } .alignLeft { @@ -329,7 +330,7 @@ input[type="radio"]:checked + label span { } #detailReplication { - height: 190px; + height: auto !important; } .trueClass { diff --git a/html/admin/js/views/dashboardView.js b/html/admin/js/views/dashboardView.js index 4375cbf866..5a11fa1b8a 100644 --- a/html/admin/js/views/dashboardView.js +++ b/html/admin/js/views/dashboardView.js @@ -99,6 +99,7 @@ var dashboardView = Backbone.View.extend({ putReplicationStatus: function () { var time; + var clientString = ''; if (this.replApplyState.state.running === true) { $('#detailReplication').height(290); @@ -107,15 +108,22 @@ var dashboardView = Backbone.View.extend({ else { $('.checkApplyRunningStatus').hide(); } - + time = this.replLogState.state.time; + if (this.replLogState.state.clients) { + $.each(this.replLogState.state.clients, function(k,v) { + clientString = clientString + "Server: "+v.serverId+" | Time: "+v.time+"\n"; + }); + } + //log table $('#logRunningVal').text(this.replLogState.state.running); $('#logTimeVal').text(time); $('#logLastTickVal').text(this.replLogState.state.lastLogTick); $('#logClientsVal').text(JSON.stringify(this.replLogState.clients)); + //apply table var lastAppliedTick; var phase = "-";