Changeset 28593

Timestamp:

Jun 2, 2014, 5:26:14 PM (10 years ago)

Author:

mistic100

Message:

fix "missing image_ids" + clean buttons

Location:

extensions/UserCollections

Files:

• include/events.inc.php (modified) (1 diff)
• template/buttons/clear.tpl (modified) (1 diff)
• template/buttons/delete.tpl (modified) (1 diff)
• template/buttons/mail.tpl (modified) (1 diff)
• template/buttons/picture.tpl (added)
• template/buttons/share.tpl (modified) (1 diff)
• template/picture_button.tpl (deleted)
• template/style_collections.css (modified) (1 diff)
• template/style_thumbnails.css (modified) (1 diff)
• template/thumbnails_css_js.tpl (modified) (8 diffs)

extensions/UserCollections/include/events.inc.php

@@ -198 +198 @@
 
   // toolbar button
-  $template->set_filename('usercol_button', realpath(USER_COLLEC_PATH.'template/picture_button.tpl'));
+  $template->set_filename('usercol_button', realpath(USER_COLLEC_PATH.'template/buttons/picture.tpl'));
   $button = $template->parse('usercol_button', true);
   $template->add_picture_button($button, 50);

extensions/UserCollections/template/buttons/clear.tpl

@@ -1 @@
-<a href="{$U_CLEAR}" title="{'Clear this collection'|translate}" class="pwg-state-default pwg-button" rel="nofollow" onClick="return confirm('{'Are you sure?'|translate|escape:javascript}');">
-  <span class="pwg-icon user-collections-clear-icon" style="background:url('{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/bin.png') center center no-repeat;">&nbsp;</span><span class="pwg-button-text">{'Clear'|translate}</span>
+<a href="{$U_CLEAR}" title="{'Clear this collection'|translate}" class="pwg-state-default pwg-button" rel="nofollow"
+  onClick="return confirm('{'Are you sure?'|translate|escape:javascript}');">
+  <span class="pwg-icon user-collections-clear-icon">&nbsp;</span>
+  <span class="pwg-button-text">{'Clear'|translate}</span>
 </a>

extensions/UserCollections/template/buttons/delete.tpl

@@ -1 @@
-<a href="{$U_DELETE}" title="{'Delete this collection'|translate}" class="pwg-state-default pwg-button" rel="nofollow" onClick="return confirm('{'Are you sure?'|translate|escape:javascript}');">
-  <span class="pwg-icon user-collections-delete-icon" style="background:url('{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/delete.png') center center no-repeat;">&nbsp;</span><span class="pwg-button-text">{'Delete'|translate}</span>
+<a href="{$U_DELETE}" title="{'Delete this collection'|translate}" class="pwg-state-default pwg-button" rel="nofollow"
+  onClick="return confirm('{'Are you sure?'|translate|escape:javascript}');">
+  <span class="pwg-icon user-collections-delete-icon">&nbsp;</span>
+  <span class="pwg-button-text">{'Delete'|translate}</span>
 </a>

extensions/UserCollections/template/buttons/mail.tpl

@@ -1 +1 @@
 <a href="#mail_form" title="{'Send this collection by mail'|translate}" class="mail_colorbox_open pwg-state-default pwg-button" rel="nofollow">
-  <span class="pwg-icon user-collections-mail-icon" style="background:url('{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/mail.png') center center no-repeat;">&nbsp;</span><span class="pwg-button-text">{'Send'|translate}</span>
+  <span class="pwg-icon user-collections-mail-icon">&nbsp;</span>
+  <span class="pwg-button-text">{'Send'|translate}</span>
 </a>

extensions/UserCollections/template/buttons/share.tpl

@@ -1 +1 @@
 <a href="#share_form" title="{'Share this collection'|translate}" class="share_colorbox_open pwg-state-default pwg-button" rel="nofollow">
-  <span class="pwg-icon user-collections-share-icon" style="background:url('{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/share.png') center center no-repeat;">&nbsp;</span><span class="pwg-button-text">{'Share'|translate}</span>
+  <span class="pwg-icon user-collections-share-icon">&nbsp;</span>
+  <span class="pwg-button-text">{'Share'|translate}</span>
 </a>

extensions/UserCollections/template/style_collections.css

@@ -126 +126 @@
   filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#333333', endColorstr='#222222',GradientType=0 );
 }
+
+.user-collections-delete-icon {
+  background:transparent url('resources/delete.png') center center no-repeat !important;
+}
+.user-collections-clear-icon {
+  background:transparent url('resources/bin.png') center center no-repeat !important;
+}
+.user-collections-share-icon {
+  background:transparent url('resources/share.png') center center no-repeat !important;
+}
+.user-collections-mail-icon {
+  background:transparent url('resources/mail.png') center center no-repeat !important;
+}

extensions/UserCollections/template/style_thumbnails.css

@@ -47 +47 @@
   display:none;
 }
