From 6ab78c051c17517851ff6b0ccf23c4161bf61ad8 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 4 May 2006 16:35:50 +0000 Subject: [PATCH] more XHTML compliance, mainly paragraphs --- lib/WebGUI/i18n/English/Macro_LoginToggle.pm | 16 +++++++++------- lib/WebGUI/i18n/English/Macro_PageUrl.pm | 3 ++- .../i18n/English/Macro_RandomAssetProxy.pm | 4 ++-- lib/WebGUI/i18n/English/Macro_RandomThread.pm | 12 ++++++++---- .../i18n/English/Macro_Slash_gatewayUrl.pm | 3 ++- lib/WebGUI/i18n/English/Macro_r_printable.pm | 5 ++--- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/lib/WebGUI/i18n/English/Macro_LoginToggle.pm b/lib/WebGUI/i18n/English/Macro_LoginToggle.pm index 27c9b11da..4fe8f297a 100644 --- a/lib/WebGUI/i18n/English/Macro_LoginToggle.pm +++ b/lib/WebGUI/i18n/English/Macro_LoginToggle.pm @@ -14,18 +14,20 @@ our $I18N = { 'login toggle body' => { message => q| -^LoginToggle; or ^LoginToggle();
+^LoginToggle; or ^LoginToggle();
Displays a "Login" or "Logout" message depending upon whether the user is logged in or not. You can optionally specify other labels like this: ^LoginToggle("Click here to log in.","Click here to log out.");. You can also use the special case ^LoginToggle(linkonly); to return only the URL with no label. -

-toggle.url
+

+ +

toggle.url
The URL to login or logout. -

-toggle.text
+

+ +

toggle.text
The Internationalized label for logging in or logging out (depending on the state of the macro), or the text that you supply to the macro. -

+

|, - lastUpdated => 1112466919, + lastUpdated => 1146759379, }, '716' => { diff --git a/lib/WebGUI/i18n/English/Macro_PageUrl.pm b/lib/WebGUI/i18n/English/Macro_PageUrl.pm index d641b13ed..12d7641d8 100644 --- a/lib/WebGUI/i18n/English/Macro_PageUrl.pm +++ b/lib/WebGUI/i18n/English/Macro_PageUrl.pm @@ -16,8 +16,9 @@ our $I18N = { message => q|

^PageUrl;
The URL to the current page (example: /index.pl/pagename). +

|, - lastUpdated => 1112466919, + lastUpdated => 1146759407, }, }; diff --git a/lib/WebGUI/i18n/English/Macro_RandomAssetProxy.pm b/lib/WebGUI/i18n/English/Macro_RandomAssetProxy.pm index 9045bd90f..0477d06e6 100644 --- a/lib/WebGUI/i18n/English/Macro_RandomAssetProxy.pm +++ b/lib/WebGUI/i18n/English/Macro_RandomAssetProxy.pm @@ -18,9 +18,9 @@ our $I18N = { ^RandomAssetProxy(Asset URL);
This macro works similarly to the ^AssetProxy(); macro except instead of displaying the Asset, it picks a random Asset from the descendents of the Asset whose URL is supplied as the -argument. +argument.

|, - lastUpdated => 1135101114, + lastUpdated => 1146760545, }, 'childless' => { diff --git a/lib/WebGUI/i18n/English/Macro_RandomThread.pm b/lib/WebGUI/i18n/English/Macro_RandomThread.pm index 328e6d9e5..71a018876 100644 --- a/lib/WebGUI/i18n/English/Macro_RandomThread.pm +++ b/lib/WebGUI/i18n/English/Macro_RandomThread.pm @@ -13,8 +13,8 @@ our $I18N = { }, 'random thread body' => { - message => q|^RandomThread( [ startURL, relatives, templateURL ] );
-

The Collaboration System can be used for much more than just a forum. A few examples of its + message => q|

^RandomThread( [ startURL, relatives, templateURL ] );
+The Collaboration System can be used for much more than just a forum. A few examples of its possible usages are a FAQ, photo gallery, job listings, quotes database or weblog. For these applications (and others that you might think of) it can be nice to display a random entry from such a CS somewhere on your site. That is exactly the functionality that this macro provides.

@@ -27,6 +27,7 @@ the template variables that are normally available in a CS Post template are ava

Although all the parameters can be omitted, it usually makes sense specify them all. If you want to display a random thread from a single CS, we suggest you use the URL of the CS as the startURL and "self" as relatives.

+
startURL
URL of the asset you want to use as the starting point for finding a random CS. If omitted @@ -43,8 +44,10 @@ are used. Allowed values for this parameter are 'siblings', 'children', 'ancesto available template variables. Since you almost certainly will not want this output in a production-environment, it makes sense to not omit this parameter.
+
-

Examples

+

Examples:

+
^RandomThread(home/photo_album, descendants, templates/randomPhoto);
If you have a page with many subpages with photo galleries, you can use the parameters above @@ -58,8 +61,9 @@ of questions), then the example above can be used to display a random question f
^RandomThread;
Gets a random post from all Collaboration Systems in root 'home' with debug output.
+
|, - lastUpdated => 1132970060, + lastUpdated => 1146760592, }, }; diff --git a/lib/WebGUI/i18n/English/Macro_Slash_gatewayUrl.pm b/lib/WebGUI/i18n/English/Macro_Slash_gatewayUrl.pm index e68443163..a7639cf96 100644 --- a/lib/WebGUI/i18n/English/Macro_Slash_gatewayUrl.pm +++ b/lib/WebGUI/i18n/English/Macro_Slash_gatewayUrl.pm @@ -16,8 +16,9 @@ our $I18N = { message => q|

^/; - System URL
The URL to the gateway script (example: /index.pl/). +

|, - lastUpdated => 1112466919, + lastUpdated => 1146760697, }, }; diff --git a/lib/WebGUI/i18n/English/Macro_r_printable.pm b/lib/WebGUI/i18n/English/Macro_r_printable.pm index e2e3eae3a..e0d330357 100644 --- a/lib/WebGUI/i18n/English/Macro_r_printable.pm +++ b/lib/WebGUI/i18n/English/Macro_r_printable.pm @@ -14,7 +14,6 @@ our $I18N = { 'printable body' => { message => q| -

^r(link text)
^r("",custom style name)
^r("",custom style name,custom template name)
@@ -27,7 +26,7 @@ Creates a link to alter the style from a page to make it printable.

Normally, the default style to make the page printable is the "Make Page Printable" style. The second argument specifies that a different style than the default be used to make the page printable: ^r("Print!","WebGUI");.

-

The third argument allows a different template be used to generate the HTML code for presenting the link and text, by specifying the name of the template. The following variables are available in the template: +

The third argument allows a different template be used to generate the HTML code for presenting the link and text, by specifying the name of the template. The following variables are available in the template:

printable.url
The URL to make the page printable. @@ -41,7 +40,7 @@ The translated label for the printable link, or the text that you supply to the

|, - lastUpdated => 1146608731, + lastUpdated => 1146760682, }, '53' => {