# HG changeset patch
# User paulb
# Date 1128366761 0
# Node ID 7fbddded81b85e0351fbe894335e6d9d87c44b79
# Parent  59fdbcae2113c4671e18e8f8760d5cd0d00d1f79
[project @ 2005-10-03 19:12:41 by paulb]
Converted the template to use "macro" attributes.
Switched to using input/initialiser stylesheets, restricting additional
transformations to those filtering the choices in the output.
Split up the old "database" document into separate enumeration-related
documents.
Renamed the example document (from config_input.xml to config_example.xml).
Introduced the config_filter.xsl stylesheet to perform the filtering.

diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_accessories.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_accessories.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<accessories>
+  <accessory-enum value="(Not selected)" price="0"/>
+  <accessory-enum value="DVD+R 10 pack" price="100" storage="DVD+-RW 8x"/>
+  <accessory-enum value="DVD+RW 10 pack" price="200" storage="DVD+-RW 8x"/>
+  <accessory-enum value="CD-RW 10 pack" price="50" storage="CD-RW 48x/24x/48x"/>
+</accessories>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_base_system.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_base_system.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<base-system>
+  <base-system-enum value="(Not selected)" price="0"/>
+  <base-system-enum value="Shuttle SB61G2V3" price="2174" cpu-socket="478" interface="SATA-150"/>
+  <base-system-enum value="Shuttle SS56GV3" price="2000" cpu-socket="478" interface="ATA-133"/>
+  <base-system-enum value="Shuttle ST62K" price="2000" cpu-socket="478" interface="ATA-100"/>
+  <base-system-enum value="Soltek Qbic EQ3901" price="2500" cpu-socket="939" interface="SATA-150"/>
+</base-system>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_cpu.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_cpu.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<cpu>
+  <cpu-enum value="(Not selected)" price="0"/>
+  <cpu-enum value="Pentium 4 3.0 GHz" price="1650" cpu-socket="478"/>
+  <cpu-enum value="Athlon 3000+" price="1500" cpu-socket="A"/>
+  <cpu-enum value="Athlon 64 3500+" price="2300" cpu-socket="939"/>
+</cpu>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_database.xml
--- a/examples/Common/Configurator/Resources/config_database.xml	Mon Oct 03 19:11:12 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<database>
-  <base-system>
-    <base-system-enum value="(Not selected)" price="0"/>
-    <base-system-enum value="Shuttle SB61G2V3" price="2174" cpu-socket="478" interface="SATA-150"/>
-    <base-system-enum value="Shuttle SS56GV3" price="2000" cpu-socket="478" interface="ATA-133"/>
-    <base-system-enum value="Shuttle ST62K" price="2000" cpu-socket="478" interface="ATA-100"/>
-    <base-system-enum value="Soltek Qbic EQ3901" price="2500" cpu-socket="939" interface="SATA-150"/>
-  </base-system>
-  <cpu>
-    <cpu-enum value="(Not selected)" price="0"/>
-    <cpu-enum value="Pentium 4 3.0 GHz" price="1650" cpu-socket="478"/>
-    <cpu-enum value="Athlon 3000+" price="1500" cpu-socket="A"/>
-    <cpu-enum value="Athlon 64 3500+" price="2300" cpu-socket="939"/>
-  </cpu>
-  <memory-unit>
-    <memory-unit-enum value="(Not selected)" price="0"/>
-    <memory-unit-enum value="PC3200 DDR RAM 256MB" price="500"/>
-    <memory-unit-enum value="PC3200 DDR RAM 512MB" price="800"/>
-  </memory-unit>
-  <storage-unit>
-    <storage-unit-enum value="(Not selected)" price="0"/>
-    <storage-unit-enum value="CD-ROM 48x" price="200"/>
-    <storage-unit-enum value="CD-RW 48x/24x/48x" price="400"/>
-    <storage-unit-enum value="DVD+-RW 8x" price="750"/>
-  </storage-unit>
-  <hard-disk>
-    <hard-disk-enum value="(Not selected)" price="0"/>
-    <hard-disk-enum value="SATA-150 80GB" price="700" interface="SATA-150"/>
-    <hard-disk-enum value="SATA-150 160GB" price="1200" interface="SATA-150"/>
-    <hard-disk-enum value="ATA-133 80GB" price="600" interface="ATA-133"/>
-    <hard-disk-enum value="ATA-133 160GB" price="1000" interface="ATA-133"/>
-    <hard-disk-enum value="ATA-100 80GB" price="500" interface="ATA-100"/>
-    <hard-disk-enum value="ATA-100 160GB" price="800" interface="ATA-100"/>
-  </hard-disk>
-  <keyboard>
-    <keyboard-enum value="(Not selected)" price="0"/>
-  </keyboard>
-  <mouse>
-    <mouse-enum value="(Not selected)" price="0"/>
-  </mouse>
-  <screen>
-    <screen-enum value="(Not selected)" price="0"/>
-  </screen>
-  <accessories>
-    <accessory-enum value="(Not selected)" price="0"/>
-    <accessory-enum value="DVD+R 10 pack" price="100" storage="DVD+-RW 8x"/>
-    <accessory-enum value="DVD+RW 10 pack" price="200" storage="DVD+-RW 8x"/>
-    <accessory-enum value="CD-RW 10 pack" price="50" storage="CD-RW 48x/24x/48x"/>
-  </accessories>
-</database>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_database.xsl
--- a/examples/Common/Configurator/Resources/config_database.xsl	Mon Oct 03 19:11:12 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:param name="database"/>
-
-  <xsl:template match="configuration">
-    <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-      <!-- Find out some additional information. -->
-      <xsl:variable name="cpu-socket" select="$database/database/base-system/base-system-enum[@value = current()/details/base-system/@value]/@cpu-socket"/>
-      <xsl:variable name="interface" select="$database/database/base-system/base-system-enum[@value = current()/details/base-system/@value]/@interface"/>
-      <!-- Complete all multiple choice fields. -->
-      <details>
-        <base-system>
-          <xsl:variable name="value" select="details/base-system/@value"/>
-          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-          <xsl:for-each select="$database/database/base-system/base-system-enum">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="@value = $value">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:for-each>
-        </base-system>
-        <cpu>
-          <xsl:variable name="value" select="details/cpu/@value"/>
-          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-          <xsl:for-each select="$database/database/cpu/cpu-enum[@cpu-socket = $cpu-socket or not(@cpu-socket)]">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="@value = $value">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:for-each>
-        </cpu>
-      </details>
-      <memory>
-        <xsl:for-each select="memory/memory-unit">
-          <xsl:copy>
-            <xsl:variable name="value" select="@value"/>
-            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-            <xsl:for-each select="$database/database/memory-unit/memory-unit-enum">
-              <xsl:copy>
-                <xsl:apply-templates select="@*"/>
-                <xsl:if test="@value = $value">
-                  <xsl:attribute name="value-is-set">true</xsl:attribute>
-                </xsl:if>
-              </xsl:copy>
-            </xsl:for-each>
-          </xsl:copy>
-        </xsl:for-each>
-      </memory>
-      <hard-disks>
-        <xsl:for-each select="hard-disks/hard-disk">
-          <xsl:copy>
-            <xsl:variable name="value" select="@value"/>
-            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-            <xsl:for-each select="$database/database/hard-disk/hard-disk-enum[@interface = $interface or not(@interface)]">
-              <xsl:copy>
-                <xsl:apply-templates select="@*"/>
-                <xsl:if test="@value = $value">
-                  <xsl:attribute name="value-is-set">true</xsl:attribute>
-                </xsl:if>
-              </xsl:copy>
-            </xsl:for-each>
-          </xsl:copy>
-        </xsl:for-each>
-      </hard-disks>
-      <storage>
-        <xsl:for-each select="storage/storage-unit">
-          <xsl:copy>
-            <xsl:variable name="value" select="@value"/>
-            <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-            <xsl:for-each select="$database/database/storage-unit/storage-unit-enum">
-              <xsl:copy>
-                <xsl:apply-templates select="@*"/>
-                <xsl:if test="@value = $value">
-                  <xsl:attribute name="value-is-set">true</xsl:attribute>
-                </xsl:if>
-              </xsl:copy>
-            </xsl:for-each>
-          </xsl:copy>
-        </xsl:for-each>
-      </storage>
-      <accessories>
-        <xsl:variable name="values" select="accessories/accessory-enum/@value"/>
-        <xsl:variable name="storage-values" select="storage/storage-unit/@value"/>
-        <xsl:for-each select="$database/database/accessories/accessory-enum">
-          <xsl:if test="$storage-values[string() = current()/@storage] or not(@storage)">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="$values[string() = current()/@value]">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:if>
-        </xsl:for-each>
-      </accessories>
-      <peripherals>
-        <keyboard>
-          <xsl:variable name="value" select="peripherals/keyboard/@value"/>
-          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-          <xsl:for-each select="$database/database/keyboard/keyboard-enum">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="@value = $value">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:for-each>
-        </keyboard>
-        <mouse>
-          <xsl:variable name="value" select="peripherals/mouse/@value"/>
-          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-          <xsl:for-each select="$database/database/mouse/mouse-enum">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="@value = $value">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:for-each>
-        </mouse>
-        <screen>
-          <xsl:variable name="value" select="peripherals/screen/@value"/>
-          <xsl:attribute name="value"><xsl:value-of select="$value"/></xsl:attribute>
-          <xsl:for-each select="$database/database/screen/screen-enum">
-            <xsl:copy>
-              <xsl:apply-templates select="@*"/>
-              <xsl:if test="@value = $value">
-                <xsl:attribute name="value-is-set">true</xsl:attribute>
-              </xsl:if>
-            </xsl:copy>
-          </xsl:for-each>
-        </screen>
-      </peripherals>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- Replicate unknown elements. -->
-
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_example.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_example.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<configuration>
+  <details>
+    <base-system value="Shuttle SB65G2"/>
+    <cpu value="Pentium 4 3.0 GHz"/>
+  </details>
+  <memory>
+    <memory-unit value="PC3200 DDR RAM 512MB"/>
+    <memory-unit value="PC3200 DDR RAM 256MB"/>
+  </memory>
+</configuration>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_filter.xsl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_filter.xsl	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+  <!-- Find out some additional information. -->
+
+  <xsl:variable name="cpu-socket" select="configuration/details/base-system/base-system-enum[@value = ../@value]/@cpu-socket"/>
+  <xsl:variable name="interface" select="configuration/details/base-system/base-system-enum[@value = ../@value]/@interface"/>
+  <xsl:variable name="storage" select="configuration/storage/storage-unit/@value"/>
+
+
+
+  <!-- Descend into the document, including only relevant elements. -->
+
+  <xsl:template match="cpu-enum">
+    <xsl:if test="@cpu-socket = $cpu-socket or not(@cpu-socket)">
+      <cpu-enum>
+        <xsl:apply-templates select="@*"/>
+        <xsl:apply-templates select="*"/>
+      </cpu-enum>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="hard-disk-enum">
+    <xsl:if test="@interface = $interface or not(@interface)">
+      <hard-disk-enum>
+        <xsl:apply-templates select="@*"/>
+        <xsl:apply-templates select="*"/>
+      </hard-disk-enum>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="accessory-enum">
+    <xsl:if test="$storage[string() = current()/@storage] or not(@storage)">
+      <accessory-enum>
+        <xsl:apply-templates select="@*"/>
+        <xsl:apply-templates select="*"/>
+      </accessory-enum>
+    </xsl:if>
+  </xsl:template>
+
+
+
+  <!-- Replicate unknown elements. -->
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_hard_disk.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_hard_disk.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<hard-disk>
+  <hard-disk-enum value="(Not selected)" price="0"/>
+  <hard-disk-enum value="SATA-150 80GB" price="700" interface="SATA-150"/>
+  <hard-disk-enum value="SATA-150 160GB" price="1200" interface="SATA-150"/>
+  <hard-disk-enum value="ATA-133 80GB" price="600" interface="ATA-133"/>
+  <hard-disk-enum value="ATA-133 160GB" price="1000" interface="ATA-133"/>
+  <hard-disk-enum value="ATA-100 80GB" price="500" interface="ATA-100"/>
+  <hard-disk-enum value="ATA-100 160GB" price="800" interface="ATA-100"/>
+</hard-disk>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_input.xml
--- a/examples/Common/Configurator/Resources/config_input.xml	Mon Oct 03 19:11:12 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <details>
-    <base-system value="Shuttle SB65G2"/>
-    <cpu value="Pentium 4 3.0 GHz"/>
-  </details>
-  <memory>
-    <memory-unit value="PC3200 DDR RAM 512MB"/>
-    <memory-unit value="PC3200 DDR RAM 256MB"/>
-  </memory>
-</configuration>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_keyboard.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_keyboard.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<keyboard>
+  <keyboard-enum value="(Not selected)" price="0"/>
+  <keyboard-enum value="PS/2 Danish" price="50"/>
+  <keyboard-enum value="PS/2 Norwegian" price="50"/>
+  <keyboard-enum value="PS/2 Swedish" price="50"/>
+  <keyboard-enum value="PS/2 United Kingdom" price="50"/>
+</keyboard>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_memory_unit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_memory_unit.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<memory-unit>
+  <memory-unit-enum value="(Not selected)" price="0"/>
+  <memory-unit-enum value="PC3200 DDR RAM 256MB" price="500"/>
+  <memory-unit-enum value="PC3200 DDR RAM 512MB" price="800"/>
+</memory-unit>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_mouse.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_mouse.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<mouse>
+  <mouse-enum value="(Not selected)" price="0"/>
+  <mouse-enum value="2 button PS/2" price="70"/>
+  <mouse-enum value="3 button PS/2" price="80"/>
+</mouse>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_screen.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_screen.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<screen>
+  <screen-enum value="(Not selected)" price="0"/>
+  <screen-enum value="17 inch LCD" price="2000"/>
+  <screen-enum value="19 inch LCD" price="3000"/>
+</screen>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_storage_unit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/Common/Configurator/Resources/config_storage_unit.xml	Mon Oct 03 19:12:41 2005 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<storage-unit>
+  <storage-unit-enum value="(Not selected)" price="0"/>
+  <storage-unit-enum value="CD-ROM 48x" price="200"/>
+  <storage-unit-enum value="CD-RW 48x/24x/48x" price="400"/>
+  <storage-unit-enum value="DVD+-RW 8x" price="750"/>
+</storage-unit>
diff -r 59fdbcae2113 -r 7fbddded81b8 examples/Common/Configurator/Resources/config_template.xhtml
--- a/examples/Common/Configurator/Resources/config_template.xhtml	Mon Oct 03 19:11:12 2005 +0000
+++ b/examples/Common/Configurator/Resources/config_template.xhtml	Mon Oct 03 19:12:41 2005 +0000
@@ -19,8 +19,8 @@
   <div template:element="details" class="details">
     <h2>Base System</h2>
 
