[interchange-cvs] interchange - jonc modified 20 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Wed Jan 26 12:27:01 EST 2005


User:      jonc
Date:      2005-01-26 17:27:01 GMT
Modified:  dist/standard/pages aboutus.html advancedsearch.html
Modified:           change_password.html contact.html flypage.html
Modified:           index.html login.html new_account.html
Modified:  dist/standard/pages/forum reply.html submit.html
Modified:  dist/standard/pages/member account.html
Modified:  dist/standard/pages/ord address.html basket.html
Modified:           billing.html checkout.html country.html
Modified:           finalize.html multi.html shipmode.html
Modified:           shipping.html
Log:
First part of Standard demo alterations

	* Styling and colors along the lines of the Interchange logo.
	* CSS drive the look of the demo so you can alter font sizes, component
	  colors etc from a single file.
	* some tidying of the HTML along the way.

Designed by Ian Cowley, HTML by Rob Hewson, both of Webmaint

Revision  Changes    Path
1.2       +12 -14    interchange/dist/standard/pages/aboutus.html


rev 1.2, prev_rev 1.1
Index: aboutus.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/aboutus.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aboutus.html	25 Apr 2004 17:07:52 -0000	1.1
+++ aboutus.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -37,27 +37,25 @@
 
 <!-- BEGIN CONTENT -->
 
-<br><br>
-
-<p>
-[L]Welcome to[/L] <b>__COMPANY__</b>!
-</p>
-
-<p>
-[msg arg.0="[page contact]" arg.1="</a>"]Please %scontact us%s if you have any questions for us.[/msg]
-</p>
-<br><br>
-
-<table width="80%">
+<br>
+<table width="100%">
 <tr>
   <td>
+	<h1>
+	[L]Welcome to[/L] <b>__COMPANY__</b>!
+	</h1>
+
 	<p>
-    [msg arg.0="<a href='@_INTERCHANGE_URL_@'>" arg.1="</a>"]This is a demo store. If you would like further information on how you can build a store or how you can get custom services, please %svisit our web site%s.[/msg]
+	[msg arg.0="[page contact]" arg.1="</a>"]Please %scontact us%s if you have any questions for us.[/msg]<br>
+	</p>
+
+	<p>
+	[msg arg.0="<a href='@_INTERCHANGE_URL_@'>" arg.1="</a>"]This is a demo store. If you would like further information on how you can build a store or how you can get custom services, please %svisit our web site%s.[/msg]
 	</p>
 
     <p>
 	[L]Or send an e-mail to[/L]: <a href="mailto:@_INTERCHANGE_EMAIL_@">@_INTERCHANGE_EMAIL_@</a>.
-	</p>
+	<br><br></p>
   </td>
 </tr>
 </table>



1.2       +76 -49    interchange/dist/standard/pages/advancedsearch.html


rev 1.2, prev_rev 1.1
Index: advancedsearch.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/advancedsearch.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- advancedsearch.html	25 Apr 2004 17:07:52 -0000	1.1
+++ advancedsearch.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -47,42 +47,58 @@
 
 [tmp matchlimit]10[/tmp]
 
-<table width="95%" border="0">
+<table width="100%" border="0">
 <tr>
 <td>
 <br>
 
-<big><b>[L]Advanced Search[/L]</b></big>
-<br><br>
+<h1>[L]Advanced Search[/L]</h1>
+<br>
 
 <p>
 <form action="[area search]" method=post>
-<input type=hidden name=mv_session_id value="[data session id]">
-<b>[L]Search by Field[/L]:</b><br>
-[L]Search for[/L]
-<input type=text name=se size=20>
-<input type=hidden name=st value=db>
-<input type=hidden name=co value=1>
-[if module-version Text::Query]
-<input type=hidden name=op value=aq>
-[else]
-<input type=hidden name=op value=rm>
-[/else]
-[/if]
-[L]in[/L]
-<select name=sf>
-<option value=":sku:price:comment:description:category:author">--[L]all fields[/L]--
-[loop
-	acclist=1
-	list="sku=SKU,price=Price"
-]
-<option value="[loop-code]">[loop-param label]
-[/loop]
-</select>
-<input type=hidden name=sf value=category>
-&nbsp;
-<input type=submit value="[L]SEARCH[/L]" class=button2>
-<table>
+<table width="100%">
+	<tr>
+		<td colspan="2">
+			<input type=hidden name=mv_session_id value="[data session id]">
+			<b>[L]Search by Field[/L]:</b><br><br>
+		</td>
+	</tr>
+	<tr>
+		<td width="50%">
+			[L]Search for[/L]
+		</td>
+		<td>
+			<input type=text name=se size=20>
+			<input type=hidden name=st value=db>
+			<input type=hidden name=co value=1>		
+			[if module-version Text::Query]
+			<input type=hidden name=op value=aq>
+			[else]
+			<input type=hidden name=op value=rm>
+			[/else]
+			[/if]
+		</td>
+	</tr>
+	<tr>
+		<td>
+			[L]In fields[/L]
+			
+		</td>
+		<td>
+			<select name=sf>
+			<option value=":sku:price:comment:description:category:author">--[L]all fields[/L]--
+			[loop
+				acclist=1
+				list="sku=SKU,price=Price"
+			]
+			<option value="[loop-code]">[loop-param label]
+			[/loop]
+			</select>
+			<input type=hidden name=sf value=category>
+			&nbsp;
+		</td>
+	</tr>
 	<tr>
 		<td>
 			Full words only
@@ -123,36 +139,42 @@
 		[scratch cat_widget]
 		</td>
 	</tr>
+	<tr>
+		<td colspan="2" align="center"><br>
+			<input type=submit value="[L]SEARCH[/L]" class=button3>
+		</td>
+	</tr>
 </table>
 </form>
 </p>
 
 <p>
-<b>[L]Search by Price[/L]:</b><br>
-<form action="[area search]" method=post>
-<input type=hidden name=mv_session_id value="[data session id]">
-<input type=hidden name=st value=db>
-<input type=hidden name=co value=1>
-<input type=hidden name=sf value=price>
-<input type=hidden name=sf value=price>
-<input type=hidden name=sf value=category>
-<input type=hidden name=nu value=1>
-<input type=hidden name=nu value=1>
-<input type=hidden name=nu value=0>
-<input type=hidden name=op value=ge>
-<input type=hidden name=op value=le>
-<input type=hidden name=op value=eq>
-<table>
+<table width="100%">
 	<tr>
-		<td>
+		<td colspan="2">
+			<b>[L]Search by Price[/L]:</b><br><br>
+			<form action="[area search]" method=post>
+			<input type=hidden name=mv_session_id value="[data session id]">
+			<input type=hidden name=st value=db>
+			<input type=hidden name=co value=1>
+			<input type=hidden name=sf value=price>
+			<input type=hidden name=sf value=price>
+			<input type=hidden name=sf value=category>
+			<input type=hidden name=nu value=1>
+			<input type=hidden name=nu value=1>
+			<input type=hidden name=nu value=0>
+			<input type=hidden name=op value=ge>
+			<input type=hidden name=op value=le>
+			<input type=hidden name=op value=eq>
+		</td>
+	</tr>
+	<tr>
+		<td width="50%">
 			[L]Minimum Price[/L]
 		</td>
 		<td>
 			<input type=text name=se size=8 maxlength=12>
-		</td>
-		<td rowspan=3>
-			<input type=submit value="[L]SEARCH[/L]" class=button2>
-		</td>
+		</td>		
 	</tr>
 	<tr>
 		<td>
@@ -168,6 +190,11 @@
 		</td>
 		<td>
 			[scratch cat_widget]
+		</td>
+	</tr>
+	<tr>
+		<td colspan="2" align="center"><br>
+			<input type=submit value="[L]SEARCH[/L]" class=button3>
 		</td>
 	</tr>
 </table>



