diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 5576f370e..65c346ce8 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -22,6 +22,7 @@ Palamara) - fix: Paginator: addDataByArrayRef off by one error (perlDreamer Consulting LLC) + - fix: English help, really XHTML fixes (thanks to Klaus) 7.3.3 - fix: Wiki Purge throws fatal diff --git a/lib/WebGUI/i18n/English/Asset_Article.pm b/lib/WebGUI/i18n/English/Asset_Article.pm index b1e9e90a9..be7c852c9 100644 --- a/lib/WebGUI/i18n/English/Asset_Article.pm +++ b/lib/WebGUI/i18n/English/Asset_Article.pm @@ -115,7 +115,7 @@ be useful, others may not.|, 'new.template' => { message => q|Articles have the special ability to change their template so that you can allow users to see different views of the article. You do this by creating a link with a URL like this (replace 999 with the template Id you wish to use): -

+

<a href="<tmpl_var new.template>999">Read more...</a>|, lastUpdated => 1148960553, diff --git a/lib/WebGUI/i18n/English/Asset_Navigation.pm b/lib/WebGUI/i18n/English/Asset_Navigation.pm index 12af30ed3..3ed9df5ca 100644 --- a/lib/WebGUI/i18n/English/Asset_Navigation.pm +++ b/lib/WebGUI/i18n/English/Asset_Navigation.pm @@ -453,8 +453,8 @@ a Google sitemap of your site or RSS feeds.

'page.depthIsN' => { message => q|A conditional indicating whether the depth of this page is N. This variable is useful if you want to style a certain level. -

-

<tmpl_if page.depthIs1>
+
+
<tmpl_if page.depthIs1>
   <img src="level1.gif">
<tmpl_else>
   <img src="defaultBullet.gif">
</tmpl_if>|, lastUpdated => 1149394665, }, diff --git a/lib/WebGUI/i18n/English/Asset_SQLForm.pm b/lib/WebGUI/i18n/English/Asset_SQLForm.pm index 0cd55d0b2..1a34aecfb 100644 --- a/lib/WebGUI/i18n/English/Asset_SQLForm.pm +++ b/lib/WebGUI/i18n/English/Asset_SQLForm.pm @@ -1202,8 +1202,8 @@ variable.|, 'searchFormTrash.label' => { message => q|The label for the search in trash option. Available in normal and advanced search. Only use this if you are -not using the complete searchForm.

-

searchFormTrash.form
+not using the complete searchForm.
+
searchFormTrash.form
The form Element for the search in trash option. Available in normal and advanced search. Only use this if you are not using the complete searchForm.|, lastUpdated => 1149822982, @@ -1223,8 +1223,8 @@ not using the complete searchForm.|, 'searchFormQuery.label' => { message => q|The label for the search query. Available in normal search. Only use this if you are -not using the complete searchForm.

-

searchFormQuery.form
+not using the complete searchForm.
+
searchFormQuery.form
The form Element for the search query. Available in normal search. Only use this if you are not using the complete searchForm.|, lastUpdated => 1149822982, diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index 94c505e47..8dd4c2a3f 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -924,12 +924,12 @@ to add or remove users from their groups. 'head.tags' => { message => q|Tags that WebGUI automatically generates for you so that caching works the way it should, search engines can find you better, and other useful automated functionality. This should go in the <head> </head> section of your style. -

-

We suggest using something like this in the <title> </title> portion of your style: -

-

<tmpl_var session.page.title> - <tmpl_var session.setting.companyName> -

-

That particular example will help you get good ranking on search engines.|, +
+
We suggest using something like this in the <title> </title> portion of your style: +
+
<tmpl_var session.page.title> - <tmpl_var session.setting.companyName> +
+
That particular example will help you get good ranking on search engines.|, lastUpdated => 1149182155, }, diff --git a/lib/WebGUI/i18n/English/Workflow_Activity_ExpireSubscriptionCodes.pm b/lib/WebGUI/i18n/English/Workflow_Activity_ExpireSubscriptionCodes.pm index 254150b46..b9daf2fdb 100644 --- a/lib/WebGUI/i18n/English/Workflow_Activity_ExpireSubscriptionCodes.pm +++ b/lib/WebGUI/i18n/English/Workflow_Activity_ExpireSubscriptionCodes.pm @@ -8,9 +8,7 @@ our $I18N = { }, 'expire subscription codes body' => { - message => q|

This workflow activity will go through all subscription codes and expire any subscription code whose status is unused after the expiration date for the subscription code has passed. The expiration date is calculated from the date it was created and interval it was set to expire.

-

-|, + message => q|

This workflow activity will go through all subscription codes and expire any subscription code whose status is unused after the expiration date for the subscription code has passed. The expiration date is calculated from the date it was created and interval it was set to expire.

|, lastUpdated => 0, }, diff --git a/t/Paginator.t b/t/Paginator.t index 9660dc8eb..a1a4d0589 100644 --- a/t/Paginator.t +++ b/t/Paginator.t @@ -27,7 +27,7 @@ my $startingRowNum = 0; my $endingRowNum = 99; my @paginatingData = ($startingRowNum..$endingRowNum); -plan tests => 11; # increment this value for each test you create +plan tests => 12; # increment this value for each test you create my $rowCount = $endingRowNum - $startingRowNum + 1; my $NumberOfPages = ceil($rowCount/25); ##Default page size=25 @@ -65,3 +65,4 @@ cmp_bag([0..24], $p->getPageData(1), '(101) page 1 data correct'); cmp_bag([25..49], $p->getPageData(2), '(101) page 2 data correct'); cmp_bag([100 ], $p->getPageData(5), '(101) page 5 data correct'); +is($p->getPageNumber, 1, 'Default page number is 1');