Merge lp:~bac/launchpad/accordion-style into lp:launchpad

[Brad Crittenden]

[r=benji][no-qa] Update gallery-accordion to latest version. Include the new LP-specific styling.

= Summary =

Update gallery-accordion to latest version. Include the new LP-specific
styling.

== Tests ==

None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:

lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css

lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js

lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/accordion_sprite.png

./lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js
      22: Line has trailing whitespace.
 ...

Lint ignored as it is third-party code.

[Brad Crittenden (bac)]

Also removed the reference to lp.registry.pillar from product-index.pt

[Benji York (benji)]

Looks good.

review: Approve (code)

=== modified file 'lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/accordion_sprite.png'
Binary files lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/accordion_sprite.png	2011-02-14 20:14:47 +0000 and lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/accordion_sprite.png	2011-03-14 15:41:23 +0000 differ
=== modified file 'lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css'
--- lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css	2011-02-14 20:14:47 +0000
+++ lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css	2011-03-14 15:41:23 +0000
@@ -1,31 +1,28 @@
 .yui3-skin-sam .yui3-accordion {
-    border: 1px solid #93B2CC;
+    border-width: 1px 1px 0 1px;
+    border-style: solid;
+    border-color: #DDD;
 }
 
 .yui3-skin-sam .yui3-accordion-item .yui3-widget-hd {
-    background-image: url( accordion_sprite.png );
-    background-position: 0px 0px;
-    border: 1px solid #93B2CC;
+    background-color: #EEE;
+    border-bottom: 1px solid #DDD;
     height: 25px;
-}
-
-.yui3-skin-sam .yui3-accordion-item-icon,
+    position: relative;
+    padding-left: 25px;
+}
+
+.yui3-accordion-item .yui3-widget-bd {
+    border-bottom: 1px solid #DDD;
+    margin: 0;
+}
+
 .yui3-skin-sam .yui3-accordion-item-iconexpanded,
-.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible,
 .yui3-skin-sam .yui3-accordion-item-iconclose {
     background-repeat: no-repeat;
 }
-    
-.yui3-skin-sam .yui3-accordion-item-icon {
-    background-image: url( accordion_sprite.png );
-    background-position: center -25px;
-    _background-position: center -27px;
-}
-
-.yui3-skin-sam .yui3-accordion-item-label{
-    color: #444444;
-}
-
+
+.yui3-skin-sam .yui3-accordion-item-label:hover,
 .yui3-skin-sam .yui3-accordion-item-label {
     text-decoration: none;
     background: transparent;
@@ -34,23 +31,8 @@
     font-weight: bold;
 }
 
-.yui3-skin-sam .yui3-accordion-item-label:hover{
-    text-decoration: underline;
-}
-
-.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible,
-.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible-off {
-    background-image: url( accordion_sprite.png );
-    background-position: 0px -85px;
-    _background-position: 0px -87px;
-}
-
-.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible-on {
-    background-image: url( accordion_sprite.png );
-    background-position: 0px -55px;
-    _background-position: 0px -57px;
-}
-
+.yui3-skin-sam .yui3-accordion-item-iconexpanded-off:hover,
+.yui3-skin-sam .yui3-accordion-item-iconexpanded-collapsing,
 .yui3-skin-sam .yui3-accordion-item-iconexpanded,
 .yui3-skin-sam .yui3-accordion-item-iconexpanded-off {
     background-image: url( accordion_sprite.png );
@@ -58,35 +40,14 @@
     _background-position: 0px -177px;
 }
 
-.yui3-skin-sam .yui3-accordion-item-iconexpanded-off:hover{
-    background-image: url( accordion_sprite.png );
-    background-position: 0px -205px;
-}
-
+.yui3-skin-sam .yui3-accordion-item-iconexpanded-on:hover,
+.yui3-skin-sam .yui3-accordion-item-iconexpanded-expanding,
 .yui3-skin-sam .yui3-accordion-item-iconexpanded-on {
     background-image: url( accordion_sprite.png );
     background-position: 0px -115px;
     _background-position: 0px -117px;
 }
 
