From c99764b486d5b6fa65dfc6e26ffaae389fcfc8cc Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Fri, 29 Apr 2011 04:53:24 -0400
Subject: [PATCH] Updated so that loading spinner is displayed always

---
 apps/documents/__init__.py    | 2 +-
 apps/documents/forms.py       | 6 +++---
 apps/main/templates/base.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py
index 52eefbd701..c09c69aee0 100644
--- a/apps/documents/__init__.py
+++ b/apps/documents/__init__.py
@@ -127,7 +127,7 @@ def document_exists(document):
 
 register_model_list_columns(Document, [
         {'name':_(u'thumbnail'), 'attribute':
-            lambda x: '<a class="fancybox" href="%(url)s"><img class="lazy-load" data-href="%(thumbnail)s" src="%(media_url)s/images/blank.gif" /><noscript><img src="%(thumbnail)s" /></noscript></a>' % {
+            lambda x: '<a class="fancybox" href="%(url)s"><img class="lazy-load" data-href="%(thumbnail)s" src="%(media_url)s/images/ajax-loader.gif" /><noscript><img src="%(thumbnail)s" /></noscript></a>' % {
                 'url': reverse('document_preview', args=[x.pk]),
                 'thumbnail': reverse('document_thumbnail', args=[x.pk]),
                 'media_url': settings.MEDIA_URL
diff --git a/apps/documents/forms.py b/apps/documents/forms.py
index 6d213da598..ba271c1261 100644
--- a/apps/documents/forms.py
+++ b/apps/documents/forms.py
@@ -40,7 +40,7 @@ class DocumentPageImageWidget(forms.widgets.Widget):
             output.append('''
                 <div class="full-height scrollable" style="overflow: auto;">
                     <div class="tc">
-                        <img class="lazy-load" data-href="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" src="%(media_url)s/images/blank.gif" />
+                        <img class="lazy-load" data-href="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" src="%(media_url)s/images/ajax-loader.gif" />
                         <noscript>
                             <img src="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" />
                         </noscript>     
@@ -118,7 +118,7 @@ class ImageWidget(forms.widgets.Widget):
                         <div class="tc">%(page_string)s %(page)s</div>
                         <div class="tc">
                             <a rel="page_gallery" class="fancybox-noscaling" href="%(view_url)s?page=%(page)d">
-                                <img class="lazy-load" data-href="%(img)s?page=%(page)d" src="%(media_url)s/images/blank.gif"/>
+                                <img class="lazy-load" data-href="%(img)s?page=%(page)d" src="%(media_url)s/images/ajax-loader.gif"/>
                                 <noscript>
                                     <img src="%(img)s?page=%(page)d" />
                                 </noscript>
@@ -384,7 +384,7 @@ class MetaDataImageWidget(forms.widgets.Widget):
                         %(tags_template)s
                         <div class="tc">
                             <a rel="group_%(group_id)d_documents_gallery" class="fancybox-noscaling" href="%(view_url)s">
-                                <img class="lazy-load" style="border: 1px solid black; margin: 10px;" src="%(media_url)s/images/blank.gif" data-href="%(img)s" />
+                                <img class="lazy-load" style="border: 1px solid black; margin: 10px;" src="%(media_url)s/images/ajax-loader.gif" data-href="%(img)s" />
                                 <noscript>
                                     <img style="border: 1px solid black; margin: 10px;" src="%(img)s" />
                                 </noscript>
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 3491c2cda7..ab16999113 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -88,8 +88,8 @@
             });
             $('img.lazy-load').jail({
                 event: 'load',
-                placeholder : '{{ MEDIA_URL }}/images/ajax-loader.gif'
-                //effect: 'fadeIn'
+                timeout: 10,
+                placeholder: '{{ MEDIA_URL }}/images/ajax-loader.gif'
             });
         });
     </script>