1.1 --- a/examples/Common/Configurator/Resources/config_database.xml Sun May 08 23:11:05 2005 +0000
1.2 +++ b/examples/Common/Configurator/Resources/config_database.xml Sun May 08 23:13:18 2005 +0000
1.3 @@ -2,9 +2,10 @@
1.4 <database>
1.5 <base-system>
1.6 <base-system-enum value="(Not selected)" price="0"/>
1.7 - <base-system-enum value="Shuttle SB61G2V3" price="2174" cpu-socket="478"/>
1.8 - <base-system-enum value="Shuttle SB65G2" price="2700" cpu-socket="478"/>
1.9 - <base-system-enum value="Soltek Qbic EQ3901" price="2500" cpu-socket="939"/>
1.10 + <base-system-enum value="Shuttle SB61G2V3" price="2174" cpu-socket="478" interface="SATA-150"/>
1.11 + <base-system-enum value="Shuttle SS56GV3" price="2000" cpu-socket="478" interface="ATA-133"/>
1.12 + <base-system-enum value="Shuttle ST62K" price="2000" cpu-socket="478" interface="ATA-100"/>
1.13 + <base-system-enum value="Soltek Qbic EQ3901" price="2500" cpu-socket="939" interface="SATA-150"/>
1.14 </base-system>
1.15 <cpu>
1.16 <cpu-enum value="(Not selected)" price="0"/>
1.17 @@ -25,8 +26,12 @@
1.18 </storage-unit>
1.19 <hard-disk>
1.20 <hard-disk-enum value="(Not selected)" price="0"/>
1.21 - <hard-disk-enum value="ATA-133 80GB" price="600"/>
1.22 - <hard-disk-enum value="ATA-133 160GB" price="1000"/>
1.23 + <hard-disk-enum value="SATA-150 80GB" price="700" interface="SATA-150"/>
1.24 + <hard-disk-enum value="SATA-150 160GB" price="1200" interface="SATA-150"/>
1.25 + <hard-disk-enum value="ATA-133 80GB" price="600" interface="ATA-133"/>
1.26 + <hard-disk-enum value="ATA-133 160GB" price="1000" interface="ATA-133"/>
1.27 + <hard-disk-enum value="ATA-100 80GB" price="500" interface="ATA-100"/>
1.28 + <hard-disk-enum value="ATA-100 160GB" price="800" interface="ATA-100"/>
1.29 </hard-disk>
1.30 <keyboard>
1.31 <keyboard-enum value="(Not selected)" price="0"/>
2.1 --- a/examples/Common/Configurator/Resources/config_database.xsl Sun May 08 23:11:05 2005 +0000
2.2 +++ b/examples/Common/Configurator/Resources/config_database.xsl Sun May 08 23:13:18 2005 +0000
2.3 @@ -36,7 +36,10 @@
2.4 <xsl:for-each select="hard-disks/hard-disk">
2.5 <xsl:call-template name="complete-element">
2.6 <xsl:with-param name="found-element" select="."/>
2.7 + <xsl:with-param name="control-element" select="/configuration/details/base-system[1]"/>
2.8 <xsl:with-param name="element-name">hard-disk</xsl:with-param>
2.9 + <xsl:with-param name="control-element-name">base-system</xsl:with-param>
2.10 + <xsl:with-param name="control-attribute-name">interface</xsl:with-param>
2.11 </xsl:call-template>
2.12 </xsl:for-each>
2.13 </hard-disks>
3.1 --- a/examples/Common/Configurator/Resources/config_template.xhtml Sun May 08 23:11:05 2005 +0000
3.2 +++ b/examples/Common/Configurator/Resources/config_template.xhtml Sun May 08 23:13:18 2005 +0000
3.3 @@ -20,7 +20,7 @@
3.4 <h2>Base System</h2>
3.5
3.6 <p template:element="base-system">Model
3.7 - <select name="{template:multi-field-name('value')}" onchange="requestUpdate('{$application-url}cpu', '{template:multi-field-name('value')}', 'cpu-node', '{template:other-multi-field-names('value', ../cpu)}'); requestUpdate('{$application-url}memory', '{template:multi-field-name('value')}', 'memory', '{template:other-multi-field-names('value', ../../memory/memory-unit)}')">
3.8 + <select name="{template:multi-field-name('value')}" onchange="requestUpdate('{$application-url}cpu', '{template:multi-field-name('value')}', 'cpu-node', '{template:other-multi-field-names('value', ../cpu)}', '/configuration/details/cpu'); requestUpdate('{$application-url}memory', '{template:multi-field-name('value')}', 'memory-node', '{template:other-multi-field-names('value', ../../memory/memory-unit)}', '/configuration/memory'); requestUpdate('{$application-url}hard-disks', '{template:multi-field-name('value')}', 'hard-disks-node', '{template:other-multi-field-names('value', ../../hard-disks/hard-disk)}', '/configuration/hard-disks')">
3.9 <option template:element="base-system-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
3.10 value="{@value}"></option>
3.11 </select>
3.12 @@ -39,36 +39,40 @@
3.13 <div template:element="memory" class="memory">
3.14 <h2>Memory</h2>
3.15
3.16 - <p id="memory-node" template:element="memory-unit">Memory unit
3.17 - <select name="{template:multi-field-name('value')}">
3.18 - <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
3.19 - value="{@value}"></option>
3.20 - </select>
3.21 + <div id="memory-node">
3.22 + <p template:element="memory-unit">Memory unit
3.23 + <select name="{template:multi-field-name('value')}">
3.24 + <option template:element="memory-unit-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
3.25 + value="{@value}"></option>
3.26 + </select>
3.27
3.28 - <input type="submit" value="Remove"
3.29 - name="remove-memory-unit={template:this-position()}" /></p>
3.30 + <input type="submit" value="Remove"
3.31 + name="remove-memory-unit={template:this-position()}" /></p>
3.32
3.33 - <p>
3.34 - <input type="submit" value="Add memory"
3.35 - name="add-memory-unit={template:this-position()}" /></p>
3.36 + <p>
3.37 + <input type="submit" value="Add memory"
3.38 + name="add-memory-unit={template:this-position()}" /></p>
3.39 + </div>
3.40 </div>
3.41 </div>
3.42 <div id="right">
3.43 <div template:element="hard-disks" class="hard-disks">
3.44 <h2>Hard Disks</h2>
3.45
3.46 - <p template:element="hard-disk">Hard disk drive
3.47 - <select name="{template:multi-field-name('value')}">
3.48 - <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
3.49 - value="{@value}"></option>
3.50 - </select>
3.51 + <div id="hard-disks-node">
3.52 + <p template:element="hard-disk">Hard disk drive
3.53 + <select name="{template:multi-field-name('value')}">
3.54 + <option template:element="hard-disk-enum" template:expr="@value-is-set" template:expr-attr="selected" template:value="@value"
3.55 + value="{@value}"></option>
3.56 + </select>
3.57
3.58 - <input type="submit" value="Remove"
3.59 - name="remove-hard-disk={template:this-position()}" /></p>
3.60 + <input type="submit" value="Remove"
3.61 + name="remove-hard-disk={template:this-position()}" /></p>
3.62
3.63 - <p>
3.64 - <input type="submit" value="Add hard disk"
3.65 - name="add-hard-disk={template:this-position()}" /></p>
3.66 + <p>
3.67 + <input type="submit" value="Add hard disk"
3.68 + name="add-hard-disk={template:this-position()}" /></p>
3.69 + </div>
3.70 </div>
3.71
3.72 <div template:element="storage" class="storage">