From aefb658fd5edf1ba611a938b67e8267cb4ed5832 Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Wed, 8 Apr 2009 19:52:35 +0000 Subject: [PATCH] Added 'too few/many' messages to matrix compare box, rfe# 9965 --- docs/changelog/7.x.x.txt | 1 + .../matrix-default-compare-template.wgpkg | Bin 0 -> 1480 bytes .../matrix-default-view-template.wgpkg | Bin 0 -> 2153 bytes lib/WebGUI/i18n/English/Asset_Matrix.pm | 11 +++ www/extras/wobject/Matrix/matrix.js | 30 ++++---- .../wobject/Matrix/matrixCompareList.js | 65 +++++++----------- 6 files changed, 49 insertions(+), 58 deletions(-) create mode 100644 docs/upgrades/packages-7.7.3/matrix-default-compare-template.wgpkg create mode 100644 docs/upgrades/packages-7.7.3/matrix-default-view-template.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 9c2e7bcab..829f6de64 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - rfe #9612: Carousel Wobject (was Widget Wobject) (SDH Consulting Group) - Survey summaries now added. In the Survey edit, select quiz mode, and a summary will be shown to the user at the end of the survey. - fixed #10110: Matrix 2.0 - "Data Error" on Pending Product Listing Updates + - rfe #9965: matrix/pls reverse dropped event variables 7.7.2 - fixed #10056: YUI javascripts included while adminOff (BNC) diff --git a/docs/upgrades/packages-7.7.3/matrix-default-compare-template.wgpkg b/docs/upgrades/packages-7.7.3/matrix-default-compare-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..7cedad39d7e3dcbcc4a211b87fa2b904b8d3d2a0 GIT binary patch literal 1480 zcmV;(1vmO1iwFP!00000|Ls_9Q`xr9LU;h#(@ECAY=^amNeyFG9Y9^<6>zPqNMdeWc{ z+$V%UKf&rJ$=N+20e$OhYd6Ioj0eG7{99`Q#2?sv_~)VGzxwdd@591BPoM~EQgML? zq=q`^?BbbON(E1eP?Si$YQ(f;C@$8`6mU5I%o7S4Tc)IQBvw%kR@?LS+J4 zjie#uSDNT#Mwy70Kg@VwE!#)}!#d`^(PYk<-%ma7j9#MN)t)OIoYCw0DZk~%KbL*zUT;kS^rz0$o;(QOY z$sUmsdKY?$>K}Sc5y7ycoZ)!64iYE<5tLY&`m_3LUE&}2OfJ?}Uerzea&6mWe2cP6 zGQLgMY*j^cWbo=qrwcz2ji81t%e&-KHxiRNusEiX8g`oPU!XK~66quQF~>q^uM&j% znNplVx0w+!VrA0uzT{Zbc5Y}NRweX8t+~`VX8VJIl7Dn%ikbB!Pml$83?{3zNPPPX zWas0QYeBhqjQb?6#;TiRth(-NK-FajQxYt~Ay`JJOl{#*cQH;>0c!Q2I|3}s%|oz! z79oZglb7Ssf2Nrn=D)v>WyDz+)9?zi#^pgL=AkK%RY9PlL$X|l=GN7X;iIks=mW2y zDptVMAyJuNP-VzgOV`I$imS|beVy|QTrGP&lhb)MP^l;zEb!6QO`a#)TqGc8EtS>U zoD-;^ay;_V`oCE`L=J~x}t zHjLj@1K%ter@b^Yuptptorri_@Zv=I>~P$H8Z6wxSKkSCdv14VrPw0 z(tmf->vYUJzSB9b3@zpo@@9zH;HDeQ9*1!XG9w>QTAR&gquttY7L~43vunE|dTU1| z^u~@#PBI^N-cw?)H6LCdCb4`IeB(G??&lO;>ZF+u&N(jqLtN2e4w7;3X1K|`d zbffa6%Z!Id^o#YT`Mka6V8GA^cPnG#22wkno#VaTD#cXp^6;vlcjgL6WzN;SQ{}Lj zz0J*y&CNFaJIEmtWJD#5b#IGnWYDYz2Zm1^UKQz6rWGz7J*M9qmW|RDgY1DpAuI>g zuLP5@P)t&FQ0OipQ+SXM*`K4s{pk1P@crn|$?iLL9q*@qu)mxSR31$vOuF;_8{Z1b z%6DqW6LX_plqu#SK0`>*YHh5wnyu%~q8{Fv%Hi!slz$0(Cm}t}MymC<$8h^}T+_Gx iuTQ?-$3GJubv!cg$iO25j|}{882A@4gQDU98UO$oP}v^< literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.7.3/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.7.3/matrix-default-view-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..695875af5efe5cbbfb5edb050429be8cecf99be4 GIT binary patch literal 2153 zcmV-v2$uIBiwFP!00000|Lt0BZ`(K$&gcCVT7O9jtP{&l>$U3*uI;v4*u)i-4HV2R1r2hQ-oWANx zt##=BcJoH`zbzANP6{`}dBI!Tx~e?w?)R|8V!J--m?%{s2MP zl8Os5rLABXynXkR9?AsIs8Ebb9Mxn<83{@hji0V?wAE{AVw^~bRL?(VT)^xTy(V2G zNihvkrZoRnwwNSL&S>n`rgZs+r7>S>rX4pSS1HdVtFz5bq}S=+KepR%*>x~}{!Wj5k)SrCO|nKmzNKl*uHUuWPPU8$%Typm1e*fQ zbFJxr79?p$JdqH>pmwXY?+@gbn1!%?*pB8=@Weei@QIXE<@g%rYMvz~KbVB!XaPNK z2SeA6=`~p-s(s42pDKyqq<(X z3uwpQ*M9BnyRR4F4i)ETBwd{W9uVWfFTwu%ajK|Di2^-IaSbh15Cz=PU*GEV-z6rVVo?K;%Ny%nUOTm ziz7bIh@j}+hR*uG`32+E-RCQUoID{Dn$!^(9hrHI8W5(@we`!$iIK;IS7#6DrlSghe;<$}s_0fynN`s#sn2C*+gOt8nES zamFb=cPXA}7g>x4-bPhH_wtru0MRY&$3=PWa4)!+7Zk>pcK;jP9XA*Nq|W7XcHL&D ztNGlQx%?Vk^|=T>6D8pP!wFY91iaj3vl#BM8tMOH)0qu*+}*a_S4rlCrRSKHJqJfV z_*g{oyVF}|T|Z7Rc|PSI*Dxr~6DCjjbV}oKIrfn;Jk_KEQ4~Ne5kRSfp%D=0}$FsJ4D3XFk5!NOG(tEOtq#H5JU zZOTwx2tQF!N5ZK=Wv)z3w4n<~LD+l@kP}}heD?vysSUmZ>7qdFJvm4K2c9M?T^(-6 zr{ZOw0go$LjP9tiD|j~4XgN95M!xFK*cesY(M77eVvCaWzx-@98lY4A)u0=-`OJ=3 zYq%VPGsUQ%Ys{Ja8ZJcWsgWNBuv?!}mzrxl)+QCaR2d%4ep6Mn>D;fJ@})|k=f#ne zSxJ^_kNqP2wAZZJ%AA9ZB3%tM@1ar|AhK}A7rfzsCcxVHxN{V*)-d^CeI1gLIhOPg zV+U*3>il~00Gy#*qrgDr;II4!gL;Z?1Oe|#a#t9b!f7o8W~vbZGrbXj!p)6g%7}ah z0(n)kGZ3EHDsU|h#cU%K1;u7G5C!+x6o4b(F150-G=G=i*AXLVL{pWlf`uthoBif1 z#y?)X6V5YGMyjh^Gd)r}IIGFR;TVxj>U$|Q1gMp?6oM*O;`47ptAcd z?e1P|jA<(nc<=bO42ybQfnHG2-ltt7*y)su)eep7C-ymo`}rZ|Nl$-=?Xx zV*l5+HVLJapY!}(I`B#acS+!qDH^yk>dPbCy|U4T8kBC8VlKY|Ihk8ZHys9ds9S6u zYObG+7lTUCRON1yw9cpaiZN&V3@^3ylmH2~mWlPLT37|@c)V!jmApAVwq7=jweM7Z zXZSK6?)15yjrGdVT?ViU%HK=ptLyo5hn2ZKse(q~X8TxIm%(-8uHLp~tT`w(*p|$G z`scW{Z*c{62l{6o!pOa5{(R7GaqD3W42&fT%JN9zH^tklVg#f6&TqQ3D{Y}h&aRKa z(is&@U5Mm`;PY4T7CSY~4zD8ycXyh1>RP4=dUK_rJsCM)yqK(8+HXYivxYLE{4w4L7 zowt5FQa8R{vrk5WN5`Qj1KzPg*HH^-fO9x}d46_U2N&NTMmHANQgf8a9Hr`xe1qt@ z!Jt1FJnVNpjRd`A*y#EdY^Q0~nFTs)B)YMV6MC4=_;Q@$t7wCUH-!Z;9wfdw-9nm1 zVwI^^mZztYBGbHW_vk3eT<4^@_04M+eEDSqg literal 0 HcmV?d00001 diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index a8b5b5bf9..4386e0412 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -807,6 +807,17 @@ selectBox.