-
-.yui3-skin-sam .yui3-accordion-item-iconexpanded-on:hover {
-    background-image: url( accordion_sprite.png );
-    background-position: 0px -145px;
-}
-
-
-.yui3-skin-sam .yui3-accordion-item-iconexpanded-expanding {
-    background-image: url( wait_expand.gif );
-    background-position: 0px center;
-}
-
-
-.yui3-skin-sam .yui3-accordion-item-iconexpanded-collapsing {
-    background-image: url( wait_collapse.gif );
-    background-position: 0px center;
-}
-
 .yui3-skin-sam .yui3-accordion-item-iconclose {
     background-image: url( accordion_sprite.png );
     background-position: 0px -235px;
@@ -102,3 +63,15 @@
     opacity : 0.7;
     filter: alpha(opacity = 70);
 } 
+
+.yui3-accordion-item-icons {
+    position: absolute;
+    float: none;
+    top: 0;
+    left: 5px;
+}
+
+.yui3-accordion-item-icon,
+.yui3-accordion-item-iconalwaysvisible {
+    display: none;
+}

=== modified file 'lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js'
--- lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js	2011-02-14 20:14:47 +0000
+++ lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js	2011-03-14 15:41:23 +0000
@@ -266,6 +266,19 @@
     },
 
 
+	/**
+     * Binds an event to Accordion's contentBox.
+     *
+     * @method _bindItemChosenEvent
+     * @protected
+     */
+	_bindItemChosenEvent: function(itemChosenEvent) {
+		var contentBox;
+
+		contentBox = this.get( CONTENT_BOX );
+		contentBox.delegate( itemChosenEvent, Y.bind( this._onItemChosenEvent, this ), '.yui3-widget-hd' );
+	},
+
     /**
      * Contains items for collapsing
      * @property _forCollapsing
@@ -1340,18 +1353,26 @@
 
 
     /**
-     * Add listener to <code>itemChosen</code> event in Accordion's content box
+     * Add listener(s) to <code>itemChosen</code> event in Accordion's content box.
+	 * If itemChosen is an Array, this function will invoke multiple times _bindItemChosenEvent
      *
      * @method bindUI
      * @protected
      */
     bindUI: function(){
-        var contentBox, itemChosenEvent;
+		var i, itemChosenEvent, length;
 
-        contentBox = this.get( CONTENT_BOX );
         itemChosenEvent = this.get( 'itemChosen' );
 
-        contentBox.delegate( itemChosenEvent, Y.bind( this._onItemChosenEvent, this ), '.yui3-widget-hd' );
+		if( Lang.isArray(itemChosenEvent) ){
+			length = itemChosenEvent.length;
+
+			for( i = 0; i < length; i++ ) {
+				this._bindItemChosenEvent(itemChosenEvent[i]);
+			}
+		} else {
+			this._bindItemChosenEvent(itemChosenEvent);
+		}
     },
 
 
@@ -1509,7 +1530,7 @@
      * @return {Y.AccordionItem} The removed item or null if not found
      */
     removeItem: function( p_item ){
-        var items, bb, item = null, itemIndex;
+        var items, bb, item = null, itemIndex, allowed;
 
         items = this.get( ITEMS );
 
@@ -1522,11 +1543,14 @@
         }
 
         if( itemIndex >= 0 ){
-
-            this.fire( BEFOREITEMREMOVE, {
+            allowed = this.fire( BEFOREITEMREMOVE, {
                 item: p_item
             });
 
+            if( !allowed ){
+                return null;
+            }
+
             item = items.splice( itemIndex, 1 )[0];
 
             this._removeItemHandles( item );
@@ -1644,16 +1668,18 @@
     ATTRS : {
         /**
          * @description The event on which Accordion should listen for user interactions.
-         * The value can be also mousedown or mouseup. Mousedown event can be used if
-         * drag&drop is not enabled
+         * The value can be also 'mousedown', 'mouseup' or ['mouseenter','click'].
+		 * Mousedown event can be used if drag&drop is not enabled.
          *
          * @attribute itemChosen
          * @default click
-         * @type String
+         * @type String|Array
          */
         itemChosen: {
             value: "click",
-            validator: Lang.isString
+            validator: function( value ) {
+				return Lang.isString(value) || Lang.isArray(value);
+			}
         },
 
         /**

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2011-03-07 20:07:54 +0000
+++ lib/lp/registry/templates/product-index.pt	2011-03-14 15:41:23 +0000
@@ -32,16 +32,6 @@
       </style>
     </noscript>
 
-        <script type="text/javascript"
-                tal:content="string:
-          LPS.use('lp.registry.pillar', function(Y) {
-              Y.on('load',
-                  function(e) {
-                      Y.lp.registry.pillar.activate_collapsible_div();
-                  },
-                  window);
-          });
-        "></script>
   </tal:head-epilogue>
 </head>