Merged revision(s) 16986-16987 from trunk: refactor code when selected derivative on index page is changed by a plugin ...

fix ie7 display and unwanted text in print


git-svn-id: http://piwigo.org/svn/branches/2.4@16988 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 23 insertions, 29 deletions

diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 18ad85fb3..4c356a9ee 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -151,10 +151,8 @@ foreach ($pictures as $row)
   $tpl_thumbnails_var[] = $tpl_var;
 }
 
-$derivative_params = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) );
-
 $template->assign( array(
-  'derivative_params' =>$derivative_params,
+  'derivative_params' => trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ),
   'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'],
     ) );
 $tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures);
@@ -162,6 +160,6 @@ $template->assign('thumbnails', $tpl_thumbnails_var);
 
 $template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails');
 unset($pictures, $selection, $tpl_thumbnails_var);
-$template->clear_assign( array('thumbnails', 'derivative_params') );
+$template->clear_assign( 'thumbnails' );
 pwg_debug('end include/category_default.inc.php');
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index e6f6b5965..02cd6369f 100644
--- a/index.php
+++ b/index.php
@@ -273,28 +273,6 @@ if ( $conf['index_sort_order_input']
   }
 }
 
-if ( count($page['items']) > 0 )
-{
-  $url = add_url_params(
-          duplicate_index_url(),
-          array('display' => '')
-        );
-  $selected_type = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) )->type;
-  $type_map = ImageStdParams::get_defined_type_map();
-  unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
-  foreach($type_map as $params)
-  {
-    $template->append(
-      'image_derivatives',
-      array(
-        'DISPLAY' => l10n($params->type),
-        'URL' => $url.$params->type,
-        'SELECTED' => ($params->type == $selected_type ? true:false),
-        )
-      );
-  }
-}
-
 // category comment
 if ($page['start']==0 and !isset($page['chronology_field']) and !empty($page['comment']) )
 {
@@ -322,6 +300,25 @@ if ( 0==$page['start']
 if ( !empty($page['items']) )
 {
   include(PHPWG_ROOT_PATH.'include/category_default.inc.php');
+  $url = add_url_params(
+          duplicate_index_url(),
+          array('display' => '')
+        );
+  $selected_type = $template->get_template_vars('derivative_params')->type;
+  $template->clear_assign( 'derivative_params' );
+  $type_map = ImageStdParams::get_defined_type_map();
+  unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
+  foreach($type_map as $params)
+  {
+    $template->append(
+      'image_derivatives',
+      array(
+        'DISPLAY' => l10n($params->type),
+        'URL' => $url.$params->type,
+        'SELECTED' => ($params->type == $selected_type ? true:false),
+        )
+      );
+  }
 }
 //------------------------------------------------------- category informations
 
diff --git a/themes/default/fix-ie7.css b/themes/default/fix-ie7.css
index 73868ff62..479f39f7a 100644
--- a/themes/default/fix-ie7.css
+++ b/themes/default/fix-ie7.css
@@ -15,8 +15,7 @@
 
 .thumbnails .wrap2 IMG {
   position: relative;
-  top: -50%;   
-  margin-top: 2%;
+  top: -50%;
 }
 
 .pwg-icon {
diff --git a/themes/default/print.css b/themes/default/print.css
index 3f68df3c9..89823a3df 100644
--- a/themes/default/print.css
+++ b/themes/default/print.css
@@ -1,6 +1,6 @@
 @media print {
 #menubar, .content .navigationBar, .categoryActions, .content .calendarViews, .calendarBar,
-#imageToolBar, .navThumb, #addComment {
+#imageToolBar, .navThumb, #commentAdd {
 	display: none;
 }