Changeset 21212 for extensions/Back2Front

Timestamp:

Mar 5, 2013, 4:53:11 PM (11 years ago)

Author:

mistic100

Message:

update for Piwigo 2.5, multisize is disabled for photos with verso

Location:

extensions/Back2Front

Files:

• Back2Front.php (modified) (11 diffs)
• main.inc.php (modified) (1 diff)
• template/admin_button.tpl (modified) (1 diff)
• template/picture_content.tpl (modified) (2 diffs)
• template/picture_modify.tpl (modified) (1 diff)
• template/rotate_edit.png (deleted)
• template/style.css (modified) (1 diff)

extensions/Back2Front/Back2Front.php

@@ -7 +7 @@
  * Add verso link on picture page
  */
-function Back2Front_picture_content($content, $image)
+function Back2Front_picture_content($content, $element_info)
 {
   global $template, $user, $conf;
@@ -13 +13 @@
   /* search for a verso picture */
   $query = "
-    SELECT 
-      i.id, 
-      i.path,
-      i.has_high,
-      i.width,
-      i.height
+    SELECT i.*
     FROM ".IMAGES_TABLE." as i
       INNER JOIN ".B2F_TABLE." as v
       ON i.id = v.verso_id
-    WHERE
-      v.image_id = ".$image['id']."
+      AND v.image_id = ".$element_info['id']."
   ;";
   $result = pwg_query($query);
@@ -31 +25 @@
     $verso = pwg_db_fetch_assoc($result);
     $conf['back2front'] = explode(',',$conf['back2front']);
+    $deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
+    
+    $verso['src_image'] = new SrcImage($verso);
+    $verso['derivatives'] = DerivativeImage::get_all($verso['src_image']);
+    $verso['element_path'] = get_element_path($verso);
+    $verso['selected_derivative'] = $verso['derivatives'][$deriv_type];
     
     /* websize picture */
     $template->assign(array(
       'B2F_PATH' => B2F_PATH,
-      'VERSO_URL' => $verso['path'],
+      'verso' => $verso,
       ));
     
@@ -41 +41 @@
     if (is_admin())
     {
-      $template->assign('VERSO_U_ADMIN', get_root_url().'admin.php?page=picture_modify&image_id='.$verso['id']);
+      $template->assign('VERSO_U_ADMIN', get_root_url().'admin.php?page=photo-'.$verso['id']);
       $template->set_filename('B2F_admin_button', dirname(__FILE__).'/template/admin_button.tpl');
       $template->concat('PLUGIN_PICTURE_ACTIONS', $template->parse('B2F_admin_button', true));
-    }
-
-    /* high picture */
-    if ($verso['has_high'])
-    {
-      $template->assign('VERSO_HD', get_high_url($verso));
     }
     
@@ -80 +74 @@
       $conf['back2front'][4] = array(l10n('See back'), l10n('See front'));
     }
+    
+    if ($conf['back2front'][2] == 'fade' and $conf['back2front'][3] ==  'bottom')
+    {
+      $conf['back2front'][3] = 'top';
+    }
+    
 
     /* template & output */
@@ -116 +116 @@
   global $page, $template, $conf;
   
-  if ($page['page'] != 'picture_modify') return;
+  if ($page['page'] != 'photo') return;
+  if (isset($_GET['tab']) && $_GET['tab']!='properties') return;
+  
+  
   $conf['back2front'] = explode(',',$conf['back2front']);
   
