Launchpad itself

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

  1. accordion-style
  2. Merge into devel
Proposed by Brad Crittenden
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: 12591
Proposed branch: lp:~bac/launchpad/accordion-style
Merge into: lp:launchpad
Diff against target: 257 lines (+69/-80)
3 files modified
lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/gallery-accordion-skin.css (+32/-59)
lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/gallery-accordion.js (+37/-11)
lib/lp/registry/templates/product-index.pt (+0/-10)
To merge this branch: bzr merge lp:~bac/launchpad/accordion-style
Reviewer Review Type Date Requested Status
Benji York (community) code Approve
Review via email: mp+53259@code.launchpad.net

Commit message

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

Description of the change

= 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.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

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

Revision history for this message
Benji York (benji) wrote :

Looks good.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/contrib/javascript/yui3-gallery/gallery-accordion/assets/skins/sam/accordion_sprite.png'
0Binary 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 differ0Binary 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 @@
1.yui3-skin-sam .yui3-accordion {1.yui3-skin-sam .yui3-accordion {
2 border: 1px solid #93B2CC;2 border-width: 1px 1px 0 1px;
3 border-style: solid;
4 border-color: #DDD;
3}5}
46
5.yui3-skin-sam .yui3-accordion-item .yui3-widget-hd {7.yui3-skin-sam .yui3-accordion-item .yui3-widget-hd {
6 background-image: url( accordion_sprite.png );8 background-color: #EEE;
7 background-position: 0px 0px;9 border-bottom: 1px solid #DDD;
8 border: 1px solid #93B2CC;
9 height: 25px;10 height: 25px;
10}11 position: relative;
1112 padding-left: 25px;
12.yui3-skin-sam .yui3-accordion-item-icon,13}
14
15.yui3-accordion-item .yui3-widget-bd {
16 border-bottom: 1px solid #DDD;
17 margin: 0;
18}
19
13.yui3-skin-sam .yui3-accordion-item-iconexpanded,20.yui3-skin-sam .yui3-accordion-item-iconexpanded,
14.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible,
15.yui3-skin-sam .yui3-accordion-item-iconclose {21.yui3-skin-sam .yui3-accordion-item-iconclose {
16 background-repeat: no-repeat;22 background-repeat: no-repeat;
17}23}
18 24
19.yui3-skin-sam .yui3-accordion-item-icon {25.yui3-skin-sam .yui3-accordion-item-label:hover,
20 background-image: url( accordion_sprite.png );
21 background-position: center -25px;
22 _background-position: center -27px;
23}
24
25.yui3-skin-sam .yui3-accordion-item-label{
26 color: #444444;
27}
28
29.yui3-skin-sam .yui3-accordion-item-label {26.yui3-skin-sam .yui3-accordion-item-label {
30 text-decoration: none;27 text-decoration: none;
31 background: transparent;28 background: transparent;
@@ -34,23 +31,8 @@
34 font-weight: bold;31 font-weight: bold;
35}32}
3633
37.yui3-skin-sam .yui3-accordion-item-label:hover{34.yui3-skin-sam .yui3-accordion-item-iconexpanded-off:hover,
38 text-decoration: underline;35.yui3-skin-sam .yui3-accordion-item-iconexpanded-collapsing,
39}
40
41.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible,
42.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible-off {
43 background-image: url( accordion_sprite.png );
44 background-position: 0px -85px;
45 _background-position: 0px -87px;
46}
47
48.yui3-skin-sam .yui3-accordion-item-iconalwaysvisible-on {
49 background-image: url( accordion_sprite.png );
50 background-position: 0px -55px;
51 _background-position: 0px -57px;
52}
53
54.yui3-skin-sam .yui3-accordion-item-iconexpanded,36.yui3-skin-sam .yui3-accordion-item-iconexpanded,
55.yui3-skin-sam .yui3-accordion-item-iconexpanded-off {37.yui3-skin-sam .yui3-accordion-item-iconexpanded-off {
56 background-image: url( accordion_sprite.png );38 background-image: url( accordion_sprite.png );
@@ -58,35 +40,14 @@
58 _background-position: 0px -177px;40 _background-position: 0px -177px;
59}41}
6042
61.yui3-skin-sam .yui3-accordion-item-iconexpanded-off:hover{43.yui3-skin-sam .yui3-accordion-item-iconexpanded-on:hover,
62 background-image: url( accordion_sprite.png );44.yui3-skin-sam .yui3-accordion-item-iconexpanded-expanding,
63 background-position: 0px -205px;
64}
65
66.yui3-skin-sam .yui3-accordion-item-iconexpanded-on {45.yui3-skin-sam .yui3-accordion-item-iconexpanded-on {
67 background-image: url( accordion_sprite.png );46 background-image: url( accordion_sprite.png );
68 background-position: 0px -115px;47 background-position: 0px -115px;
69 _background-position: 0px -117px;48 _background-position: 0px -117px;
70}49}
7150
72
73.yui3-skin-sam .yui3-accordion-item-iconexpanded-on:hover {
74 background-image: url( accordion_sprite.png );
75 background-position: 0px -145px;
76}
77
78
79.yui3-skin-sam .yui3-accordion-item-iconexpanded-expanding {
80 background-image: url( wait_expand.gif );
81 background-position: 0px center;
82}
83
84
85.yui3-skin-sam .yui3-accordion-item-iconexpanded-collapsing {
86 background-image: url( wait_collapse.gif );
87 background-position: 0px center;
88}
89
90.yui3-skin-sam .yui3-accordion-item-iconclose {51.yui3-skin-sam .yui3-accordion-item-iconclose {
91 background-image: url( accordion_sprite.png );52 background-image: url( accordion_sprite.png );
92 background-position: 0px -235px;53 background-position: 0px -235px;
@@ -102,3 +63,15 @@
102 opacity : 0.7;63 opacity : 0.7;
103 filter: alpha(opacity = 70);64 filter: alpha(opacity = 70);
104} 65}
66
67.yui3-accordion-item-icons {
68 position: absolute;
69 float: none;
70 top: 0;
71 left: 5px;
72}
73
74.yui3-accordion-item-icon,
75.yui3-accordion-item-iconalwaysvisible {
76 display: none;
77}
10578
=== 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 @@
266 },266 },
267267
268268
269 /**
270 * Binds an event to Accordion's contentBox.
271 *
272 * @method _bindItemChosenEvent
273 * @protected
274 */
275 _bindItemChosenEvent: function(itemChosenEvent) {
276 var contentBox;
277
278 contentBox = this.get( CONTENT_BOX );
279 contentBox.delegate( itemChosenEvent, Y.bind( this._onItemChosenEvent, this ), '.yui3-widget-hd' );
280 },
281
269 /**282 /**
270 * Contains items for collapsing283 * Contains items for collapsing
271 * @property _forCollapsing284 * @property _forCollapsing
@@ -1340,18 +1353,26 @@
13401353
13411354
1342 /**1355 /**
1343 * Add listener to <code>itemChosen</code> event in Accordion's content box1356 * Add listener(s) to <code>itemChosen</code> event in Accordion's content box.
1357 * If itemChosen is an Array, this function will invoke multiple times _bindItemChosenEvent
1344 *1358 *
1345 * @method bindUI1359 * @method bindUI
1346 * @protected1360 * @protected
1347 */1361 */
1348 bindUI: function(){1362 bindUI: function(){
1349 var contentBox, itemChosenEvent;1363 var i, itemChosenEvent, length;
13501364
1351 contentBox = this.get( CONTENT_BOX );
1352 itemChosenEvent = this.get( 'itemChosen' );1365 itemChosenEvent = this.get( 'itemChosen' );
13531366
1354 contentBox.delegate( itemChosenEvent, Y.bind( this._onItemChosenEvent, this ), '.yui3-widget-hd' );1367 if( Lang.isArray(itemChosenEvent) ){
1368 length = itemChosenEvent.length;
1369
1370 for( i = 0; i < length; i++ ) {
1371 this._bindItemChosenEvent(itemChosenEvent[i]);
1372 }
1373 } else {
1374 this._bindItemChosenEvent(itemChosenEvent);
1375 }
1355 },1376 },
13561377
13571378
@@ -1509,7 +1530,7 @@
1509 * @return {Y.AccordionItem} The removed item or null if not found1530 * @return {Y.AccordionItem} The removed item or null if not found
1510 */1531 */
1511 removeItem: function( p_item ){1532 removeItem: function( p_item ){
1512 var items, bb, item = null, itemIndex;1533 var items, bb, item = null, itemIndex, allowed;
15131534
1514 items = this.get( ITEMS );1535 items = this.get( ITEMS );
15151536
@@ -1522,11 +1543,14 @@
1522 }1543 }
15231544
1524 if( itemIndex >= 0 ){1545 if( itemIndex >= 0 ){
15251546 allowed = this.fire( BEFOREITEMREMOVE, {
1526 this.fire( BEFOREITEMREMOVE, {
1527 item: p_item1547 item: p_item
1528 });1548 });
15291549
1550 if( !allowed ){
1551 return null;
1552 }
1553
1530 item = items.splice( itemIndex, 1 )[0];1554 item = items.splice( itemIndex, 1 )[0];
15311555
1532 this._removeItemHandles( item );1556 this._removeItemHandles( item );
@@ -1644,16 +1668,18 @@
1644 ATTRS : {1668 ATTRS : {
1645 /**1669 /**
1646 * @description The event on which Accordion should listen for user interactions.1670 * @description The event on which Accordion should listen for user interactions.
1647 * The value can be also mousedown or mouseup. Mousedown event can be used if1671 * The value can be also 'mousedown', 'mouseup' or ['mouseenter','click'].
1648 * drag&drop is not enabled1672 * Mousedown event can be used if drag&drop is not enabled.
1649 *1673 *
1650 * @attribute itemChosen1674 * @attribute itemChosen
1651 * @default click1675 * @default click
1652 * @type String1676 * @type String|Array
1653 */1677 */
1654 itemChosen: {1678 itemChosen: {
1655 value: "click",1679 value: "click",
1656 validator: Lang.isString1680 validator: function( value ) {
1681 return Lang.isString(value) || Lang.isArray(value);
1682 }
1657 },1683 },
16581684
1659 /**1685 /**
16601686
=== 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 @@
32 </style>32 </style>
33 </noscript>33 </noscript>
3434
35 <script type="text/javascript"
36 tal:content="string:
37 LPS.use('lp.registry.pillar', function(Y) {
38 Y.on('load',
39 function(e) {
40 Y.lp.registry.pillar.activate_collapsible_div();
41 },
42 window);
43 });
44 "></script>
45 </tal:head-epilogue>35 </tal:head-epilogue>
46</head>36</head>
4737