mirror of https://github.com/MISP/MISP
Removed useless progressbar and simplified loading popup information
Sami Mokaddem
parent
fc6301dc6b
commit
9ebaf334ae
|
|
@ -357,11 +357,8 @@
|
|||
|
||||
<div id="eventgraph_network" class="eventgraph_network" data-event-id="<?php echo h($event['Event']['id']); ?>" data-user-manipulation="<?php echo $mayModify || $isSiteAdmin ? 'true' : 'false'; ?>"></div>
|
||||
<div class="loading-network-div" id="refecences_network_loading_div" style="display: none;">
|
||||
<div class="spinner-network" data-original-title="" title="" style="display: none;"></div>
|
||||
<div class="progress progressbar-network-div" >
|
||||
<div id="progressbar-network" class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="300" style="width:0%">0%</div>
|
||||
</div>
|
||||
<div class="loadingText-network" data-original-title="" title="" style="display: none;"></div>
|
||||
<div class="spinner-network" data-original-title="" title=""></div>
|
||||
<div class="loadingText-network" data-original-title="" title=""></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="attributes_div">
|
||||
|
|
|
|||
|
|
@ -17,16 +17,15 @@
|
|||
.spinner-network {
|
||||
height: 60px;
|
||||
width: 60px;
|
||||
margin: 0 auto;
|
||||
position: absolute;
|
||||
position: relative;
|
||||
-webkit-animation: rotation .6s infinite linear;
|
||||
-moz-animation: rotation .6s infinite linear;
|
||||
-o-animation: rotation .6s infinite linear;
|
||||
animation: rotation .6s infinite linear;
|
||||
border: 6px solid rgba(0,174,239,.15);
|
||||
border-radius: 100%;
|
||||
right: 10px;
|
||||
z-index: 15;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.spinner-network:before {
|
||||
|
|
@ -47,43 +46,20 @@
|
|||
|
||||
.loadingText-network {
|
||||
color: #0088cc;
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
top: 32px;
|
||||
text-align: center;
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.loading-network-div {
|
||||
width:320px;
|
||||
height: 100px;
|
||||
position: absolute;
|
||||
width: 170px;
|
||||
top: 40px;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.progressbar-network-div {
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
right: 10px;
|
||||
top: 10px;
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
.progress-bar {
|
||||
float: left;
|
||||
width: 0;
|
||||
height: 100%;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
background-color: #337ab7;
|
||||
-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
|
||||
box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
|
||||
-webkit-transition: width .6s ease;
|
||||
-o-transition: width .6s ease;
|
||||
transition: width .6s ease;
|
||||
padding: 5px;
|
||||
background: #FAFAFA;
|
||||
border-radius: 7px;
|
||||
box-shadow: 0px 0px 6px #B2B2B2;
|
||||
}
|
||||
|
||||
.shortcut-help {
|
||||
|
|
|
|||
|
|
@ -63,8 +63,7 @@ class EventGraph {
|
|||
}
|
||||
|
||||
update_graph(data) {
|
||||
var total = data.items.length + data.relations.length;
|
||||
this.network_loading(0, total);
|
||||
this.network_loading(true, loadingText_creating);
|
||||
|
||||
// New nodes will be automatically added
|
||||
// removed references will be deleted
|
||||
|
|
@ -117,7 +116,6 @@ class EventGraph {
|
|||
}
|
||||
|
||||
this.nodes.update(newNodes);
|
||||
this.network_loading(data.items.length, total);
|
||||
|
||||
// New relations will be automatically added
|
||||
// removed references will be deleted
|
||||
|
|
@ -148,7 +146,7 @@ class EventGraph {
|
|||
}
|
||||
|
||||
this.edges.update(newRelations);
|
||||
this.network_loading(total, total);
|
||||
this.network_loading(false, "");
|
||||
}
|
||||
|
||||
reset_view() {
|
||||
|
|
@ -163,39 +161,16 @@ class EventGraph {
|
|||
});
|
||||
}
|
||||
|
||||
// -1: Undefined state
|
||||
// 0<=iterations<total: state known
|
||||
// iterations>=total: finished
|
||||
network_loading(iterations, total) {
|
||||
if(iterations == -1) {
|
||||
var loadingText = loadingText_fetching;
|
||||
// state true: loading
|
||||
// state false: finished
|
||||
network_loading(state, message) {
|
||||
if(state) {
|
||||
$('.loading-network-div').show();
|
||||
$('.spinner-network').show();
|
||||
$('.loadingText-network').text(loadingText);
|
||||
$('.loadingText-network').show();
|
||||
} else if (iterations >= 0 && iterations < total) {
|
||||
var loadingText = loadingText_creating;
|
||||
$('.loading-network-div').show();
|
||||
$('.loadingText-network').text(loadingText);
|
||||
$('.loadingText-network').show();
|
||||
$('.spinner-network').hide();
|
||||
// pb
|
||||
var percentage = parseInt(iterations*100/total);
|
||||
$('.progressbar-network-div').show();
|
||||
$('#progressbar-network').show();
|
||||
$('#progressbar-network').width(percentage*progressbar_length);
|
||||
$('#progressbar-network').text(percentage+' %');
|
||||
|
||||
} else if (iterations >= total) {
|
||||
$('#progressbar-network').width(100*progressbar_length);
|
||||
$('#progressbar-network').text(100+' %');
|
||||
$('.loadingText-network').text(message);
|
||||
} else {
|
||||
setTimeout(function() {
|
||||
$('.loading-network-div').hide();
|
||||
$('.spinner-network').hide();
|
||||
$('.loadingText-network').hide();
|
||||
$('.progressbar-network-div').hide();
|
||||
$('#progressbar-network').hide();
|
||||
}, 1000)
|
||||
}, 500)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -336,10 +311,9 @@ class DataHandler {
|
|||
}
|
||||
|
||||
fetch_data_and_update() {
|
||||
eventGraph.network_loading(-1, 0);
|
||||
eventGraph.network_loading(true, loadingText_fetching);
|
||||
$.getJSON( "/events/getReferences/"+scope_id+"/event.json", function( data ) {
|
||||
var extracted = dataHandler.extract_references(data);
|
||||
eventGraph.network_loading(1, 0);
|
||||
eventGraph.update_graph(extracted);
|
||||
eventGraph.reset_view_on_stabilized();
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue