From 2ce64ed9eb790c3a08e1a3b162cb9cb0f3ec36ae Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 4 May 2006 23:42:29 +0000 Subject: [PATCH] XHTML fixes --- lib/WebGUI/i18n/English/Asset.pm | 12 +- lib/WebGUI/i18n/English/Asset_MultiSearch.pm | 5 +- lib/WebGUI/i18n/English/Asset_Navigation.pm | 6 +- lib/WebGUI/i18n/English/Asset_Poll.pm | 62 +-- lib/WebGUI/i18n/English/Asset_Post.pm | 378 ++++++------- lib/WebGUI/i18n/English/Asset_Product.pm | 192 +++---- lib/WebGUI/i18n/English/Asset_SQLForm.pm | 2 +- lib/WebGUI/i18n/English/Asset_SQLReport.pm | 149 +++--- lib/WebGUI/i18n/English/Asset_Shortcut.pm | 2 +- lib/WebGUI/i18n/English/Asset_StockData.pm | 524 ++++++++++--------- 10 files changed, 677 insertions(+), 655 deletions(-) diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index 2d99857ad..5f14e8f1f 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -525,12 +525,12 @@ each asset under the tab "Meta" in the asset properties.

You can use the AOI macro's described above in the criteria, so you can present content based upon the users Areas of Interest. Example:
type = ^AOIRank(contenttype);

