Changeset 12855 for trunk/admin

Timestamp:

Jan 5, 2012, 11:06:21 PM (12 years ago)

Author:

rvelices

Message:

feature 2548 multisize - improved picture.php display (original...) + code cleanup

Location:

trunk/admin

Files:

• include/functions.php (modified) (1 diff)
• picture_modify.php (modified) (1 diff)
• themes/default/template/picture_modify.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -201 +201 @@
     $files[] = get_element_path($row);
 
-    if (!empty($row['tn_ext']))
-    {
-      $files[] = get_thumbnail_path($row);
-    }
-    
-    if (!empty($row['has_high']) and get_boolean($row['has_high']))
-    {
-      $files[] = get_high_path($row);
-    }
-    
+   
     if (!empty($row['representative_ext']))
     {
       $pi = pathinfo($row['path']);
       $file_wo_ext = get_filename_wo_extension($pi['basename']);
-      $files[] = PHPWG_ROOT_PATH.$pi['dirname'].'/pwg_representative/'.$file_wo_ext.'.'.$row['representative_ext'];
+      $files[] = original_to_representative( $files[0], $row['representative_ext']);
     }
 

trunk/admin/picture_modify.php

@@ -304 +304 @@
   );
 
-if ($row['has_high'] == 'true')
-{
-  $template->assign(array(
-    'HIGH_FILESIZE' => isset($row['high_filesize']) ? $row['high_filesize'].' KB' : l10n('unknown'),
-    'HIGH_DIMENSIONS' => isset($row['high_width']) ? $row['high_width'].' * '.$row['high_height'] : l10n('unknown'),
-    ));
-}
-
 // image level options
 $selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level'];

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

@@ -67 +67 @@
       </tr>
 
-{if isset($HIGH_FILESIZE) }
-      <tr>
-        <td><strong>{'High dimensions'|@translate}</strong></td>
-        <td>{$HIGH_DIMENSIONS}</td>
-      </tr>
-      
-      <tr>
-        <td><strong>{'High filesize'|@translate}</strong></td>
-        <td>{$HIGH_FILESIZE}</td>
-      </tr>
-{/if}
-
       <tr>
         <td><strong>{'Storage album'|@translate}</strong></td>