1.2       +17 -17    interchange/dist/standard/pages/change_password.html


rev 1.2, prev_rev 1.1
Index: change_password.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/change_password.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- change_password.html	25 Apr 2004 17:07:52 -0000	1.1
+++ change_password.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -44,46 +44,46 @@
 	[bounce page=login]
 	[/if]
 
-    <FORM ACTION="[process secure=1]" METHOD=POST>
-	<input type=hidden name=mv_session_id value="[data session id]">    
-	<INPUT TYPE=hidden NAME=mv_todo  VALUE=return>
-    <INPUT TYPE=hidden NAME=mv_check VALUE=Change_password>
-    <INPUT TYPE=hidden NAME=mv_failpage VALUE="change_password">
-    <INPUT TYPE=hidden NAME=mv_successpage VALUE="member/service">
-    <INPUT TYPE=hidden NAME=mv_nextpage VALUE="change_password">
+    <form action="[process secure=1]" method="POST">
+    <input type="hidden" name="mv_session_id" value="[data session id]">    
+    <input type="hidden" name="mv_todo" value="return">
+    <input type="hidden" name="mv_check" value="Change_password">
+    <input type="hidden" name="mv_failpage" value="change_password">
+    <input type="hidden" name="mv_successpage" value="member/service">
+    <input type="hidden" name="mv_nextpage" value="change_password">
 
     <table border="0">
     <tr>
       <td class="contentbar1"> 
 	<table>
 	<tr>
-	  <td align=right class="contentbar2">
+	  <td align="right" class="titletab_small">
 	    [L]Old password[/L]
 	  </td>
-	  <td class="contentbar2">
-	    <INPUT TYPE=password NAME=mv_password_old VALUE="">
+	  <td class="titletab_small">
+	    <input type="password" name="mv_password_old" value="">
 	  </td>
 	</tr>
 	<tr>
-	  <td align=right class="contentbar2">
+	  <td align="right" class="titletab_small">
 	    [L]Password[/L]
 	  </td>
-	  <td class="contentbar2">
-	    <INPUT TYPE=password NAME=mv_password VALUE="">
+	  <td class="titletab_small">
+	    <input type="password" name="mv_password" value="">
 	  </td>
 	</tr>
 	<tr>
-	  <td align=right class="contentbar2">
+	  <td align="right" class="titletab_small">
 	    [L]Verify[/L]
 	  </td>
-	  <td class="contentbar2">
-	    <INPUT TYPE=password NAME=mv_verify VALUE="">
+	  <td class="titletab_small">
+	    <input type="password" name="mv_verify" value="">
 	  </td>
 	</tr>
 	<tr>
 	  <td>&nbsp;</td>
 	  <td class="contentbar1">
-	    <input type="submit" value="[L]Change password[/L]">
+	    <input type="submit" value="[L]Change password[/L]" class="button3">
 	  </td>
 	</tr>
         </table>



1.2       +3 -6      interchange/dist/standard/pages/contact.html


rev 1.2, prev_rev 1.1
Index: contact.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/contact.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- contact.html	25 Apr 2004 17:07:52 -0000	1.1
+++ contact.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -40,10 +40,8 @@
 <table width="90%">
 <tr>
   <td align="left">
-
-    <br>
-
-	<p>[L]You can contact us the following ways[/L]:</p>
+    
+	<p><br>[L]You can contact us the following ways[/L]:</p>
 
 	<p>
     <b>__COMPANY__</b><br>
@@ -69,8 +67,7 @@
 	<p>[L]If you would like further information on constructing a store like this, please contact the Interchange Development Group[/L]:</p>
 
     <p><a href="@_INTERCHANGE_URL_@">@_INTERCHANGE_URL_@</a><br>
-    [L]e-mail[/L]: <a href="mailto:@_INTERCHANGE_EMAIL_@">@_INTERCHANGE_EMAIL_@</a></p>
-
+    [L]e-mail[/L]: <a href="mailto:@_INTERCHANGE_EMAIL_@">@_INTERCHANGE_EMAIL_@</a><br><br></p>     
   </td>
 </tr>
 </table>



1.2       +12 -12    interchange/dist/standard/pages/flypage.html


rev 1.2, prev_rev 1.1
Index: flypage.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/flypage.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flypage.html	25 Apr 2004 17:07:52 -0000	1.1
+++ flypage.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -35,24 +35,24 @@
 [set upsell][item-data merchandising upsell_to][/set]
 [set cross_codes][item-data merchandising cross_sell][/set]
 
-  <FORM ACTION="[area href="[item-code]"]" METHOD=POST>
-  <INPUT TYPE=hidden  NAME="mv_action"  VALUE="refresh">
-  <INPUT TYPE=hidden  NAME="mv_order_item"  VALUE="[item-code]">
-  <input type=hidden name=mv_session_id value="[data session id]">
+  <form action="[area href="ord/basket.html"]" method="POST">
+  <input type="hidden" name="mv_action"  value="refresh">
+  <input type="hidden" name="mv_order_item"  value="[item-code]">
+  <input type="hidden" name="mv_session_id" value="[data session id]">
 
   <table width="70%" border="0" cellspacing="0" cellpadding="5">
   <tr valign="middle"> 
-    <td align=center class="titlebar1">
-      <big>[item-field category] : <b>[item-description]</b></big>
+    <td align="left">
+      <h1>[item-description]</h1>
     </td>
   </tr>
   <tr valign="middle"> 
-    <td align=center> 
-      <table cellspacing=0 cellpadding=3 align=center>
+    <td align="center"> 
+      <table cellspacing="0" cellpadding="3" align="center">
       <tr> 
 	<td valign="center" align="left"> 
 	  [if-item-field image]
-	    <IMG SRC="items/[item-field image]" ALT="[item-filter encode_entities][item-description][/item-filter]" title="[item-filter encode_entities][item-description][/item-filter]" BORDER=0>
+	    <img src="items/[item-field image]" slt="[item-filter encode_entities][item-description][/item-filter]" title="[item-filter encode_entities][item-description][/item-filter]" border="0">
  	  [/if-item-field]
 	</td>
 	<td valign="center" align="center"> 
@@ -178,7 +178,7 @@
 	  </td>
 	  <td align="right">					
 
-	    <input type="submit" value="[L]BUY NOW[/L]" class=button3>
+	    <input type="submit" value="[L]BUY NOW[/L]" class="button2">
 
 	  </td>
 	</tr>
@@ -189,9 +189,9 @@
 [if variable FORUM_PRODUCTS]
   <tr>
   	<td>
-		[forum top="[item-code]" display_page="forum/display" /]
+		[forum top="[item-code]" display_page="forum/display/"]
 		<p>