-

  • Display
    - Metadata fields are exposed to the asset templates as their property name. So you can actually display the metadata - to the rendered page using a template variable like <tmpl_var propertyname>

    • -

  • Meta tags
    - Since the meta data is exposed as template variables, you can use that in combination with the ^RawHeadTags(); - macro to create meta tags from meta data, including the tags from the Dublin Core standard.

    • +

  • Display
    + Metadata fields are exposed to the asset templates as their property name. So you can actually display the metadata + to the rendered page using a template variable like <tmpl_var propertyname>

    • +

  • Meta tags
    + Since the meta data is exposed as template variables, you can use that in combination with the ^RawHeadTags(); + macro to create meta tags from meta data, including the tags from the Dublin Core standard.

    • |, context => q|Metadata help|, lastUpdated => 1110530955 diff --git a/lib/WebGUI/i18n/English/Asset_MultiSearch.pm b/lib/WebGUI/i18n/English/Asset_MultiSearch.pm index 0f5d7b06f..65f3a6ace 100644 --- a/lib/WebGUI/i18n/English/Asset_MultiSearch.pm +++ b/lib/WebGUI/i18n/English/Asset_MultiSearch.pm @@ -44,7 +44,8 @@ our $I18N = { 'multisearch template body' => { message => q|

    The MultiSearch template has all the template variables used by Wobjects, -as well as these: +as well as these:

    +

    search
    Internationalized label for the word "search"

    @@ -58,7 +59,7 @@ Submit button with internationalized label for "Submit".

    |, - lastUpdated => 1133619940, + lastUpdated => 1146784875, }, 'for' => { diff --git a/lib/WebGUI/i18n/English/Asset_Navigation.pm b/lib/WebGUI/i18n/English/Asset_Navigation.pm index 37e8206c1..b951824a7 100644 --- a/lib/WebGUI/i18n/English/Asset_Navigation.pm +++ b/lib/WebGUI/i18n/English/Asset_Navigation.pm @@ -184,10 +184,10 @@ all of the classes of pages that should be included:
    }, '31 description' => { - message => q|Should the menus include pages which are marked as Hidden? Similar to + message => q|

    Should the menus include pages which are marked as Hidden? Similar to System Pages, if you want certain groups to be able to see Hidden Pages, then select Yes and use the Navigation Template to determine who can see them in the menu.

    -

    NOTE: Any user in Admin mode will automatically be able to see all pages that they can edit regardless of whether they are hidden or the value of this property.|, +

    NOTE: Any user in Admin mode will automatically be able to see all pages that they can edit regardless of whether they are hidden or the value of this property.

    |, lastUpdated => 1121969610, }, @@ -205,7 +205,7 @@ vertical, horizontal and crumbtrail. These templates can often be styled via CS of rewriting the templates.

    The Navigation Asset can also be used to generate XML output by creating a template and setting the MIME Type appropriately. This could be useful for building -a Google sitemap of your site. +a Google sitemap of your site.

    |, lastUpdated => 1140139614, diff --git a/lib/WebGUI/i18n/English/Asset_Poll.pm b/lib/WebGUI/i18n/English/Asset_Poll.pm index 1b29ad81e..e447f73e8 100644 --- a/lib/WebGUI/i18n/English/Asset_Poll.pm +++ b/lib/WebGUI/i18n/English/Asset_Poll.pm @@ -2,71 +2,71 @@ package WebGUI::i18n::English::Asset_Poll; our $I18N = { '74' => { - message => q|The following variables are available to the poll template: -

    + message => q|

    The following variables are available to the poll template: +

    -canVote
    +

    canVote
    A condition indicating whether the user has the right to vote on this poll. -

    +

    -question
    +

    question
    The poll question. -

    +

    -form.start
    +

    form.start
    The beginning of the poll form. -

    +

    -answer_loop
    +

    answer_loop
    A loop containing information about the answers in the poll. -

    +

    -answer.form
    +

    answer.form
    The radio button for this answer. -

    +

    -answer.text
    +

    answer.text
    The text of the answer. -

    +

    -answer.number
    +

    answer.number
    The number of this answer. As in 1, 2, 3, etc. -

    +

    -answer.graphWidth
    +

    answer.graphWidth
    The width that the graph should be rendered for this answer. Based upon a percentage of the total graph size. -

    +

    -answer.percent
    +

    answer.percent
    The percentage of the vote that this answer has received. -

    +

    -answer.total
    +

    answer.total
    The total number of votes that this answer has received. -

    +

    -form.submit
    +

    form.submit
    The submit button for the poll form. -

    +

    -form.end
    +

    form.end
    The end of the poll form. -

    +

    -responses.label
    +

    responses.label
    The label for the total responses. "Total Votes" -

    +

    -responses.total
    +

    responses.total
    The total number of votes that have been placed on this poll. -

    +

    |, - lastUpdated => 1102115797, + lastUpdated => 1146785056, }, '6' => { diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm index 82dba2073..6d408ca79 100644 --- a/lib/WebGUI/i18n/English/Asset_Post.pm +++ b/lib/WebGUI/i18n/English/Asset_Post.pm @@ -7,153 +7,154 @@ our $I18N = { }, 'add/edit post template body' => { - message => q|In addition to the common Post Template variables, the Add/Edit Post Template has these variables: -

    -! : This variable is required for the Post to function correctly.

    + message => q|

    In addition to the common Post Template variables, the Add/Edit Post Template has these variables: +

    +! : This variable is required for the Post to function correctly. +

    -form.header !
    +

    form.header !
    Code required to start the form for the Post. -

    +

    -isNewPost
    +

    isNewPost
    A conditional that is true if the user is adding a new Post, as opposed to editing an existing Post. -

    +

    -isReply
    +

    isReply
    A conditional that is true if the user is replying to an existing Post. -

    +

    -reply.title
    +

    reply.title
    The title of the Post that is being replied to. -

    +

    -reply.synopsis
    +

    reply.synopsis
    The synopsis of the Post that is being replied to. -

    +

    -reply.content
    +

    reply.content
    The content of the Post that is being replied to. -

    +

    -reply.userDefinedN
    +

    reply.userDefinedN
    The contents of user defined fields for the Post that is being replied to, where N is from 1 to 5. -

    +

    -subscribe.form
    +

    subscribe.form
    A yes/no button to allow the user to subscribe to the thread this post belongs to. -

    +

    -isNewThread
    +

    isNewThread
    A conditional that is true if the user is adding a new thread. -

    +

    -sticky.form
    +

    sticky.form
    A yes/no button to set the thread to be sticky, so that it stays at the top of the forum listing. -

    +

    -lock.form
    +

    lock.form
    A yes/no button to lock the thread, so that no posts can be added or edited. -

    +

    -isThread
    +

    isThread
    A conditional that is true if the user is editing the main post for a thread, as opposed to a reply in the thread. -

    +

    -isEdit
    +

    isEdit
    A conditional that is true if the user is editing an existing post. -

    +

    -preview.title
    +

    preview.title
    The web safe title for previewing a post. -

    +

    -preview.synopsis
    +

    preview.synopsis
    The synopsis when previewing a post. -

    +

    -preview.content
    +

    preview.content
    The content when previewing a post. -

    +

    -preview.userDefinedN
    +

    preview.userDefinedN
    The contents of user defined fields for the Post without WebGUI Macros being processed, where N is from 1 to 5. -

    +

    -form.footer !
    +

    form.footer !
    Code for the end of the form. -

    +

    -usePreview !
    +

    usePreview !
    A conditional indicating that posts to the thread will be previewed before being submitted. -

    +

    -user.isModerator
    +

    user.isModerator
    A conditional indicating if the current user is a moderator. -

    +

    -user.isVisitor
    +

    user.isVisitor
    A conditional indicating if the current user is a visitor. -

    +

    -visitorName.form
    +

    visitorName.form
    A form where the user can enter their name, even if they are a visitor. -

    +

    -userDefinedN.{form,form.yesNo,form.textarea,form.htmlarea,form.float}
    +

    userDefinedN.{form,form.yesNo,form.textarea,form.htmlarea,form.float}
    For each of the 5 User Defined fields, which can be form widgets for a single line of text, a yes/no field, a text area, a WYSIWIG HTML area, or a float. -

    +

    -title.form
    +

    title.form
    A 1-line text form field to enter or edit the title, stripped of all HTML and macros disabled. Use this OR title.form.textarea. -

    +

    -title.form.textarea
    +

    title.form.textarea
    A text area field to enter or edit the title, stripped of all HTML and macros disabled. Use this OR title.form. -

    +

    -synopsis.form
    +

    synopsis.form
    A form field to enter or edit the synopsis. -

    +

    -content.form
    +

    content.form
    A field to enter or edit the content, with all macros disabled. If the discussion board allows rich content, then this will be a WYSIWIG HTML area. Otherwise it will be a plain text area. -

    +

    -form.submit
    +

    form.submit
    A button to submit the post. -

    +

    -karmaScale.form
    +

    karmaScale.form
    A form element that allows moderators to set the scale of an individual thread. This is only available for threads. -

    +

    -karmaIsEnabled
    +

    karmaIsEnabled
    A conditional that is true if karma has been enabled in the WebGUI settings in the Admin Console for this site. -

    +

    -form.preview
    +

    form.preview
    A button to preview the post. -

    +

    -attachment.form
    +

    attachment.form
    Code to allow an attachment to be added to the post. -

    +

    -contentType.form
    +

    contentType.form
    A form field that will describe how the content of the post is formatted, HTML, text, code or mixed. Defaults to mixed. -

    +

    |, - lastUpdated => 1146505625, + lastUpdated => 1146785107, }, 'post template variables title' => { @@ -162,225 +163,226 @@ Defaults to mixed. }, 'post template variables body' => { - message => q|The following variables are available in all Post templates. Internationalized labels + message => q|

    The following variables are available in all Post templates. Internationalized labels for the action URLs (reply, delete, etc.) are provided in the set of Collaboration Template labels. -

    +

    -userId
    +

    userId
    The User ID of the owner of the Post. -

    +

    -user.isPoster
    +

    user.isPoster
    A conditional that is true if the current user is the owner of this Post. -

    +

    -avatar.url
    +

    avatar.url
    A URL to the avatar for the owner of the Post, if avatars are enabled in the parent Collaboration System and the user has an avatar. -

    +

    -userProfile.url
    +

    userProfile.url
    A URL to the profile of the owner of the Post. -

    +

    -dateSubmitted.human
    +

    dateSubmitted.human
    The date that the post was sumbitted, in a readable format. -

    +

    -dateUpdated.human
    +

    dateUpdated.human
    The date that the post was last updated, in a readable format. -

    +

    -title.short
    +

    title.short
    The title of the Post, limited to 30 characters. -

    +

    -content
    +

    content
    The content of the post, if a thread containing the Post exists. -

    +

    -user.canEdit
    +

    user.canEdit
    A conditional that is true if the user is adding a new Post, as opposed to editing an existing Post, and a thread containing the Post exists. -

    +

    -delete.url
    +

    delete.url
    A URL to delete this Post. -

    +

    -edit.url
    +

    edit.url
    A URL to edit this Post. -

    +

    -status
    +

    status
    The status of this Post: "Approved", "Pending" or "Archived". -

    +

    -reply.url
    +

    reply.url
    The URL to reply to this Post without quoting it. -

    +

    -reply.withQuote.url
    +

    reply.withQuote.url
    The URL to initiate a quoted reply to this Post. -

    +

    -url
    +

    url
    The URL for this Post. -

    +

    -rating.value
    +

    rating.value
    The current rating for this Post. -

    +

    -rate.url.thumbsUp
    +

    rate.url.thumbsUp
    A positive rating. -

    +

    -rate.url.thumbsDown
    +

    rate.url.thumbsDown
    A negative rating. -

    +

    -hasRated
    +

    hasRated
    A conditional that is true if the user has already rated this Post. -

    +

    -image.url
    +

    image.url
    The URL to the first image attached to the Post. -

    +

    -image.thumbnail
    +

    image.thumbnail
    A thumbnail for the image attached to the Post. -

    +

    -attachment.url
    +

    attachment.url
    The URL to download the first attachment attached to the Post. -

    +

    -attachment.icon
    +

    attachment.icon
    An icon showing the file type of this attachment. -

    +

    -attachment.name
    +

    attachment.name
    The name of the first attachment found on the Post. -

    +

    -attachment_loop
    +

    attachment_loop
    A loop containing all file and image attachments to this Post. -

    +

    -url
    +

    url
    The URL to download this attachment. -

    +

    -icon
    +

    icon
    The icon representing the file type of this attachment. -

    +

    -filename
    +

    filename
    The name of this attachment. -

    +

    -thumbnail
    +

    thumbnail
    A thumbnail of this attachment, if applicable. -

    +

    -isImage
    +

    isImage
    A conditional indicating whether this attachment is an image. -

    +

    -storageId
    +

    storageId
    The Asset ID of the storage node for the Post, where the attachments are kept. -

    +

    -threadId
    +

    threadId
    The ID of the thread that contains this Post. -

    +

    -dateSubmitted
    +

    dateSubmitted
    The date the Post was submitted, in epoch format. -

    +

    -dateUpdated
    +

    dateUpdated
    The date the Post was last updated, in epoch format. -

    +

    -username
    +

    username
    The name of the user who last updated or submitted the Post. -

    +

    -rating
    +

    rating
    Another name for rating.value -

    +

    -views
    +

    views
    The number of times that this post has been viewed. -

    +

    -contentType
    +

    contentType
    The type of content in the post, typically "code", "text", "HTML", "mixed". -

    +

    -content
    +

    content
    The content, or body, of the Post. -

    +

    -title
    +

    title
    The title of the Post. -

    +

    -menuTitle
    +

    menuTitle
    The menu title of the Post, often used in navigation. -

    +

    -synopsis
    +

    synopsis
    The synopsis of the Post. -

    +

    -extraHeadTags
    +

    extraHeadTags
    Extra tags that the user requested by added to the HTML header. -

    +

    -groupIdEdit
    +

    groupIdEdit
    The ID of the group with permission to edit this Post. -

    +

    -groupIdView
    +

    groupIdView
    The ID of the group with permission to view this Post. -

    +

    -ownerUserId
    +

    ownerUserId
    An alias for userId. -

    +

    -assetSize
    +

    assetSize
    The formatted size of this Post. -

    +

    -isPackage
    +

    isPackage
    A conditional indicating whether this Post is a package. -

    +

    -isPrototype
    +

    isPrototype
    A conditional indicating whether this Post is a Content Prototype. -

    +

    -isHidden
    +

    isHidden
    A conditional indicating whether this Post should be hidden from navigation. -

    +

    -newWindow
    +

    newWindow
    A conditional indicating whether this Post should be opened in a new window. -

    +

    -userDefined1, userDefined2, userDefined3, userDefined4, userDefined5
    +

    userDefined1, userDefined2, userDefined3, userDefined4, userDefined5
    You can use up to 5 user defined fields. The fields are called "userDefined1" through "userDefined5". In the Post Form template you can use those variables like this to collect data: +

    <tmpl_var userDefined1.form> (text)
    @@ -395,13 +397,11 @@ this to collect data:
    -Then in the Thread and Main CS templates you can call -back the data with a simple <tmpl_var userDefined1>. - -

    +

    Then in the Thread and Main CS templates you can call +back the data with a simple <tmpl_var userDefined1>.

    |, - lastUpdated => 1146505453, + lastUpdated => 1146785175, }, 'post received' => { @@ -441,23 +441,23 @@ back the data with a simple <tmpl_var userDefined1>. }, 'notification template body' => { - message => q|In addition to the common Post Template variables, the Notification Template has these variables: -

    + message => q|

    In addition to the common Post Template variables, the Notification Template has these variables: +

    -All variables from the Post Template Variables. -

    +

    All variables from the Post Template Variables. +

    -url
    +

    url
    The URL to the post that triggered the notification. -

    +

    -notification.subscription.message
    +

    notification.subscription.message
    Internationalized message that a new message has been posted to a thread that the user subscribed to. -

    +

    |, - lastUpdated => 1146505593, + lastUpdated => 1146785190, }, '875' => { diff --git a/lib/WebGUI/i18n/English/Asset_Product.pm b/lib/WebGUI/i18n/English/Asset_Product.pm index 6d75a01b3..382b9b948 100644 --- a/lib/WebGUI/i18n/English/Asset_Product.pm +++ b/lib/WebGUI/i18n/English/Asset_Product.pm @@ -22,200 +22,206 @@ our $I18N = { }, '63' => { - message => q|The following is the list of template variables available in product templates. -

    + message => q|

    The following is the list of template variables available in product templates. +

    -brochure.icon
    +

    brochure.icon
    The URL to the icon for the brochure. -

    +

    -brochure.url
    +

    brochure.url
    The URL to download the brochure. -

    +

    -brochure.label
    +

    brochure.label
    The translated label for the brochure URL. -

    +

    -manual.icon
    +

    manual.icon
    The URL to the icon for the manual. -

    +

    -manual.url
    +

    manual.url
    The URL to download the manual. -

    +

    -manual.label
    +

    manual.label
    The translated label for the manual URL. -

    +

    -warranty.icon
    +

    warranty.icon
    The URL to the icon for the warranty. -

    +

    -warranty.url
    +

    warranty.url
    The URL to download the warranty. -

    +

    -warranty.label
    +

    warranty.label
    The label for the warranty URL. -

    +

    -image1
    +

    image1
    The URL to the first image uploaded to this product. -

    +

    -thumbnail1
    +

    thumbnail1
    The URL to the thumbnail of the first image uploaded to this product. -

    +

    -image2
    +

    image2
    The URL to the second image uploaded to this product. -

    +

    -thumbnail2
    +

    thumbnail2
    The URL to the thumbnail of the second image uploaded to this product. -

    +

    -image3
    +

    image3
    The URL to the third image uploaded to this product. -

    +

    -thumbnail3
    +

    thumbnail3
    The URL to the thumbnail of the third image uploaded to this product. -

    +

    -addfeature.url
    +

    addfeature.url
    The URL to add a feature to this product. -

    +

    -addfeature.label
    +

    addfeature.label
    The translated label for the add feature link. -

    +

    -feature_loop
    +

    feature_loop
    This loop contains all of the features associated with this product. +

    +
    -feature.controls
    + +

    feature.controls
    The WebGUI management controls for this feature. -

    +

    -feature.feature
    +

    feature.feature
    The text of the feature itself. -

    -

    -

    +

    -addbenefit.url
    + + +

    addbenefit.url
    The URL to add a benefit to this product. -

    +

    -addbenefit.label
    +

    addbenefit.label
    The translated label for the add benefit link. -

    +

    -benefit_loop
    +

    benefit_loop
    This loop contains the benefits for this product. +

    +
    -benefit.benefit
    +

    benefit.benefit
    The benefit text itself. -

    +

    -benefit.controls
    +

    benefit.controls
    The WebGUI management controls for this benefit. -

    +

    -

    -addspecification.url
    +

    addspecification.url
    The URL to add a specification to this product. -

    +

    -addspecification.label
    +

    addspecification.label
    The translated label for the add specification link. -

    +

    -specification_loop
    +
    specification_loop
    The list of specifications associated with this product. -
    +
    -specification.controls
    +

    specification.controls
    The WebGUI management controls for this specification. -

    +

    -specification.specification
    +

    specification.specification
    The text of the specification itself. -

    +

    -specification.units
    +

    specification.units
    The units for this specification. ex: meters -

    +

    -specification.label
    +

    specification.label
    The label for this specification. ex: height -

    +

    -

    -addaccessory.url
    +

    addaccessory.url
    The URL to add an accessory to this product. -

    +

    -addaccessory.label
    +

    addaccessory.label
    The translated label for the add accessory link. -

    +

    -accessory_loop
    +

    accessory_loop
    This loop contains all of the accessories associated with this product. +

    +
    -accessory.url
    +

    accessory.url
    The URL to the linked accessory. -

    +

    -accessory.title
    +

    accessory.title
    The title of the linked accessory. -

    +

    -accessory.controls
    +

    accessory.controls
    The WebGUI management controls for this accessory. -

    +

    -

    -addRelatedProduct.url
    +

    addRelatedProduct.url
    The URL to add a related product to this product. -

    +

    -addRelatedProduct.label
    +

    addRelatedProduct.label
    The translated label for the add related product link. -

    +

    -relatedproduct.loop
    +

    relatedproduct.loop
    This loop contains all of the products related to this product. -

    +

    -relatedproduct.url
    + +

    relatedproduct.url
    The URL to the related product. -

    +

    -relatedproduct.title
    +

    relatedproduct.title
    The title of the related product. -

    +

    -relatedproduct.controls
    +

    relatedproduct.controls
    The WebGUI management controls for this related product. -

    +

    +
    |, - lastUpdated => 1102661764, + lastUpdated => 1146785294, }, '21' => { diff --git a/lib/WebGUI/i18n/English/Asset_SQLForm.pm b/lib/WebGUI/i18n/English/Asset_SQLForm.pm index a8be4c997..d7180600a 100644 --- a/lib/WebGUI/i18n/English/Asset_SQLForm.pm +++ b/lib/WebGUI/i18n/English/Asset_SQLForm.pm @@ -1001,7 +1001,7 @@ of perl-style regular expressions can be found here. To ensure data integrity, regular expressions can only be deleted if they're not is use by any SQLForm in the system. Please note this also includes SQLForm that are in the trash and not -have been purged yet.|, +have been purged yet.

    |, lastUpdated => 0, }, diff --git a/lib/WebGUI/i18n/English/Asset_SQLReport.pm b/lib/WebGUI/i18n/English/Asset_SQLReport.pm index aa906d9ab..be3b6df7f 100644 --- a/lib/WebGUI/i18n/English/Asset_SQLReport.pm +++ b/lib/WebGUI/i18n/English/Asset_SQLReport.pm @@ -17,13 +17,14 @@ our $I18N = { }, '71' => { - message => q|SQL Reports are perhaps the most powerful wobject in the WebGUI arsenal. They allow a user to query data from any database that they have access to. This is great for getting sales figures from your Accounting database or even summarizing all the message boards on your web site. + message => q|

    SQL Reports are perhaps the most powerful wobject in the WebGUI arsenal. They allow a user to query data from any database that they have access to. This is great for getting sales figures from your Accounting database or even summarizing all the message boards on your web site.

    Nested query support
    The SQL Report wobject supports up to 5 nested queries (1 base query and 4 subqueries). Each subsequent query is executed for each row in the previous query results. For example, if you have two queries: query1 and query2, then query2 will be executed once for each row returned in query1. You can use placeholder parameters to compose subqueries with data from prior queries. +

    SQL Reports are Wobjects and Assets, so they share the properties of both. SQL Reports also have these unique properties: -

    |, - lastUpdated => 1119841674, +

    |, + lastUpdated => 1146785522, }, '72 description' => { @@ -47,16 +48,16 @@ There are four input types:
  • Query results
    Query results begin with "query1:" through "query4:". Query results are populated with data from prior queries. So when the second query is initiated, it can used the results returned by query1. When query 5 is initiated it can use the results from queries 1 through 4.
  • String
    Anything else is a string

    • -

    Example: +

    Example:

    -Query: select * from some_table where some_field = ? and some_other_field < ?
    -Placeholder Parameters: query1:pageId
    form:field1 +

    Query: select * from some_table where some_field = ? and some_other_field < ?
    +Placeholder Parameters: query1:pageId
    form:field1

    -In this example the first question mark will contain the field value of pageId in query1, +

    In this example the first question mark will contain the field value of pageId in query1, while the second question mark will contain the form variable "field1".

    Place one Placeholder Parameter on each line.

    |, - lastUpdated => 1140308175, + lastUpdated => 1146785541, }, '15 description' => { @@ -73,8 +74,8 @@ while the second question mark will contain the form variable "field1".

    }, '14 description' => { - message => q|How many rows should be displayed before splitting the results into separate pages? In other words, how many rows should be displayed per page? -

    |, + message => q|

    How many rows should be displayed before splitting the results into separate pages? In other words, how many rows should be displayed per page? +

    |, lastUpdated => 1119841649, }, @@ -133,144 +134,150 @@ while the second question mark will contain the form variable "field1".

    }, '73' => { - message => q|The following variables are made available in SQL Reports: -

    + message => q|

    The following variables are made available in SQL Reports: +

    -columns_loop
    +

    columns_loop
    A loop containing information about each column. -

    +

    +
    -column.number
    +

    column.number
    An integer starting with 1 and counting through the number of columns. -

    +

    -column.name
    +

    column.name
    The name of this column as returned by the query. -

    +

    -rows.count
    +

    rows.count
    The total number of rows returned by the query. -

    +

    -rows.count.isZero
    +

    rows.count.isZero
    A boolean indicating that the query returned zero rows. -

    +

    -rows.count.isZero.label
    +

    rows.count.isZero.label
    The default label for rows.count.isZero. -

    +

    -rows_loop
    +

    rows_loop
    A loop containing the data returned from the query. -

    +

    +
    -row.number
    +

    row.number
    An integer starting with 1 and counting through the total list of rows. -

    +

    -row.field.NAME.value
    +

    row.field.NAME.value
    The data for a given field in this row where NAME is the name of the field as it is returned by the query. -

    +

    -row.field_loop
    +

    row.field_loop
    A loop containing all of the fields for this row. -

    +

    +
    -field.number
    +

    field.number
    An integer starting with 1 and counting through the number of fields in this row. This is the same as column.number in the column_loop. -

    +

    -field.name
    +

    field.name
    The name of the field as it is returned by the query. -

    +

    -field.value
    +

    field.value
    The data in this field. -

    +

    -hasNest
    +

    hasNest
    A boolean indicating whether query2 has returned any results. -

    +

    -Any subqueries will have exactly the same format as the loops +

    Any subqueries will have exactly the same format as the loops and variables above, but will be prefixed with queryN where N -goes from 2 to 5.

    +goes from 2 to 5.

    -queryN.columns_loop
    +

    queryN.columns_loop
    A loop containing information about each column for queryN. -

    +

    +
    -column.number
    +

    column.number
    An integer starting with 1 and counting through the number of columns. -

    +

    -column.name
    +

    column.name
    The name of this column as returned by the query. -

    +

    +
    -queryN.rows.count
    +

    queryN.rows.count
    The total number of rows returned by queryN. -

    +

    -queryN.count.isZero
    +

    queryN.count.isZero
    A boolean indicating that queryN returned zero rows. -

    +

    -queryN.rows.count.isZero.label
    +

    queryN.rows.count.isZero.label
    The default label for rows.count.isZero. -

    +

    -queryN.rows_loop
    +
    queryN.rows_loop
    A loop containing the data returned from queryN. -

    -
    +

    +

    -queryN.row.number
    +

    queryN.row.number
    An integer starting with 1 and counting through the total list of rows. -

    +

    queryN.row.field.NAME.value
    The data for a given field in this row where NAME is the name of the field as it is returned by the query. -

    +

    -queryN.row.field_loop
    +

    queryN.row.field_loop
    A loop containing all of the fields for this row. -

    +

    +
    -field.number
    +

    field.number
    An integer starting with 1 and counting through the number of fields in this row. This is the same as column.number in the column_loop. -

    +

    -field.name
    +

    field.name
    The name of the field as it is returned by the query. -

    +

    -field.value
    +

    field.value
    The data in this field. -

    +

    -queryN.hasNest
    +

    queryN.hasNest
    A boolean indicating whether the queryN+1 has returned any results. This variable will always be false for query5. -

    +

    |, - lastUpdated => 1110004844, + lastUpdated => 1146785660, }, '16' => { diff --git a/lib/WebGUI/i18n/English/Asset_Shortcut.pm b/lib/WebGUI/i18n/English/Asset_Shortcut.pm index 95a358277..9bf584368 100644 --- a/lib/WebGUI/i18n/English/Asset_Shortcut.pm +++ b/lib/WebGUI/i18n/English/Asset_Shortcut.pm @@ -62,7 +62,7 @@ The shortcut is not available through the Add Content menu, but instead through

    Overrides
    You can also create overrides and user preferences. The 6.8 upgrade automatically converted your previous override settings to overrides. These are shown on the Overrides tab. You can also view them by clicking "Manage overrides" on the right menu bar while editing a Shortcut. The list of fields is the list of the shortcutted asset's properties. If one is overridden, its values are displayed to the right, and you may edit or delete the override by clicking on the icons. if there is no override, you can click Edit to edit that property.

    User Preference Fields
    -You may also create User Preference fields, which autogenerate form fields for your users to customize settings on Dashlets on a Dashboard. These are displayed when the dashboard user clicks the (default) green Edit hoverbutton on the titlebar of a Dashlet. You can choose from the form field types: text, textlist (multiline text box), selectList (choose one from a drop-down list), and checkList (choose one or more from a list of checkboxes). You can set the possibleValues while editing a User Preference field. You can also directly create an override by creating a User Preference field whose unique fieldName corresponds to a field on the shortcutted asset. +You may also create User Preference fields, which autogenerate form fields for your users to customize settings on Dashlets on a Dashboard. These are displayed when the dashboard user clicks the (default) green Edit hoverbutton on the titlebar of a Dashlet. You can choose from the form field types: text, textlist (multiline text box), selectList (choose one from a drop-down list), and checkList (choose one or more from a list of checkboxes). You can set the possibleValues while editing a User Preference field. You can also directly create an override by creating a User Preference field whose unique fieldName corresponds to a field on the shortcutted asset.

    Chaining
    In an override's New Value field, you can put a substitution call for the value of a User Preference Field. This is helpful for the Dashboard container, primarily. Let's say you create a user preference selectList field named myFavColor, with possible values blue, green, red, and yellow. Then you want to override the shorcutted asset's Title with: "My Favorite Color is XXXX." You create an override for "title", and in the New Value box, place the following text:

    My Favorite Color is ##userPref:myFavColor##.

    Make sure to create a default Value under the myFavColor user preference field.

    diff --git a/lib/WebGUI/i18n/English/Asset_StockData.pm b/lib/WebGUI/i18n/English/Asset_StockData.pm index ec22e6b8a..858eff73e 100644 --- a/lib/WebGUI/i18n/English/Asset_StockData.pm +++ b/lib/WebGUI/i18n/English/Asset_StockData.pm @@ -104,7 +104,7 @@ our $I18N = { }, 'help_add_edit_stocklist_body' => { - message => q|

    Stock Lists allow users to track stocks on your site. Data is retrieved from various sources on the internet and displayed in tabluar format. This application allows any registered user to configure stock lists as well as to set a default stock list for visitors or for users who have not configured one themselves

    |, + message => q|

    Stock Lists allow users to track stocks on your site. Data is retrieved from various sources on the internet and displayed in tabluar format. This application allows any registered user to configure stock lists as well as to set a default stock list for visitors or for users who have not configured one themselves

    |, lastUpdated => 1119066571, }, @@ -155,186 +155,192 @@ our $I18N = { 'help_stock_list_template_description' => { message => q|

    The following describes the list of available template variables for building StockList templates

    - extrasFolder
    - The url to the extras folder containing css files and images used by the Stock List application -

    - editUrl
    - The url to the page where users can customize stocks -

    - isVisitor
    - Whether or not the current user is a visitor. This returns true if the users is authenticated against the system -

    +

    extrasFolder
    +The url to the extras folder containing css files and images used by the Stock List application +

    - stock.display.url
    - General url to the page that displays details for individual stocks. A stock symbol must be added to the end of this url -

    +

    editUrl
    +The url to the page where users can customize stocks +

    - lastUpdate.default
    - default date and time format for the date and time stocks were updated by the returning sources -

    +

    isVisitor
    +Whether or not the current user is a visitor. This returns true if the users is authenticated against the system +

    - lastUpdate.intl
    - international date and time format for the date and time stocks were updated by the returning sources -

    +

    stock.display.url
    +General url to the page that displays details for individual stocks. A stock symbol must be added to the end of this url +

    - lastUpdate.us
    - US date and time format for the date and time stocks were updated by the returning sources -

    +

    lastUpdate.default
    +default date and time format for the date and time stocks were updated by the returning sources +

    - stocks.loop
    - Loop containing all default or personalized stocks -

    +

    lastUpdate.intl
    +international date and time format for the date and time stocks were updated by the returning sources +

    -
    stocks.symbol
    -
    Stock Symbol -

    +

    lastUpdate.us
    +US date and time format for the date and time stocks were updated by the returning sources +

    -
    stocks.name
    -
    Company or Mutual Fund Name -

    +

    stocks.loop
    +Loop containing all default or personalized stocks +

    -
    stocks.last
    -
    Last Price -

    +

    -
    stocks.high
    -
    Highest trade today -

    +

    stocks.symbol
    +Stock Symbol +

    -
    stocks.low
    -
    Lowest trade today -

    +

    stocks.name
    +Company or Mutual Fund Name +

    -
    stocks.date
    -
    Last Trade Date (MM/DD/YY format) -

    +

    stocks.last
    +Last Price +

    -
    stocks.time
    -
    Last Trade Time -

    +

    stocks.high
    +Highest trade today +

    -
    stocks.net
    -
    Net Change -

    +

    stocks.low
    +Lowest trade today +

    -
    stocks.net.isDown
    -
    Net Change is negative -

    +

    stocks.date
    +Last Trade Date (MM/DD/YY format) +

    -
    stocks.net.isUp
    -
    Net Change is positive -

    +

    stocks.time
    +Last Trade Time +

    -
    stocks.net.noChange
    -
    Net Change is zero -

    +

    stocks.net
    +Net Change +

    -
    stocks.net.icon
    -
    Icon associated with net change (up, down, even) -

    +

    stocks.net.isDown
    +Net Change is negative +

    -
    stocks.p_change
    -
    Percent Change from previous day's close -

    +

    stocks.net.isUp
    +Net Change is positive +

    -
    stocks.volume
    -
    Day's Volume -

    +

    stocks.net.noChange
    +Net Change is zero +

    -
    stocks.volume.millions
    -
    Day's Volume In Millions -

    +

    stocks.net.icon
    +Icon associated with net change (up, down, even) +

    -
    stocks.avg_vol
    -
    Average Daily Vol -

    +

    stocks.p_change
    +Percent Change from previous day's close +

    -
    stocks.bid
    -
    Bid -

    +

    stocks.volume
    +Day's Volume +

    -
    stocks.ask
    -
    Ask -

    +

    stocks.volume.millions
    +Day's Volume In Millions +

    -
    stocks.close
    -
    Previous Close -

    +

    stocks.avg_vol
    +Average Daily Vol +

    -
    stocks.open
    -
    Today's Open -

    +

    stocks.bid
    +Bid +

    -
    stocks.day_range
    -
    Day's Range -

    +

    stocks.ask
    +Ask +

    -
    stocks.year_range
    -
    52-Week Range -

    +

    stocks.close
    +Previous Close +

    -
    stocks.year_high
    -
    52-Week High -

    +

    stocks.open
    +Today's Open +

    -
    stocks.year_low
    -
    52-Week Low -

    +

    stocks.day_range
    +Day's Range +

    -
    stocks.eps
    -
    Earnings per Share -

    +

    stocks.year_range
    +52-Week Range +

    -
    stocks.pe
    -
    P/E Ratio -

    +

    stocks.year_high
    +52-Week High +

    -
    stocks.div_date
    -
    Dividend Pay Date -

    +

    stocks.year_low
    +52-Week Low +

    -
    stocks.div
    -
    Dividend per Share -

    +

    stocks.eps
    +Earnings per Share +

    -
    stocks.div_yield
    -
    Dividend Yield -

    +

    stocks.pe
    +P/E Ratio +

    -
    stocks.cap
    -
    Market Capitalization -

    +

    stocks.div_date
    +Dividend Pay Date +

    -
    stocks.ex_div
    -
    Ex-Dividend Date. -

    +

    stocks.div
    +Dividend per Share +

    -
    stocks.nav
    -
    Net Asset Value -

    +

    stocks.div_yield
    +Dividend Yield +

    -
    stocks.yield
    -
    Yield (usually 30 day avg) -

    +

    stocks.cap
    +Market Capitalization +

    -
    stocks.exchange
    -
    The exchange the information was obtained from. -

    +

    stocks.ex_div
    +Ex-Dividend Date. +

    -
    stocks.success
    -
    Did the stock successfully return information? (true/false) -

    +

    stocks.nav
    +Net Asset Value +

    -
    stocks.errormsg
    -
    If success is false, this field may contain the reason why. -

    +

    stocks.yield
    +Yield (usually 30 day avg) +

    -
    stocks.method
    -
    The module (as could be passed to fetch) which found this information. -

    +

    stocks.exchange
    +The exchange the information was obtained from. +

    + +

    stocks.success
    +Did the stock successfully return information? (true/false) +

    + +

    stocks.errormsg
    +If success is false, this field may contain the reason why. +

    + +

    stocks.method
    +The module (as could be passed to fetch) which found this information. +

    + +
    |, - lastUpdated => 1119066250 + lastUpdated => 1146785833 }, 'help_stock_list_display_template' => { @@ -344,167 +350,169 @@ our $I18N = { 'help_stock_list_display_template_description' => { message => q|

    The following describes the list of available template variables for building StockList templates

    - extrasFolder
    - The url to the extras folder containing css files and images used by the Stock List application -

    - lastUpdate.intl
    - international date and time format for the date and time stocks were updated by the returning sources -

    +

    extrasFolder
    +The url to the extras folder containing css files and images used by the Stock List application +

    - lastUpdate.us
    - US date and time format for the date and time stocks were updated by the returning sources -

    +

    lastUpdate.intl
    +international date and time format for the date and time stocks were updated by the returning sources +

    - stocks.symbol
    - Stock Symbol -

    +

    lastUpdate.us
    +US date and time format for the date and time stocks were updated by the returning sources +

    - stocks.name
    - Company or Mutual Fund Name -

    +

    stocks.symbol
    +Stock Symbol +

    - stocks.last
    - Last Price -

    +

    stocks.name
    +Company or Mutual Fund Name +

    - stocks.high
    - Highest trade today -

    +

    stocks.last
    +Last Price +

    - stocks.low
    - Lowest trade today -

    +

    stocks.high
    +Highest trade today +

    - stocks.date
    - Last Trade Date (MM/DD/YY format) -

    +

    stocks.low
    +Lowest trade today +

    - stocks.time
    - Last Trade Time -

    +

    stocks.date
    +Last Trade Date (MM/DD/YY format) +

    - stocks.net
    - Net Change -

    +

    stocks.time
    +Last Trade Time +

    - stocks.net.isDown
    - Net Change is negative -

    +

    stocks.net
    +Net Change +

    - stocks.net.isUp
    - Net Change is positive -

    +

    stocks.net.isDown
    +Net Change is negative +

    - stocks.net.noChange
    - Net Change is zero -

    +

    stocks.net.isUp
    +Net Change is positive +

    - stocks.net.icon
    - Icon associated with net change (up, down, even) -

    +

    stocks.net.noChange
    +Net Change is zero +

    - stocks.p_change
    - Percent Change from previous day's close -

    +

    stocks.net.icon
    +Icon associated with net change (up, down, even) +

    - stocks.volume
    - Day's Volume -

    +

    stocks.p_change
    +Percent Change from previous day's close +

    - stocks.volume.millions
    - Day's Volume In Millions -

    +

    stocks.volume
    +Day's Volume +

    - stocks.avg_vol
    - Average Daily Vol -

    +

    stocks.volume.millions
    +Day's Volume In Millions +

    - stocks.bid
    - Bid -

    +

    stocks.avg_vol
    +Average Daily Vol +

    - stocks.ask
    - Ask -

    +

    stocks.bid
    +Bid +

    - stocks.close
    - Previous Close -

    +

    stocks.ask
    +Ask +

    - stocks.open
    - Today's Open -

    +

    stocks.close
    +Previous Close +

    - stocks.day_range
    - Day's Range -

    +

    stocks.open
    +Today's Open +

    - stocks.year_range
    - 52-Week Range -

    +

    stocks.day_range
    +Day's Range +

    - stocks.year_high
    - 52-Week High -

    +

    stocks.year_range
    +52-Week Range +

    - stocks.year_low
    - 52-Week Low -

    +

    stocks.year_high
    +52-Week High +

    - stocks.eps
    - Earnings per Share -

    +

    stocks.year_low
    +52-Week Low +

    - stocks.pe
    - P/E Ratio -

    +

    stocks.eps
    +Earnings per Share +

    - stocks.div_date
    - Dividend Pay Date -

    +

    stocks.pe
    +P/E Ratio +

    - stocks.div
    - Dividend per Share -

    +

    stocks.div_date
    +Dividend Pay Date +

    - stocks.div_yield
    - Dividend Yield -

    +

    stocks.div
    +Dividend per Share +

    - stocks.cap
    - Market Capitalization -

    +

    stocks.div_yield
    +Dividend Yield +

    - stocks.ex_div
    - Ex-Dividend Date. -

    +

    stocks.cap
    +Market Capitalization +

    - stocks.nav
    - Net Asset Value -

    +

    stocks.ex_div
    +Ex-Dividend Date. +

    - stocks.yield
    - Yield (usually 30 day avg) -

    +

    stocks.nav
    +Net Asset Value +

    - stocks.exchange
    - The exchange the information was obtained from. -

    +

    stocks.yield
    +Yield (usually 30 day avg) +

    - stocks.success
    - Did the stock successfully return information? (true/false) -

    +

    stocks.exchange
    +The exchange the information was obtained from. +

    - stocks.errormsg
    - If success is false, this field may contain the reason why. -

    +

    stocks.success
    +Did the stock successfully return information? (true/false) +

    + +

    stocks.errormsg
    +If success is false, this field may contain the reason why. +

    + +

    stocks.method
    +The module (as could be passed to fetch) which found this information. +

    - stocks.method
    - The module (as could be passed to fetch) which found this information. -

    |, - lastUpdated => 1119066250 + lastUpdated => 1146786317 }, };