Changeset 16637

Timestamp:

Jul 12, 2012, 12:33:33 AM (12 years ago)

Author:

plg

Message:

Compatibility with Piwigo 2.4

Better "zoom" feature on gallery side and admin side

Bug fixed: the "Upload Photos" link in menubar is hidden when Advanced Menu Manager is activated.

Location:

extensions/community

Files:

• add_photos.php (modified) (1 diff)
• add_photos.tpl (modified) (2 diffs)
• admin_pendings.php (modified) (4 diffs)
• admin_pendings.tpl (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/community/add_photos.php

@@ -193 +193 @@
       );
 
-    // the link on thumbnail must go to the websize photo
-    foreach ($page['thumbnails'] as $idx => $thumbnail)
-    {
-      $page['thumbnails'][$idx]['link'] = str_replace(
-        'thumbnail/'.$conf['prefix_thumbnail'],
-        '',
-        $thumbnail['src']
+    // find the url to the medium size
+    $page['thumbnails'] = array();
+
+    $query = '
+SELECT *
+  FROM '.IMAGES_TABLE.'
+  WHERE id IN ('.implode(',', $image_ids).')
+;';
+    $result = pwg_query($query);
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      $src_image = new SrcImage($row);
+
+      $page['thumbnails'][] = array(
+        'file' => $row['file'],
+        'src' => DerivativeImage::url(IMG_THUMB, $src_image),
+        'title' => $row['name'],
+        'link' => $image_url = DerivativeImage::url(IMG_MEDIUM, $src_image),
+        'lightbox' => true,
         );
     }

extensions/community/add_photos.tpl

@@ -377 +377 @@
   <div>
   {foreach from=$thumbnails item=thumbnail}
-    <a href="{$thumbnail.link}" class="externalLink">
+    <a href="{$thumbnail.link}"  class="{if isset($thumbnail.lightbox)}colorboxThumb{else}externalLink{/if}">
       <img src="{$thumbnail.src}" alt="{$thumbnail.file}" title="{$thumbnail.title}" class="thumbnail">
     </a>
@@ -523 +523 @@
 
 </div> <!-- photosAddContent -->
+
+{* Community specific *}
+{footer_script}{literal}
+jQuery(document).ready(function(){
+  jQuery("a.colorboxThumb").colorbox({rel:"colorboxThumb"});
+
+  jQuery("a.externalLink").click(function() {
+    window.open($(this).attr("href"));
+    return false;
+  });
+});
+{/literal}{/footer_script}

extensions/community/admin_pendings.php

@@ -131 +131 @@
     i.id,
     path,
-    tn_ext,
     date_creation,
     name,
@@ -141 +140 @@
     width,
     height,
-    has_high,
-    high_filesize,
+    rotation,
 
     '.$conf['user_fields']['username'].' AS username
@@ -192 +190 @@
 foreach ($rows as $row)
 {
-  $thumb = get_thumbnail_url(
-    array(
-      'id' => $row['image_id'],
-      'path' => $row['path'],
-      'tn_ext' => @$row['tn_ext']
-      )
-    );
-
+  $src_image = new SrcImage($row);
+  $thumb_url = DerivativeImage::url(IMG_THUMB, $src_image);
+  $medium_url = DerivativeImage::url(IMG_MEDIUM, $src_image);
+  
   // file properties
   $dimensions = null;
@@ -231 +225 @@
       'U_EDIT' => get_root_url().'admin.php?page=picture_modify&image_id='.$row['image_id'],
       'ID' => $row['image_id'],
-      'TN_SRC' => $thumb,
-      'WEBSIZE_SRC' => $row['path'],
+      'TN_SRC' => $thumb_url,
+      'MEDIUM_SRC' => $medium_url,
       'ADDED_BY' => $row['username'],
       'ADDED_ON' => format_date($row['added_on'], true),
-      'NAME' => get_image_name($row['name'], $row['file']),
+      'NAME' => $row['name'],
       'DIMENSIONS' => $dimensions,
       'FILE' => $row['file'],

extensions/community/admin_pendings.tpl

@@ +1 @@
+{combine_script id='jquery.colorbox' load='footer' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
+{combine_css path="themes/default/js/plugins/colorbox/style2/colorbox.css"}
+
 {literal}
 <style>
@@ -10 +13 @@
 {literal}
 <script type="text/javascript">
-$(document).ready(function(){
+jQuery(document).ready(function(){
+
+  jQuery("a.zoom").colorbox({rel:"zoom"});
 
   function checkSelectedRows() {
@@ -78 +83 @@
     <td>
   <div class="comment">
-    <p class="commentAction" style="float:left;margin:0.5em 0 0 0.5em"><a href="{$photo.WEBSIZE_SRC}" class="externalLink">{'Zoom'|@translate}</a> &middot; <a href="{$photo.U_EDIT}" class="externalLink">{'Edit'|@translate}</a></p>
+    <p class="commentAction" style="float:left;margin:0.5em 0 0 0.5em"><a href="{$photo.MEDIUM_SRC}" class="zoom">{'Zoom'|@translate}</a> &middot; <a href="{$photo.U_EDIT}" class="externalLink">{'Edit'|@translate}</a></p>
     <p class="commentHeader"><strong>{$photo.ADDED_BY}</strong> - <em>{$photo.ADDED_ON}</em></p>
     <table>

extensions/community/main.inc.php

@@ -119 +119 @@
 }
 
-add_event_handler('blockmanager_apply' , 'community_gallery_menu');
+add_event_handler('blockmanager_apply' , 'community_gallery_menu', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
 function community_gallery_menu($menu_ref_arr)
 {