Changeset 12796 for trunk/admin

Timestamp:

Dec 27, 2011, 6:26:44 AM (12 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• core implementation + usage on most public/admin pages
• still to do: sync process, upload, gui/persistence for size parameters, migration script, center of interest ...

Location:

trunk/admin

Files:

• batch_manager_global.php (modified) (2 diffs)
• batch_manager_unit.php (modified) (2 diffs)
• cat_modify.php (modified) (3 diffs)
• comments.php (modified) (2 diffs)
• element_set_ranks.php (modified) (3 diffs)
• history.php (modified) (6 diffs)
• picture_modify.php (modified) (1 diff)
• rating.php (modified) (2 diffs)
• rating_user.php (modified) (3 diffs)
• themes/default/template/rating_user.tpl (modified) (2 diffs)

trunk/admin/batch_manager_global.php

@@ -712 +712 @@
 
   $query = '
-SELECT id,path,tn_ext,file,filesize,level,name
+SELECT id,path,representative_ext,file,filesize,level,name
   FROM '.IMAGES_TABLE;
   
@@ -748 +748 @@
   {
     $nb_thumbs_page++;
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
 
     $title = $row['name'];

trunk/admin/batch_manager_unit.php

@@ -202 +202 @@
 
   $query = '
-SELECT id,path,tn_ext,name,date_creation,comment,author,level,file
+SELECT id,path,representative_ext,name,date_creation,comment,author,level,file
   FROM '.IMAGES_TABLE;
   
@@ -238 +238 @@
     array_push($element_ids, $row['id']);
 
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
 
     // creation date

trunk/admin/cat_modify.php

@@ -302 +302 @@
   {
     $query = '
-SELECT id,tn_ext,path
+SELECT id,representative_ext,path
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$category['representative_picture_id'].'
 ;';
     $row = pwg_db_fetch_assoc(pwg_query($query));
-    $src = get_thumbnail_url($row);
+    $src = DerivativeImage::thumb_url($row);
     $url = get_root_url().'admin.php?page=picture_modify';
     $url.= '&image_id='.$category['representative_picture_id'];
@@ -388 +388 @@
   {
     $query = '
-SELECT id, file, path, tn_ext
+SELECT id, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$category['representative_picture_id'].'
@@ -404 +404 @@
                           'category' => $category
                         ))
-                      .'" class="thumblnk"><img src="'.get_thumbnail_url($element).'"></a>';
+                      .'" class="thumblnk"><img src="'.DerivativeImage::thumb_url($element).'"></a>';
     }
   }

trunk/admin/comments.php

@@ -100 +100 @@
 $query = '
 SELECT c.id, c.image_id, c.date, c.author, '.
-$conf['user_fields']['username'].' AS username, c.content, i.path, i.tn_ext
+$conf['user_fields']['username'].' AS username, c.content, i.path, i.representative_ext
   FROM '.COMMENTS_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i