@@ -164 +167 @@
       {
           $recto_current_verso['id'] = $all_recto_verso[$_POST['b2f_front_id']];
-          $recto_current_verso['link'] = get_root_url().'admin.php?page=picture_modify&image_id='.$recto_current_verso['id'];
+          $recto_current_verso['link'] = get_root_url().'admin.php?page=photo-'.$recto_current_verso['id'];
           array_push(
             $page['errors'], 
@@ -236 +239 @@
         
         $verso['id'] = $_POST['b2f_front_id'];
-        $verso['link'] = get_root_url().'admin.php?page=picture_modify&image_id='.$verso['id'];
+        $verso['link'] = get_root_url().'admin.php?page=photo-'.$verso['id'];
         array_push($page['infos'], l10n_args(get_l10n_args('This picture is now the backside of the picture n°%s', '<a href="'.$verso['link'].'">'.$verso['id'].'</a>')));
       }
@@ -300 +303 @@
         $template->assign(array(
           'B2F_VERSO_ID' => $item['verso_id'],
-          'B2F_VERSO_URL' => get_root_url().'admin.php?page=picture_modify&amp;image_id='.$item['verso_id'],
+          'B2F_VERSO_URL' => get_root_url().'admin.php?page=photo-'.$item['verso_id'],
         ));
       }
@@ -312 +315 @@
 function Back2front_picture_modify_prefilter($content, &$smarty)
 {
-  $search = '<form id="associations"';
-  $replacement = file_get_contents(B2F_PATH.'template/picture_modify.tpl')."\n".$search;
+  $search = '</form>';
+  $replacement = $search."\n\n".file_get_contents(B2F_PATH.'template/picture_modify.tpl');
   return str_replace($search, $replacement, $content);
 }
@@ -321 +324 @@
  * Add mark on thumbnails list
  */
