mirror of https://github.com/MISP/misp-dashboard
better display for badges and time
parent
46d389c210
commit
0080de3d8e
|
@ -84,14 +84,16 @@
|
||||||
|
|
||||||
.table > tbody > tr > td.centerCellPicOrgLogo {
|
.table > tbody > tr > td.centerCellPicOrgLogo {
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
text-align: right;
|
text-align: left;
|
||||||
min-width: 45px;
|
}
|
||||||
|
|
||||||
|
.table > tbody > tr > td.verticalAlign {
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.table > tbody > tr > td.centerCellPicOrgRank {
|
.table > tbody > tr > td.centerCellPicOrgRank {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
min-width: 45px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress {
|
.progress {
|
||||||
|
|
|
@ -66,9 +66,13 @@ var optionDatatable_light = {
|
||||||
var optionDatatable_top = jQuery.extend({}, optionDatatable_light)
|
var optionDatatable_top = jQuery.extend({}, optionDatatable_light)
|
||||||
var optionDatatable_last = jQuery.extend({}, optionDatatable_light)
|
var optionDatatable_last = jQuery.extend({}, optionDatatable_light)
|
||||||
optionDatatable_last.columnDefs = [
|
optionDatatable_last.columnDefs = [
|
||||||
{ className: "centerCellPicOrgRank", "targets": [ 2 ] },
|
{ className: "small", "targets": [ 0 ] },
|
||||||
|
{ className: "verticalAlign", "targets": [ 1 ] },
|
||||||
|
{ className: "centerCellPicOrgRank verticalAlign", "targets": [ 2 ] },
|
||||||
{ className: "centerCellPicOrgLogo", "targets": [ 3 ] },
|
{ className: "centerCellPicOrgLogo", "targets": [ 3 ] },
|
||||||
{ className: "centerCellPicOrgLogo", "targets": [ 4 ] },
|
{ className: "centerCellPicOrgLogo verticalAlign", "targets": [ 4 ] },
|
||||||
|
{ className: "centerCellPicOrgLogo verticalAlign", "targets": [ 5 ] },
|
||||||
|
{ className: "verticalAlign", "targets": [ 6 ] },
|
||||||
{ 'orderData':[6], 'targets': [0] },
|
{ 'orderData':[6], 'targets': [0] },
|
||||||
{
|
{
|
||||||
'targets': [6],
|
'targets': [6],
|
||||||
|
@ -169,6 +173,8 @@ function createImg(source, size) {
|
||||||
function createHonorImg(array, size) {
|
function createHonorImg(array, size) {
|
||||||
size = 32;
|
size = 32;
|
||||||
var div = document.createElement('div');
|
var div = document.createElement('div');
|
||||||
|
div.style.boxShadow = '0px 0px 5px #00000099';
|
||||||
|
div.style.backgroundColor = '#e1e1e1';
|
||||||
for (badgeNum of array) {
|
for (badgeNum of array) {
|
||||||
var obj = document.createElement('img');
|
var obj = document.createElement('img');
|
||||||
obj.height = size;
|
obj.height = size;
|
||||||
|
@ -178,6 +184,8 @@ function createHonorImg(array, size) {
|
||||||
obj.src = url_baseHonorLogo+badgeNum+'.svg';
|
obj.src = url_baseHonorLogo+badgeNum+'.svg';
|
||||||
div.appendChild(obj);
|
div.appendChild(obj);
|
||||||
}
|
}
|
||||||
|
div.style.width = 32*array.length+'px';
|
||||||
|
div.style.borderRadius = '15px';
|
||||||
return div.outerHTML;
|
return div.outerHTML;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -555,7 +563,7 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
if(currOrg != "") // currOrg selected
|
if(currOrg != "") // currOrg selected
|
||||||
//FIXME: timeout used to wait that all datatables are draw.
|
//FIXME: timeout used to wait that all datatables are draw.
|
||||||
setTimeout( function() { updateProgressHeader(currOrg); }, 400);
|
setTimeout( function() { updateProgressHeader(currOrg); }, 500);
|
||||||
|
|
||||||
source_lastContrib = new EventSource(url_eventStreamLastContributor);
|
source_lastContrib = new EventSource(url_eventStreamLastContributor);
|
||||||
source_lastContrib.onmessage = function(event) {
|
source_lastContrib.onmessage = function(event) {
|
||||||
|
|
|
@ -263,7 +263,7 @@
|
||||||
<table id="lastTable" class="table table-hover table-striped">
|
<table id="lastTable" class="table table-hover table-striped">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>date/time</th>
|
<th>Date</th>
|
||||||
<th>Points</th>
|
<th>Points</th>
|
||||||
<th>Cur. rank</th>
|
<th>Cur. rank</th>
|
||||||
<th>Org. rank</th>
|
<th>Org. rank</th>
|
||||||
|
|
Loading…
Reference in New Issue