Changeset 21382

Timestamp:

Mar 8, 2013, 7:18:00 PM (11 years ago)

Author:

mistic100

Message:

fix caddie button,
fix fatal error for Back2Front,
update ZeroClipboard,
fix breadcrumb and body_id,
unactive for mobile themes,
fix display issues

Location:

extensions/UserCollections

Files:

• include/display_thumbnails.inc.php (modified) (3 diffs)
• include/events.inc.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• template/edit.tpl (modified) (3 diffs)
• template/resources/ZeroClipboard.min.js (added)
• template/resources/ZeroClipboard.swf (modified) (previous)
• template/resources/jquery.zclip.min.js (deleted)
• template/style.css (modified) (1 diff)
• template/thumbnails_css_js.tpl (modified) (1 diff)

extensions/UserCollections/include/display_thumbnails.inc.php

@@ -2 +2 @@
 defined('USER_COLLEC_PATH') or die('Hacking attempt!');
 
-
-// caddie
-if (isset($_GET['uc_caddie']))
-{
-  fill_caddie($page['items']);
-  redirect($self_url);
-}
 
 // image order
@@ -37 +30 @@
 ;';
 $page['items'] = array_from_query($query, 'id');
+
+// caddie
+if (isset($_GET['uc_caddie']))
+{
+  fill_caddie($page['items']);
+  redirect($self_url);
+}
 
 // image order menu
@@ -78 +78 @@
 add_event_handler('loc_end_index_thumbnails', 'user_collections_thumbnails_in_collection', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
 
+global $selection, $pictures;
 include(PHPWG_ROOT_PATH . 'include/category_default.inc.php');
 

extensions/UserCollections/include/events.inc.php

@@ -12 +12 @@
   if ($tokens[0] == 'collections')
   {
+    add_event_handler('loc_begin_page_header', 'user_collections_page_header');
+    
     $page['section'] = 'collections';
-    $page['title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>';
+    $page['section_title'] = '<a href="'.get_absolute_root_url().'">'.l10n('Home').'</a>'.$conf['level_separator'].'<a href="'.USER_COLLEC_PUBLIC.'">'.l10n('Collections').'</a>';
+    $page['title'] = l10n('Collections');
     
     if (in_array(@$tokens[1], array('edit','view','list')))
@@ -29 +32 @@
     }
   }
+}
+
+function user_collections_page_header()
+{
+  global $page;
+  $page['body_id'] = 'theCollectionPage';
 }
 

extensions/UserCollections/main.inc.php

@@ -10 +10 @@
 
 defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
+
+if (mobile_theme())
+{
+  return;
+}
 
 global $conf, $prefixeTable;

extensions/UserCollections/template/edit.tpl

@@ -1 +1 @@
 {combine_css path=$USER_COLLEC_PATH|@cat:"template/style.css"}
-{combine_script id='jquery.zclip' path=$USER_COLLEC_PATH|@cat:"template/resources/jquery.zclip.min.js"}
-{combine_script id='jquery.tipTip' path='themes/default/js/plugins/jquery.tipTip.minified.js'}
+{combine_script id='ZeroClipboard' path=$USER_COLLEC_PATH|@cat:"template/resources/ZeroClipboard.min.js"}
 
 {combine_script id='jquery.colorbox' load='footer' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
@@ -8 +7 @@
 {footer_script require='jquery'}
 {if $user_collections.allow_public}
-  function bindZclip() {ldelim}
-    jQuery("#publicURL .button").zclip({ldelim}
-      path:'{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/ZeroClipboard.swf',
-      copy:$("#publicURL .url").html(),
-      afterCopy: function() {ldelim}
-        $('.confirm').remove();
-        $("#publicURL .url").select();
-        $('<span class="confirm" style="display:none;">{'Copied'|@translate}</span>').appendTo("#publicURL")
-          .fadeIn(400).delay(1000).fadeOut(400, function(){ldelim} $(this).remove(); });
-      }
-    });
-    $("#publicURL .url").click(function() {ldelim}
-      $(this).select();
-    });
-  }
+ZeroClipboard.setDefaults( {ldelim} moviePath: "{$ROOT_URL}{$USER_COLLEC_PATH}template/resources/ZeroClipboard.swf" } );
+var clip = new ZeroClipboard();
+clip.glue(jQuery("#publicURL .button").get());
+clip.addEventListener('onMouseOver', function() {ldelim}
+  clip.setText(jQuery("#publicURL .url").val());
+});
+clip.addEventListener('complete', function() {ldelim}
+  jQuery('.confirm').remove();
+  jQuery("#publicURL .url").select();
+  jQuery('<span class="confirm" style="display:none;">{'Copied'|@translate}</span>').appendTo("#publicURL")
+    .fadeIn(400).delay(1000).fadeOut(400, function(){ldelim} jQuery(this).remove(); });
+});
 
