diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index b3409b7e5..9c1494711 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -2601,7 +2601,7 @@ sub view { push (@events, {'event' => $self->processTemplate(\%eventFields, $event->{'templateId'}), %eventFields }); } $var{'checkout.url'} = $self->getUrl('op=viewCart'); - $var{'checkout.label'} = "Checkout"; + $var{'checkout.label'} = $i18n->get('checkout'); $var{'events_loop'} = \@events; $var{'paginateBar'} = $p->getBarTraditional; $var{'manageEvents.url'} = $self->getUrl('func=manageEvents'); @@ -2619,7 +2619,6 @@ sub view { $p->appendTemplateVars(\%var); $self->buildMenu(\%var); $var{'ems.wobject.dir'} = $self->session->config->get("extrasURL")."/wobject/EventManagementSystem"; - my $templateId = $self->get("displayTemplateId"); return $self->processTemplate(\%var, undef, $self->{_viewTemplate}); } diff --git a/lib/WebGUI/Help/Asset_EventManagementSystem.pm b/lib/WebGUI/Help/Asset_EventManagementSystem.pm index b0e8264a7..89ae895c5 100644 --- a/lib/WebGUI/Help/Asset_EventManagementSystem.pm +++ b/lib/WebGUI/Help/Asset_EventManagementSystem.pm @@ -168,6 +168,10 @@ our $HELP = { tag => 'event management system event template', namespace => 'Asset_EventManagementSystem', }, + { + tag => 'pagination template variables', + namespace => 'WebGUI', + }, { tag => 'template language', namespace => 'Asset_Template', diff --git a/lib/WebGUI/Help/Asset_SQLForm.pm b/lib/WebGUI/Help/Asset_SQLForm.pm index 2933dc085..802b39074 100644 --- a/lib/WebGUI/Help/Asset_SQLForm.pm +++ b/lib/WebGUI/Help/Asset_SQLForm.pm @@ -1,7 +1,7 @@ package WebGUI::Help::Asset_SQLForm; our $HELP = { - 'sqlform add/edit' => { + 'sql form add/edit' => { title => 'edit sqlform', body => 'sqlform description', fields => [ @@ -335,7 +335,7 @@ our $HELP = { body => 'edit template help', related => [ { - tag => 'sqlform add/edit', + tag => 'sql form add/edit', namespace => 'Asset_SQLForm', }, { @@ -350,7 +350,7 @@ our $HELP = { body => 'search template help', related => [ { - tag => 'sqlform add/edit', + tag => 'sql form add/edit', namespace => 'Asset_SQLForm', }, { diff --git a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm index f80cec355..0c0d98b44 100644 --- a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm +++ b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm @@ -375,12 +375,28 @@ This loop contains all events that have been approved so that users can register The information for one event that has been processed by its own event template.

+

Event template variables
+The template variables from the Event template. This gives you access to the raw +data for the event. + +

checkout.url
+A URL to take the user the screen that displays the contents of their shopping cart. +

+ +

checkout.label
+A label to go with checkout.url. The internationalized word "Checkout". +

+

paginateBar
A bar to help the user page through sets of Events if several pages of Events exist.

+

Pagination variables
+Common pagination template variables. +

+

canManageEvents
A flag to indiciate if the current user is allowed to Manage Events.

@@ -393,8 +409,28 @@ A URL to take the user to the screen where Events can be managed (i.e. added, ap An internationalized label to dispaly to the user the link for managing events.

+

managePurchases.url
+A URL to take the user to the screen where purchases can be managed (i.e. added, approved, deleted) +

+ +

managePurchases.label
+An internationalized label to dispaly to the user the link for managing purchases. +

+ +

search.filters.options
+Javascript for a search interface for Events based on metadata. +

+ +

search.data.url
+The URL to this Asset. +

+ +

ems.wobject.dir
+The URL the EventManagementSystem area in the WebGUI Extras directory. +

+ |, - lastUpdated => 1140465899, + lastUpdated => 1145421686, }, 'event template help title' => { @@ -419,16 +455,42 @@ The description of this event. The price of this event.

-

purchase.url
-A URL for the user to register for this event and add it to their shopping cart. +

numberRegistered
+The number of people currently registered for this event. +

+ +

maximumAttendees
+The number of people allowed to attend this event. +

+ +

seatsRemaining
+The number of available seats remaining for this event. +

+ +

startDate.human
+The date and time this event starts, in human readable format. +

+ +

endDate.human
+The date and time this event ends, in human readable format. +

+ +

eventIsFull
+A boolean that is true if the there are no available seats remaining in this event.

purchase.label
-An internationalized label to dispaly to the user the link for purchasing this event. +An internationalized label to display to the user the link for purchasing this event. +If the event is full, the label will be "Sold out". +

+ +

purchase.url
+A URL for the user to register for this event and add it to their shopping cart. +If the event is full, the url will be blank.

|, - lastUpdated => 1140471404, + lastUpdated => 1145421471, }, 'add/edit event help title' => { @@ -592,6 +654,11 @@ allows you to edit events, delete events, or change their order.

lastUpdated => 1145402683, }, + 'checkout' => { + message => q|Checkout|, + lastUpdated => 1145402683, + }, + }; 1; diff --git a/t/Help/compiled.t b/t/Help/compiled.t index b263a8ffc..801a655c8 100644 --- a/t/Help/compiled.t +++ b/t/Help/compiled.t @@ -30,8 +30,6 @@ my @helpFileSet = WebGUI::Operation::Help::_getHelpFilesList($session); $numTests = scalar @helpFileSet; #One for each help compile -diag("Planning on running $numTests tests\n"); - plan tests => $numTests; foreach my $helpSet (@helpFileSet) { diff --git a/t/Help/related.t b/t/Help/related.t index 22b1f5f8b..079c6f773 100644 --- a/t/Help/related.t +++ b/t/Help/related.t @@ -51,8 +51,6 @@ foreach my $topic ( keys %helpTable ) { } } -diag("Planning on running $numTests tests\n"); - plan tests => $numTests; ##Each array element is a hash with two keys, tag (entry) and namespace (topic). diff --git a/t/Help/toc.t b/t/Help/toc.t index ce2011a47..54781d6a3 100644 --- a/t/Help/toc.t +++ b/t/Help/toc.t @@ -30,12 +30,8 @@ my @helpFileSet = WebGUI::Operation::Help::_getHelpFilesList($session); $numTests = scalar @helpFileSet; -diag("Planning on running $numTests tests\n"); - plan tests => $numTests; -diag("Check for mandatory lables for Help table of contents"); - foreach my $fileSet (@helpFileSet) { my $file = $fileSet->[1]; ok(WebGUI::Operation::Help::_getHelpName($session, $file), "Missing label for $file"); diff --git a/t/i18n/label.t b/t/i18n/label.t index 979c4ab4a..b60c93184 100644 --- a/t/i18n/label.t +++ b/t/i18n/label.t @@ -69,35 +69,22 @@ my @sqlLabels; my @libLabels; my @objLabels; -diag("Getting Help labels"); @helpLabels = getHelpLabels(); -#diag("Getting SQL labels"); #@sqlLabels = getSQLLabels(); -diag("Getting subroutine labels"); find(\&label_finder_pm, $lib); -diag("Getting object labels"); find(\&obj_finder_pm, $lib); -diag ("Checking ". scalar(@helpLabels). " help labels"); -#diag ("Checking ". scalar(@sqlLabels). " SQL labels"); -diag ("Checking ". scalar(@libLabels). " library code labels"); -diag ("Checking ". scalar(@objLabels). " library code labels via object"); - $numTests = scalar(@helpLabels) # + scalar(@sqlLabels) + scalar(@libLabels) + scalar(@objLabels) ; -diag("Planning on running $numTests tests\n"); - plan tests => $numTests; -diag("Help Label tests\n"); - my $i18n = WebGUI::International->new($session); foreach my $label ( @helpLabels ) { @@ -105,7 +92,6 @@ foreach my $label ( @helpLabels ) { sprintf "label: %s->%s inside %s->%s->%s", @{ $label }{'namespace', 'label', 'topic', 'entry', 'tag', }); } -#diag("SQL Label tests\n"); # #foreach my $label ( @sqlLabels ) { # ok($i18n->get(@{ $label }{qw(label namespace )} ), @@ -113,15 +99,12 @@ foreach my $label ( @helpLabels ) { #} # ##Subroutine calls are now illegal, everything must be done by object methods. -diag("Subroutine Call Label tests\n"); foreach my $label ( @libLabels ) { ok(0, sprintf "label: %s->%s inside %s", @{ $label }{'namespace', 'label', 'file', }); } -diag("Object Method Label tests\n"); - foreach my $label ( @objLabels ) { ok($i18n->get(@{ $label }{qw(label namespace )} ), sprintf "label: %s->%s inside %s", @{ $label }{'namespace', 'label', 'file', });