1.1 --- a/examples/Common/Configurator/Resources/config_template.xhtml Mon Oct 03 19:11:12 2005 +0000
1.2 +++ b/examples/Common/Configurator/Resources/config_template.xhtml Mon Oct 03 19:12:41 2005 +0000
1.3 @@ -19,8 +19,8 @@
1.4 <div template:element="details" class="details">
1.5 <h2>Base System</h2>
1.6
1.7 - <p template:element="base-system">Model
1.8 - <select template:attribute="value" name="{template:this-attribute()}"
1.9 + <p>Model
1.10 + <select template:multiple-choice-field="base-system,value" name="..."
1.11 onchange="
1.12 requestUpdate('cpu', '{template:this-attribute()}',
1.13 '{template:other-elements(../cpu)}', '{template:other-attributes('value', ../cpu)}',
1.14 @@ -31,17 +31,15 @@
1.15 requestUpdate('hard-disks', '{template:this-attribute()}',
1.16 '{template:other-elements(../../hard-disks)}',
1.17 '{template:other-attributes('value', ../../hard-disks/hard-disk)}', '/configuration/hard-disks')">
1.18 - <option template:element="base-system-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.19 - value="{@value}"></option>
1.20 + <option template:multiple-choice-value="base-system-enum,value,selected" value="..."></option>
1.21 </select>
1.22 </p>
1.23
1.24 <h2>Processor</h2>
1.25
1.26 <p template:element="cpu" template:id="cpu-node" id="{template:this-element()}">CPU
1.27 - <select template:attribute="value" name="{template:this-attribute()}">
1.28 - <option template:element="cpu-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.29 - value="{@value}"></option>
1.30 + <select template:multiple-choice-field="-,value" name="...">
1.31 + <option template:multiple-choice-value="cpu-enum,value,selected" value="..."></option>
1.32 </select>
1.33 </p>
1.34 </div>
1.35 @@ -51,18 +49,15 @@
1.36
1.37 <div template:id="memory-node" id="{template:this-element()}">
1.38 <p template:element="memory-unit">Memory unit
1.39 - <select template:attribute="value" name="{template:this-attribute()}">
1.40 - <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.41 - value="{@value}"></option>
1.42 + <select template:multiple-choice-field="-,value" name="...">
1.43 + <option template:multiple-choice-value="memory-unit-enum,value,selected" value="..."></option>
1.44 </select>
1.45
1.46 - <input type="submit" value="Remove"
1.47 - name="remove-memory-unit={template:this-element()}" />
1.48 + <input type="submit" value="Remove" name="..." template:selector-field="remove-memory-unit" />
1.49 </p>
1.50
1.51 <p>
1.52 - <input type="submit" value="Add memory"
1.53 - name="add-memory-unit={template:this-element()}" />
1.54 + <input type="submit" value="Add memory" name="..." template:selector-field="add-memory-unit,memory-unit" />
1.55 </p>
1.56 </div>
1.57 </div>
1.58 @@ -73,18 +68,15 @@
1.59
1.60 <div template:id="hard-disks-node" id="{template:this-element()}">
1.61 <p template:element="hard-disk">Hard disk drive
1.62 - <select template:attribute="value" name="{template:this-attribute()}">
1.63 - <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.64 - value="{@value}"></option>
1.65 + <select template:multiple-choice-field="-,value" name="...">
1.66 + <option template:multiple-choice-value="hard-disk-enum,value,selected" value="..."></option>
1.67 </select>
1.68
1.69 - <input type="submit" value="Remove"
1.70 - name="remove-hard-disk={template:this-element()}" />
1.71 + <input type="submit" value="Remove" name="..." template:selector-field="remove-hard-disk" />
1.72 </p>
1.73
1.74 <p>
1.75 - <input type="submit" value="Add hard disk"
1.76 - name="add-hard-disk={template:this-element()}" />
1.77 + <input type="submit" value="Add hard disk" name="..." template:selector-field="add-hard-disk,hard-disk" />
1.78 </p>
1.79 </div>
1.80 </div>
1.81 @@ -93,28 +85,24 @@
1.82 <h2>Additional Storage</h2>
1.83
1.84 <p template:element="storage-unit">Storage unit
1.85 - <select template:attribute="value" name="{template:this-attribute()}"
1.86 + <select template:multiple-choice-field="-,value" name="..."
1.87 onchange="requestUpdate('accessories', '{template:other-attributes('value', ../storage-unit)}', '{template:other-elements(../../accessories)}', '{template:other-list-attributes('accessory-enum', 'value', ../../accessories)}', '/configuration/accessories')">
1.88
1.89 - <option template:element="storage-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.90 - value="{@value}"></option>
1.91 + <option template:multiple-choice-value="storage-unit-enum,value,selected" value="..."></option>
1.92 </select>
1.93
1.94 - <input type="submit" value="Remove"
1.95 - name="remove-storage-unit={template:this-element()}" />
1.96 + <input type="submit" value="Remove" name="..." template:selector-field="remove-storage-unit" />
1.97 </p>
1.98
1.99 <p>
1.100 - <input type="submit" value="Add storage"
1.101 - name="add-storage-unit={template:this-element()}" /></p>
1.102 + <input type="submit" value="Add storage" name="..." template:selector-field="add-storage-unit,storage-unit" /></p>
1.103 </div>
1.104
1.105 <div template:element="accessories" template:id="accessories-node" id="{template:this-element()}" class="accessories">
1.106 <h2>Accessories</h2>
1.107
1.108 - <select name="{template:list-attribute('accessory-enum', 'value')}" multiple="multiple">
1.109 - <option template:element="accessory-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.110 - value="{@value}"></option>
1.111 + <select name="..." template:multiple-choice-list-field="-,accessory-enum,value" multiple="multiple">
1.112 + <option template:multiple-choice-list-value="accessory-enum,value,selected" value="..."></option>
1.113 </select>
1.114 </div>
1.115 </div>
1.116 @@ -123,25 +111,22 @@
1.117 <h2>Input Devices</h2>
1.118
1.119 <p template:element="keyboard">Keyboard
1.120 - <select template:attribute="value" name="{template:this-attribute()}">
1.121 - <option template:element="keyboard-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.122 - value="{@value}"></option>
1.123 + <select template:multiple-choice-field="-,value" name="...">
1.124 + <option template:multiple-choice-value="keyboard-enum,value,selected" value="..."></option>
1.125 </select>
1.126 </p>
1.127
1.128 <p template:element="mouse">Mouse
1.129 - <select template:attribute="value" name="{template:this-attribute()}">
1.130 - <option template:element="mouse-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.131 - value="{@value}"></option>
1.132 + <select template:multiple-choice-field="-,value" name="...">
1.133 + <option template:multiple-choice-value="mouse-enum,value,selected" value="..."></option>
1.134 </select>
1.135 </p>
1.136
1.137 <h2>Display</h2>
1.138
1.139 <p template:element="screen">Screen
1.140 - <select template:attribute="value" name="{template:this-attribute()}">
1.141 - <option template:element="screen-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
1.142 - value="{@value}"></option>
1.143 + <select template:multiple-choice-field="-,value" name="...">
1.144 + <option template:multiple-choice-value="screen-enum,value,selected" value="..."></option>
1.145 </select>
1.146 </p>
1.147 </div>
1.148 @@ -150,7 +135,7 @@
1.149 <h2>Price</h2>
1.150
1.151 <p>Total for this configuration:
1.152 - <span template:value="sum(/configuration//*[@value-is-set]/@price)"></span></p>
1.153 + <span template:value="sum(/configuration//*[@value-is-set]/@price) + sum(/configuration//*[@value = ../@value]/@price)"></span></p>
1.154
1.155 <p>
1.156 <input type="submit" value="Update!" name="update" />