Changeset 16688 for extensions/UserCollections

Timestamp:

Jul 13, 2012, 12:09:19 PM (12 years ago)

Author:

mistic100

Message:

-rework the main menu
-bug when a collection is create through AJAX
-add "Remove from collection" on colorbox
-minor interfaces changes

Location:

extensions/UserCollections

Files:

• include/UserCollection.class.php (modified) (11 diffs)
• include/collections.inc.php (modified) (4 diffs)
• include/events.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• template/edit.tpl (modified) (4 diffs)
• template/list.tpl (modified) (2 diffs)
• template/menublock_user_collec.tpl (modified) (1 diff)
• template/thumbnails.tpl (modified) (2 diffs)
• template/thumbnails_css_js.tpl (modified) (1 diff)
• template/view.tpl (modified) (1 diff)

extensions/UserCollections/include/UserCollection.class.php

@@ -17 +17 @@
     
     $this->data = array(
-      'col_id' => 0,
+      'id' => 0,
       'user_id' => $user['id'],
       'name' => null,
@@ -53 +53 @@
       $query = '
 SELECT
+    id,
     user_id,
     name,
@@ -69 +70 @@
       if (pwg_db_num_rows($result))
       {
-        $this->data['col_id'] = $col_id;
         $this->data = array_merge(
           $this->data,
@@ -87 +87 @@
 SELECT image_id
   FROM '.COLLECTION_IMAGES_TABLE.'
-  WHERE col_id = '.$this->data['col_id'].'
+  WHERE col_id = '.$this->data['id'].'
 ;';
         $this->images = array_from_query($query, 'image_id');
@@ -107 +107 @@
       $this->data['active'] = $active;
       $this->data['public'] = $public;
-      $this->data['public_id'] = 'uc'.hash('crc32', uniqid(serialize($this->data, true)));
+      $this->data['public_id'] = 'uc'.hash('crc32', uniqid(serialize($this->data), true));
       
       $query = '
@@ -128 +128 @@
 ;';
       pwg_query($query);
-      $this->data['col_id'] = pwg_db_insert_id();
+      $this->data['id'] = pwg_db_insert_id();
       
       $date = pwg_query('SELECT FROM_UNIXTIME(NOW());');
@@ -146 +146 @@
   WHERE
     user_id = '.$this->data['user_id'].'
-    AND id != '.$this->data['col_id'].'
+    AND id != '.$this->data['id'].'
 ;';
         pwg_query($query);
@@ -165 +165 @@
   {
     $this->data[$name] = $value;
-    pwg_query('UPDATE '.COLLECTIONS_TABLE.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data['col_id'].';');
+    pwg_query('UPDATE '.COLLECTIONS_TABLE.' SET '.$name.' = "'.$value.'" WHERE id = '.$this->data['id'].';');
   }
   
@@ -213 +213 @@
 DELETE FROM '.COLLECTION_IMAGES_TABLE.'
   WHERE 
-    col_id = '.$this->data['col_id'].'
+    col_id = '.$this->data['id'].'
     AND image_id IN('.implode(',', $image_ids).')
 ;';
@@ -237 +237 @@
       
       array_push($this->images, $image_id);
-      array_push($inserts, array('col_id'=>$this->data['col_id'], 'image_id'=>$image_id));
+      array_push($inserts, array('col_id'=>$this->data['id'], 'image_id'=>$image_id));
     }
     
@@ -275 +275 @@
     $query = '
 DELETE FROM '.COLLECTION_IMAGES_TABLE.'
-  WHERE col_id = '.$this->data['col_id'].'
+  WHERE col_id = '.$this->data['id'].'
 ;';
     pwg_query($query);

extensions/UserCollections/include/collections.inc.php

@@ -24 +24 @@
         case 'new':
         {
-          new UserCollection('new', array(), empty($_GET['name']) ? 'temp' : $_GET['name'], 1);
-          redirect(USER_COLLEC_PUBLIC);
-          break;
-        }
-        
-        // clear
-        case 'clear':
-        {
-          $query = '
-DELETE ci
-  FROM '.COLLECTION_IMAGES_TABLE.' AS ci
-    INNER JOIN '.COLLECTIONS_TABLE.' AS c 
-    ON ci.col_id = c.id
-  WHERE
-    c.user_id = '.$user['id'].'
-    AND c.id = '.$_GET['col_id'].'
-;';
-          pwg_query($query);
+          $UserCollection = new UserCollection('new', array(), empty($_GET['name']) ? 'temp' : $_GET['name'], 1);
           
-          if (!empty($_SERVER['HTTP_REFERER']))
+          if (isset($_GET['redirect']))
           {
-            redirect($_SERVER['HTTP_REFERER']);
+            $redirect = USER_COLLEC_PUBLIC.'edit/'.$UserCollection->getParam('id');
           }
+          else
+          {
+            $redirect = USER_COLLEC_PUBLIC;
+          }
+          redirect($redirect);
           break;
         }
@@ -194 +182 @@
       }
       
+      // clear
+      if ( isset($_GET['action']) and $_GET['action'] == 'clear' )
+      {
+        $UserCollection->clearImages();
+      }
+      
       // remove an element
       if ( isset($_GET['collection_toggle']) and preg_match('#^[0-9]+$#', $_GET['collection_toggle']) )
       {
         $UserCollection->removeImages(array($_GET['collection_toggle']));
+        unset($_GET['collection_toggle']);
       }
       
@@ -205 +200 @@
       
       // collection content
-      $template->assign('collection', $UserCollection->getCollectionInfo());
+      $col = $UserCollection->getCollectionInfo();
+      $col['U_CLEAR'] = $self_url.'&action=clear';
+      $col['U_DELETE'] = USER_COLLEC_PUBLIC.'&action=delete&col_id='.$page['col_id'];
+      $template->assign('collection', $col);
+      
       $page['items'] = $UserCollection->getImages();
       
@@ -252 +251 @@
       $UserCollection = new UserCollection($page['col_id']);
       
-      // backlink for owner
-      if ($UserCollection->getParam('user_id') == $user['id'])
-      {
-        $template->assign('U_LIST', USER_COLLEC_PUBLIC);
-      }
-      
       // special template
       add_event_handler('loc_end_index_thumbnails', 'user_collections_thumbnails_in_collection', EVENT_HANDLER_PRIORITY_NEUTRAL+10, 2); // +10 to overload GThumb+
       
       // collection content
-      $template->assign('collection', $UserCollection->getCollectionInfo());
       $page['items'] = $UserCollection->getImages();
       

extensions/UserCollections/include/events.inc.php

@@ -216 +216 @@
 function user_collections_applymenu($menu_ref_arr)
 {
-  global $template, $conf, $UserCollection;
+  $max = 6;
+  
+  global $template, $conf, $user, $UserCollection;
   $menu = &$menu_ref_arr[0];
   
   if (($block = $menu->get_block('mbUserCollection')) != null)
   {
-    if (($col_id = get_current_collection_id(false)) !== false)
-    {
-      if (empty($UserCollection))
-      {
-        $UserCollection = new UserCollection($col_id);
-      }
-    
-      $data = array(
-        'current' => array(
-          'NAME' => $UserCollection->getParam('name'),
-          'NB_IMAGES' => $UserCollection->getParam('nb_images'),
-          ),
-        'links' => array(),
-        );
-        
-      if ($data['current']['NB_IMAGES'] > 0)
-      {
-        $data['links'] = array(
-          array(
-            'URL' => USER_COLLEC_PUBLIC.'edit/'.$UserCollection->getParam('col_id'),
-            'NAME' => l10n('Display collection'),
-            ),
-          array(
-            'URL' => USER_COLLEC_PUBLIC.'&action=clear&col_id='.$UserCollection->getParam('col_id'),
-            'NAME' => l10n('Clear collection'),
-            ),
-          );
-      }
+    $query = '
+SELECT *
+  FROM '.COLLECTIONS_TABLE.'
+  WHERE user_id = '.$user['id'].'
+  ORDER BY
+    active DESC,
+    date_creation DESC
+;';
+    $collections = array_values(hash_from_query($query, 'id'));
+    
+    $data['collections'] = array();
+    for ($i=0; $i<$max && $i<count($collections); $i++)
+    {
+      $collections[$i]['U_EDIT'] = USER_COLLEC_PUBLIC.'edit/'.$collections[$i]['id'];
+      array_push($data['collections'], $collections[$i]);
+    }
+    
+    $data['NB_COL'] = count($collections);
+    if ($data['NB_COL'] > $max)
+    {
+      $data['MORE'] = count($collections)-$max;
     }
     
     $data['U_LIST'] = USER_COLLEC_PUBLIC;
+    $data['U_CREATE'] = USER_COLLEC_PUBLIC.'&amp;action=new&amp;col_id=0&amp;redirect=true';
     
     $template->set_template_dir(USER_COLLEC_PATH . 'template/');
-    $block->set_title(l10n('Collections'));
+    $block->set_title('<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>');
     $block->template = 'menublock_user_collec.tpl';
     $block->data = $data;

extensions/UserCollections/include/functions.inc.php

@@ -26 +26 @@
   {
     $UserCollection = new UserCollection('new', array(), 'temp', 1);
-    return $UserCollection->getParam('col_id');
+    return $UserCollection->getParam('id');
   }
   

extensions/UserCollections/language/en_UK/plugin.lang.php

@@ -12 +12 @@
 $lang['set active'] = 'set active';
 $lang['Saved collections'] = 'Saved collections';
-$lang['Current collection:'] = 'Current collection:';
 $lang['See all my collections'] = 'See all my collections';
 $lang['Please give a name'] = 'Please give a name';
@@ -21 +20 @@
 $lang['Remove from collection'] = 'Remove from collection';
 $lang['Add to collection'] = 'Add to collection';
-$lang['Display collection'] = 'Display';
 $lang['Clear collection'] = 'Clear';
+$lang['You have %d collections'] = 'You have %d collections';
+$lang['active'] = 'active';
+$lang['Save'] = 'Save';
+$lang['%d more...'] = '%d more...';
 
 ?>

extensions/UserCollections/language/fr_FR/plugin.lang.php

@@ -12 +12 @@
 $lang['set active'] = 'choisir comme collection active';
 $lang['Saved collections'] = 'Collections sauvegardées';
-$lang['Current collection:'] = 'Collection actuelle:';
 $lang['See all my collections'] = 'Voir toutes mes collections';
 $lang['Please give a name'] = 'Veuillez donner un nom';
@@ -21 +20 @@
 $lang['Remove from collection'] = 'Supprimer de la collection';
 $lang['Add to collection'] = 'Ajouter à la collection';
-$lang['Display collection'] = 'Afficher';
 $lang['Clear collection'] = 'Vider';
+$lang['You have %d collections'] = 'Vous avez %d collections';
+$lang['active'] = 'active';
+$lang['Save'] = 'Sauvegarder';
+$lang['%d more...'] = 'et %d autres...';
 
 ?>

extensions/UserCollections/main.inc.php

@@ -23 +23 @@
 
 add_event_handler('loc_end_section_init', 'user_collections_section_init');
-add_event_handler('loc_end_index', 'user_collections_page');
+add_event_handler('loc_end_index', 'user_collections_page', EVENT_HANDLER_PRIORITY_NEUTRAL-10);
 
 add_event_handler('loc_end_index', 'user_collections_index_actions');

extensions/UserCollections/template/edit.tpl

@@ -23 +23 @@
   delay: 0,
   defaultPosition: 'right'
+});
+
+jQuery("#actions input").click(function() {ldelim}
+  if (confirm("{'Are you sure?'|@translate}")) {ldelim}
+    document.location.href = jQuery(this).data("href");
+  }
+  return false;
 });
 {if $collection.PUBLIC}bindZclip();{/if}
