ändere Ladebalken

4 files changed, 11 insertions, 14 deletions

diff --git a/css/images/ajax-loader.gif b/css/images/ajax-loader.gif
index 57f5624..47adbf0 100644..100755
--- a/css/images/ajax-loader.gif
+++ b/css/images/ajax-loader.gif
diff --git a/css/index.css b/css/index.css
index 919f63c..22cfb46 100644
--- a/css/index.css
+++ b/css/index.css
@@ -57,3 +57,8 @@ body {
 .pdfcanvas {
     height: 100%;
 }
+
+#loader {
+    width: 100%;
+    margin: 0 auto;
+}
diff --git a/index.html b/index.html
index e0c4520..556cf6f 100644
--- a/index.html
+++ b/index.html
@@ -46,9 +46,7 @@
                         </form>
 
                         <div>
-                            <div id="loader" style="display:none;">
-                                <input name="slider" id="slider" data-highlight="true" min="0" max="100" value="50" type="range">
-                            </div>
+                            <img id="loader" src="css/images/ajax-loader.gif" style="display:none;"/>
                         </div>
 
                         <div class="ui-bar ui-bar-a ui-corner-all" style="display:none;" id="error_noconn">
diff --git a/js/index.js b/js/index.js
index f1f3f18..bc3eaff 100644
--- a/js/index.js
+++ b/js/index.js
@@ -23,13 +23,6 @@ $('#loginpage').on('pagebeforeshow', function loginform(){
     }, 500);
 });
 
-// einen Slider zu einem Ladebalken umstylen
-$(document).on('pageinit', function(){
-    $('#loader').parent().find('input').hide();
-    $('#loader').parent().find('.ui-slider-track').css('margin', '0 15px 0 15px');
-    $('#loader').parent().find('.ui-slider-handle').hide();
-});
-
 // Page-Template für Vertretungsplan
 var page_html = '\n\
 <div data-role="page" class="page" id="page-vplan-{ID}" data-prefetch>\n\
@@ -86,8 +79,9 @@ function render_pdf(viewerstr){
 }
 
 function fail(text){
-    $('#error_noconn').show('fast');
+    $('#loginform').removeClass('ui-disabled');
     $('#loader').hide('slow');
+    $('#error_noconn').show('fast');
     console.log('Fehler: ' + text.toString());
 }
 
@@ -113,7 +107,6 @@ function download_pdf(link, id){
                                 $('#pdf-' + id).attr('data-plan-url', theFile.toURL());
 
                                 if(location.href.indexOf('page-') == -1){
-                                    $('#loader').hide('fast');
                                     $.mobile.changePage('#page-vplan-' + id);
                                 }
                             },
@@ -209,13 +202,14 @@ function login(){
     var password = encodeURIComponent($('#password').val());
     var params = 'username=' + username + '&password=' + password;
 
+    $('#loginform').addClass('ui-disabled');
+    $('#loader').show('fast');
+    
     var request = $.ajax({
         type: 'POST',
         url: 'https://***REMOVED***/moodle/login/index.php',
         data: {username: username, password: password}
     });
-    
-    $('#loader').show('fast');
 
     request.done(function(result){
         var vertretungs_re = new RegExp('title="Vertretungsplan" href="(http://***REMOVED***\\.de/moodle/course/view\\.php\\?id=\\d+)"');