| message => q|Matrix Fieldtype|, }, + 'too many message' => { + lastUpdated => 0, + message => q|You tried to compare more than your maximum number of listings.|, + context => q|A message shown to the user when they have selected too many listings to compare.|, + }, + + 'too few message' => { + lastUpdated => 0, + message => q|You tried to compare only one listing. If you want to view just one listing, click on its name.|, + context => q|A message shown to the user when they have selected only one listing to compare.|, + } }; 1; diff --git a/www/extras/wobject/Matrix/matrix.js b/www/extras/wobject/Matrix/matrix.js index f68cf25a9..200016420 100644 --- a/www/extras/wobject/Matrix/matrix.js +++ b/www/extras/wobject/Matrix/matrix.js @@ -8,7 +8,7 @@ YAHOO.util.Event.addListener(window, "load", function() { if(typeof(oRecord.getData("checked")) != 'undefined' && oRecord.getData("checked") == 'checked'){ innerHTML = innerHTML + " checked='checked'"; } - innerHTML = innerHTML + " onchange='javascript:compareFormButton()' class='compareCheckBox'>"; + innerHTML = innerHTML + " class='compareCheckBox'>"; elCell.innerHTML = innerHTML; }; @@ -82,7 +82,7 @@ YAHOO.util.Event.addListener(window, "load", function() { this.onDataReturnAppendRows.apply(this,arguments); }; - window.compareFormButton = function() { + var compareFormButton = function() { var compareCheckBoxes = YAHOO.util.Dom.getElementsByClassName('compareCheckBox','input'); var checked = 0; var checkedCompareBoxes = new Object(); @@ -92,12 +92,12 @@ YAHOO.util.Event.addListener(window, "load", function() { checkedCompareBoxes[compareCheckBoxes[i].value] = true; } } - if (checked > 1 && checked < maxComparisons){ - btnCompare.set("disabled",false); - btnCompare2.set("disabled",false); + if (checked < 2){ + alert(tooFewMessage); + }else if (checked > maxComparisons){ + alert(tooManyMessage); }else{ - btnCompare.set("disabled",true); - btnCompare2.set("disabled",true); + window.document.forms['doCompare'].submit(); } var elements = window.compareDataTable.getRecordSet().getRecords(); for(j=0; j 1 && checked < maxComparisons){ - btnCompare.set("disabled",false); - btnCompare2.set("disabled",false); + if (checked < 2){ + alert(tooFewMessage); + }else if (checked > maxComparisons){ + alert(tooManyMessage); }else{ - btnCompare.set("disabled",true); - btnCompare2.set("disabled",true); + //window.document.forms['doCompare'].submit(); + var uri = "func=getCompareListData"; + for (var i = compareCheckBoxes.length; i--; ) { + if(compareCheckBoxes[i].checked == true){ + uri = uri+';listingId='+compareCheckBoxes[i].value; + } + } + myDataTable.getRecordSet().reset(); + myDataTable.refreshView(); + myDataTable.showTableMessage('Loading...'); + this.myDataSource.sendRequest(uri,callback2); } + + },this,true); } + if(document.getElementById("stickied")){ var btnStickied = new YAHOO.widget.Button("stickied"); btnStickied.on("click", function(e) { var elements = myDataTable.getRecordSet().getRecords(); @@ -187,6 +169,7 @@ YAHOO.util.Event.addListener(window, "load", function() { hideStickies = 0; } },this,true); + } }; });