@@ -49 +56 @@
 
 
-{if $collection and not $collection.IS_TEMP}
+{if $collection}
 <form action="{$F_ACTION}" method="post">
 <fieldset id="colProperties">
@@ -68 +75 @@
 </fieldset>
 </form>
-{/if}
 
 
-{if !empty($THUMBNAILS)}
+{if $collection.NB_IMAGES > 0}
 <ul class="thumbnails" id="thumbnails">
 {$THUMBNAILS}
@@ -82 +88 @@
 
 
-<p style="text-align:center;font-weight:bold;margin:20px;"><a href="{$U_LIST}" rel="nofollow">{'Return to collections list'|@translate}</a></p>
+<form id="actions" style="text-align:center;">
+<input type="submit" data-href="{$collection.U_CLEAR}" value="{'Clear collection'|@translate}">
+<input type="submit" data-href="{$collection.U_DELETE}" value="{'Delete'|@translate}">
+</form>
+{/if}
+
 
 </div>{* <!-- content --> *}

extensions/UserCollections/template/list.tpl

@@ -56 +56 @@
         | <a href="{$col.U_SAVE}" class="save_col" rel="nofollow">{'save'|@translate}</a>
         {if $col.U_DOWNLOAD}| <a href="{$col.U_DOWNLOAD}" rel="nofollow">{'download'|@translate}</a>{/if}