+
+.user-collections-icon {
+  background:transparent url('resources/image_add.png') center center no-repeat !important;
+}

extensions/UserCollections/template/thumbnails_css_js.tpl

@@ -6 +6 @@
 var $cdm = jQuery('#collectionsDropdown');
 
-{if not $IN_PICTURE}
 $cdm.on('mouseleave', function() {
   $cdm.hide();
 });
-{/if}
 
 // click on "create collection" button
@@ -39 +37 @@
       return;
     }
+    
+    var first = $cdm.children('.noCollecMsg').length > 0;
 
     jQuery.ajax({
@@ -51 +51 @@
       success: function(data) {
         if (data.stat == 'ok') {
-          var col = data.result;
-          var html = '<span>&#9733;</span> <a class="add" data-id="'+ col.id +'">'+ col.name +'</a> '
+          var col = data.result,
+              html = 
+            '<span>&#9733;</span> <a class="add" data-id="'+ col.id +'">'+ col.name +'</a> '
             +'<span class="menuInfoCat">[<span class="nbImagesCollec-'+ col.id +'">'+ col.nb_images +'</span>]</span> '
             +'<a class="remove" data-id="'+ col.id +'">{'(remove)'|translate|escape:javscript}</a>'
@@ -58 +59 @@
 
           $cdm.children('.switchBoxFooter').before(html);
-          $cdm.children('.noCollecMsg').remove();
+          
+          if (first) {
+            $cdm.children('.noCollecMsg').remove();
+            $cdm.children('.add').trigger('click');
+          }
         }
         else {
@@ -77 +82 @@
 // add and remove links (delegate for new collections)
 $cdm.on('click', '.add, .remove', function(e) {
-  var img_id = $cdm.data('img_id');
-  var col_id = jQuery(this).data('id');
-  var method = jQuery(this).hasClass('add') ? 'pwg.collections.addImages' : 'pwg.collections.removeImages';
+  var img_id = $cdm.data('img_id'),
+      col_id = jQuery(this).data('id'),
+      method = jQuery(this).hasClass('add') ? 'pwg.collections.addImages' : 'pwg.collections.removeImages';
 
   jQuery.ajax({
@@ -97 +102 @@
 
         // update item datas
-        var $target = jQuery('.addCollection[data-id="'+ img_id +'"]');
-        var col_ids = $target.data('cols');
+        var $target = jQuery('.addCollection[data-id="'+ img_id +'"]'),
+            col_ids = $target.data('cols');
+
         if (method == 'pwg.collections.addImages' && col_ids.indexOf(col_id) == -1) {
           col_ids[ col_ids.length ] = col_id;
@@ -121 +127 @@
 
 // main button, open the menu
-jQuery('#thumbnails').on('click', '.addCollection', function(e) {
-  var img_id = jQuery(this).data('id');
-  var col_ids = jQuery(this).data('cols');
+jQuery(document).on('click', '.addCollection', function(e) {
+  var img_id = jQuery(this).data('id'),
+      col_ids = jQuery(this).data('cols');
 
   $cdm.data('img_id', img_id);
 
   $cdm.children('.add').each(function() {
-    if (col_ids.indexOf($(this).data('id')) != -1) {
-      $(this).css('font-weight', 'bold').next().next().show();
+    if (col_ids.indexOf(jQuery(this).data('id')) != -1) {
+      jQuery(this).css('font-weight', 'bold').next().next().show();
     }
     else {
-      $(this).css('font-weight', 'normal').next().next().hide();
-    }
-  });
-
-  {if not $IN_PICTURE}
+      jQuery(this).css('font-weight', 'normal').next().next().hide();
+    }
+  });
+
+  {if $IN_PICTURE}
   $cdm.css({
-    'top': e.pageY-5-$(window).scrollTop(),
-    'left': Math.min(e.pageX-jQuery(window).scrollLeft()-20, jQuery(window).width()-$cdm.outerWidth(true)-5)
-  });
-  $cdm.show();
+    'left': Math.min(jQuery(this).offset().left, jQuery(window).width()-$cdm.outerWidth(true)-5),
+    'top': jQuery(this).offset().top + jQuery(this).outerHeight(true)
+  });
+  {else}
+  $cdm.css({
+    'left': Math.min(e.pageX-jQuery(window).scrollLeft()-20, jQuery(window).width()-$cdm.outerWidth(true)-5),
+    'top': e.pageY-5-$(window).scrollTop()
+  });
   {/if}
+  $cdm.toggle();
 
   e.preventDefault();
@@ -173 +184 @@
 {footer_script require='jquery'}
 jQuery('#thumbnails').on('click', '.addCollection', function(e) {
-  var $trigger = jQuery(this);
-  var img_id = jQuery(this).data('id');
-  var col_id = {$collection.ID};
+  var $trigger = jQuery(this),
+      img_id = jQuery(this).data('id'),
+      col_id = {$collection.ID};
 
   jQuery.ajax({