-function Back2Front_thumbnails($tpl_thumbnails_var, $pictures)
+function Back2Front_thumbnails($tpl_thumbnails_var)
 {
-  global $conf;
+  global $conf, $selection;
   
   $conf['back2front'] = explode(',',$conf['back2front']);
   if (!$conf['back2front'][5]) return $tpl_thumbnails_var;
-  if (empty($pictures)) return $tpl_thumbnails_var;
-  
-  $ids = array();
-  foreach ($pictures as $row)
-  {
-    array_push($ids, $row['id']);
-  }
+  if (empty($tpl_thumbnails_var)) return $tpl_thumbnails_var;
     
   /* has the pictures a verso ? */
-  $query = "SELECT image_id, verso_id
+  $query = "SELECT image_id
     FROM ".B2F_TABLE."
-    WHERE image_id IN(".implode(',', $ids).");";
-  $result = hash_from_query($query, 'image_id');
-  
-  $ids = array_keys($result);
+    WHERE image_id IN(".implode(',', $selection).");";
+  $ids = array_from_query($query, 'image_id');
+  
+  $root_path = get_absolute_root_url();
   
   foreach($tpl_thumbnails_var as &$tpl_var)
   {
-    if (in_array($tpl_var['ID'], $ids))
-    {
-      $tpl_var['NAME'].= ' <img class="has_verso" src="'.B2F_PATH.'template/rotate_1.png" title="'.l10n('This picture has a backside :').'"/>';
+    if (in_array($tpl_var['id'], $ids))
+    {
+      $tpl_var['NAME'].= ' <img class="has_verso" src="'.$root_path.B2F_PATH.'template/rotate_1.png" title="'.l10n('This picture has a backside :').'"/>';
     }
   }

extensions/Back2Front/main.inc.php

@@ -21 +21 @@
 if (script_basename() == 'picture')
 {
-  add_event_handler('render_element_content', 'Back2Front_picture_content', 99, 2);
+  add_event_handler('render_element_content', 'Back2Front_picture_content', EVENT_HANDLER_PRIORITY_NEUTRAL+20, 2);
 }
 
 if (script_basename() == 'index')
 {
-  add_event_handler('loc_end_index_thumbnails', 'Back2Front_thumbnails', 99, 2);
+  add_event_handler('loc_end_index_thumbnails', 'Back2Front_thumbnails');
 }
 

extensions/Back2Front/template/admin_button.tpl

@@ -1 @@
-{strip}<a href="{$VERSO_U_ADMIN}" title="{'Modify backside information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
-  <img src="{$B2F_PATH}template/rotate_edit.png"/><span class="pwg-button-text">{'edit'|@translate}</span>
-</a>{/strip}
+{strip}{if isset($VERSO_U_ADMIN)}
+        <a href="{$VERSO_U_ADMIN}" title="{'Modify backside information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+                <span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'Edit'|@translate}</span>
+        </a>
+{/if}{/strip}

extensions/Back2Front/template/picture_content.tpl

@@ -1 +1 @@
 {combine_css path=$B2F_PATH|@cat:"template/style.css"}
-{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
+
+{if !$verso.selected_derivative->is_cached() && $current.selected_derivative->is_cached}
+{combine_script id='jquery.ajaxmanager' path='themes/default/js/plugins/jquery.ajaxmanager.js' load='footer'}
+{combine_script id='thumbnails.loader' path='themes/default/js/thumbnails.loader.js' require='jquery.ajaxmanager' load='footer'}
+{footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script}
+{/if}
+
+
+{if $b2f_position != "toolbar"}<div>{/if}
+<a class="reverse" data-what="front" rel="nofollow" class="pwg-state-default pwg-button" title="{$b2f_see_back}" {if $b2f_position == "toolbar"}style="border:none !important;"{/if}>
+  <img src="{$ROOT_URL}{$B2F_PATH}template/rotate_1.png"/> {$b2f_see_back}
+</a>
+{if $b2f_position != "toolbar"}</div>{/if}
+
+<img {if $verso.selected_derivative->is_cached()}src="{$verso.selected_derivative->get_url()}" {$verso.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$verso.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theVersoImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}{/if}">
+
 
 {footer_script require="jquery"}
-jQuery(document).ready(function () {ldelim}
+jQuery("#derivativeSwitchLink").hide();
+jQuery(".reverse").css("display", "inline-block");
+jQuery("img#theVersoImage").insertAfter(jQuery("img#theMainImage"));
 
-{if $b2f_switch_mode == 'click'}
-  jQuery('.reverse').click(function() {ldelim}
-    if (jQuery(this).attr('rel') == 'front') {ldelim}
+{if $b2f_switch_mode == "click"}
+  jQuery(".reverse").click(function() {ldelim}
+    if (jQuery(this).data("what") == "front") {ldelim}
 {else}
-  jQuery('.reverse').hover(function() {ldelim}
+  jQuery(".reverse").hover(function() {ldelim}
 {/if}
 
-      /* picture switch */
-    {if $b2f_transition == 'fade'}
-      jQuery('img#theMainImage').animate({ldelim}
-        opacity:0
-      }, 400, function() {ldelim}
-        jQuery(this).attr({ldelim}
-          src: '{$VERSO_URL}',
-          style: 'max-width:{$WIDTH_IMG}px;max-height:{$HEIGHT_IMG}px;',
-        });
-        jQuery(this).animate({ldelim}
-          opacity:1
-        }, 400);
+      $("img#theVersoImage").hide();
+      
+    {if $b2f_transition == "fade"}
+      $("img#theMainImage").fadeOut(400, function() {ldelim}
+        $("img#theVersoImage").fadeIn(400);
       });
     {else}
-      jQuery('img#theMainImage').attr({ldelim}
-        src: '{$VERSO_URL}',
-        style: 'max-width:{$WIDTH_IMG}px;max-height:{$HEIGHT_IMG}px;',
-      });
+      $("img#theMainImage").hide();
+      $("img#theVersoImage").show();
     {/if}
     
-    {if $b2f_switch_mode == 'click'}
-      /* hd link */
-      {if isset($VERSO_HD)}
-      jQuery('img#theMainImage').parent('a').attr({ldelim}
-        href: "javascript:phpWGOpenWindow('{$VERSO_HD}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"
-      });
-      {/if}
-    
-      /* B2F link content */
-      jQuery(this).html('<img src="{$B2F_PATH}template/rotate_2.png"/> {$b2f_see_front}');
-      jQuery(this).attr('rel', 'back');
-    {/if}
-      
-{if $b2f_switch_mode == 'click'}
-    } else if (jQuery(this).attr('rel') == 'back') {ldelim}
+      $(this).data("what", "back");
+      $(this).html('<img src="{$ROOT_URL}{$B2F_PATH}template/rotate_2.png"/> {$b2f_see_front}');
+
+{if $b2f_switch_mode == "click"}
+    } else if (jQuery(this).data("what") == "back") {ldelim}
 {else}
   }, function() {ldelim}
 {/if} 