@@ -112 +112 @@
 while ($row = pwg_db_fetch_assoc($result))
 {
-  $thumb = get_thumbnail_url(
+  $thumb = DerivativeImage::thumb_url(
       array(
         'id'=>$row['image_id'],

trunk/admin/element_set_ranks.php

@@ -200 +200 @@
     file,
     path,
-    tn_ext,
+    representative_ext,
+    width, height,
     name,
     rank
@@ -215 +216 @@
         $thumbnail_info=array();
         $clipping=array();
+  $derivativeParams = ImageStdParams::get_by_type(IMG_SQUARE);
         while ($row = pwg_db_fetch_assoc($result))
         {
-                $src = get_thumbnail_url($row);
-
-                $thumbnail_size = getimagesize($src);
+    $derivative = new DerivativeImage($derivativeParams, new SrcImage($row));
+
+                $thumbnail_size = $derivative->get_size();
                 if ( !empty( $row['name'] ) )
                 {
@@ -234 +236 @@
                         'height'        => $thumbnail_size[1],
                         'id'    => $row['id'],
-                        'tn_src'        => $src,
+                        'tn_src'        => $derivative->get_url(),
                         'rank'  => $current_rank * 10,
                         );

trunk/admin/history.php

@@ -304 +304 @@
     file,
     path,
-    tn_ext
+    representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', array_keys($image_ids)).')
@@ -314 +314 @@
     $file_of_image = array();
     $path_of_image = array();
-    $tn_ext_of_image = array();
+    $representative_ext_of_image = array();
 
     $result = pwg_query($query);
@@ -333 +333 @@
       $file_of_image[ $row['id'] ] = $row['file'];
       $path_of_image[ $row['id'] ] = $row['path'];
-      $tn_ext_of_image[ $row['id'] ] = $row['tn_ext'];
+      $representative_ext_of_image[ $row['id'] ] = $row['representative_ext'];
     }
 
@@ -455 +455 @@
           'file' => $file_of_image[$line['image_id']],
           'path' => $path_of_image[$line['image_id']],
-          'tn_ext' => $tn_ext_of_image[$line['image_id']],
+          'representative_ext' => $representative_ext_of_image[$line['image_id']],
           );
         $thumbnail_display = $page['search']['fields']['display_thumbnail'];
@@ -488 +488 @@
           $image_string =
             '<a class="thumbnail" href="'.$picture_url.'">'
-            .'<span><img src="'.get_thumbnail_url($element)
+            .'<span><img src="'.DerivativeImage::thumb_url($element)
             .'" alt="'.$image_title.'" title="'.$image_title.'">'
             .'</span></a>';
@@ -497 +497 @@
           $image_string =
             '<a class="over" href="'.$picture_url.'">'
-            .'<span><img src="'.get_thumbnail_url($element)
+            .'<span><img src="'.DerivativeImage::thumb_url($element)
             .'" alt="'.$image_title.'" title="'.$image_title.'">'
             .'</span>'.$image_title.'</a>';

trunk/admin/picture_modify.php

@@ -283 +283 @@
     'PATH'=>$row['path'],
 
-    'TN_SRC' => get_thumbnail_url($row),
+    'TN_SRC' => DerivativeImage::thumb_url($row),
 
     'NAME' =>

trunk/admin/rating.php

@@ -185 +185 @@
         i.path,
         i.file,
-        i.tn_ext,
+        i.representative_ext,
         i.rating_score,
         r.element_id
@@ -202 +202 @@
 foreach ($images as $image)
 {
-  $thumbnail_src = get_thumbnail_url($image);
+  $thumbnail_src = DerivativeImage::thumb_url($image);
 
   $image_url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.

trunk/admin/rating_user.php

@@ -102 +102 @@
 if (count($image_ids) > 0 )
 {
-  $query = 'SELECT id, name, file, path, tn_ext
+  $query = 'SELECT id, name, file, path, representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', array_keys($image_ids)).')';
@@ -109 +109 @@
   {
     $image_urls[ $row['id'] ] = array(
-      'tn' => get_thumbnail_url($row),
+      'tn' => DerivativeImage::thumb_url($row),
       'page' => make_picture_url( array('image_id'=>$row['id'], 'image_file'=>$row['file']) ),
     );
@@ -218 +218 @@
   'ratings' => $by_user_ratings,
   'image_urls' => $image_urls,
-  'TN_WIDTH' => 20+2*$conf['upload_form_thumb_maxwidth'],
+  'TN_WIDTH' => 28+2*ImageStdParams::get_by_type(IMG_THUMB)->sizing->ideal_size[0],
   ) );
 $template->set_filename('rating', 'rating_user.tpl');

trunk/admin/themes/default/template/rating_user.tpl

@@ -60 +60 @@
                 {capture assign=rate_over}{foreach from=$rates item=rate_arr}<img src="{$image_urls[$rate_arr.id].tn}" alt="thumb-{$rate_arr.id}" title="{$rate_arr.date}"></img>
                 {/foreach}{/capture}
-                <a class="cluetip" title="{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
+                <a class="cluetip" title="|{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
                 {/if}</td>
         {/foreach}
@@ -72 +72 @@
 jQuery(document).ready(function(){ldelim}
         jQuery('.cluetip').cluetip({ldelim}
-                width: {$TN_WIDTH}, splitTitle: '|'
+                width: {$TN_WIDTH}, showTitle:false, splitTitle: '|'
         });
 })