-  jQuery("input[name='public']").change(function() {ldelim}
-    jQuery("#publicURL").fadeToggle("fast");
-    bindZclip();
-  });
-  jQuery("#publicURL .button").tipTip({ldelim}
-    delay: 0,
-    defaultPosition: 'right'
-  });
-  {if $collection.PUBLIC}bindZclip();{/if}
+jQuery("#publicURL .url").click(function() {ldelim}
+  jQuery(this).select();
+});
+
+jQuery("input[name='public']").change(function() {ldelim}
+  jQuery("#publicURL").fadeToggle("fast");
+});
 {/if}
 
 {if $collection.PUBLIC && $user_collections.allow_mails}
-  $(window).load(function(){ldelim}
-    $(".mail_colorbox_open").colorbox({ldelim}
+  jQuery(window).load(function(){ldelim}
+    jQuery(".mail_colorbox_open").colorbox({ldelim}
       {if isset($uc_mail_errors)}open: true, transition:"none",{/if}
       inline:true
     });
-    $(".mail_colorbox_close").click(function() {ldelim}
-      $(".mail_colorbox_open").colorbox.close();
+    jQuery(".mail_colorbox_close").click(function() {ldelim}
+      jQuery(".mail_colorbox_open").colorbox.close();
       return false;
     })
   });
-  $("#mail_form").css('background-color', $("#the_page #content").css('background-color'));
+  jQuery("#mail_form").css('background-color', jQuery("#the_page #content").css('background-color'));
 {/if}
 {/footer_script}
@@ -80 +74 @@
     <label><input type="radio" name="public" value="0" {if not $collection.PUBLIC}checked="checked"{/if}> {'No'|@translate}</label>
     <label><input type="radio" name="public" value="1" {if $collection.PUBLIC}checked="checked"{/if}> {'Yes'|@translate}</label>
-    <span id="publicURL" {if not $collection.PUBLIC}style="display:none;"{/if}><span class="button" title="{'Copy to clipboard'|@translate}">&nbsp;</span><input type="text" class="url" value="{$collection.U_PUBLIC}" size="{$collection.U_PUBLIC|strlen}"></span>
+    <span id="publicURL" {if not $collection.PUBLIC}style="display:none;"{/if}><!--
+    --><span class="button" title="{'Copy to clipboard'|@translate}">&nbsp;</span><!--
+    --><input type="text" class="url" value="{$collection.U_PUBLIC}" size="{$collection.U_PUBLIC|strlen}"><!--
+  --></span>
   </p>
 {/if}

extensions/UserCollections/template/style.css

@@ -36 +36 @@
     border-right:none;
     border-radius:3px 0 0 3px;
+    cursor:pointer;
   }
   #publicURL .confirm {

extensions/UserCollections/template/thumbnails_css_js.tpl

@@ -31 +31 @@
         else if (method == "remove") {ldelim}
         {if $UC_IN_EDIT}
-          $trigger.parent(".wrap1, .gthumb").hide("fast", function() {ldelim} $(this).remove() });
+          $trigger.parent("li").hide("fast", function() {ldelim} $(this).remove() });
           if (typeof batchdown_count != 'undefined') batchdown_count-=1;
         {else}