-        | <a href="{$col.U_DELETE}" onClick="return confirm('{'Are you sure?'|@translate}');" rel="nofollow">{'delete'|@translate}</a>
+        | <a href="{$col.U_DELETE}" onClick="return confirm('{'Are you sure?'|@translate}');" rel="nofollow">{'Delete'|@translate}</a>
         {if not $col.active}| <a href="{$col.U_ACTIVE}" rel="nofollow">{'set active'|@translate}</a>{/if}
       </p>
@@ -83 +83 @@
         <a href="{$col.U_EDIT}" rel="nofollow">{'Edit'|@translate}</a>
         {if $col.U_DOWNLOAD}| <a href="{$col.U_DOWNLOAD}" rel="nofollow">{'download'|@translate}</a>{/if}
-        | <a href="{$col.U_DELETE}" onClick="return confirm('{'Are you sure?'|@translate}');" rel="nofollow">{'delete'|@translate}</a>
+        | <a href="{$col.U_DELETE}" onClick="return confirm('{'Are you sure?'|@translate}');" rel="nofollow">{'Delete'|@translate}</a>
         {if not $col.active}| <a href="{$col.U_ACTIVE}" rel="nofollow">{'set active'|@translate}</a>{/if}
       </p>

extensions/UserCollections/template/menublock_user_collec.tpl

