From: PeterThoeny Date: Sun, 25 Apr 2004 07:15:24 +0000 (+0000) Subject: none X-Git-Url: https://git.openafs.org/?p=openafs-wiki.git;a=commitdiff_plain;h=8f37aa8ebd71c4aa9d52836eaecd0a0997217154 none --- diff --git a/TWiki/TWikiForms.mdwn b/TWiki/TWikiForms.mdwn index 657ca0e..8e3db39 100644 --- a/TWiki/TWikiForms.mdwn +++ b/TWiki/TWikiForms.mdwn @@ -43,13 +43,56 @@ A Form Template is simply a page containing your form, defined as a table where - **form** - a topic containing additional meta data (besides the freeform TEXTAREA) that categorizes the content (replaces _category table_) - Within a form-enabled web, individual topics can have a form or no form - **form field** - a named item in a form (replaces _category item name_) -- **field type** - selects the INPUT type: - - **select** - drop-down menu or scrollable box - - **checkbox** - one or more checkboxes - - **checkbox+buttons** - one or more checkboxes, plus **Set** and **Clear** buttons - - **radio** - one or more radio buttons - - **text** - a one-line text field - - **textarea** - a text box; size is 40x10 (columns x rows) +- **field type** - selects the INPUT type: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Input type Type field Size field Value field
One or more checkboxes checkbox number of checkboxes per line comma list of checkbox labels
One or more checkboxes, plus Set and Clear buttons checkbox+buttons (same) (same)
Read-only label text label1 (unused)
One or more radio buttons radio number of radio buttons per line comma list of checkbox labels
Drop-down menu or scrollable box label1 for drop down, 2 and up for scrollable box comma list of options
A one-line text field text text box width in number of characters (unused)
A text box; size is 40x10 (columns x rows) textarea columns x rows, e.g. 40x6 (unused)
- **field value** - one or more values from a fixed set (select, checkbox, radio type) or free-form (text). (replaces _category item value_) ### Defining a Form in One Topic @@ -245,4 +288,4 @@ The new Form Template system should work with old Category Table data with no sp %T% **NOTE:** If things aren't working correctly, there may be useful entries in `data/warning.txt`. --- [[JohnTalintyre]] - 16 Aug 2001
-- [[MikeMannix]] - 05 Jan 2002 +-- TWiki:Main.JohnTalintyre - 16 Aug 2001 %BR% -- TWiki:Main.MikeMannix - 05 Jan 2002 %BR% -- TWiki:Main.PeterThoeny - 25 Apr 2004 diff --git a/TWiki/TWikiTemplates.mdwn b/TWiki/TWikiTemplates.mdwn index b41060d..7ee12f6 100644 --- a/TWiki/TWikiTemplates.mdwn +++ b/TWiki/TWikiTemplates.mdwn @@ -165,8 +165,16 @@ The following variables get expanded when a user creates a new topic based on a > Current date, e.g. 29 Jun 2010 > > +> %USERNAME% +> Login name, e.g. jsmith +> +> +> %WIKINAME% +> [[Main/WikiName]] of user, e.g. JohnSmith +> +> > %WIKIUSERNAME% -> User name, e.g. Main.admin +> User name, e.g. Main.JohnSmith > > > %URLPARAM{"name"}% @@ -349,4 +357,4 @@ With URL: **.../bin/oops/Sandbox/TestTopic2?template=oopstest&param1=W - A drawback of referring to a master template is that you can only test a template from within TWiki, where the include variables are resolved. In the previous system, each template was a structurally complete HTML document with a `.tmpl` filename extension - it contained unresolved `%VARIABLES%`, but could still be previewed directly in a browser. --- TWiki:Main.PeterThoeny - 30 Dec 2004 %BR% -- TWiki:Main.MikeMannix - 14 Sep 2001 %BR% -- TWiki:Main.DavidLeBlanc - 11 Mar 2002 +-- TWiki:Main.PeterThoeny - 25 Apr 2004 %BR% -- TWiki:Main.MikeMannix - 14 Sep 2001 %BR% -- TWiki:Main.DavidLeBlanc - 11 Mar 2002 diff --git a/TWiki/TWikiUserAuthentication.mdwn b/TWiki/TWikiUserAuthentication.mdwn index dc98e3f..7c8afa5 100644 --- a/TWiki/TWikiUserAuthentication.mdwn +++ b/TWiki/TWikiUserAuthentication.mdwn @@ -62,7 +62,7 @@ This section applies only if your TWiki site is installed on a server that is bo TWiki can automatically map an Intranet (Login) Username to a TWiki Username, provided that the username pair exists in the [[TWikiUsers]] topic. This is also handled automatically when you register. -- %X% In the original TWiki distribution, in **twiki/data**, there are two registration form topics, [[TWikiRegistration]] and [[TWikiRegistrationPub]]. The original form includes an intranet Login Username field. For Basic Authentication, the original form is replaced by the Pub version. If you started using TWiki on Basic Authentication and want to change, you have to switch back forms for future use, and manually correct the existing entries, by editing [[TWikiUsers]], adding the Login Username for each member - `PeterThoeny - pthoeny - 01 Jan 1999` - and also in the **.htpasswd** file, where you can either replace the [[WikiNames]] or duplicate the entries and have both, so both usernames will work. **_verification and clearer rewrite to follow in a bit. also link to original installation mention._** +- %X% In the original TWiki distribution, in **twiki/data**, there are two registration form topics, [[TWikiRegistration]] and [[TWikiRegistrationPub]]. The original form includes an intranet Login Username field. For Basic Authentication, the original form is replaced by the Pub version. If you started using TWiki on Basic Authentication and want to change, you have to switch back forms for future use, and manually correct the existing entries, by editing [[TWikiUsers]], adding the Login Username for each member - `PeterThoeny - pthoeny - 01 Jan 1999` - and also in the **.htpasswd** file, where you can either replace the [[WikiNames]] or duplicate the entries and have both, so both usernames will work. > **_NOTE:_** > @@ -98,4 +98,4 @@ Change and reset passwords using forms on regular pages. Use [[TWikiAccessContro > --- [[MikeMannix]] - 19 May 2002 +-- [[MikeMannix]] - 19 May 2002 %BR% -- [[PeterThoeny]] - 25 Apr 2004 diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn index c85ca89..aa2625f 100644 --- a/TWiki/TextFormattingRules.mdwn +++ b/TWiki/TextFormattingRules.mdwn @@ -159,16 +159,68 @@ class CatAnimal { - Ordered List: %BR% Three spaces, a number, and another space. + Ordered List: %BR% Three spaces, a number, a dot, and another space. Several types are available besides a number: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Type Generated Style Sample Sequence
1. Arabic numerals 1, 2, 3, 4...
A. Uppercase letters A, B, C, D...
a. Lowercase letters a, b, c, d...
I. Uppercase Roman Numerals I, II, III, IV...
i. Lowercase Roman Numerals i, ii, iii, iv...
+

+

+ 
-	1 Sushi
-	1 Dim Sum
+	1. Sushi
+	1. Dim Sum
+
+	A. Sushi
+	A. Dim Sum
+
+	i. Sushi
+	i. Dim Sum
  1. Sushi
  2. Dim Sum
+

+

+
    +
  1. Sushi
    2. +
  2. Dim Sum
    3. +
+

+

+
    +
  1. Sushi
    2. +
  2. Dim Sum
    3. +
@@ -252,8 +304,12 @@ Know.ReadmeFirst [[wiki syntax]] [[Main.TWiki users]] + +escaped: +![[wiki syntax]] [[Main/WikiSyntax]]

[[Main/TWikiUsers]]

+

escaped: [[wiki syntax]]

@@ -330,7 +386,7 @@ You can use just about any HTML tag without a problem - however, there are a few ### TWiki and JavaScript -You can use JavaScript for your TWiki applications. Sice TWiki rendering might interfere with JavaScript code you need to escape it with HTML comments and `
` tags:
+You can use JavaScript for your TWiki applications. Since TWiki rendering might interfere with JavaScript code you need to escape it with HTML comments and `
` tags: