Changeset 12857 for extensions/GThumb
- Timestamp:
- Jan 6, 2012, 4:39:54 PM (12 years ago)
- Location:
- extensions/GThumb
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/GThumb/js/gthumb.js
r12710 r12857 1 1 var GThumb = { 2 2 3 root: './', 3 4 max_height: 200, 4 5 margin: 10, … … 44 45 GThumb.queue.add({ 45 46 type: 'GET', 46 url: 'ws.php',47 url: GThumb.root+'ws.php', 47 48 data: { 48 49 method: 'pwg.images.getGThumbPlusThumbnail', … … 53 54 success: function(data) { 54 55 if (data.stat == 'ok') { 55 jQuery('#gt'+data.result.id).prop('src', data.result.src).show();56 jQuery('#gt'+data.result.id).prop('src', GThumb.root+data.result.src).show(); 56 57 } else if (loop < 4) { 57 58 GThumb.addToQueue(id, ++loop); -
extensions/GThumb/main.inc.php
r12758 r12857 94 94 include_once(GTHUMB_PATH.'functions.inc.php'); 95 95 $result = make_gthumb_image($pictures[0], $data); 96 $big_thumb['src'] = $result['destination'];96 $big_thumb['src'] = embellish_url(get_root_url().$result['destination']); 97 97 } 98 98 else 99 99 { 100 $big_thumb['src'] = 'ws.php?method=pwg.images.getGThumbPlusThumbnail&image_id='.$ft['ID'].'&size=big&return=true';100 $big_thumb['src'] = get_root_url().'ws.php?method=pwg.images.getGThumbPlusThumbnail&image_id='.$ft['ID'].'&size=big&return=true'; 101 101 } 102 102 } … … 137 137 global $conf; 138 138 139 if (!in_array(get_extension($picture['path']), $conf['picture_ext'])) 140 { 141 $file = get_thumbnail_url($picture); 142 list($width, $height) = getimagesize($file); 139 $picture_ext = array('jpg', 'jpeg', 'png', 'gif'); 140 141 if (!in_array(strtolower(get_extension($picture['path'])), $picture_ext)) 142 { 143 list($width, $height) = getimagesize(get_thumbnail_path($picture)); 143 144 144 145 return array( 145 'src' => $file,146 'src' => get_thumbnail_url($picture), 146 147 'width' => $width, 147 148 'height' => $height, … … 157 158 158 159 return array( 159 'src' => $file,160 'src' => embellish_url(get_root_url().$file), 160 161 'width' => $width, 161 162 'height' => $height, -
extensions/GThumb/template/admin.tpl
r12759 r12857 60 60 {'Generating cache, please wait...'|@translate}<br> 61 61 <div id="progressbar"></div> 62 <p><button onclick="GThumb.abort();">{'Ca cncel'|@translate}</button></p>62 <p><button onclick="GThumb.abort();">{'Cancel'|@translate}</button></p> 63 63 </div> 64 64 </fieldset> -
extensions/GThumb/template/gthumb.tpl
r12712 r12857 15 15 16 16 {footer_script require="gthumb"} 17 GThumb.root = '{$ROOT_URL}'; 17 18 GThumb.max_height = {$GThumb.height}; 18 19 GThumb.margin = {$GThumb.margin};
Note: See TracChangeset
for help on using the changeset viewer.