@@ -1 +1 @@
 <dt>{$block->get_title()}</dt>
 <dd>
-{if $block->data.current}
-  {assign var="nb_images" value='<span class="nbImagesCollec">'|@cat:$block->data.current.NB_IMAGES|@cat:'</span>'}
-  <p>{'Current collection:'|@translate} <b>{$block->data.current.NAME}</b>, {'%d photos'|@translate|replace:'%d':'%s'|sprintf:$nb_images}</p>
-        <ul>{strip}
-                {foreach from=$block->data.links item=link}
-                <li><a href="{$link.URL}" title="{$link.TITLE}" rel="nofollow">{$link.NAME}</a></li>
+  <p><a href="{$block->data.U_LIST}">{'You have %d collections'|@translate|sprintf:$block->data.NB_COL}</a></p>
+  {if $block->data.collections}
+  <ul>{strip}
+                {foreach from=$block->data.collections item=col}
+                <li>{if $col.active}
+      <a href="{$col.U_EDIT}" style="font-weight:bold;" rel="nofollow">{$col.name}</a> <i class="menuInfoCat">({'active'|@translate})</i> <span class="menuInfoCat">[<span class="nbImagesCollec">{$col.nb_images}</span>]</span>
+    {else}
+      <a href="{$col.U_EDIT}" rel="nofollow">{$col.name}</a> <span class="menuInfoCat">[{$col.nb_images}]</span>
+    {/if}</li>
                 {/foreach}
+    {if $block->data.MORE}<li class="menuInfoCat">{'%d more...'|@translate|sprintf:$block->data.MORE}</li>{/if}
         {/strip}</ul>
-{/if}
-  <p><a href="{$block->data.U_LIST}" rel="nofollow">{'See all my collections'|@translate}</a></p>
+  {/if}
+  <p><a href="{$block->data.U_CREATE}" rel="nofollow">{'Create a new collection'|@translate}</a></p>
 </dd>

extensions/UserCollections/template/thumbnails.tpl

@@ -5 +5 @@
   rel: ".preview-box",
   title: function() {ldelim}
-    return $(this).attr("title") +' · <a href="'+ $(this).data('url') +'" target="_blank">{'jump to photo'|@translate} →</a>';
+    var title = $(this).attr("title");
+    {if $F_ACTION} title+= ' · <a href="{$collection_toggle_url}&amp;collection_toggle='+ $(this).data('id') +'" class="addCollection" data-id="'+ $(this).data('id') +'">{'Remove from collection'|@translate}</a>';{/if}
+    title+= ' · <a href="'+ $(this).data('url') +'" target="_blank">{'jump to photo'|@translate} →</a>';
+    return  title;
   }
+});
+jQuery(document).on("click", "#cboxTitle .addCollection", function() {ldelim}
+  jQuery.colorbox.close();
+  jQuery("#thumbnails a.addCollection[data-id='"+ $(this).data('id')+"']").trigger("click");
+  return false;
 });
 {/footer_script}
@@ -42 +50 @@
         <span class="wrap1">
                 <span class="wrap2">
-                <a href="{$thumbnail.FILE_SRC}" class="preview-box" title="{$thumbnail.NAME}" data-url="{$thumbnail.URL}">
+                <a href="{$thumbnail.FILE_SRC}" class="preview-box" title="{$thumbnail.NAME}" data-url="{$thumbnail.URL}" data-id="{$thumbnail.id}">
                         <img class="thumbnail" {if $derivative->is_cached()}src="{$derivative->get_url()}"{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax-loader-small.gif" data-src="{$derivative->get_url()}"{/if} alt="{$thumbnail.TN_ALT}" title="{$thumbnail.TN_TITLE}">
                 </a>

extensions/UserCollections/template/thumbnails_css_js.tpl

@@ -1 +1 @@
 {html_style}
 .thumbnails .wrap1 {ldelim} position:relative !important; }
-.addCollection {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:10px;z-index:100;color:#eee;white-space:nowrap; }
+.wrap1 .addCollection {ldelim} width:100%;height:16px;display:none;position:absolute;top:0;background:rgba(0,0,0,0.8);padding:2px;border-radius:2px;font-size:10px;z-index:100;color:#eee;white-space:nowrap; }
 .wrap1:hover .addCollection {ldelim} display:block; }
 {/html_style}

extensions/UserCollections/template/view.tpl

@@ -32 +32 @@
 
 
-{if $U_LIST}<p style="text-align:center;font-weight:bold;margin:20px;"><a href="{$U_LIST}" rel="nofollow">{'Return to collections list'|@translate}</a></p>{/if}
-
 </div>{* <!-- content --> *}