Changeset 6718 for extensions/rv_thumbs/trunk/main.inc.php

Timestamp:

Jul 28, 2010, 1:54:27 AM (14 years ago)

Author:

patdenice

Message:

Compatible with 2.1.x
Move icons to title

File:

• extensions/rv_thumbs/trunk/main.inc.php (modified) (4 diffs)

extensions/rv_thumbs/trunk/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: RV Thumbs
-Version: 2.0.c
+Version: 2.1.a
 Description: Let users see a variable number of thumbnails on index page
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=261
@@ -22 +22 @@
                 {
                         case 'more':
-                                $multiplier = ($multiplier==1) ? 4 : $multiplier*2;
-                                $multiplier = min($multiplier, ceil(RV_THUMBS_MAX/$page['nb_image_page']));
+                                if (count($page['items']) > $page['nb_image_page'] * $multiplier)
+                                {
+                                        $multiplier = ($multiplier==1) ? 4 : $multiplier*2;
+                                        $multiplier = min($multiplier, ceil(RV_THUMBS_MAX/$page['nb_image_page']));
+                                }
                                 break;
                         case 'less':
@@ -44 +47 @@
         global $user, $template, $page;
         $multiplier = pwg_get_session_var('idx_thumbs_muliplier', 1);
-        $nav_bar = & $template->get_template_vars('NAV_BAR');
+        $title = & $template->get_template_vars('TITLE');
         $ini_per_page = $user['nb_image_page'];
         $has_less = $multiplier>1 && count($page['items'])>$ini_per_page;
-        $has_more = !empty($nav_bar) && $multiplier < ceil(RV_THUMBS_MAX/$ini_per_page );
+        $has_more = !empty($page['navigation_bar']) && $multiplier < ceil(RV_THUMBS_MAX/$ini_per_page );
         if ($has_less || $has_more)
         {
                 global $lang_info, $conf; if ($lang_info['code']!='en' or $conf['debug_l10n']) load_language( 'lang', dirname(__FILE__).'/' );
-                $css = 'background:url('.get_root_url().'plugins/rv_thumbs/sprite.gif) no-repeat top left; height:15px; width:17px; padding:0 15px 1px 0; display:inline; background-position:center ';
-                $fmt_link = '<a href="%s" rel="nofollow" style="border:none"><div style="'.$css.'%spx;" title="%s">&nbsp;</div></a>';
+                $css = 'background:url('.get_root_url().'plugins/rv_thumbs/sprite.gif) no-repeat top left; height:15px; width:17px; padding:0 5px 1px 0; display:inline-block; background-position:center ';
+                $fmt_link = '<a href="%s" rel="nofollow" style="border:none; margin:0;"><div style="'.$css.'%spx;" title="%s">&nbsp;</div></a>';
                 $fmt = '<div style="'.$css.'%spx; cursor:default" title="%s">&nbsp;</div>';
-                $bar = '<span style="margin-left:10px;">';
+                $bar = '<span style="margin-left:10px;vertical-align:middle;">';
                 if ($has_less)
                         $bar .= sprintf( $fmt_link, add_url_params(duplicate_index_url(), array('thumbs'=>'less')), -39, l10n('Show less thumbnails') );
@@ -64 +67 @@
                         $bar .= sprintf( $fmt, -21, l10n('Show more thumbnails') );
                 $bar .= '</span>';
-                $nav_bar .= ( !empty($nav_bar) ? ' &nbsp; ' : '' ) . $bar;
+                $title .= $bar;
         }
 }