Changeset 10571
- Timestamp:
- Apr 22, 2011, 4:22:50 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
admin/themes/default/template/thumbnail.tpl (modified) (7 diffs)
-
admin/thumbnail.php (modified) (3 diffs)
-
language/en_UK/admin.lang.php (modified) (1 diff)
-
language/fr_FR/admin.lang.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/themes/default/template/thumbnail.tpl
r10570 r10571 12 12 {literal} 13 13 var queuedManager = $.manageAjax.create('queued', { 14 15 16 14 queue: true, 15 cacheResponse: false, 16 maxRequests: 3, 17 17 complete: function() { 18 18 jQuery("#thumb_remaining").text(todo-(++done) + ' ' + remaining); … … 24 24 25 25 function processThumbs(width,height,crop,follow_orientation) { 26 27 28 29 30 31 32 26 jQuery('tr.nothumb').each(function() { 27 var image_path = jQuery(this).find('td.filepath').text(); 28 var td=this; 29 queuedManager.add({ 30 type: 'GET', 31 url: 'ws.php', 32 data: { 33 33 method: 'pwg.images.resize', 34 34 image_path: image_path, … … 40 40 format:'json' 41 41 }, 42 43 44 42 dataType: 'json', 43 success: (function(row) { return function(data) { 44 if (data.stat =='ok') { 45 45 if (todo < 200) 46 46 jQuery(row).find('td.thumbpic').html('<img src="'+data.result.destination+'"/>'); … … 49 49 jQuery(row).find('td.thumbsize').html(""+data.result.size); 50 50 jQuery(row).removeClass("nothumb"); 51 52 jQuery(row).find('td.thumb pic').html('#ERR#'+data.err+"# : "+data.message);51 } else { 52 jQuery(row).find('td.thumbdim').html('#ERR#'+data.err+"# : "+data.message); 53 53 jQuery(row).removeClass("nothumb"); 54 54 jQuery(row).addClass("error"); 55 56 55 } 56 } 57 57 })(td) 58 59 58 }); 59 }); 60 60 } 61 61 … … 77 77 var width = jQuery('input[name="thumb_maxwidth"]').val(); 78 78 var height = jQuery('input[name="thumb_maxheight"]').val(); 79 var crop = jQuery('# crop').is(':checked');80 var follow_orientation = jQuery('# follow_orientation').is(':checked');79 var crop = jQuery('#thumb_crop').is(':checked'); 80 var follow_orientation = jQuery('#thumb_follow_orientation').is(':checked'); 81 81 jQuery(".waiting_bar").toggle(); 82 82 if (todo < 200) … … 114 114 <li> 115 115 <span class="property"><label for="thumb_crop">{'Crop'|@translate}</label></span> 116 116 <input type="checkbox" name="thumb_crop" id="thumb_crop" {$values.thumb_crop}> 117 117 </li> 118 118 <li id="thumb_follow_orientation_li"> 119 119 <span class="property"><label for="thumb_follow_orientation">{'Follow Orientation'|@translate}</label></span> 120 120 <input type="checkbox" name="thumb_follow_orientation" id="thumb_follow_orientation" {$values.thumb_follow_orientation}> 121 121 </li> 122 122 <li> 123 123 <span class="property"><label for="thumb_maxwidth">{'Maximum Width'|@translate}</label></span> 124 124 <input type="text" name="thumb_maxwidth" id="thumb_maxwidth" value="{$values.thumb_maxwidth}" size="4" maxlength="4"> {'pixels'|@translate} 125 125 </li> 126 126 <li> 127 127 <span class="property"><label for="thumb_maxheight">{'Maximum Height'|@translate}</label></span> 128 128 <input type="text" name="thumb_maxheight" id="thumb_maxheight" value="{$values.thumb_maxheight}" size="4" maxlength="4"> {'pixels'|@translate} 129 129 </li> 130 130 <li> 131 131 <span class="property"><label for="thumb_quality">{'Image Quality'|@translate}</label></span> 132 132 <input type="text" name="thumb_quality" id="thumb_quality" value="{$values.thumb_quality}" size="3" maxlength="3"> % 133 133 </li> 134 134 </ul> … … 157 157 <td>{$elt.FILESIZE_IMG}</td> 158 158 <td>{$elt.WIDTH_IMG} x {$elt.HEIGHT_IMG}</td> 159 160 161 162 159 <td class="thumbpic"><img src="admin/themes/default/images/ajax-loader.gif"></td> 160 <td class="thumbgentime"> </td> 161 <td class="thumbsize"> </td> 162 <td class="thumbdim"> </td> 163 163 </tr> 164 164 {/foreach} 165 165 </table> 166 166 {else} 167 <div style="text-align:center;font-weight:bold;margin:10px;"> [ {'No missing thumbnail'|@translate} ]</div> 167 <p style="text-align:left;margin:20px;"> 168 <b>{'No missing thumbnail'|@translate}</b><br><br> 169 {'If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'|@translate|@sprintf:"admin.php?page=batch_manager"} 170 </p> 168 171 {/if} -
trunk/admin/thumbnail.php
r10570 r10571 101 101 // | form & pictures without thumbnails display | 102 102 // +-----------------------------------------------------------------------+ 103 $template->set_filenames( array('thumbnail'=>'thumbnail.tpl') ); 104 103 105 if (count($wo_thumbnails) > 0) 104 106 { … … 115 117 'WIDTH_IMG'=>$width, 116 118 'HEIGHT_IMG'=>$height, 117 )); 119 ) 120 ); 118 121 } 119 122 } … … 132 135 'values' => $form_values, 133 136 'TOTAL_NB_REMAINING' => count($wo_thumbnails), 137 'U_HELP' => get_root_url().'admin/popuphelp.php?page=thumbnail', 134 138 ) 135 139 ); 136 140 137 // +-----------------------------------------------------------------------+138 // | return to admin |139 // +-----------------------------------------------------------------------+140 $template->set_filenames( array('thumbnail'=>'thumbnail.tpl') );141 142 $template->assign('U_HELP', get_root_url().'admin/popuphelp.php?page=thumbnail');143 144 141 $template->assign_var_from_handle('ADMIN_CONTENT', 'thumbnail'); 145 142 ?> -
trunk/language/en_UK/admin.lang.php
r10552 r10571 830 830 $lang['Height'] = 'Height'; 831 831 $lang['Follow Orientation'] = 'Follow Orientation'; 832 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'; 832 833 ?> -
trunk/language/fr_FR/admin.lang.php
r10552 r10571 841 841 $lang['Height'] = 'Hauteur'; 842 842 $lang['Follow Orientation'] = "Respecter l'orientation"; 843 $lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Si vous voulez régénérer des miniatures, merci de vous rendre dans la <a href="%s">Gestion par lot</a>.'; 843 844 ?>
Note: See TracChangeset
for help on using the changeset viewer.
