stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added loading animation

Browse source 
fixed bug in uuid validation
This commit is contained in:
Steffen Vogel 2010-10-08 13:04:29 +02:00
parent 5f20335a4d
commit f2781b2fb5
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
frontend/images/ladebild.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.9 KiB

BIN
frontend/images/loading.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

2
frontend/javascripts/frontend.js
View file

@ -324,7 +324,7 @@ vz.entities.each = function(cb) {
*/
vz.plot.data.load = function() {
vz.plot.data.clear();
$('#plot').html('<div id="loading">loading...</div>'); // TODO insert loading animation
$('#plot').html('<div id="loading"><img src="images/loading.gif" alt="loading..." /><p>Loading...</p></div>'); // TODO insert loading animation
vz.entities.each(function(entity, parent) {
if (entity.active && entity.type != 'group') {
$.getJSON(vz.options.backendUrl + '/data/' + entity.uuid + '.json', { from: Math.floor(vz.from), to: Math.ceil(vz.to), tuples: vz.options.tuples }, waitAsync(function(json) {

2
frontend/javascripts/uuid.js
View file

@ -71,5 +71,5 @@ vz.uuids.remove = function(uuid) {
* Validate UUID
*/
vz.uuids.validate = function(uuid) {
return new uuid.match(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/) > 0;
return uuid.match(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/);
};

10
frontend/stylesheets/style.css
View file

@ -121,6 +121,10 @@ tbody tr td {
text-align: right;
}
.loading {
/* TODO center */
}
#loading {
display: block;
margin: auto;
padding-top: 150px;
text-align: center;
color: grey;
}