-    <p template:element="base-system">Model 
-      <select template:attribute="value" name="{template:this-attribute()}"
+    <p>Model 
+      <select template:multiple-choice-field="base-system,value" name="..."
         onchange="
           requestUpdate('cpu', '{template:this-attribute()}',
             '{template:other-elements(../cpu)}', '{template:other-attributes('value', ../cpu)}',
@@ -31,17 +31,15 @@
           requestUpdate('hard-disks', '{template:this-attribute()}',
             '{template:other-elements(../../hard-disks)}',
             '{template:other-attributes('value', ../../hard-disks/hard-disk)}', '/configuration/hard-disks')">
-        <option template:element="base-system-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+        <option template:multiple-choice-value="base-system-enum,value,selected" value="..."></option>
       </select>
     </p>
 
     <h2>Processor</h2>
 
     <p template:element="cpu" template:id="cpu-node" id="{template:this-element()}">CPU 
-      <select template:attribute="value" name="{template:this-attribute()}">
-        <option template:element="cpu-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+      <select template:multiple-choice-field="-,value" name="...">
+        <option template:multiple-choice-value="cpu-enum,value,selected" value="..."></option>
       </select>
     </p>
   </div>
@@ -51,18 +49,15 @@
 
     <div template:id="memory-node" id="{template:this-element()}">
       <p template:element="memory-unit">Memory unit 
-        <select template:attribute="value" name="{template:this-attribute()}">
-          <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-          value="{@value}"></option>
+        <select template:multiple-choice-field="-,value" name="...">
+          <option template:multiple-choice-value="memory-unit-enum,value,selected" value="..."></option>
         </select>
    
-        <input type="submit" value="Remove"
-        name="remove-memory-unit={template:this-element()}" />
+        <input type="submit" value="Remove" name="..." template:selector-field="remove-memory-unit" />
       </p>
 
       <p>
-        <input type="submit" value="Add memory"
-        name="add-memory-unit={template:this-element()}" />
+        <input type="submit" value="Add memory" name="..." template:selector-field="add-memory-unit,memory-unit" />
       </p>
     </div>
   </div>
@@ -73,18 +68,15 @@
 
     <div template:id="hard-disks-node" id="{template:this-element()}">
       <p template:element="hard-disk">Hard disk drive 
-        <select template:attribute="value" name="{template:this-attribute()}">
-          <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-          value="{@value}"></option>
+        <select template:multiple-choice-field="-,value" name="...">
+          <option template:multiple-choice-value="hard-disk-enum,value,selected" value="..."></option>
         </select>
    
-        <input type="submit" value="Remove"
-        name="remove-hard-disk={template:this-element()}" />
+        <input type="submit" value="Remove" name="..." template:selector-field="remove-hard-disk" />
       </p>
 
       <p>
-        <input type="submit" value="Add hard disk"
-        name="add-hard-disk={template:this-element()}" />
+        <input type="submit" value="Add hard disk" name="..." template:selector-field="add-hard-disk,hard-disk" />
       </p>
     </div>
   </div>
@@ -93,28 +85,24 @@
     <h2>Additional Storage</h2>
 
     <p template:element="storage-unit">Storage unit 
-      <select template:attribute="value" name="{template:this-attribute()}"
+      <select template:multiple-choice-field="-,value" name="..."
         onchange="requestUpdate('accessories', '{template:other-attributes('value', ../storage-unit)}', '{template:other-elements(../../accessories)}', '{template:other-list-attributes('accessory-enum', 'value', ../../accessories)}', '/configuration/accessories')">
 
-        <option template:element="storage-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+        <option template:multiple-choice-value="storage-unit-enum,value,selected" value="..."></option>
       </select>
    
-      <input type="submit" value="Remove"
-      name="remove-storage-unit={template:this-element()}" />
+      <input type="submit" value="Remove" name="..." template:selector-field="remove-storage-unit" />
     </p>
 
     <p>
-      <input type="submit" value="Add storage"
-      name="add-storage-unit={template:this-element()}" /></p>
+      <input type="submit" value="Add storage" name="..." template:selector-field="add-storage-unit,storage-unit" /></p>
   </div>
 
   <div template:element="accessories" template:id="accessories-node" id="{template:this-element()}" class="accessories">
     <h2>Accessories</h2>
 
-    <select name="{template:list-attribute('accessory-enum', 'value')}" multiple="multiple">
-      <option template:element="accessory-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-      value="{@value}"></option>
+    <select name="..." template:multiple-choice-list-field="-,accessory-enum,value" multiple="multiple">
+      <option template:multiple-choice-list-value="accessory-enum,value,selected" value="..."></option>
     </select>
   </div>
 </div>
@@ -123,25 +111,22 @@
     <h2>Input Devices</h2>
 
     <p template:element="keyboard">Keyboard 
-      <select template:attribute="value" name="{template:this-attribute()}">
-        <option template:element="keyboard-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+      <select template:multiple-choice-field="-,value" name="...">
+        <option template:multiple-choice-value="keyboard-enum,value,selected" value="..."></option>
       </select>
     </p>
 
     <p template:element="mouse">Mouse 
-      <select template:attribute="value" name="{template:this-attribute()}">
-        <option template:element="mouse-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+      <select template:multiple-choice-field="-,value" name="...">
+        <option template:multiple-choice-value="mouse-enum,value,selected" value="..."></option>
       </select>
     </p>
 
     <h2>Display</h2>
 
     <p template:element="screen">Screen 
-      <select template:attribute="value" name="{template:this-attribute()}">
-        <option template:element="screen-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
-        value="{@value}"></option>
+      <select template:multiple-choice-field="-,value" name="...">
+        <option template:multiple-choice-value="screen-enum,value,selected" value="..."></option>
       </select>
     </p>
   </div>
@@ -150,7 +135,7 @@
     <h2>Price</h2>
 
     <p>Total for this configuration:
-      <span template:value="sum(/configuration//*[@value-is-set]/@price)"></span></p>
+      <span template:value="sum(/configuration//*[@value-is-set]/@price) + sum(/configuration//*[@value = ../@value]/@price)"></span></p>
 
     <p>
       <input type="submit" value="Update!" name="update" />