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 000000000..3ee42d4ef Binary files /dev/null and b/docs/upgrades/packages-7.6.4/matrix-default-compare-template.wgpkg differ 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 000000000..8342baef6 Binary files /dev/null and b/docs/upgrades/packages-7.6.4/matrix-default-detailed-listing.wgpkg differ diff --git a/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg new file mode 100644 index 000000000..ba8109368 Binary files /dev/null and b/docs/upgrades/packages-7.6.4/matrix-default-view-template.wgpkg differ 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 000000000..79496b5b8 Binary files /dev/null and b/docs/upgrades/packages-7.6.4/matrix-search-template.wgpkg differ diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm index 1b76f6629..31222048b 100644 --- a/lib/WebGUI/Asset/Wobject/Matrix.pm +++ b/lib/WebGUI/Asset/Wobject/Matrix.pm @@ -13,7 +13,6 @@ $VERSION = "2.0.0"; #------------------------------------------------------------------- use strict; -use warnings; use Tie::IxHash; use JSON; use WebGUI::International; @@ -461,6 +460,7 @@ sub view { $var->{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("?");