diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/Sylvia/icon/errors_small.png | bin | 0 -> 1270 bytes | |||
| -rw-r--r-- | themes/Sylvia/icon/img_small.png | bin | 0 -> 1164 bytes | |||
| -rw-r--r-- | themes/Sylvia/images/ajax_loader.gif | bin | 0 -> 10819 bytes | |||
| -rw-r--r-- | themes/default/images/ajax-loader-big.gif | bin | 7429 -> 0 bytes | |||
| -rw-r--r-- | themes/default/js/thumbnails.loader.js | 5 | ||||
| -rw-r--r-- | themes/default/template/comment_list.tpl | 8 | ||||
| -rw-r--r-- | themes/default/template/picture_content.tpl | 3 |
7 files changed, 12 insertions, 4 deletions
diff --git a/themes/Sylvia/icon/errors_small.png b/themes/Sylvia/icon/errors_small.png Binary files differnew file mode 100644 index 000000000..724cc659c --- /dev/null +++ b/themes/Sylvia/icon/errors_small.png diff --git a/themes/Sylvia/icon/img_small.png b/themes/Sylvia/icon/img_small.png Binary files differnew file mode 100644 index 000000000..dbfcc9a00 --- /dev/null +++ b/themes/Sylvia/icon/img_small.png diff --git a/themes/Sylvia/images/ajax_loader.gif b/themes/Sylvia/images/ajax_loader.gif Binary files differnew file mode 100644 index 000000000..d84f65378 --- /dev/null +++ b/themes/Sylvia/images/ajax_loader.gif diff --git a/themes/default/images/ajax-loader-big.gif b/themes/default/images/ajax-loader-big.gif Binary files differdeleted file mode 100644 index cae8630d3..000000000 --- a/themes/default/images/ajax-loader-big.gif +++ /dev/null diff --git a/themes/default/js/thumbnails.loader.js b/themes/default/js/thumbnails.loader.js index 9483caeb6..b383b7276 100644 --- a/themes/default/js/thumbnails.loader.js +++ b/themes/default/js/thumbnails.loader.js @@ -11,12 +11,17 @@ function add_thumbnail_to_queue(img, loop) { url: img.data('src'), data: { ajaxload: 'true' }, dataType: 'json', + beforeSend: function(){jQuery('.loader').show()}, success: function(result) { img.attr('src', result.url); + jQuery('.loader').hide(); }, error: function() { if (loop < 3) add_thumbnail_to_queue(img, ++loop); // Retry 3 times + if ( typeof( error_icon ) != "undefined" ) + img.attr('src', error_icon); + jQuery('.loader').hide(); } }); } diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index df60a453a..f70a1a075 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -9,6 +9,8 @@ } {/html_style}{/strip} {/if} +{footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script} +<div class="loader" style="display: none; position: fixed; right: 0;bottom: 0;"><img src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif"></div> <ul class="commentsList"> {foreach from=$comments item=comment name=comment_loop} <li class="commentElement {if $smarty.foreach.comment_loop.index is odd}odd{else}even{/if}"> @@ -20,11 +22,11 @@ {/if} {if !$derivative->is_cached()} {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} - {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} - {/if} + {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} + {/if} <div class="illustration"> <a href="{$comment.U_PICTURE}"> - <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-small.gif" data-src="{$derivative->get_url()}"{/if} alt="{$comment.ALT}"> + <img {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.icon_dir}/img_small.png" data-src="{$derivative->get_url()}"{/if} alt="{$comment.ALT}"> </a> </div> {/if} diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl index 06ec8180f..ef54bc100 100644 --- a/themes/default/template/picture_content.tpl +++ b/themes/default/template/picture_content.tpl @@ -1,9 +1,10 @@ {if !$current.selected_derivative->is_cached()} {combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'} {combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'} +{footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script} {/if} -<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} {else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-big.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}"> +<img {if $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}" {$current.selected_derivative->get_size_htm()} {else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}"> {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip} <map name="map{$derivative->get_type()}"> |