-		[page href="forum/reply"
+		[page href="forum/submit"
 				form="
 					product=1
 					mv_arg=[item-code]



1.3       +30 -27    interchange/dist/standard/pages/index.html


rev 1.3, prev_rev 1.2
Index: index.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	26 Jan 2005 17:15:44 -0000	1.2
+++ index.html	26 Jan 2005 17:27:00 -0000	1.3
@@ -3,7 +3,7 @@
 ui_type: page
 ui_name: index.html
 ui_page_template: leftright
-ui_version: 4.9.8
+ui_version: 5.3.0-200410200658
 ui_source: pages/index.html
 ui_template: Yes
 ui_template_name: leftright
@@ -21,7 +21,7 @@
 [/control-set]
 [control-set]
 	[component]product_tree[/component]
-	[link_class]barlink[/link_class]
+	[link_class][/link_class]
 	[link_class_closed][/link_class_closed]
 	[link_class_open][/link_class_open]
 	[link_closed_style][/link_closed_style]
@@ -36,14 +36,21 @@
 [control-set]
 	[component]cross[/component]
 	[banner][L]Specials[/L][/banner]
-	[cols]2[/cols]
-	[size]2[/size]
+	[buttons][/buttons]
+	[cols]3[/cols]
+	[cross_codes][/cross_codes]
+	[random][/random]
+	[size]3[/size]
 [/control-set]
 [control-set]
 	[component]random[/component]
 	[banner][L]See also...[/L][/banner]
+	[buttons][/buttons]
 	[cols]1[/cols]
+	[matches]3[/matches]
+	[pool]100[/pool]
 	[size]3[/size]
+	[table_width]150[/table_width]
 [/control-set]
 [control-set]
 	[component][/component]
@@ -53,32 +60,29 @@
 [/control-set]
 [control reset=1]
 
-
 @_LEFTRIGHT_TOP_@
 <!-- BEGIN CONTENT -->
-<table width="95%" border="0">
+[set strTemp]10[/set]
+[set strColumn]Description, prod_group[/set]
+<table width="100%" border="0">
 <tr> 
   <td>
-    <br>
-    [L INDEX_PAR1]
-    Welcome to the <b>Interchange</b> Foundation Store! This 
-    site is intended to get you started building
+[L INDEX_PAR1]
+    <h1>Welcome to the Interchange Standard Store!</h1>
+    <p><br>This site is intended to get you started building
     your own e-business site. Replace the stock graphics, products, 
-    and categories in this store to begin building your custom site.[/L]
-    <br><br>
-  </td>
-</tr>
-<tr> 
-  <td>
-    <br>
-    [L]Take our[/L] 
-		[page
-			href=survey/standard
-			form="survey_start=customer_satisfaction"
-		][L]Customer Satisfaction Survey[/L]</A>.
+    and categories in this store to begin building your custom site.</p>
+    <p>Please note that any products purchased will not be delivered nor 
+    will the customer be billed. Any products found on this site is to 
+    be treated as fictional.
+    </p>[/L]
+    <p>[L]Take our[/L]
+               [page
+                       href=survey/standard
+                       form="survey_start=customer_satisfaction"
+               ][L]Customer Satisfaction Survey[/L]</A>.</p>
   </td>
 </tr>
-
 [if !scratch gift_cert_code]
 	[seti gift_cert_code][read-cookie MV_GIFT_CERT_CODE][/seti]
 	[seti gift_cert_check][read-cookie MV_GIFT_CERT_CHECK][/seti]
@@ -99,10 +103,9 @@
 [/if]
 
 <tr> 
-  <td>
-    <br>
-    [L]Generate test order to fill the sample order database[/L]:
-		[page href=test_order][L]Do test order[/L]</A>.
+  <td>    
+    <p>[L]Generate test order to fill the sample order database[/L]:
+		<a href="[area href="test_order"]">[L]Do test order[/L]</a>.<br><br></p>
   </td>
 </tr>
 </table>



1.3       +33 -32    interchange/dist/standard/pages/login.html


rev 1.3, prev_rev 1.2
Index: login.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/login.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- login.html	25 Jan 2005 09:44:51 -0000	1.2
+++ login.html	26 Jan 2005 17:27:00 -0000	1.3
@@ -41,48 +41,48 @@
 
 [if !session logged_in]
 
-    <FORM ACTION="[process secure=1]" METHOD=POST>
-    <INPUT TYPE=hidden NAME=mv_todo  VALUE=return>
-    <INPUT TYPE=hidden NAME=mv_click VALUE=Login>
-    <INPUT TYPE=hidden NAME=mv_failpage VALUE="login">
-	<INPUT TYPE=hidden NAME=mv_successpage VALUE="[either][scratchd mv_successpage][or]member/service[/either]">
-    <INPUT TYPE=hidden NAME=mv_nextpage VALUE="index">
-    <input type=hidden name=mv_session_id value="[data session id]">
+    <form action="[process secure=1]" method="POST">
+    <input type="hidden" name="mv_todo"  value="return">
+    <input type="hidden" name="mv_click" value="Login">
+    <input type="hidden" name="mv_failpage" value="login">
+    <input type="hidden" name="mv_successpage" value="[either][scratchd mv_successpage][or]member/service[/either]">
+    <input type="hidden" name="mv_nextpage" value="index">
+    <input type="hidden" name="mv_session_id" value="[data session id]">
 
     <table border="0" align="center">
     <tr>
       <td class="contentbar1" align="center"> 
 	<table align="center">
 	<tr> 
-	  <td align=right class="contentbar2">
+	  <td align="right" class="titletab_small">
 	    [L]Username[/L]
 	  </td>
-	  <td class="contentbar2">
-	    <INPUT NAME=mv_username VALUE="[scratch cookie_username]">
+	  <td class="titletab_small">
+	    <input name="mv_username" value="[scratch cookie_username]">
 	  </td>
 	</tr>
 	<tr>
-	  <td align=right class="contentbar2">
+	  <td align="right" class="titletab_small">
 	    [L]Password[/L]
 	  </td>
-	  <td class="contentbar2">
-	    <INPUT TYPE=password NAME=mv_password VALUE="">
+	  <td class="titletab_small">
+	    <input type="password" name="mv_password" VALUE="">
 	  </td>
 	</tr>
 	<tr>
 	  <td>&nbsp;</td>
-	  <td class="contentbar1">
-	    <input type=submit value="[L]Log In[/L]">
-	    <input type="submit" NAME="mv_click" value="[L]New Account[/L]">
+	  <td>
+	    <input class="button3" type=submit value="[L]Log In[/L]">
+	    <input class="button3" type="submit" NAME="mv_click" value="[L]New Account[/L]">
 	  </td>
 	</tr>
 	[if config CookieLogin]
 	<tr>
-	  <td align=right class="contentbar1"> 
-	    <INPUT TYPE=hidden NAME=mv_cookie_password VALUE=0>
-	    <INPUT TYPE=checkbox NAME=mv_cookie_password VALUE=1 [if scratch cookie_username]CHECKED[/if]>
+	  <td align="right" class="contentbar1"> 
+	    <input type="hidden" name="mv_cookie_password" value="0">
+	    <input type="checkbox" name="mv_cookie_password" value="1" [if scratch cookie_username]CHECKED[/if]>
 	  </td>
-	  <td class="contentbar1">
+	  <td>
 	    [L]Log me in automatically (sets cookie)[/L]
 	  </td>
 	</tr>
@@ -96,18 +96,18 @@
 
 [else]
 
-    <FORM ACTION="[process]" METHOD=POST>
-    <input type=hidden name=mv_session_id value="[data session id]">
-    <INPUT TYPE=hidden NAME=mv_todo  VALUE=return>
-    <INPUT TYPE=hidden NAME=mv_click VALUE=Logout_choice>
-    <INPUT TYPE=hidden NAME=mv_nextpage VALUE="login">
+    <form action="[process]" method="POST">
+    <input type="hidden" name="mv_session_id" value="[data session id]">
+    <input type="hidden" name="mv_todo" value="return">
+    <input type="hidden" name="mv_click" value="Logout_choice">
+    <input type="hidden" name="mv_nextpage" value="login">
 
     <table align="center">
     <tr>
       <td class="contentbar1" align="center"> 
 	<table>
-	<tr class=contentbar2> 
-	  <td colspan=2 class=contentbar2>
+	<tr class="titletab_small"> 
+	  <td colspan="2" class="titletab_small">
 	    <b>[L]You are already logged in.[/L]</b>
 	  </td>
 	</tr>
@@ -115,17 +115,17 @@
 	  <td>&nbsp;</td>
 	  <td class="contentbar1">
 	  	<br>&nbsp;<br>
-	    <INPUT TYPE=submit VALUE="Log out"> <INPUT TYPE=checkbox NAME=clear_values CHECKED VALUE=1>&nbsp;[L]Clear&nbsp;name/address[/L][if items]&nbsp;&nbsp;<INPUT TYPE=checkbox NAME=clear_cart CHECKED VALUE=1>&nbsp;[L]Clear&nbsp;cart[/L][/if]<BR>
+	    <input name="submit" value="[L]Log Out[/L]">
+            <input type="checkbox" name="clear_values" checked value="1">&nbsp;[L]Clear&nbsp;name/address[/L][if items]&nbsp;&nbsp;<input type="checkbox" name="clear_cart" checked value="1">&nbsp;[L]Clear&nbsp;cart[/L][/if]<BR>
 	  	<br>&nbsp;<br>
 	  </td>
 	</tr>
-	<tr class=contentbar2> 
+	<tr class="titletab_small"> 
 	  <td colspan=2>
-	    [msg arg.0="<A HREF='[area new_account]'>" arg.1="</a>"]Or you can create a %snew account%s.[/msg]
+	    [msg arg.0="<a href='[area new_account]'>" arg.1="</a>"]Or you can create a %snew account%s.[/msg]
 	  </td>
 	</tr>
 	</table>
-		
       </td>
     </tr>
     </table>
@@ -136,9 +136,10 @@
 [/if]
 
 	<p>
-	<center>
+	<center>	
 	[page lost_password][L]Lost your password?[/L]</a>
 	</center>
+	</p>
 
   </td>
 </tr>



1.2       +18 -18    interchange/dist/standard/pages/new_account.html


rev 1.2, prev_rev 1.1
Index: new_account.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/new_account.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- new_account.html	25 Apr 2004 17:07:52 -0000	1.1
+++ new_account.html	26 Jan 2005 17:27:00 -0000	1.2
@@ -54,50 +54,50 @@
 [/if]
 [/set]
 
-<FORM ACTION="[process]" METHOD=POST>
-<input type=hidden name=mv_session_id value="[data session id]">
-<INPUT TYPE=hidden NAME=mv_click VALUE=NewAccount>
-<INPUT TYPE=hidden NAME=mv_doit  VALUE=return>
-<INPUT TYPE=hidden NAME=function  VALUE=new_account>
-<INPUT TYPE=hidden NAME=mv_nextpage VALUE=ord/basket>
+<form action="[process]" method="POST">
+<input type="hidden" name="mv_session_id" value="[data session id]">
+<input type="hidden" name="mv_click" value="NewAccount">
+<input type="hidden" name="mv_doit" value="return">
+<input type="hidden" name="function" value="new_account">
+<input type="hidden" name="mv_nextpage" value="ord/basket">
 
 <tr> 
   <td> 
     <table border="0" cellspacing="0" cellpadding="2">
     <tr> 
-      <td align="right" class="contentbar2">
+      <td align="right" class="titletab_small">
         <b>[L]Username[/L]:</b>
       </td>
-      <td class="contentbar2" align="left"> 
-        <input type="text" NAME=mv_username VALUE="">
+      <td class="titletab_small" align="left"> 
+        <input type="text" name="mv_username" value="">
       </td>
     </tr>
     <tr> 
-      <td align="right" class="contentbar2"> 
+      <td align="right" class="titletab_small"> 
         <b>[L]Password[/L]:</b>
       </td>
-      <td align="left" class="contentbar2"> 
-        <INPUT TYPE=password NAME=mv_password VALUE="">
+      <td align="left" class="titletab_small"> 
+        <input type="password" name="mv_password" value="">
       </td>
     </tr>
     <tr> 
-      <td align="right" class="contentbar2"> 
+      <td align="right" class="titletab_small"> 
         <b>[L]Verify Password[/L]:</b>
       </td>
-      <td align="left" class="contentbar2"> 
-        <INPUT TYPE=password NAME=mv_verify VALUE="">
+      <td align="left" class="titletab_small"> 
+        <input type="password" name="mv_verify" value="">
       </td>
     </tr>
-    <tr class="contentbar1"> 
+    <tr class="contentbar1">
       <td>&nbsp;</td>
       <td> 
-        <INPUT TYPE=submit VALUE="[L]Create Account[/L]">
+        <input type="submit" value="[L]Create Account[/L]">
       </td>
     </tr>
 	[if config CookieLogin]
     <tr class="contentbar1"> 
       <td align="right"> 
-        <INPUT TYPE=checkbox NAME=mv_cookie_password VALUE=1>
+        <input type="checkbox" name="mv_cookie_password" value="1">
       </td>
       <td>[L]Log me in automatically (sets cookie)[/L]</td>
     </tr>



1.2       +3 -3      interchange/dist/standard/pages/forum/reply.html


rev 1.2, prev_rev 1.1
Index: reply.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/forum/reply.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reply.html	25 Apr 2004 17:07:52 -0000	1.1
+++ reply.html	26 Jan 2005 17:27:01 -0000	1.2
@@ -43,7 +43,7 @@
 				created => $Tag->convert_date( { fmt => '%Y%m%d%H%M' }),
 				artid => $code,
 				subject => "Comments on $desc",
-				username => "interch",
+				username => $Session->{username},
 				name => "Product Manager",
 				email => $Variable->{FORUM_EMAIL_NOTIFY} || '',
 				score => 1,
@@ -105,10 +105,10 @@
 	<B>[cgi name=subject filter=restrict_html]<br>
 	by 
 		[if !session logged_in]
-			[either]__FORUM_ANON_NAME__[or]Anonymous Coward[/either]
+			[either]blah[or]Guest user[/either]
 		[else]
 			[if cgi anon]
-			[either]__FORUM_ANON_NAME__[or]Anonymous Coward[/either]
+			[either]__FORUM_ANON_NAME__[or]Guest user[/either]
 			[else]
 			[either][value handle][or][value fname][or][data session username][/either]
 			[/else]



1.2       +1 -1      interchange/dist/standard/pages/forum/submit.html


rev 1.2, prev_rev 1.1
Index: submit.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/forum/submit.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- submit.html	25 Apr 2004 17:07:52 -0000	1.1
+++ submit.html	26 Jan 2005 17:27:01 -0000	1.2
@@ -65,7 +65,7 @@
 	<tr>
 	<td bgcolor="#eeeeee">
 	<B>[cgi name=subject filter=restrict_html]<br>
-	by [either][value fname][or]Shrinking Violet[/either] on [convert-date fmt="%A, %B %e, %Y @%H:%M"][/convert-date]<B>
+	by [either][value fname][or]Guest user[/either] on [convert-date fmt="%A, %B %e, %Y @%H:%M"][/convert-date]<B>
 	</td>
 	</tr>
 	<tr>



1.2       +8 -8      interchange/dist/standard/pages/member/account.html


rev 1.2, prev_rev 1.1
Index: account.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/member/account.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- account.html	25 Apr 2004 17:07:52 -0000	1.1
+++ account.html	26 Jan 2005 17:27:01 -0000	1.2
@@ -69,8 +69,8 @@
 
 <br>
 
-<table border="0" cellspacing="0" cellpadding="0" align="center" width="75%">
-<tr class="contentbar2"> 
+<table border="0" cellspacing="0" cellpadding="4" align="center" width="75%">
+<tr class="titletab_small"> 
   <td class="contentbar2" colspan=4>
     <big>&nbsp;<b>[L]Shipping Address[/L]</b> <i>([L]primary[/L])</i></big>
   </td>
@@ -210,7 +210,7 @@
   <td>&nbsp;</td>
   <td>&nbsp;</td>
 </tr>
-<tr class="contentbar2">
+<tr class="titletab_small">
   <td>
     [L]Mailing Status[/L]
   </td>
@@ -254,9 +254,9 @@
 
 <p>&nbsp;</p>
 
-<table border="0" cellspacing="0" cellpadding="0" align="center" width="75%">
-<tr class="contentbar2"> 
-  <td class="contentbar2" colspan=4>
+<table border="0" cellspacing="0" cellpadding="4" align="center" width="75%">
+<tr class="titletab_small"> 
+  <td class="titletab_small" colspan=4>
     <big>&nbsp;<b>[L]Billing Address[/L]</b></big> - <i>[L]If different than above[/L]</i>
   </td>
 </tr>
@@ -332,7 +332,7 @@
 
 <p>&nbsp;</p>
 
-<INPUT TYPE=SUBMIT VALUE="[L]Save Acct. Info[/L]">
+<INPUT TYPE=SUBMIT VALUE="[L]Save Acct. Info[/L]" class="button3">
 
 [if items]
   [set Save and Checkout]
@@ -340,7 +340,7 @@
   [/set]
 
   <INPUT TYPE=hidden VALUE="Save and Checkout" NAME="mv_click"  >
-  <INPUT TYPE=SUBMIT VALUE="[L]Save and Checkout[/L]">
+  <INPUT TYPE=SUBMIT VALUE="[L]Save and Checkout[/L]" class="button3">
   <br><br>
   <A HREF="[area ord/checkout]">[L]No change, go to checkout[/L]</A>
 [/if]



1.4       +1 -1      interchange/dist/standard/pages/ord/address.html


rev 1.4, prev_rev 1.3
Index: address.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/address.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- address.html	13 Jul 2004 20:37:58 -0000	1.3
+++ address.html	26 Jan 2005 17:27:01 -0000	1.4
@@ -33,7 +33,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
     [/if]
 



1.3       +36 -36    interchange/dist/standard/pages/ord/basket.html


rev 1.3, prev_rev 1.2
Index: basket.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/basket.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- basket.html	8 Sep 2004 17:23:50 -0000	1.2
+++ basket.html	26 Jan 2005 17:27:01 -0000	1.3
@@ -64,7 +64,7 @@
 
 <br><b>[L]Your Current Shopping Cart[/L]:</b><br>
 
-<table width="95%" cellspacing="0">
+<table width="100%" cellspacing="0">
 <tr>
 	<td align="center">
 
@@ -96,12 +96,12 @@
       		<td>
         	<table cellspacing="0" cellpadding="4" border="0">
 				<tr>
-          			<td class="contentbar2"><b>&nbsp;[L]Remove[/L]</b></td>
-			        <td class="contentbar2" align="center"><b>[L]SKU[/L]</b></td>
-          			<td class="contentbar2"><b>[L]Description[/L]</b></td>
-          			<td class="contentbar2"><b>[L]Quantity[/L]</b></td>
-          			<td class="contentbar2" align="center"><b>[L]Price[/L]</b></td>
-          			<td class="contentbar2"><b>[L]Extension[/L]&nbsp;</b></td>
+          			<td class="titletab_small"><b>&nbsp;[L]Remove[/L]</b></td>
+			        <td class="titletab_small" align="center"><b>[L]SKU[/L]</b></td>
+          			<td class="titletab_small"><b>[L]Description[/L]</b></td>
+          			<td class="titletab_small"><b>[L]Quantity[/L]</b></td>
+          			<td class="titletab_small" align="center"><b>[L]Price[/L]</b></td>
+          			<td class="titletab_small"><b>[L]Extension[/L]&nbsp;</b></td>
 				</tr>
 			<tbody>
 	
@@ -134,13 +134,13 @@
 [/item-calc]
 
 	<TR class="[item-calc]$row_class || 'cartnorm'[/item-calc]">
-		<TD align=center>
+		<TD align=center valign="top">
 [if-item-param !mv_si]
 	    		<INPUT TYPE=checkbox NAME="[quantity-name]" onClick="this.form.action='[process-target]', this.form.submit()" VALUE=0>
 [/if-item-param]
 	  	</TD>
-	  	<TD><b>[item-sku]</b></TD>
-	  	<td>[page [item-sku]]<b>[item-description]</b></A>
+	  	<TD valign="top"><b>[item-sku]</b></TD>
+	  	<td><a href="[area href="item-sku"]" class="cartlink"><b>[item-description]</b></A><br><br>
 
 	[if scratch dealer]
 	[if-item-data pricing sku]
@@ -179,8 +179,8 @@
 		return '' unless @ary;
 		my $out = <<'EOF';
 	    <TABLE>
-	    <TR class="contentbar2">
-              <TD>[L]Customers who bought this item also bought[/L]:</TD>
+	    <TR>
+              <TD class="titletab_small">[L]&nbsp;Customers who bought this item also bought&nbsp;[/L]:</TD>
 	    </TR>
             <TR class="[item-calc]$row_class || 'contentbar1'[/item-calc]">
 	      <TD>
@@ -188,7 +188,7 @@
 		for(@ary) {
  			my $desc = tag_data( 'products', 'description', $_);
 			$out .= <<EOF;
-		<A HREF="[area $_]">$desc</A><BR>
+		<A HREF="[area $_]" class="cartlink">$desc</A><BR>
 EOF
 		}
 		return $out . '</TD></TR></TABLE>';
@@ -201,21 +201,21 @@
 	[set upsell_found][/set]
 	[loop list="[item-data merchandising upsell_to]"]
 	[if scratch upsell_found]
-	<TABLE CELLPADDING=0 CELLSPACING=0>
-	<TR class="contentbar2">
-		<TD class="contentbar1">
-			[L]Other items you may like[/L]:
+	<TABLE>
+	<TR>
+		<TD class="titletab_small">
+			[L]&nbsp;Other items you may like&nbsp;[/L]:
 	      	</TD>
-	      	<TD class="contentbar1"></TD>
+	      	<TD></TD>
 	</TR>
 	<TR>
-	      	<TD class="contentbar1">
+	      	<TD>
 		  [list]
 		  [loop-calc]
 		  @ary = grep $_->{code} eq q{[loop-code]}, @{$Carts->{main}};
 		  return if scalar @ary;
 		  $Scratch->{upsell_found} = 1;
-		  return q{<A HREF="[area [loop-code]]">[loop-description]</A><BR>};
+		  return q{<A HREF="[area [loop-code]]" class="cartlink">[loop-description]</A><BR>};
 		  [/loop-calc]
 		  [/list]
 	      	</TD>
@@ -227,35 +227,35 @@
 [/if]
 
 	<br>
-
 [if-item-param !mv_si]
 	[table-organize cols=4 table=' ' font="size=1" pretty=1]
 		[item-options td=1 label=1 bold=1 price=1 blank-label="--select--"]
 	[/table-organize]
 [/if-item-param]
 
+
 	  </TD>
 
 [input-filter name="[quantity-name]" op="nullselect digits_dot"][/input-filter]
 
-	  <TD ALIGN=CENTER>
+	  <TD ALIGN=CENTER valign="top">
 	    <INPUT TYPE=text NAME="[quantity-name]" VALUE="[item-quantity]" SIZE=3>
 	  </TD>
 	[if discount [item-code]]
-	  <TD ALIGN=right>
+	  <TD ALIGN=right valign="top">
 	    [L]Regular price[/L] <STRIKE>[item-price]</STRIKE>
 	    <BR>
 	    <B>[L]Your price[/L]: [discount-price]<br>
 	    [L]You save[/L]: [item-difference]
 	  </TD>
-	  <TD ALIGN=right>
+	  <TD ALIGN=right valign="top">
 	    <strike>[item-subtotal]</strike><br>
 	    <B>[item-discount-subtotal]<BR>
 	    [L]You save[/L]: [item-discount]</b>
 	  </TD>
 	[else]
-	  <TD ALIGN=right>[item-price]</TD>
-	  <TD ALIGN=right>[item-subtotal]</TD>
+	  <TD ALIGN=right valign="top">[item-price]</TD>
+	  <TD ALIGN=right valign="top">[item-subtotal]</TD>
 	[/else]
 	[/if]
 	</TR>
@@ -290,17 +290,17 @@
 	<table border="0" width="100%">
         <tr> 
 	  <td>
-	    <INPUT type="submit" value="Recalculate" class=button1>
+	    <INPUT type="submit" value="Recalculate" class="button3">
 	  </td>
 	  <td align="center" valign="center"> 
     		[button
 			  text="[L]Check Out[/L]"
-			  class=button4
+			  class=button3
 			 
 			  form=basket
 		  ]
 			mv_todo=return
-			mv_nextpage=__CHECKOUT_PAGE__
+			mv_nextpage=ord/country.html
 		[/button]
 	  </td>
 	  <td align="center">
@@ -309,16 +309,16 @@
       	  <td align="Right">
             <table cellspacing="0" cellpadding="4" border="0">
             <tr> 
-              <td align=right class="contentbar1">
+              <td align=right>
                 [L]Shipping Weight[/L]:
               </td>
-              <td class="contentbar2" align="right">[summary format="%s" total=1]</td>
+              <td class="titletab_small" align="right">[summary format="%s" total=1]</td>
             </tr>
             <tr>
-              <td align="right" class="contentbar1">
+              <td align="right">
                 <b>[L]Subtotal[/L]:</b>
               </td>
-              <td class="contentbar2" align=right><b>[subtotal]</b></td>
+              <td class="titletab_small" align=right><b>[subtotal]</b></td>
             </tr>
 	    </table>
 	  </td>
@@ -362,14 +362,14 @@
     	    <INPUT TYPE=HIDDEN NAME="mv_todo" VALUE="return">
     	    <INPUT TYPE=HIDDEN NAME="mv_check" VALUE="Save Cart">
 	    <input type=hidden name=mv_session_id vlaue="[data session id]">
-    	    <input type=submit value="[L]Save Cart[/L]" class=buttonv>
+    	    <input type=submit value="[L]Save Cart[/L]" class=button3>
 			
 	    </FORM>
   [/elsif]
   [else]
       [button
           text="[L]Save This Cart[/L]"
-          class=buttonvl
+          class=button3
           form=basket
           mv_check="Save This Cart"
       ]
@@ -379,7 +379,7 @@
       [/button]
       [button
           text="[L]Set As Recurring Order[/L]"
-          class=buttonv
+          class=button3
           form=basket
           mv_check="Set As Recurring Order"
       ]



1.5       +5 -17     interchange/dist/standard/pages/ord/billing.html


rev 1.5, prev_rev 1.4
Index: billing.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/billing.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- billing.html	25 Jan 2005 04:13:13 -0000	1.4
+++ billing.html	26 Jan 2005 17:27:01 -0000	1.5
@@ -70,7 +70,7 @@
 <input type=hidden NAME=mv_failpage      value="ord/billing">
 <input type=hidden name=mv_form_profile  value="Check_billing">
 
-<table width="95%" align=center>
+<table width="100%" align=center>
 <tr>
   <td align="left" width="100%" align=center>
 
@@ -93,7 +93,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
 	[/tmp]
     [/if]
@@ -128,7 +128,7 @@
 
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large">
 			Billing Address <small>[scratch get_message]</small>
 		</td>
 	  </tr>
@@ -181,7 +181,6 @@
 			<INPUT TYPE=text NAME=b_address2 VALUE="[value b_address2]" size=40 maxlength="64">
 		  </td>
 		</tr>
-	  [if type=!data term="country::no_state::[value country]"]
 		<tr>
 		  <td align=right>
 			[error name=b_city std_label="[L]City[/L]" required=1]
@@ -196,17 +195,6 @@
 			<INPUT TYPE=text NAME=b_state VALUE="[value b_state]" size="5" maxlength="5">
 		  </td>
 		</tr>
-      [else]
-		<tr>
-		  <td align=right>
-			[error name=b_city std_label="[L]City[/L]" required=1]
-		  </td>
-		  <td colspan=3>
-			<INPUT TYPE=text NAME=b_city VALUE="[value b_city]" size="20">
-		  </td>
-		</tr>
-      [/else]
-      [/if]
 		<tr>
 		  <td align=right>
 			[error name=b_zip std_label="[L]Zip/Postal Code[/L]" required=1]
@@ -223,7 +211,7 @@
 		  [display
 		  		name=b_country
 		  		type=select
-				value="[either][value b_country][or]__SHIP_DEFAULT_COUNTRY__[/either]"
+				default=__SHIP_DEFAULT_COUNTRY__
 				lookup_query="select code,name from country where shipmodes != '' order by name"
 		  ]
 		  </td>
@@ -262,7 +250,7 @@
 					this.form.submit();
 				"
 				value="&lt;-- [L]Back[/L]" class=button3>
-				<input type=submit value="Next --&gt;" class=button1 style="font-weight: bold">
+				<input type=submit value="Next --&gt;" class=button3 style="font-weight: bold">
 		</td>
 	  </tr>
 	  [if scratch error_display]



1.4       +16 -4     interchange/dist/standard/pages/ord/checkout.html


rev 1.4, prev_rev 1.3
Index: checkout.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/checkout.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- checkout.html	13 Jul 2004 20:37:58 -0000	1.3
+++ checkout.html	26 Jan 2005 17:27:01 -0000	1.4
@@ -11,7 +11,7 @@
 
 <!-- BEGIN CONTENT -->
 
-<table width="95%">
+<table width="100%">
 <tr>
   <td align="left" width="100%">
 
@@ -33,7 +33,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
     [/if]
 
@@ -81,7 +81,7 @@
 	  <tr>
 		<td>
 				<br>
-				[include include/checkout/mailing_status]
+				[include include/checkout/mailing_status]				
 		</td>
 	  </tr>
 	  <tr>
@@ -113,6 +113,12 @@
 		  <table align="center" cellpadding="10" cellspacing="10">
 			[if items]
 			<tr>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 			  <td>
 			  <input type=submit value="[L]Recalculate[/L]" class=button3>
 			  </td>
@@ -122,7 +128,7 @@
 					  text="[L]Place Order[/L]"
 					  wait-text="-- [L]Wait[/L] --"
 					  form=checkout
-					  class=button1
+					  class=button3
 					  style="font-weight: bold"
 			  ]
 					  mv_todo=submit
@@ -131,6 +137,12 @@
 			</tr>
 			[else]
 			<tr>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
 			  <td>
 			  <b>[L]No items in your shopping cart![/L]</b>
 			  </td>



1.4       +3 -3      interchange/dist/standard/pages/ord/country.html


rev 1.4, prev_rev 1.3
Index: country.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/country.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- country.html	13 Jul 2004 20:37:58 -0000	1.3
+++ country.html	26 Jan 2005 17:27:01 -0000	1.4
@@ -38,7 +38,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
     [/if]
 
@@ -54,7 +54,7 @@
 
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large">
 			Country selection
 		</td>
 	  </tr>
@@ -83,7 +83,7 @@
 		<td>&nbsp;</td>
 		<td colspan="3">
 		<br>
-				<input type=submit value="[L]Next[/L] --&gt;" class=button1 style="font-weight: bold">
+				<input type=submit value="[L]Next[/L] --&gt;" class=button3 style="font-weight: bold">
 		</td>
 	  </tr>
 	  <tr>



1.4       +21 -21    interchange/dist/standard/pages/ord/finalize.html


rev 1.4, prev_rev 1.3
Index: finalize.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/finalize.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- finalize.html	25 Jan 2005 04:13:13 -0000	1.3
+++ finalize.html	26 Jan 2005 17:27:01 -0000	1.4
@@ -23,7 +23,7 @@
 <input type=hidden NAME=mv_nextpage      value="ord/finalize">
 <input type=hidden NAME=mv_failpage      value="ord/finalize">
 
-<table width="95%">
+<table width="100%">
 <tr>
   <td align="left" width="100%" align=center>
 
@@ -38,7 +38,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
 	[/tmp]
     [/if]
@@ -50,7 +50,7 @@
 
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large">
 			Review your order details
 		</td>
 	  </tr>
@@ -58,13 +58,13 @@
 		<td class=shadowbox style="padding: 12px">
 
         <table cellspacing="0" cellpadding="5" border="0" width="100%">
-        <TR class="contentbar2">
-          <td class="contentbar2">&nbsp;<b>[L]Remove[/L]</b></td>
-          <td class="contentbar2" align="center"><b>[L]SKU[/L]</b></td>
-          <td class="contentbar2"><b>[L]Description[/L]</b></td>
-          <td class="contentbar2"><b>[L]Quantity[/L]</b></td>
-          <td class="contentbar2" align="center"><b>[L]Price[/L]</b></td>
-          <td class="contentbar2"><b>[L]Extension[/L]&nbsp;</b></td>
+        <TR class="titletab_small">
+          <td class="titletab_small">&nbsp;<b>[L]Remove[/L]</b></td>
+          <td class="titletab_small" align="center"><b>[L]SKU[/L]</b></td>
+          <td class="titletab_small"><b>[L]Description[/L]</b></td>
+          <td class="titletab_small"><b>[L]Quantity[/L]</b></td>
+          <td class="titletab_small" align="center"><b>[L]Price[/L]</b></td>
+          <td class="titletab_small"><b>[L]Extension[/L]&nbsp;</b></td>
         </TR>
         <TBODY>
 
@@ -72,12 +72,12 @@
         [then]
         [item-list]
 
-        <TR class="[item-alternate 2]maincontent[else]contentbar1[/else][/item-alternate]">
+        <TR class="[item-alternate 2]cartdisplay[else]cartdisplay_alt[/else][/item-alternate]">
           <TD align=center valign=top>
             <INPUT TYPE=checkbox NAME="[quantity-name]" onClick="this.form.action='[process]', this.form.submit()" VALUE=0>
           </TD>
           <TD><b>[item-sku]</b></TD>
-          <TD>[page [item-sku]]<b>[item-description]</b></a>
+          <TD><a href="[area href="item-sku"]" class="cartlink"><b>[item-description]</b></a>
 
                 [table-organize cols=4 table=' ' font="size=1" pretty=1]
                     [item-options td=1 label=1 bold=1 price=1]
@@ -100,7 +100,7 @@
         [/then]
         [else]
         <TR>
-          <TD ALIGN=CENTER COLSPAN=6 class="contentbar2">
+          <TD ALIGN=CENTER COLSPAN=6 class="titletab_small">
             [L]No items at the moment.[/L]
           </TD>
         </TR>
@@ -115,7 +115,7 @@
         <TR>
           <td align="left">
                         [if items]
-            <INPUT TYPE=submit VALUE="[L]Recalculate[/L]" class=button1>
+            <INPUT TYPE=submit VALUE="[L]Recalculate[/L]" class=button3>
                         [/if]
           </td>
           <td align="right">
@@ -150,8 +150,8 @@
 		[/else]
 		[/if]
             <tr>
-              <td align=right class=contentbar2>[L]TOTAL[/L]:</TD>
-              <td align=right class=contentbar2>[total-cost]</TD>
+              <td align=right class="titletab_small">[L]TOTAL[/L]:</TD>
+              <td align=right class="titletab_small">[total-cost]</TD>
             </tr>
             </table>
 		</td>
@@ -171,7 +171,7 @@
 	<td>
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large" style="padding: 12px; border-bottom: 0">
 			Mailing status
 		</td>
 	  </tr>
@@ -222,7 +222,7 @@
 
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large">
 			Payment and submit order
 		</td>
 	  </tr>
@@ -240,7 +240,7 @@
 						[value fname] [value lname]<br>
 						[value address1]<br>
 						[if value address2][value address2]<br>[/if]
-						[value city][if value state], [value state][/if]  [value zip]<br>
+						[value city], [value state]  [value zip]<br>
 						[value country]
 						</blockquote>
 						</td>
@@ -251,7 +251,7 @@
 						[value b_fname] [value b_lname]<br>
 						[value b_address1]<br>
 						[if value b_address2][value b_address2]<br>[/if]
-						[value b_city][if value b_state], [value b_state][/if]  [value b_zip]<br>
+						[value b_city], [value b_state]  [value b_zip]<br>
 						[value b_country]
 						</blockquote>
 						</td>
@@ -297,7 +297,7 @@
 					this.form.submit();
 				"
 				value="&lt;-- [L]Back[/L]" class=button3>
-				[button text="[L]Place Order[/L]" wait-text="-- Wait --"  class=button1 id=placebutton style="font-weight: bold"]
+				[button text="[L]Place Order[/L]" wait-text="-- Wait --"  class=button3 id=placebutton style="font-weight: bold"]
 					mv_todo=submit
 				[/button]
 		</div>



1.3       +37 -37    interchange/dist/standard/pages/ord/multi.html


rev 1.3, prev_rev 1.2
Index: multi.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/multi.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multi.html	25 Jan 2005 21:51:57 -0000	1.2
+++ multi.html	26 Jan 2005 17:27:01 -0000	1.3
@@ -35,37 +35,37 @@
 
 [warnings auto=1]
 
-<table width="90%" align=center cellspacing=0>
+<table width="90%" align="center" cellspacing="0">
 <tr>
-	<td width="30%" align=center valign=bottom class=titlebox style="border-bottom: 0">
+	<td width="30%" align="center" valign="bottom" class="titletab_large">
 		[L]Log in to account[/L]
 	</td>
-	<td width="5%" valign=top>
+	<td width="5%" valign="top">
 	</td>
-	<td width="30%" align=center valign=bottom class=titlebox style="border-bottom: 0">
+	<td width="30%" align="center" valign="bottom" class="titletab_large">
 		[L]Create a new account[/L]
 	</td>
-	<td width="5%" valign=top>
+	<td width="5%" valign="top">
 	</td>
-	<td width="30%" align=center valign=bottom class=titlebox style="border-bottom: 0">
+	<td width="30%" align="center" valign="bottom" class="titletab_large">
 		[L]Don't create an account[/L]
 	</td>
 <tr>
-	<td width="30%" valign=top class=shadowbox>
-		<FORM ACTION="[process secure=1]" METHOD=POST>
-		<INPUT TYPE=hidden NAME=mv_todo  VALUE=return>
-		<INPUT TYPE=hidden NAME=mv_click VALUE=Login>
-		<INPUT TYPE=hidden NAME=mv_failpage VALUE="@@MV_PAGE@@">
-		<INPUT TYPE=hidden NAME=mv_successpage VALUE="ord/country">
-		<INPUT TYPE=hidden NAME=mv_nextpage VALUE="ord/country">
-		<input type=hidden name=mv_session_id value="[data session id]">
+	<td width="30%" valign="top" class="shadowbox">
+		<form action="[process secure=1]" method="POST">
+		<input type="hidden" name="mv_todo" value="return">
+		<input type="hidden" name="mv_click" value="Login">
+		<input type="hidden" name="mv_failpage" value="@@MV_PAGE@@">
+		<input type="hidden" name="mv_successpage" value="ord/country">
+		<input type="hidden" name="mv_nextpage" value="ord/country">
+		<input type="hidden" name="mv_session_id" value="[data session id]">
 
 		<table border="0" align="center" width="100%" height="100%">
 		<tr>
 		  <td align="center"> 
 		<table align="center">
 		<tr> 
-		  <td align=right>
+		  <td align="right">
 			[L]Username[/L]
 		  </td>
 		  <td>
@@ -73,24 +73,24 @@
 		  </td>
 		</tr>
 		<tr>
-		  <td align=right>
+		  <td align="right">
 			[L]Password[/L]
 		  </td>
 		  <td>
-			<INPUT TYPE=password NAME=mv_password VALUE="">
+			<input type="password" name="mv_password" value="">
 		  </td>
 		</tr>
 		<tr>
 		  <td>&nbsp;</td>
 		  <td>
-			<input type=submit value="[L]Log In[/L] --&gt;" class=button1>
+			<input type="submit" value="[L]Log In[/L] --&gt;" class="button3">
 		  </td>
 		</tr>
 		[if config CookieLogin]
 		<tr>
-		  <td align=right>
-			<INPUT TYPE=hidden NAME=mv_cookie_password VALUE=0>
-			<INPUT TYPE=checkbox NAME=mv_cookie_password VALUE=1>
+		  <td align="right">
+			<input type="hidden" name="mv_cookie_password" value="0">
+			<input type="checkbox" name="mv_cookie_password" value="1">
 		  </td>
 		  <td>
 			[L]Log me in automatically (sets cookie)[/L]
@@ -104,19 +104,19 @@
 		
 		</form>
 	</td>
-	<td width="5%" valign=top>
+	<td width="5%" valign="top">
 		&nbsp;
 	</td>
-	<td width="30%" valign=top class=shadowbox>
+	<td width="30%" valign="top" class="shadowbox">
 		<table border="0" align="center" width="100%" height="100%">
 
-		<FORM ACTION="[process secure=1]" METHOD=POST>
-		<input type=hidden name=mv_session_id value="[data session id]">
-		<INPUT TYPE=hidden NAME=mv_click VALUE=NewAccount>
-		<INPUT TYPE=hidden NAME=mv_failpage VALUE="@@MV_PAGE@@">
-		<INPUT TYPE=hidden NAME=mv_successpage VALUE="ord/country">
-		<INPUT TYPE=hidden NAME=mv_nextpage VALUE="ord/country">
-		<INPUT TYPE=hidden NAME=mv_todo  VALUE=return>
+		<form action="[process secure=1]" method="POST">
+		<input type="hidden" name="mv_session_id" value="[data session id]">
+		<input type="hidden" name="mv_click" value=NewAccount>
+		<input type="hidden" name="mv_failpage" value="@@MV_PAGE@@">
+		<input type="hidden" name="mv_successpage" value="ord/country">
+		<input type="hidden" name="mv_nextpage" value="ord/country">
+		<input type="hidden" name="mv_todo"  value="return">
 
 		<tr> 
 		  <td>
@@ -126,7 +126,7 @@
 				[L]Username[/L]:
 			  </td>
 			  <td align="left"> 
-				<input type="text" NAME=mv_username VALUE="">
+				<input type="text" name="mv_username" value="">
 			  </td>
 			</tr>
 			<tr> 
@@ -134,7 +134,7 @@
 				[L]Password[/L]:
 			  </td>
 			  <td align="left"> 
-				<INPUT TYPE=password NAME=mv_password VALUE="">
+				<input type="password" name="mv_password" value="">
 			  </td>
 			</tr>
 			<tr> 
@@ -142,19 +142,19 @@
 				[L]Verify Password[/L]:
 			  </td>
 			  <td align="left"> 
-				<INPUT TYPE=password NAME=mv_verify VALUE="">
+				<input type="password" name="mv_verify" value="">
 			  </td>
 			</tr>
 			<tr> 
 			  <td>&nbsp;</td>
 			  <td> 
-				<INPUT TYPE=submit VALUE="[L]Create[/L] --&gt;" class=button1>
+				<input="submit" value="[L]Create[/L] --&gt;" class="button3">
 			  </td>
 			</tr>
 			[if config CookieLogin]
 			<tr> 
 			  <td align="right"> 
-				<INPUT TYPE=checkbox NAME=mv_cookie_password VALUE=1>
+				<input type="checkbox" name="mv_cookie_password" value="1">
 			  </td>
 			  <td>[L]Log me in automatically (sets cookie)[/L]</td>
 			</tr>
@@ -172,10 +172,10 @@
 
 
 	</td>
-	<td width="5%" valign=top>
+	<td width="5%" valign="top">
 		&nbsp;
 	</td>
-	<td width="30%" valign=top class=shadowbox style="padding-left: 10px">
+	<td width="30%" valign="top" class="shadowbox" style="padding-left: 10px">
 		<br>
 		[L]I would prefer not to create an account at all.[/L] 
 			<blockquote>



1.2       +2 -2      interchange/dist/standard/pages/ord/shipmode.html


rev 1.2, prev_rev 1.1
Index: shipmode.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/shipmode.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shipmode.html	25 Apr 2004 17:07:52 -0000	1.1
+++ shipmode.html	26 Jan 2005 17:27:01 -0000	1.2
@@ -66,7 +66,7 @@
 
 	<table align=center cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0" align=center>
+		<td class="titletab_large" align=center>
 			Shipping selection
 		</td>
 	  </tr>
@@ -136,7 +136,7 @@
 				class=button3
 				value="&lt;-- [L]Back[/L]"
 				>
-				<input type=submit value="Next --&gt;" class=button1 style="font-weight: 600">
+				<input type=submit value="Next --&gt;" class=button3 style="font-weight: 600">
 		</td>
 	  </tr>
 	  [if scratch error_display]



1.5       +4 -7      interchange/dist/standard/pages/ord/shipping.html


rev 1.5, prev_rev 1.4
Index: shipping.html
===================================================================
RCS file: /var/cvs/interchange/dist/standard/pages/ord/shipping.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- shipping.html	25 Jan 2005 04:13:13 -0000	1.4
+++ shipping.html	26 Jan 2005 17:27:01 -0000	1.5
@@ -30,7 +30,7 @@
 <input type=hidden NAME=mv_failpage      value="ord/shipping">
 <input type=hidden name=mv_form_profile  value="Check_shipping">
 
-<table width="95%" align=center>
+<table width="100%" align=center>
 <tr>
   <td align="left" width="100%" align=center>
 
@@ -53,7 +53,7 @@
         </blockquote>
         </p>
         <p>
-    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]The areas you need to correct are shown in %sthis color%s below.[/msg]</B>
+    [msg arg.0="<FONT color='__CONTRAST__'>" arg.1="</FONT>"]Please correct the areas listed above which are highlighted in %sthis color%s in the form.[/msg]</B>
     </p>
     [/tmp]
     [/if]
