From 675f07e1b46af2496fbea6b112532bb5072d6a03 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 2 Jan 2007 05:04:34 +0000 Subject: [PATCH] Fix bugs in the Pagination template variables and remove duplicate i18n entries. ISA relationship for WSClient view template variables w.r.t pagination template variables. --- lib/WebGUI/Help/Asset_WSClient.pm | 34 ++++--------------- lib/WebGUI/Help/WebGUI.pm | 6 ++-- lib/WebGUI/i18n/English/Asset_WSClient.pm | 40 ----------------------- lib/WebGUI/i18n/English/WebGUI.pm | 21 ------------ 4 files changed, 10 insertions(+), 91 deletions(-) diff --git a/lib/WebGUI/Help/Asset_WSClient.pm b/lib/WebGUI/Help/Asset_WSClient.pm index ebad4e96a..9d2d72041 100644 --- a/lib/WebGUI/Help/Asset_WSClient.pm +++ b/lib/WebGUI/Help/Asset_WSClient.pm @@ -96,6 +96,12 @@ our $HELP = { 'ws client template' => { title => '72', body => '73', + isa => [ + { + tag => 'pagination template variables', + namespace => 'WebGUI' + }, + ], variables => [ { 'name' => 'disableWobject' @@ -108,33 +114,7 @@ our $HELP = { }, { 'name' => 'results', - 'variables' => [ - { - 'name' => 'firstPage' - }, - { - 'name' => 'lastPage' - }, - { - 'name' => 'nextPage' - }, - { - 'name' => 'pageList' - }, - { - 'name' => 'previousPage' - }, - { - 'name' => 'multiplePages' - }, - { - 'name' => 'numberOfPages' - }, - { - 'name' => 'pageNumber' - } - ] - } + }, ], fields => [ ], diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index 8f8ee81d6..036d965b0 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -760,10 +760,10 @@ our $HELP = { }, { 'name' => 'pagination.pageList', + }, + { + 'name' => 'pagination.pageLoop', 'variables' => [ - { - 'name' => 'pagination.pageLoop' - }, { 'name' => 'pagination.url' }, diff --git a/lib/WebGUI/i18n/English/Asset_WSClient.pm b/lib/WebGUI/i18n/English/Asset_WSClient.pm index 2c7cbce15..1af360b20 100644 --- a/lib/WebGUI/i18n/English/Asset_WSClient.pm +++ b/lib/WebGUI/i18n/English/Asset_WSClient.pm @@ -234,46 +234,6 @@ names set for them by the SOAP server (i.e. perhaps "localTime" for a time query lastUpdated => 1149568071, }, - 'firstPage' => { - message => q|Link to first page in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'lastPage' => { - message => q|Link to last page in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'nextPage' => { - message => q|Link to next page in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'pageList' => { - message => q|List of all pages in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'previousPage' => { - message => q|Link to previous page in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'multiplePages' => { - message => q|Boolean indicating multiple pages in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'numberOfPages' => { - message => q|Number of pages in a paginated set.|, - lastUpdated => 1149568071, - }, - - 'pageNumber' => { - message => q|Current page number in a paginated set.|, - lastUpdated => 1149568071, - }, - '73' => { message => q|

This is the list of template variables available for Web Services Client templates.

|, diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 279aa6fb5..94c505e47 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -2363,16 +2363,6 @@ div.tabs { lastUpdated => 1149182026, }, - 'pagination.url' => { - message => q|The URL of page X, where X is the number in the loop we're at.|, - lastUpdated => 1149182026, - }, - - 'pagination.text' => { - message => q|The number of page X, where X is the number in the loop we're at.|, - lastUpdated => 1149182026, - }, - 'pagination.pageList.upTo10' => { message => q|A list of links to the 10 nearest in the paginator relative to the current page. So if you're on page 20, you'll see links for 15-25.|, lastUpdated => 1149182026, @@ -2383,17 +2373,6 @@ div.tabs { lastUpdated => 1149182026, }, - 'pagination.url' => { - message => q|The URL of page X, where X is the number in the loop we're at.|, - lastUpdated => 1149182026, - }, - - 'pagination.text' => { - message => q|The number of page X, where X is the number in the loop we're at.|, - lastUpdated => 1149182026, - }, - - '1086' => { message => q|

Many wobjects have pagination features. Though some wobjects define their own pagination variables, most use a common set of pagination variables:

|,