? collapsiblock-js-905534-2.patch
Index: collapsiblock.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/collapsiblock/collapsiblock.js,v
retrieving revision 1.7
diff -u -p -r1.7 collapsiblock.js
--- collapsiblock.js	24 Aug 2010 18:38:22 -0000	1.7
+++ collapsiblock.js	8 Sep 2010 21:10:11 -0000
@@ -22,17 +22,20 @@ Drupal.behaviors.collapsiblock = functio
       }
 
       titleElt.target = $(this).find(block_content);
-      $(titleElt)
-        .addClass('collapsiblock')
-        .click(function () {
+      
+      h2 = $("<h2/>").addClass('collapsiblock');
+      h2.append(
+        $('<a href="#" />')
+          .text($(titleElt).text())
+          .click(function () {
           var st = Drupal.Collapsiblock.getCookieData();
-          if ($(this).is('.collapsiblockCollapsed')) {
-            $(this).removeClass('collapsiblockCollapsed');
+          if ($(this).parent().is('.collapsiblockCollapsed')) {
+            $(this).parent().removeClass('collapsiblockCollapsed');
             if (slidetype == 1) {
-              $(this.target).slideDown(slidespeed);
+              $(titleElt.target).slideDown(slidespeed);
             }
             else {
-              $(this.target).animate({height:'show', opacity:'show'}, slidespeed);
+              $(titleElt.target).animate({height:'show', opacity:'show'}, slidespeed);
             }
 
             // Don't save cookie data if the block is always collapsed.
@@ -41,12 +44,12 @@ Drupal.behaviors.collapsiblock = functio
             }
           } 
           else {
-            $(this).addClass('collapsiblockCollapsed');
+            $(this).parent().addClass('collapsiblockCollapsed');
             if (slidetype == 1) {
-              $(this.target).slideUp(slidespeed);
+              $(titleElt.target).slideUp(slidespeed);
             }
             else {
-              $(this.target).animate({height:'hide', opacity:'hide'}, slidespeed);
+              $(titleElt.target).animate({height:'hide', opacity:'hide'}, slidespeed);
             }
 
             // Don't save cookie data if the block is always collapsed.
@@ -62,7 +65,11 @@ Drupal.behaviors.collapsiblock = functio
           });
           cookieString += cookieParts.join(', ') + ' }';
           $.cookie('collapsiblock', cookieString, {path: Drupal.settings.basePath});
-        });
+          return false;
+        }));
+
+        $(titleElt).parent().prepend(h2);
+        $(titleElt).remove()
       // Leave active blocks uncollapsed. If the block is expanded, do nothing.
       if (stat ==  4 || (cookieData[id] == 0 || (stat == 3 && cookieData[id] == undefined)) && !$(this).find('a.active').size()) {
         $(titleElt).addClass('collapsiblockCollapsed');