-
-      /* picture switch */
-    {if $b2f_transition == 'fade'}
-      jQuery('img#theMainImage').animate({ldelim}
-        opacity:0
-      }, 400, function() {ldelim}
-        jQuery(this).attr({ldelim}
-          src: '{$SRC_IMG}',
-          style: 'width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;',
-        });
-        jQuery(this).animate({ldelim}
-          opacity:1
-        }, 400);
+    
+      $("img#theMainImage").hide();
+    
+    {if $b2f_transition == "fade"}
+      $("img#theVersoImage").fadeOut(400, function() {ldelim}
+        $("img#theMainImage").fadeIn(400);
       });
     {else}
-      jQuery('img#theMainImage').attr({ldelim}
-        src: '{$SRC_IMG}',
-        style: 'width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;',
-      });
+      $("img#theVersoImage").hide();
+      $("img#theMainImage").show();
     {/if}
-      
-    {if $b2f_switch_mode == 'click'}
-      /* hd link */
-      {if isset($high.U_HIGH)}
-      jQuery('img#theMainImage').parent('a').attr({ldelim}
-        href: "javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"
-      });
-      {/if}
-      
-      /* B2F link content */
-      jQuery(this).html('<img src="{$B2F_PATH}template/rotate_1.png"/> {$b2f_see_back}');
-      jQuery(this).attr('rel', 'front');
-    {/if}
-      
-{if $b2f_switch_mode == 'click'}
+    
+      $(this).data("what", "front");
+      $(this).html('<img src="{$ROOT_URL}{$B2F_PATH}template/rotate_1.png"/> {$b2f_see_back}');
+
+{if $b2f_switch_mode == "click"}
     }
   });
@@ -90 +69 @@
   });
 {/if} 
-
-});
 {/footer_script}
-
-<img src="{$VERSO_URL}" style="display:none;"/> {* <!-- force preload the verso --> *}
-
-{if $b2f_position != 'toolbar'}<div>{/if}
-<a class="reverse" rel="front" class="pwg-state-default pwg-button" title="{$b2f_see_back}" {if $b2f_position == 'toolbar'}style="border:none !important;"{/if} 
-  {if $b2f_switch_mode == 'hover' and isset($VERSO_HD)}href="javascript:phpWGOpenWindow('{$VERSO_HD}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"{/if}>
-  <img src="{$B2F_PATH}template/rotate_1.png"/> {$b2f_see_back}
-</a>
-{if $b2f_position != 'toolbar'}</div>{/if}

extensions/Back2Front/template/picture_modify.tpl

@@ -17 +17 @@
       <tr>
         <td><b>{'This picture has a backside :'|@translate}</b></td>
-        <td><a href="{$B2F_VERSO_URL}">{$B2F_VERSO_ID}</a></td>
+        <td><a href="{$B2F_VERSO_URL}">#{$B2F_VERSO_ID}</a></td>
       </tr>
     </table>

extensions/Back2Front/template/style.css

@@ -1 +1 @@
 a.reverse {
-  display:inline-block;
+  display:none;
   border:1px solid #666 !important;
   padding:5px 5px;
   margin-bottom:10px;
   font-size:15px;
-  font-style:italic;  
+  font-style:italic;
+  cursor:pointer;
 }
 a.reverse img {
   vertical-align:top;
 }
+
+#theVersoImage {
+  display:none;
+}
+
+
 .lang_help {
   display:inline-block;