combine develop and master

css/style.css

@@ -2,6 +2,7 @@
     width: 100%;
     margin: 20px auto;
     border: 14px solid #ddd;
+    position: relative;
         -webkit-border-radius: 6px;
         -moz-border-radius: 6px;
         border-radius: 6px;
@@ -394,21 +395,28 @@
 }
 
 .fn-gantt-loader {
-    background-image: url(../img/loader_bg.png);
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bf000000', endColorstr='#bf000000',GradientType=0 );
+    background: rgba(0,0,0,0.75);
     z-index: 30;
 }
-
-.fn-gantt-loader-spinner {
-    width: 100px;
-    height: 20px;
+.fn-gantt-loader-spinner span {
     position: absolute;
-    margin-left: 50%;
-    margin-top: 50%;
+    margin: auto;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    width: 100%;
     text-align: center;
-}
-.fn-gantt-loader-spinner span {
+    height: 1em;
+    line-height: 1em;
     color: #fff;
-    font-size: 12px;
+    font-size: 1em;
     font-weight: bold;
 }
 

index.html

@@ -52,6 +52,9 @@ <h2>Contributors</h2>
 				<li>
 					<strong><a href="mailto:leo.pfeifenberger@googlemail.com" target="_blank">Leo Pfeifenberger</a></strong> made <em>major</em> performance updates as well as adding requested features such as click events, state persisting via cookies and scrollToToday on load functionality.
 				</li>
+				<li>
+					<strong><a href="mailto:grzegorz.russek@gmail.com" target="_blank">Grzegorz Russek</a></strong> helped fix the White Whale of a bug that prevented the hour view rendering correctly. Nice one.
+				</li>
 			</ul>
 
 	    	<h2>

js/jquery.fn.gantt.js

@@ -1419,11 +1419,11 @@
                     var eh = $(element).outerHeight();
 
                     if (!element.loader) {
-                        element.loader = $('<div class="fn-gantt-loader" style="position: absolute; top: ' + eo.top + 'px; left: ' + eo.left + 'px; width: ' + ew + 'px; height: ' + eh + 'px;">'
+                        element.loader = $('<div class="fn-gantt-loader">'
                         + '<div class="fn-gantt-loader-spinner"><span>' + settings.waitText + '</span></div></div>');
                     }
-                    $("body").append(element.loader);
-                    setTimeout(fn, 100);
+                    $(element).append(element.loader);
+                    setTimeout(fn, 500);
 
                 } else {
                     if (element.loader) {