From ac0032fedfbd722d6d11332df90b49bdedb60771 Mon Sep 17 00:00:00 2001 From: Yung Han Khoe Date: Mon, 24 Nov 2008 16:00:14 +0000 Subject: [PATCH] Adding Matrix templates, updating Matrix international --- .../matrix-default-compare-template.wgpkg | Bin 0 -> 1246 bytes .../matrix-default-detailed-listing.wgpkg | Bin 0 -> 1670 bytes .../matrix-default-view-template.wgpkg | Bin 0 -> 2153 bytes .../matrix-search-template.wgpkg | Bin 0 -> 1497 bytes lib/WebGUI/Asset/Wobject/Matrix.pm | 2 +- lib/WebGUI/i18n/English/Asset_Matrix.pm | 98 +++++++---- .../i18n/English/Asset_MatrixListing.pm | 158 ++++++++++++++++++ www/extras/wobject/Matrix/matrix.js | 2 +- www/extras/wobject/Matrix/matrixListing.js | 4 +- 9 files changed, 231 insertions(+), 33 deletions(-) create mode 100644 docs/upgrades/packages-7.6.4/matrix-default-compare-template.wgpkg create mode 100644 docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg create mode 100644 docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg create mode 100644 docs/upgrades/packages-7.6.4/matrix-search-template.wgpkg create mode 100644 lib/WebGUI/i18n/English/Asset_MatrixListing.pm diff --git a/docs/upgrades/packages-7.6.4/matrix-default-compare-template.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-compare-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..3ee42d4eff07aad29cfe8f1a4b55970ae0a65997 GIT binary patch literal 1246 zcmV<41R?t$iwFP!000001MOCAZz4Ak=JWjui%QK^3M|V)2!x(=Z@Ew<*Hjl8wWU3o zwE-W-UfEswREk>u zLF=bh3gM|Y8?DAsy@bMA*n|(LJpGeugB66fpu=&>9`6s5gvTc7zmK={pK7{j!~7i{ z``^_sT8eKJ30OR8H1^iN8AaRmj~ex`gaFN_f1axT)u#{rTX^{T0-CU_jZ}C{%cz6? z`18;$B}yh#8Ai2Tbz)XBRumgb-Yo5EIVwA0yTP$G?{5;RVE47t5h>^EZRj%N?3a^t z$eEr{lIse(xMqULg)>^qH}q1-M6+FUav`YdYpQx=I}mzf6h5PvT;cJqBG#IkOlgLV zVmD@%aCheYtDbvL6?ewHT!qjPPPwVXa+Y94D~5um&1#(_(`SqjDz?*L`cg?F%`)*2 z6fztunI=8*o-pII!h-*`0}FL`Qh)VVPZ+8MHcSf4Umo~K7<4M)cu4ud;lXR0-{%XL z*})Gd-2l`EY9P7>4>?6K;{xF_=4xyFGH|e#jqZ@66;`@vS64pPT*~f6xpXTV*=<4Y<2^$>3u?$ z0x<#xvI<%WuetK*|AY1Wk)|jU-;1{2_x=Lw5IiUpyy_A*-|&4Z)yzc*8xW@gL_Rx@fJ)f>4-!wmP{JTstop3Bf%&tdCm3Z!v9I$|B_b z zJn#R8&4<%Qn}@xAq;D6$8c{tu z&OO?(ORT21bHe0p-0R2eI-Q&7_lm&H>qXfPuXiu*zQt_(Y~vY$X9S)R_&+1?H%&Rt IM*tK60KVE_0{{R3 literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..8342baef63fc6ae76c8f998ef9aab5070539a7d9 GIT binary patch literal 1670 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 literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.6.4/matrix-search-template.wgpkg b/docs/upgrades/packages-7.6.4/matrix-search-template.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..79496b5b893022da3aed2b154c506674987ef69f GIT binary patch literal 1497 zcmV;~1t$6*iwFP!000001MOFBZ`(Ey_UHZz!b6b_s4ZKz>sa*yG)=n(NZM{mmTvPF z&=PI2p-GLT>^MdL`;Meu9jEJpWS^oUs?6iPJx4xAwi^%sbUK~kV9;oEI^E%*+i3KL z?m@-VX>{T72YrzH4b<&)`_CH)R383GmBtc6TaoEJrFZuSNy1~2bpPMo(*LSyqwSXO z?ymhFv_C1q?~17*{1P0z_) zP@ZuJ9whRz=pYDF(TgRPD6{xR$VDEzr=$GyD`{*+s(>mKP!FyPV2nE^M1n$C7IPuj z_E#mI961Zo?QTm1^P=Pi4T@z}nU^C||Glw;z!n=S;9S^37e?}M%hK=WRdotZsYnBB z*cX5@sppX!mo5}KLl+nC4-PIa_6lS~6iu2=Oqe32fGi0IiD#3bv%LbGJOEf!l@x95 z_r?)j7N%G8RxFl8#)O#_SHcky6-t_z%>iJ53cQOV=jP3-s5+RLC9!253{{I|fpI~b z0@tF3sRriCSj}Ex2|jXU?cACkY*VXcXICX99Z((XH@8fQBE@c zZdw}K($Pzcc45533&%?5Wct(DVGvjv34+rb^k%91RgC%kHr_uL5uH(Bbi-I(-yaV8 zzCWl^8r95sb2Nnx$PA}UBgZ#oXc;g5N{QLxn8U$}okB@Ew97D6( zXCl0`%3~exaU6IuK5?! zkyv=}ci(0WZ)wlI@7r`)$l~jMT$Ba;PxzVzb91Fw@M9l+b`53*tFJY~3(D33mK3uW zX8enJwT zcb+mM*@R*M&PIzs2}UDioFYH7;XtiNWyndPHiQ7lyyxVztBOmf*SS5Nn&Rn7)D-=1 zRs>e6`yA9%V|ij%QD%Kxic{compareForm} = $self->getCompareForm; $var->{exportAttributes_url} = $self->getUrl('func=exportAttributes'); $var->{listAttributes_url} = $self->getUrl('func=listAttributes'); + $var->{search_url} = $self->getUrl('func=search'); # Get the MatrixListing with the most views as an object using getLineage. my ($bestViews_listing) = @{ $self->getLineage(['descendants'], { diff --git a/lib/WebGUI/i18n/English/Asset_Matrix.pm b/lib/WebGUI/i18n/English/Asset_Matrix.pm index e46c67eb6..28e4d3bef 100644 --- a/lib/WebGUI/i18n/English/Asset_Matrix.pm +++ b/lib/WebGUI/i18n/English/Asset_Matrix.pm @@ -2,16 +2,6 @@ package WebGUI::i18n::English::Asset_Matrix; use strict; our $I18N = { - 'isTooMany' => { - message => q|A condition indicating that the user has selected too many listings to compare. They may only compare Max Comparisons listings at a time.|, - lastUpdated => 1149783768, - }, - - 'isTooFew' => { - message => q|A condition indicating that the user has selected too few listings to compare. They must compare at least two listings.|, - lastUpdated => 1149783768, - }, - 'product_loop' => { message => q|A loop containing the product information (not contained in categories) for this listing.|, lastUpdated => 1149783768, @@ -123,6 +113,21 @@ our $I18N = { lastUpdated => 0, }, + 'views label' => { + message => q|Views|, + lastUpdated => 0, + }, + + 'compares label' => { + message => q|Compares|, + lastUpdated => 0, + }, + + 'clicks label' => { + message => q|Clicks|, + lastUpdated => 0, + }, + 'ratings' => { message => q|The ratings form (or results) for this listing.|, lastUpdated => 1149784175, @@ -168,21 +173,41 @@ our $I18N = { message => q|Matrix Listing Detail Template Variables| }, - 'search.url' => { + 'search_url' => { message => q|The URL to the matrix search page.|, - lastUpdated => 1149795214, + lastUpdated => 0, }, + 'search label' => { + message => q|Search|, + lastUpdated => 0, + }, + 'isLoggedIn' => { message => q|A condition indicating whether the current user is logged in to the site.|, - lastUpdated => 1149795214, + lastUpdated => 0, }, - 'field.list.url' => { - message => q|The URL to the page where you configure new fields for this matrix.|, - lastUpdated => 1149795214, + 'listAttributes_url' => { + message => q|The URL to the page where you configure new listing attributes for this matrix.|, + lastUpdated => 0, }, + 'list attributes label' => { + message => q|List Attributes|, + lastUpdated => 0, + }, + + 'exportAttributes_url' => { + message => q|The URL to export the listing attributes for this matrix.|, + lastUpdated => 0, + }, + + 'export attributes label' => { + message => q|Export Attributes|, + lastUpdated => 0, + }, + 'addMatrixListing_url' => { message => q|The URL to the page where a user can add a new listing to the matrix.|, lastUpdated => 0, @@ -398,10 +423,10 @@ our $I18N = { lastUpdated => 1149996685, }, - 'search template help title' => { - message => q|Matrix Search Template Variables|, - lastUpdated => 1184949060, - }, + 'search template help title' => { + message => q|Matrix Search Template Variables|, + lastUpdated => 1184949060, + }, 'categories description' => { message => q|Specify one category per line here to define the categories for this matrix. Categories are used to subdivide fields and also represent the things users can rate each listing on.|, @@ -508,16 +533,17 @@ our $I18N = { lastUpdated => 0, }, - 'search template description' => { - message => q|Select a template to be used to display the search engine interface.|, - lastUpdated => 0, - }, + 'search template description' => { + message => q|Select a template to be used to display the search engine interface.|, + lastUpdated => 0, + }, - 'compare template description' => { - message => q|Select a template to be used to show the listing comparison data.|, - lastUpdated => 0, - }, - 'categories label' => { + 'compare template description' => { + message => q|Select a template to be used to show the listing comparison data.|, + lastUpdated => 0, + }, + + 'categories label' => { message => q|Categories|, lastUpdated => 0, }, @@ -845,6 +871,20 @@ selectBox.

| message => q|Select the category which this attribute falls into.| }, + 'comparison label' => { + lastUpdated => 0, + message => q|Comparison|, + }, + + 'compare button label' => { + lastUpdated => 0, + message => q|Compare|, + }, + + 'hide stickied button label' => { + lastUpdated => 0, + message => q|Hide/show stickied|, + }, }; 1; diff --git a/lib/WebGUI/i18n/English/Asset_MatrixListing.pm b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm new file mode 100644 index 000000000..054d52ff5 --- /dev/null +++ b/lib/WebGUI/i18n/English/Asset_MatrixListing.pm @@ -0,0 +1,158 @@ +package WebGUI::i18n::English::Asset_MatrixListing; + +use strict; + +our $I18N = { + 'assetName' => { + message => q|Matrix Listing|, + lastUpdated => 0, + }, + + 'edit matrix listing title' => { + message => q|Edit/Add Listing|, + lastUpdated => 0, + }, + + + 'template description' => { + message => q|Select a template to be used to display the default view of the Matrix.|, + lastUpdated => 0, + }, + + 'template label' => { + message => q|Matrix Listing Template|, + lastUpdated => 0, + }, + + 'screenshots description' => { + message => q|Upload a picture of the product, or a screen shot if it's a software package.|, + lastUpdated => 0, + }, + + 'screenshots label' => { + message => q|Screenshots/Photos|, + lastUpdated => 0, + }, + + 'description description' => { + message => q|Please give a general description of the product. Specific details can be rated in the form +fields below.|, + lastUpdated => 0, + }, + + 'description label' => { + message => q|Description|, + lastUpdated => 0, + }, + + 'version description' => { + message => q|Enter the version/edition/model number for the product.|, + lastUpdated => 0, + }, + + 'version label' => { + message => q|Version/Model|, + lastUpdated => 0, + }, + + 'last updated label' => { + message => q|Last Updated|, + lastUpdated => 0, + }, + + 'web site label' => { + message => q|Web Site|, + lastUpdated => 0, + }, + + 'message sent message' => { + message => q|Message sent.|, + lastUpdated => 0, + }, + + 'contact maintainer label' => { + message => q|Contact Maintainer|, + lastUpdated => 0, + }, + + 'maintainer description' => { + message => q|If left blank, this will be the name of the user who created this product listing. The + listing maintainer is allowed to edit this listing, even if they are not members of the group + to add or edit listings.|, + lastUpdated => 0, + }, + + 'maintainer label' => { + message => q|Maintainer|, + lastUpdated => 0, + }, + + 'manufacturer label' => { + message => q|Manufacturer|, + lastUpdated => 0, + }, + + 'manufacturerName description' => { + message => q|The name of the company that manufactures the product or provides the service represented in +this listing.|, + lastUpdated => 0, + }, + + 'manufacturerName label' => { + message => q|Manufacturer Name|, + lastUpdated => 0, + }, + + 'manufacturerURL description' => { + message => q|If the manufacturer has a website, enter the complete URL for it here.|, + lastUpdated => 0, + }, + + 'manufacturerURL label' => { + message => q|Manufacturer URL|, + lastUpdated => 0, + }, + + 'productURL description' => { + message => q|If the product has its own website, enter the complete URL for it here.|, + lastUpdated => 0, + }, + + 'productURL label' => { + message => q|Product URL|, + lastUpdated => 0, + }, + + 'mean label' => { + message => q|Mean|, + lastUpdated => 0, + }, + + 'median label' => { + message => q|Median|, + lastUpdated => 0, + }, + + 'count label' => { + message => q|Count|, + lastUpdated => 0, + }, + + 'worst label' => { + message => q|Worst|, + lastUpdated => 0, + }, + + 'respectable label' => { + message => q|Respectable|, + lastUpdated => 0, + }, + + 'best label' => { + message => q|Best|, + lastUpdated => 0, + }, + +}; + +1; diff --git a/www/extras/wobject/Matrix/matrix.js b/www/extras/wobject/Matrix/matrix.js index b4f4b1ffd..507bc4042 100644 --- a/www/extras/wobject/Matrix/matrix.js +++ b/www/extras/wobject/Matrix/matrix.js @@ -14,7 +14,7 @@ YAHOO.util.Event.addListener(window, "load", function() { var myColumnDefs = [ {key:"assetId",label:"",sortable:false, formatter:this.formatCheckBox}, - {key:"title", label:"Name", sortable:true, formatter:this.formatUrl}, + {key:"title", label:"", sortable:true, formatter:this.formatUrl}, {key:"views", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, {key:"clicks", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, {key:"compares", sortable:true, sortOptions:{defaultDir:YAHOO.widget.DataTable.CLASS_DESC}}, diff --git a/www/extras/wobject/Matrix/matrixListing.js b/www/extras/wobject/Matrix/matrixListing.js index 7c1e87aea..3f90aa284 100644 --- a/www/extras/wobject/Matrix/matrixListing.js +++ b/www/extras/wobject/Matrix/matrixListing.js @@ -23,8 +23,8 @@ YAHOO.util.Event.addListener(window, "load", function() { var myColumnDefs = [ {key:"stickied",formatter:this.formatStickied,label:""}, - {key:"label",formatter:this.formatLabel}, - {key:"value"} + {key:"label",formatter:this.formatLabel,label:""}, + {key:"value",label:""} ]; this.myDataSource = new YAHOO.util.DataSource("?");