Merging revisions 738-739 (Adding Spinner image) and 743 (Workaround fo rmissing console.log).
This commit is contained in:
parent
80045a3f54
commit
20de44f50d
Notes:
subgit
2018-03-07 17:59:06 +01:00
r744 www/branches/life
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -24,3 +24,4 @@ www/external/widget-pager.js -text
|
||||
www/impressum.inc.de -text
|
||||
www/info.inc.de -text
|
||||
www/logo_RUB_155x30.png -text
|
||||
www/spinner.gif -text
|
||||
|
@ -100,7 +100,6 @@ function ajaxLoadEvents(stime, etime, eventid, url, target) {
|
||||
};
|
||||
};
|
||||
};
|
||||
//console.log(ajax_url+'?'+$.param(request_data));
|
||||
if ( etime == '' || !etime ) { etime = new Date(); };
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
|
@ -175,5 +175,6 @@
|
||||
<div class="rublogo"><a href="http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs"><img class="rublogo" src="logo_RUB_155x30.png" alt="Ruhr-Universität Bochum" title="Ruhr-Universität Bochum" border="0"/></a></div>
|
||||
<!-- Map -->
|
||||
<div id="map" class="map"></div>
|
||||
<div id="spinner" class="spinner" style="display:none;"><img id="img-spinner" src="spinner.gif" alt="Loading"/></br>Loading ...</div>
|
||||
</body>
|
||||
</html>
|
||||
|
12
www/main.css
12
www/main.css
@ -87,4 +87,16 @@
|
||||
p.table-caption {
|
||||
font-size: smaller;
|
||||
}
|
||||
div.spinner {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
margin-left: -64px; /* half width of the spinner gif */
|
||||
margin-top: -8px; /* half height of the spinner gif */
|
||||
text-align:center;
|
||||
z-index: 19000;
|
||||
overflow: auto;
|
||||
width: 128px; /* width of the spinner gif */
|
||||
height: 40px; /*hight of the spinner gif +2px to fix IE8 issue */
|
||||
}
|
||||
</style>
|
||||
|
15
www/misc.js
15
www/misc.js
@ -145,6 +145,9 @@ var networkText = {
|
||||
};
|
||||
var bochumStation = ['BUG', 'IBBN', 'KERA', 'KARP'];
|
||||
|
||||
// FIX: firefox has no console
|
||||
if (typeof console == "undefined") var console = { log: function() {} };
|
||||
|
||||
/**********************************************************************
|
||||
* document ready *
|
||||
**********************************************************************/
|
||||
@ -192,6 +195,12 @@ $(document).ready(function() {
|
||||
heightStyle: 'content',
|
||||
animate: 200,
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
// spinner
|
||||
$(document).bind("ajaxSend", function() {
|
||||
$("#spinner").show();
|
||||
console.log('Starting Spinner at '+Date());
|
||||
}).bind("ajaxStop", function() {
|
||||
$("#spinner").hide();
|
||||
console.log('Stopping Spinner at '+Date());
|
||||
});
|
||||
});
|
BIN
www/spinner.gif
Normal file
BIN
www/spinner.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.9 KiB |
Loading…
Reference in New Issue
Block a user