upgrade jquery to 1.7.1

mouseout on index drop down bozes
improved multisize center of interest

git-svn-id: http://piwigo.org/svn/trunk@13052 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 28 insertions, 12 deletions

diff --git a/admin/picture_coi.php b/admin/picture_coi.php
index 2a3a60023..9725d5294 100644
--- a/admin/picture_coi.php
+++ b/admin/picture_coi.php
@@ -57,7 +57,24 @@ $row = pwg_db_fetch_assoc( pwg_query($query) );
 
 if (isset($_POST['submit']))
 {
-  delete_element_derivatives($row);
+  foreach(ImageStdParams::get_defined_type_map() as $params)
+  {
+    if ($params->sizing->max_crop != 0)
+    {
+      delete_element_derivatives($row, $params->type);
+    }
+  }
+  delete_element_derivatives($row, IMG_CUSTOM);
+  $uid = '&b='.time();
+  $conf['question_mark_in_urls'] = $conf['php_extension_in_urls'] = true;
+  if ($conf['derivative_url_style']==1)
+  {
+    $conf['derivative_url_style']=0; //auto
+  }
+}
+else
+{
+  $uid = '';
 }
 
 $tpl_var = array(
@@ -76,20 +93,19 @@ if (!empty($row['coi']))
   );
 }
 
-if (isset($_POST['submit']))
+foreach(ImageStdParams::get_defined_type_map() as $params)
 {
-  $uid = '&b='.time();
-  $conf['question_mark_in_urls'] = $conf['php_extension_in_urls'] = true;
-  $conf['derivative_url_style']=2; //script
-  $tpl_var['U_SQUARE'] = DerivativeImage::url(IMG_SQUARE, $row).$uid;
-  $tpl_var['U_THUMB'] = DerivativeImage::url(IMG_THUMB, $row).$uid;
-}
-else
-{
-  $tpl_var['U_SQUARE'] = DerivativeImage::url(IMG_SQUARE, $row);
-  $tpl_var['U_THUMB'] = DerivativeImage::url(IMG_THUMB, $row);
+  if ($params->sizing->max_crop != 0)
+  {
+    $derivative = new DerivativeImage($params, new SrcImage($row) );
+    $template->append( 'cropped_derivatives', array( 
+      'U_IMG' => $derivative->get_url().$uid,
+      'HTM_SIZE' => $derivative->get_size_htm(),
+    ) );
+  }
 }
 
+
 $template->assign($tpl_var);
 $template->set_filename('picture_coi', 'picture_coi.tpl');