From 3807af315cc33fa4527aeed647a6f8c53447687d Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 1 May 2006 17:42:18 +0000 Subject: [PATCH] Move the template code for title.form.textarea right next to title.form so that it's obvious that they're the same variable, and both shouldn't be used. Updated docs and fixed
tags to be XHTML compliant. --- lib/WebGUI/Asset/Post.pm | 8 +- lib/WebGUI/i18n/English/Asset_Post.pm | 154 +++++++++++++------------- 2 files changed, 83 insertions(+), 79 deletions(-) diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index c624a845e..b9462341b 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -1012,14 +1012,14 @@ sub www_edit { name=>"title", value=>$title }); - $var{'synopsis.form'} = WebGUI::Form::textarea($self->session, { - name=>"synopsis", - value=>WebGUI::HTML::filter($self->getValue("synopsis"),"all") - }); $var{'title.form.textarea'} = WebGUI::Form::textarea($self->session, { name=>"title", value=>$title }); + $var{'synopsis.form'} = WebGUI::Form::textarea($self->session, { + name=>"synopsis", + value=>WebGUI::HTML::filter($self->getValue("synopsis"),"all") + }); $var{'content.form'} = WebGUI::Form::HTMLArea($self->session, { name=>"content", value=>$content, diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm index 95b441df5..f8a932ad6 100644 --- a/lib/WebGUI/i18n/English/Asset_Post.pm +++ b/lib/WebGUI/i18n/English/Asset_Post.pm @@ -66,10 +66,6 @@ a reply in the thread. A conditional that is true if the user is editing an existing post.

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

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

@@ -103,20 +99,22 @@ A conditional indicating if the current user is a visitor.

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

-userDefinedN.{form,form.yesNo,form.textarea,form.htmlarea}
+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, or a WYSIWIG HTML area. +field, a text area, a WYSIWIG HTML area, or a float.

title.form
-A form field to enter or edit the title, stripped of all HTML and macros disabled. +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
-A text field to enter or edit the title, stripped of all HTML and macros disabled. +A text area field to enter or edit the title, stripped of all HTML and macros disabled. +Use this OR title.form.

synopsis.form
@@ -133,6 +131,14 @@ will be a plain text area. A button to submit the post.

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

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

+ form.preview
A button to preview the post.

@@ -147,7 +153,7 @@ Defaults to mixed.

|, - lastUpdated => 1134670945, + lastUpdated => 1146505217, }, 'post template variables title' => { @@ -160,234 +166,232 @@ Defaults to mixed. 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.

-userProfile.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
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

-

-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. - -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".

-userDefinedN
-The contents of the user defined properties, from 1 to 5. -

- -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)
+<tmpl_var userDefined1.form> (text)
-<tmpl_var userDefined1.form.yesNo> (yes / no)
+<tmpl_var userDefined1.form.yesNo> (yes / no)
-<tmpl_var userDefined1.form.textarea> (textarea)
+<tmpl_var userDefined1.form.textarea> (textarea)
-<tmpl_var userDefined1.form.htmlarea> (rich edit box)
+<tmpl_var userDefined1.form.htmlarea> (rich edit box)
+ +<tmpl_var userDefined1.form.float> (float field)
@@ -397,7 +401,7 @@ back the data with a simple <tmpl_var userDefined1>.

|, - lastUpdated => 1145111051, + lastUpdated => 1146505453, }, 'post received' => {