[interchange-cvs] interchange - heins modified 3 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Sun Apr 17 15:29:52 EDT 2005
User: heins
Date: 2005-04-17 19:29:52 GMT
Modified: dist/standard/pages/member account.html
Modified: dist/standard/pages/ord billing.html shipping.html
Log:
* Change some standard demo pages to use new country_select and
state_select widgets.
Revision Changes Path
1.3 +5 -23 interchange/dist/standard/pages/member/account.html
rev 1.3, prev_rev 1.2
Index: account.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/member/account.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- account.html 26 Jan 2005 17:27:01 -0000 1.2
+++ account.html 17 Apr 2005 19:29:52 -0000 1.3
@@ -123,7 +123,7 @@
[error name=state std_label="[L]State/Province[/L]" required=1]
</td>
<td>
- <INPUT TYPE=text NAME=state VALUE="[value name=state filter=uc]" size=3>
+ [display type=state_select name=state value="[value state]"]
</td>
</tr>
<tr class="contentbar1">
@@ -131,7 +131,7 @@
[error name=zip std_label="[L]Zip/Postal Code[/L]" required=1]
</td>
<td>
- <INPUT TYPE=text NAME=zip VALUE="[value zip]" size="10" maxlength="10">
+ <INPUT TYPE=text NAME=zip VALUE="[value zip]" size=10>
</td>
<td> </td>
<td> </td>
@@ -149,25 +149,7 @@
[error name=country std_label="[L]Country[/L]" required=1]
</td>
<td colspan=3>
- <SELECT NAME=country onChange="this.form.submit()">
- [if value country =~ /(^$|US|CA)/]
- <OPTION VALUE="US"> [L]United States[/L]
- <OPTION [selected country CA] VALUE="CA"> [L]Canada[/L]
- <OPTION VALUE="JP"> [L]Other[/L]
- [else]
- [loop option=country search="
- ra=yes
- fi=country
- rf=code,name
- ml=1000
- tf=name
- "]
- <OPTION VALUE="[loop-code]"> [loop-data country name]
- [/loop]
- [/else]
- [/if]
- </SELECT>
- <small>([L]will update display[/L])</small>
+ [display type=country_select name=country value="[value country]"]
</td>
</tr>
<tr class="contentbar1">
@@ -299,7 +281,7 @@
[L]State/Province[/L]
</td>
<td>
- <INPUT TYPE=text NAME=b_state VALUE="[value b_state]" size="5" maxlength="5">
+ [display type=state_select name=b_state value="[value b_state]"]
</td>
</tr>
<tr class="contentbar1">
@@ -317,7 +299,7 @@
[L]Country[/L]
</td>
<td>
- <INPUT TYPE=text NAME=b_country VALUE="[value b_country]" size="10" maxlength="10">
+ [display type=country_select name=b_country value="[value b_country]"]
</td>
<td> </td>
<td> </td>
1.8 +2 -7 interchange/dist/standard/pages/ord/billing.html
rev 1.8, prev_rev 1.7
Index: billing.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/billing.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- billing.html 5 Feb 2005 14:39:16 -0000 1.7
+++ billing.html 17 Apr 2005 19:29:52 -0000 1.8
@@ -192,7 +192,7 @@
[error name=b_state std_label="[L]State/Province[/L]" required=1]
</td>
<td>
- <INPUT TYPE=text NAME=b_state VALUE="[value b_state]" size="5" maxlength="5">
+ [display name=b_state type=state_select value="[value b_state]"]
</td>
</tr>
<tr>
@@ -208,12 +208,7 @@
[error name=b_country std_label="[L]Country[/L]" required=1]
</td>
<td colspan=3>
- [display
- name=b_country
- type=select
- default=__SHIP_DEFAULT_COUNTRY__
- lookup_query="select code,name from country where shipmodes != '' order by name"
- ]
+ [display name=b_country type=country_select value="[value b_country]"]
</td>
</tr>
<tr>
1.8 +2 -29 interchange/dist/standard/pages/ord/shipping.html
rev 1.8, prev_rev 1.7
Index: shipping.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/shipping.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- shipping.html 19 Feb 2005 17:07:53 -0000 1.7
+++ shipping.html 17 Apr 2005 19:29:52 -0000 1.8
@@ -128,35 +128,14 @@
<INPUT TYPE=text NAME=city VALUE="[value city]" size="20" maxlength="20">
</td>
</tr>
- [if type=!data term="country::no_state::[value country]"]
<tr>
<td align=right>
[error name=state std_label="[L]State/Province[/L]" required=1]
</td>
<td align="left" colspan=3>
- [loop search="
- fi=state.txt
- sf=country
- se=[default country US]
- rf=state,name,country
- un=yes
- tf=sorder,name
- ml=100
- "
- option=state]
- [on-match]<SELECT onChange="check_tax(this.form)" NAME=state>[/on-match]
- [list]
- [loop-change 1][condition][loop-param country][/condition]
- <OPTGROUP LABEL="[data table=country col=name key='[loop-param country]']">
- [/loop-change 1]
- <OPTION VALUE="[loop-code]">[loop-pos 1]
- [/list]
- [on-match]</SELECT>[/on-match]
- [no-match]<INPUT NAME=state VALUE="[value state]" SIZE=20>[/no-match]
- [/loop]
+ [display name=state type=state_select value="[value state]"]
</td>
</tr>
- [/if]
<tr>
<td align="right">
[error name=zip std_label="[L]Zip/Postal Code[/L]" required=1]
@@ -178,13 +157,7 @@
[L]Country[/L]
</td>
<td colspan="3">
- [display
- name=country
- type=select
- value="[value country]"
- default=__SHIP_DEFAULT_COUNTRY__
- lookup_query="select code,name from country where shipmodes != '' order by name"
- ]
+ [display name=country type=country_select value="[value country]"]
</td>
</tr>
<tr>
More information about the interchange-cvs
mailing list