Changeset 9864

Timestamp:

Mar 26, 2011, 3:29:27 PM (13 years ago)

Author:

flop25

Message:

feature:2230
the size of the squared thumbnails depend of the sizes of all the thumbnails : the clipping is an average of the clipping of each of the thumbnails

Location:

trunk/admin

Files:

• element_set_ranks.php (modified) (1 diff)
• themes/default/fix-ie7.css (modified) (1 diff)
• themes/default/template/element_set_ranks.tpl (modified) (1 diff)
• themes/default/theme.css (modified) (1 diff)

trunk/admin/element_set_ranks.php

@@ -210 +210 @@
 // template thumbnail initialization
 $current_rank = 1;
-
+$thumbnail_info=array();
+$clipping=array();
 while ($row = pwg_db_fetch_assoc($result))
 {
   $src = get_thumbnail_url($row);
-
-  list($thumbnail_width, $thumbnail_height) = getimagesize($src);
-  $thumbnail_x_center = $thumbnail_width/2;
-  $thumbnail_y_center = $thumbnail_height/2;
-  
+        
+        $thumbnail_size = getimagesize($src);
+        $thumbnail_info[] = array(
+                'width' => $thumbnail_size[0],
+                'height'        => $thumbnail_size[1],
+                'id'    => $row['id'],
+                'tn_src'        => $src,
+                'rank'  => $current_rank * 10,
+                );
+        $clipping[]= min($thumbnail_size[0]*0.75,$thumbnail_size[1]*0.75);
+
+  $current_rank++;
+}
+$clipping=array_sum($clipping)/count($clipping);
+foreach ($thumbnail_info as $thumbnails_info)
+{
+  $thumbnail_x_center = $thumbnails_info['width']/2;
+  $thumbnail_y_center = $thumbnails_info['height']/2;
   $template->append(
     'thumbnails',
     array(
-      'ID' => $row['id'],
-      'TN_SRC' => $src,
-      'RANK' => $current_rank * 10,
-      'CLIP_TOP' => round($thumbnail_y_center - 96/2),
-      'CLIP_RIGHT' => round($thumbnail_x_center + 96/2),
-      'CLIP_BOTTOM' => round($thumbnail_y_center + 96/2),
-      'CLIP_LEFT' => round($thumbnail_x_center - 96/2)
+      'ID' => $thumbnails_info['id'],
+      'TN_SRC' => $thumbnails_info['tn_src'],
+      'RANK' => $thumbnails_info['rank'],
+      'CLIPING' => round($clipping),
+      'CLIPING_li' => round($clipping+8),
+      'CLIP_TOP' => round($thumbnail_y_center - $clipping/2),
+      'CLIP_RIGHT' => round($thumbnail_x_center + $clipping/2),
+      'CLIP_BOTTOM' => round($thumbnail_y_center + $clipping/2),
+      'CLIP_LEFT' => round($thumbnail_x_center - $clipping/2)
       )
     );
-
-  $current_rank++;
-}
-
+}
 // image order management
 $sort_fields = array(

trunk/admin/themes/default/fix-ie7.css

@@ -3 +3 @@
 #menubar { margin: 0; }
 #footer { left: 0; }
+
+UL.thumbnails li.rank-of-image {
+        text-align:left;
+}

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

@@ -44 +44 @@
     <ul class="thumbnails">
       {foreach from=$thumbnails item=thumbnail}
-      <li class="rank-of-image">
-        <div class="clipwrapper">
+      <li class="rank-of-image" style="width:{$thumbnail.CLIPING_li}px; height:{$thumbnail.CLIPING_li}px; ">
+        <div class="clipwrapper" style="width:{$thumbnail.CLIPING}px; height:{$thumbnail.CLIPING}px; ">
           <div class="clip" style="clip:rect({$thumbnail.CLIP_TOP}px {$thumbnail.CLIP_RIGHT}px {$thumbnail.CLIP_BOTTOM}px {$thumbnail.CLIP_LEFT}px);top:-{$thumbnail.CLIP_TOP}px;left:-{$thumbnail.CLIP_LEFT}px">
             <img src="{$thumbnail.TN_SRC}" class="thumbnail" alt="">

trunk/admin/themes/default/theme.css

@@ -55 +55 @@
   width: 96px;
   height: 96px;
+  margin: 3px;
 }
 .clip {