@@ -78,7 +78,7 @@
 
 	<table align="center" cellspacing=0 width="__CHECKOUT_FORM_WIDTH__">
 	  <tr>
-		<td class=titlebox style="padding: 12px; border-bottom: 0">
+		<td class="titletab_large">
 			Shipping Address <small>[scratch get_message]</small>
 		</td>
 	  </tr>
@@ -128,7 +128,6 @@
 		  <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]
@@ -156,7 +155,6 @@
 		  [/loop]
 		</td>
 	  </tr>
-	  [/if]
 	  <tr>
 		<td align="right">
 		  [error name=zip std_label="[L]Zip/Postal Code[/L]" required=1] 
@@ -258,7 +256,7 @@
 					this.form.submit();
 				"
 				value="&lt;-- [L]Back[/L]" class=button3>
-				<input type=submit value="Next --&gt;" class=button1 style="font-weight: 500">
+				<input type=submit value="Next --&gt;" class=button3 style="font-weight: 500">
 		</td>
 	  </tr>
 	  [if scratch error_display]
@@ -291,6 +289,5 @@
 
 
 <!-- END CONTENT -->
-<!-- Version: $Id: shipping.html,v 1.4 2005/01/25 04:13:13 mheins Exp $ -->
 
 @_NOLEFT_BOTTOM_@








More information about the interchange-cvs mailing list