matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated so that loading spinner is displayed always

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-29 04:53:24 -04:00
parent fd71e86f2a
commit c99764b486
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documents/__init__.py
View File

@@ -127,7 +127,7 @@ def document_exists(document):
register_model_list_columns(Document, [ register_model_list_columns(Document, [
{'name':_(u'thumbnail'), 'attribute': {'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]), 'url': reverse('document_preview', args=[x.pk]),
'thumbnail': reverse('document_thumbnail', args=[x.pk]), 'thumbnail': reverse('document_thumbnail', args=[x.pk]),
'media_url': settings.MEDIA_URL 'media_url': settings.MEDIA_URL

6
apps/documents/forms.py
View File

@@ -40,7 +40,7 @@ class DocumentPageImageWidget(forms.widgets.Widget):
output.append(''' output.append('''
<div class="full-height scrollable" style="overflow: auto;"> <div class="full-height scrollable" style="overflow: auto;">
<div class="tc"> <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> <noscript>
<img src="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" /> <img src="%(img)s?page=%(page)d&zoom=%(zoom)d&rotation=%(rotation)d" />
</noscript> </noscript>
@@ -118,7 +118,7 @@ class ImageWidget(forms.widgets.Widget):
<div class="tc">%(page_string)s %(page)s</div> <div class="tc">%(page_string)s %(page)s</div>
<div class="tc"> <div class="tc">
<a rel="page_gallery" class="fancybox-noscaling" href="%(view_url)s?page=%(page)d"> <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> <noscript>
<img src="%(img)s?page=%(page)d" /> <img src="%(img)s?page=%(page)d" />
</noscript> </noscript>
@@ -384,7 +384,7 @@ class MetaDataImageWidget(forms.widgets.Widget):
%(tags_template)s %(tags_template)s
<div class="tc"> <div class="tc">
<a rel="group_%(group_id)d_documents_gallery" class="fancybox-noscaling" href="%(view_url)s"> <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> <noscript>
<img style="border: 1px solid black; margin: 10px;" src="%(img)s" /> <img style="border: 1px solid black; margin: 10px;" src="%(img)s" />
</noscript> </noscript>

4
apps/main/templates/base.html
View File

@@ -88,8 +88,8 @@
}); });
$('img.lazy-load').jail({ $('img.lazy-load').jail({
event: 'load', event: 'load',
placeholder : '{{ MEDIA_URL }}/images/ajax-loader.gif' timeout: 10,
//effect: 'fadeIn' placeholder: '{{ MEDIA_URL }}/images/ajax-loader.gif'
}); });
}); });
</script> </script>