diff options
| author | flop25 <flop25@piwigo.org> | 2013-01-14 23:15:34 +0000 |
|---|---|---|
| committer | flop25 <flop25@piwigo.org> | 2013-01-14 23:15:34 +0000 |
| commit | a6f55ac0381a81c6abf79bb2ed8617b6d50ed2aa (patch) | |
| tree | 491cf9c9b254fde48fd4ce97e1819bbc61833a29 /include | |
| parent | 0b702326567d90e796caac72c7d7a5449037b1b6 (diff) | |
bug:2820 & bug:2684
add $conf['maxRequests']
perf enhanced : declare once {combine_script}
add one loading gif, fixed at the bottom right of the page
display an icon for picture loading, and an error icon if ajax failed : might need to be integrated in sprite.png
ToDo picture page/clean up unused loader gif/sleep above all.
git-svn-id: http://piwigo.org/svn/trunk@20161 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/category_cats.inc.php | 1 | ||||
| -rw-r--r-- | include/category_default.inc.php | 1 | ||||
| -rw-r--r-- | include/config_default.inc.php | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index cb25bc41e..6f93dea91 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -387,6 +387,7 @@ if (count($categories) > 0) $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); $tpl_thumbnails_var_selection = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var_selection); $template->assign( array( + 'maxRequests' =>$conf['maxRequests'], 'category_thumbnails' => $tpl_thumbnails_var_selection, 'derivative_params' => $derivative_params, ) ); diff --git a/include/category_default.inc.php b/include/category_default.inc.php index b1d2106b8..cab756bbc 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -153,6 +153,7 @@ foreach ($pictures as $row) $template->assign( array( 'derivative_params' => trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ), + 'maxRequests' =>$conf['maxRequests'], 'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'], ) ); $tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures); diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 661af80fe..1478b12a5 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -769,4 +769,7 @@ $conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755; // 'small', 'medium' or 'large' $conf['derivative_default_size'] = 'medium'; + +//Maximum Ajax requests at once, for thumbnails on-the-fly generation +$conf['maxRequests']=3; ?>
\ No newline at end of file |