# HG changeset patch
# User paulb
# Date 1128366850 0
# Node ID 59f3d312ba79184aeb21fa487987715213d8c711
# Parent  289b43b22023f56c9b093afa40af8eddd4cc62b4
[project @ 2005-10-03 19:14:05 by paulb]
Converted the template to use "macro" attributes.

diff -r 289b43b22023 -r 59f3d312ba79 examples/Common/PEP241/Resources/pep241_template.xhtml
--- a/examples/Common/PEP241/Resources/pep241_template.xhtml	Mon Oct 03 19:13:51 2005 +0000
+++ b/examples/Common/PEP241/Resources/pep241_template.xhtml	Mon Oct 03 19:14:10 2005 +0000
@@ -22,23 +22,19 @@
       </tr>
       <tr>
         <th>Package name</th>
-        <td template:attribute="name"><input type="text" size="20"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td><input type="text" size="20" template:attribute-field="name" name="..." value="..." /></td>
       </tr>
       <tr>
         <th>Package version</th>
-        <td template:attribute="version"><input type="text" size="10"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td><input type="text" size="10" template:attribute-field="version" name="..." value="..." /></td>
       </tr>
       <tr>
         <th>Summary</th>
-        <td template:attribute="summary"><input type="text" size="20"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td><input type="text" size="20" template:attribute-field="summary" name="..." value="..." /></td>
       </tr>
       <tr>
         <th>Description</th>
-        <td template:attribute="description"><textarea cols="80" rows="5"
-          name="{template:this-attribute()}">
+        <td><textarea cols="80" rows="5" template:attribute-area="description" name="...">
           <span template:value="$this-value" template:effect="replace">Insert
           longer description here!</span></textarea></td>
       </tr>
@@ -49,13 +45,11 @@
       </tr>
       <tr>
         <th>Home page</th>
-        <td template:attribute="home-page"><input type="text" size="80"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td><input type="text" size="80" template:attribute-field="home-page" name="..." value="..." /></td>
       </tr>
       <tr>
         <th>Licence</th>
-        <td template:attribute="licence"><input type="text" size="20"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td><input type="text" size="20" template:attribute-field="licence" name="..." value="..." /></td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Categories</th>
@@ -63,9 +57,8 @@
       <tr template:element="categories">
         <th>Categories</th>
         <td>
-          <select template:element="category" name="{template:list-attribute('category-enum', 'value')}" multiple="multiple">
-            <option template:element="category-enum" template:expr-attr="selected" template:expr="@value-is-set" template:value="@value"
-            value="{@value}"></option>
+          <select template:multiple-choice-list-field="category,category-enum,value" multiple="multiple">
+            <option template:multiple-choice-list-value="category-enum,value,selected" value="..."></option>
           </select>
         </td>
       </tr>
@@ -74,31 +67,27 @@
       </tr>
       <tr template:element="platforms,platform">
         <th>Platform name</th>
-        <td><span template:attribute="name"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></span> 
-          <input type="submit" value="Remove!"
-          name="remove_platform={template:this-element()}" /></td>
+        <td><input template:attribute-field="name" name="..." value="..." type="text" size="20" />
+          <input type="submit" value="Remove!" name="..." template:selector-field="remove_platform" /></td>
       </tr>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add platform!"
-          name="add_platform={template:this-element()}" /></td>
+          <input type="submit" value="Add platform!" name="..." template:selector-field="add_platform,platform" /></td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Supported platforms</th>
       </tr>
       <tr template:element="supported-platforms,supported-platform">
         <th>Platform name</th>
-        <td><span template:attribute="name"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></span> 
-          <input type="submit" value="Remove!"
-          name="remove_supported_platform={template:this-element()}"
+        <td><input template:attribute-field="name" name="..." value="..." type="text" size="20" />
+          <input type="submit" value="Remove!" name="..." template:selector-field="remove_supported_platform"
           /></td>
       </tr>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add platform!"
-          name="add_supported_platform={template:this-element()}"
+          <input type="submit" value="Add platform!" name="..." template:selector-field="add_supported_platform,supported-platform"
         /></td>
       </tr>
       <tr>
@@ -106,15 +95,13 @@
       </tr>
       <tr template:element="keywords,keyword">
         <th>Keyword</th>
-        <td><span template:attribute="name"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></span> 
-          <input type="submit" value="Remove!"
-          name="remove_keyword={template:this-element()}" /></td>
+        <td><input template:attribute-field="name" name="..." value="..." type="text" size="20" />
+          <input type="submit" value="Remove!" template:selector-field="remove_keyword" name="..." /></td>
       </tr>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add keyword!"
-          name="add_keyword={template:this-element()}" /></td>
+          <input type="submit" value="Add keyword!" name="..." template:selector-field="add_keyword" /></td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Authors</th>
@@ -123,25 +110,23 @@
     <tbody template:element="authors,author">
       <tr>
         <th>Author name</th>
-        <td><span template:attribute="name"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></span>
-          <input type="submit" value="Remove!"
-          name="remove_author={template:this-element()}" /></td>
+        <td><input template:attribute-field="name" name="..." value="..." type="text" size="20" />
+          <input type="submit" value="Remove!" name="..." template:selector-field="remove_author" /></td>
       </tr>
       <tr>
         <th>Author contact</th>
-        <td template:attribute="contact"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></td>
+        <td><input template:attribute-field="contact" name="..." value="..." type="text" size="20" /></td>
       </tr>
       <tr>
         <th>Author e-mail</th>
-        <td template:attribute="e-mail"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></td>
+        <td><input template:attribute-field="e-mail" name="..." value="..." type="text" size="20" /></td>
       </tr>
     </tbody>
     <tbody>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add author!"
-          name="add_author={template:this-element()}" /></td>
+          <input type="submit" value="Add author!" name="..." template:selector-field="add_author,author" /></td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Dependencies</th>
@@ -150,21 +135,19 @@
     <tbody template:element="dependencies,dependency">
       <tr>
         <th>Package name</th>
-        <td><span template:attribute="name"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="20" /></span> 
-          <input type="submit" value="Remove!"
-          name="remove_dependency={template:this-element()}" /></td>
+        <td><input template:attribute-field="name" name="..." value="..." type="text" size="20" />
+          <input type="submit" value="Remove!" name="..." template:selector-field="remove_dependency" /></td>
       </tr>
       <tr>
         <th>Package version</th>
-        <td template:attribute="version"><input name="{template:this-attribute()}" value="{$this-value}" type="text" size="10" /></td>
+        <td><input template:attribute-field="version" name="..." value="..." type="text" size="10" /></td>
       </tr>
     </tbody>
     <tbody>
       <tr>
         <th></th>
         <td>
-          <input type="submit" value="Add dependency!"
-          name="add_dependency={template:this-element()}" /></td>
+          <input type="submit" value="Add dependency!" name="..." template:selector-field="add_dependency,dependency" /></td>
       </tr>
       <tr>
         <th colspan="2" class="heading">Actions</th>
diff -r 289b43b22023 -r 59f3d312ba79 examples/Common/Questionnaire/Resources/question_template.xhtml
--- a/examples/Common/Questionnaire/Resources/question_template.xhtml	Mon Oct 03 19:13:51 2005 +0000
+++ b/examples/Common/Questionnaire/Resources/question_template.xhtml	Mon Oct 03 19:14:10 2005 +0000
@@ -21,45 +21,43 @@
     <tbody template:element="question">
       <tr>
         <th class="question">Question</th>
-        <td class="question" template:attribute="question-text"><textarea cols="40" rows="4"
-          name="{template:this-attribute()}" template:value="$this-value">Question</textarea></td>
+        <td class="question"><textarea cols="40" rows="4" template:attribute-area="question-text,insert"
+          name="...">Question</textarea></td>
         <td class="question-options">
-          <input type="submit" value="Remove question" name="remove-question={template:this-element()}"
+          <input type="submit" value="Remove question" name="..." template:selector-field="remove-question"
           /></td>
       </tr>
       <tr>
         <th class="response">Response</th>
-        <td class="response" template:attribute="question-type"><input type="radio"
-          name="{template:this-attribute()}" value="text" template:expr-attr="checked"
-          template:expr="$this-value = 'text'" /> Text</td>
+        <td class="response"><input type="radio" template:attribute-button="question-type,text,checked"
+          name="..." value="..." /> Text</td>
         <td></td>
       </tr>
       <tr>
         <td class="response"></td>
-        <td class="response" template:attribute="response-text"><input type="text" size="40"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td class="response"><input type="text" size="40" template:attribute-field="response-text"
+          name="..." value="..." /></td>
         <td></td>
       </tr>
       <tr>
         <td class="response"></td>
-        <td class="response" template:attribute="question-type"><input type="radio"
-          name="{template:this-attribute()}" value="choice" template:expr-attr="checked"
-          template:expr="$this-value = 'choice'" /> Multiple choice</td>
+        <td class="response"><input type="radio" template:attribute-button="question-type,choice,checked"
+          name="..." value="choice" /> Multiple choice</td>
         <td></td>
       </tr>
       <tr template:element="choice">
         <td class="response"></td>
-        <td class="choice" template:attribute="response-choice"><input type="text" size="40"
-          name="{template:this-attribute()}" value="{$this-value}" /></td>
+        <td class="choice"><input type="text" size="40" template:attribute-field="response-choice"
+          name="..." value="..." /></td>
         <td class="choice-options">
-          <input type="submit" value="Remove choice" name="remove-choice={template:this-element()}"
+          <input type="submit" value="Remove choice" name="..." template:selector-field="remove-choice"
         /></td>
       </tr>
       <tr>
         <td class="response"></td>
         <td class="response"></td>
         <td class="response">
-          <input type="submit" value="Add choice" name="add-choice={template:this-element()}"
+          <input type="submit" value="Add choice" name="..." template:selector-field="add-choice,choice"
         /></td>
       </tr>
     </tbody>