[interchange-cvs] interchange - jonc modified 14 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Jan 26 12:51:14 EST 2005
User: jonc
Date: 2005-01-26 17:51:14 GMT
Modified: dist/standard/include/checkout billing_address login_form
Modified: mailing_status new_browser_payment
Modified: old_browser_payment payment_select shipping_address
Modified: shopping_cart
Modified: dist/standard/include/forum reply_form submit_form
Modified: dist/standard/include/layout leftonly leftright noleft
Modified: dist/standard/include/menus Top.txt
Log:
More Standard demo alterations:
* Updated Layout components.
* Updated checkout components.
* Fix to forum components to stop auto-creation of entry just by
going to the page.
* Make ITL code for edit helper links at bottom of pages consistent.
* Add back in Content tab in UI.
Revision Changes Path
1.2 +45 -40 interchange/dist/standard/include/checkout/billing_address
rev 1.2, prev_rev 1.1
Index: billing_address
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/billing_address,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- billing_address 25 Apr 2004 17:07:49 -0000 1.1
+++ billing_address 26 Jan 2005 17:51:13 -0000 1.2
@@ -1,9 +1,9 @@
-<table cellspacing=0 cellpadding=0 width="100%">
+<table cellspacing="0" cellpadding="0" width="100%">
<tr>
<td>
- <table border=0 cellspacing=0 cellpadding=0 width="100%">
- <tr class=contentbar2>
- <td colspan=4 class=contentbar2>
+ <table border="0" cellspacing="0" cellpadding="4" width="100%">
+ <tr class="titletab_small">
+ <td colspan=4 class="titletab_small">
<b> [L]Billing Address[/L]</b> -
<script>
@@ -41,86 +41,91 @@
[value name=mv_same_billing set=1 hide=1]
[/if]
<input
- type=radio
- name=mv_same_billing
- value=0
+ type="radio"
+ name="mv_same_billing"
+ value="0"
onClick="check_bill_elements(this)"
[checked mv_same_billing 0]>
Different than shipping
<input
- type=radio
- name=mv_same_billing
- value=1
+ type="radio"
+ name="mv_same_billing"
+ value="1
onClick="check_bill_elements(this)"
[checked mv_same_billing 1]>
- Same as shipping
-
+ Same as shipping
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
+ <br>
<b>[L]First Name[/L]</b>
</td>
- <td align=left class=contentbar1>
- <input type=text name=b_fname value="[value b_fname]" size="20" maxlength="20">
+ <td align="left" class="contentbar1">
+ <br>
+ <input type="text" name="b_fname" value="[value b_fname]" size="20" maxlength="20">
+ </td>
+ <td align="right" class="contentbar1">
+ <br>
+ <b>[L]Last Name[/L]</b>
</td>
- <td align=right class=contentbar1><b>[L]Last Name[/L]</b> </td>
- <td align=left class=contentbar1>
- <input type=text name=b_lname value="[value b_lname]" size="20">
+ <td align="left" class="contentbar1">
+ <br>
+ <input type="text" name="b_lname" value="[value b_lname]" size="20">
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
<b>[L]Company[/L]</b>
</td>
- <td align=left class=contentbar1 colspan=3>
- <input type=text name=b_company value="[value b_company]" size="20" maxlength="44">
+ <td align="left" class="contentbar1" colspan="3">
+ <input type="text" name="b_company" value="[value b_company]" size="20" maxlength="44">
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
<b>[L]Address[/L]</b>
</td>
- <td align=left colspan=3 class=contentbar1>
- <input type=text name=b_address1 value="[value b_address1]" size=40 maxlength="64">
+ <td align="left" colspan="3" class="contentbar1">
+ <input type="text" name="b_address1" value="[value b_address1]" size=40 maxlength="64">
</td>
</tr>
<tr>
- <td class=contentbar1> </td>
- <td align=left colspan=3 class=contentbar1>
- <input type=text name=b_address2 value="[value b_address2]" size=40 maxlength="64">
+ <td class="contentbar1"> </td>
+ <td align="left" colspan="3" class="contentbar1">
+ <input type="text" name="b_address2" value="[value b_address2]" size=40 maxlength="64">
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
<b>[L]City[/L]</b>
</td>
- <td class=contentbar1>
- <input type=text name=b_city value="[value b_city]" size="20">
+ <td class="contentbar1">
+ <input type="text" name="b_city" value="[value b_city]" size="20">
</td>
- <td align=right class=contentbar1><b>[L]State/Province[/L]</b></td>
- <td class=contentbar1>
- <input type=text name=b_state value="[value b_state]" size="5" maxlength="5">
+ <td align="right" class="contentbar1"><b>[L]State/Province[/L]</b></td>
+ <td class="contentbar1">
+ <input type="text" name="b_state" value="[value b_state]" size="5" maxlength="5">
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
<b>[L]Zip/Postal Code[/L]</b>
</td>
- <td class=contentbar1 colspan=3>
- <input type=text name=b_zip value="[value b_zip]" size="10" maxlength="10">
+ <td class="contentbar1" colspan="3">
+ <input type="text" name="b_zip" value="[value b_zip]" size="10" maxlength="10">
</td>
</tr>
<tr>
- <td align=right class=contentbar1>
+ <td align="right" class="contentbar1">
<b>[L]Country[/L]</b>
</td>
- <td class=contentbar1 colspan=3>
- <input type=text name=b_country value="[value b_country]" size="10" maxlength="10">
+ <td class="contentbar1" colspan="3">
+ <input type="text" name="b_country" value="[value b_country]" size="10" maxlength="10">
</td>
</tr>
<tr>
- <td class=contentbar1 colspan=4> </td>
+ <td class="contentbar1" colspan="4"> </td>
</tr>
</table>
</td>
1.2 +1 -1 interchange/dist/standard/include/checkout/login_form
rev 1.2, prev_rev 1.1
Index: login_form
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/login_form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- login_form 25 Apr 2004 17:07:49 -0000 1.1
+++ login_form 26 Jan 2005 17:51:13 -0000 1.2
@@ -18,7 +18,7 @@
<table align="center">
<tr>
- <td class="contentbar2">
+ <td class="titletab_small">
<table>
<tr>
<td align="right" class="contentbar1">
1.2 +15 -14 interchange/dist/standard/include/checkout/mailing_status
rev 1.2, prev_rev 1.1
Index: mailing_status
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/mailing_status,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mailing_status 25 Apr 2004 17:07:49 -0000 1.1
+++ mailing_status 26 Jan 2005 17:51:13 -0000 1.2
@@ -2,33 +2,34 @@
<table cellspacing="0" cellpadding="0" width="100%">
<tr>
<td>
- <table border="0" align="center" cellspacing="0" width="100%">
- <tr class="contentbar2">
- <td class="contentbar2" colspan=4><b>[L]Mailing Status[/L]</b></td>
+ <table border="0" align="center" cellspacing="0" cellpadding="4" width="100%">
+ <tr class="titletab_small">
+ <td class="titletab_small" colspan=4><b>[L] Mailing Status[/L]</b></td>
</tr>
<tr>
- <td align="center" valign="middle" class="contentbar1">
- <select name=email_copy>
+ <td class="contentbar1"><B>[L]Send an email copy of my receipt[/L]</B></td>
+ <td class="contentbar1" width="30"> </td>
+ <td valign="middle" class="contentbar1">
+ <br>
+ <select name="email_copy">
<option value="1">[L]Yes[/L]
<option [selected name=email_copy value=0] value="0">[L]No[/L]
- </select>
- </td>
- <td class="contentbar1"><B>[L]Send an email copy of my receipt[/L]</B></td>
+ </select><br><br>
+ </td>
<td class="contentbar1"> </td>
- <td class="contentbar1"> </td>
- </tr>
+ </tr>
[if variable CHECKOUT_MAIL_LIST]
<tr>
+ <td class="contentbar1"><B>[L]Mail lists (if any)[/L]</B></td>
+ <td class="contentbar1"> </td>
<td align="center" valign="middle" class="contentbar1">
[perl tables="__UI_META_TABLE__ mv_metadata"]
return;
[/perl]
[input-filter name=mail_list op=null_to_space][/input-filter]
- [display table=userdb type=multiple column=mail_list key="[data session username]"]
- </td>
- <td class="contentbar1"><B>[L]Mail lists (if any)[/L]</B></td>
- <td class="contentbar1"> </td>
+ [display table=userdb type=checkbox column=mail_list key="[data session username]"]
+ </td>
<td class="contentbar1"> </td>
</tr>
[/if]
1.2 +37 -36 interchange/dist/standard/include/checkout/new_browser_payment
rev 1.2, prev_rev 1.1
Index: new_browser_payment
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/new_browser_payment,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- new_browser_payment 25 Apr 2004 17:07:49 -0000 1.1
+++ new_browser_payment 26 Jan 2005 17:51:13 -0000 1.2
@@ -15,17 +15,17 @@
z-index:0;
">
<!--- credit card information --->
- <table cellspacing=0 cellpadding="0" width="100%">
+ <table cellspacing="0" cellpadding="0" width="100%">
<tr>
<td>
- <table border=0 cellspacing=0 cellpadding=4 width="100%">
+ <table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
- <td colspan="2" class="contentbar2" width="30%">
+ <td colspan="2" class="titletab_small" width="30%">
<b>
[error std_label="[L]Credit Card Information[/L]" name=mv_credit_card_valid]
</b>
</td>
- <td class="contentbar2">
+ <td class="titletab_small">
[calc]
my $accepted = $Variable->{CREDIT_CARDS_ACCEPTED};
my (@out);
@@ -43,10 +43,11 @@
</td>
</tr>
<tr>
- <td align=right class="contentbar1" width="30%">
+ <td align="right" class="contentbar1" width="30%">
+ <br>
<b>[L]Card Number[/L]: </b>
</td>
- <td colspan=2 class="contentbar1">
+ <td colspan="2" class="contentbar1"><br>
<script>
var cards = [ 'visa', 'mc', 'disc', 'amex' ];
var cardimg = new Array;
@@ -168,25 +169,25 @@
}
}
</script>
- <b><input type=text name=mv_credit_card_number size=22 onChange="highlight_card(this.value)"></b> <i id=textindication style="font-size: smaller"></i>
+ <b><input type="text" name="mv_credit_card_number" size="22" onChange="highlight_card(this.value)"></b> <i id="textindication" style="font-size: smaller"></i>
</td>
</tr>
[if variable MV_DEMO_MODE]
<tr>
- <td class=contentbar1>
+ <td class="contentbar1">
</td>
- <td colspan=2 class=contentbar1>
+ <td colspan="2" class="contentbar1">
([L]test number[/L] <a href="javascript:void 0" onclick="checkout.mv_credit_card_number.value='4111 1111 1111 1111'; highlight_card('4'); return false;">4111 1111 1111 1111</A>)
</td>
</tr>
[/if]
<tr>
- <td align=right class="contentbar1">
+ <td align="right" class="contentbar1">
<b>[L]Expiration[/L]: </b>
</td>
- <td colspan=2 class="contentbar1">
+ <td colspan="2" class="contentbar1">
- <select name=mv_credit_card_exp_month>
+ <select name="mv_credit_card_exp_month">
[loop
option=mv_credit_card_exp_month
acclist=1
@@ -207,7 +208,7 @@
[/loop]
</SELECT>
- <select name=mv_credit_card_exp_year>
+ <select name="mv_credit_card_exp_year">
[comment]
This should always return the current year as the first, then
7 more years.
@@ -235,7 +236,7 @@
</table>
</div>
<div
- id=postal
+ id="postal"
style="
Position:Absolute;
Left:0; Top:0;
@@ -245,7 +246,7 @@
[L NEW_BROWSER_PAYMENT_MSG1]We will wait for a check sent to us referencing the order number you receive on your receipt.[/L]
</div>
<div
- id=cod
+ id="cod"
style="
Position:Absolute;
Left:0; Top:0;
@@ -256,28 +257,28 @@
</div>
<div
- id=online_check
+ id="online_check"
style="
Position:Absolute;
Left:0; Top:0;
Visibility:Hidden;
z-index:0;
">
- <table border=0 cellspacing=0 cellpadding=0 width="100%">
+ <table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<td>
- <table border=0 cellspacing=0 cellpadding=0 width="100%">
+ <table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
- <td class=contentbar2 colspan=4 width="30%">
+ <td class="titletab_small" colspan="4" width="30%">
<b> [L]Check Information[/L]</b>
</td>
</tr>
<tr>
- <td align=right>
+ <td align="right">
[error name=check_acct std_label="[L]Account Number[/L]" required=1]
</td>
<td colspan="3 align="left" class="contentbar1">
- <input type=text name=check_acct size=22 value="[value check_acct]">
+ <input type="text" name="check_acct" size="22" value="[value check_acct]">
</td>
</tr>
<tr>
@@ -286,7 +287,7 @@
</td>
<td align="left" colspan="3" class="contentbar1">
- <b><input type=text name=check_route size=22 value="[value check_route]"></b>
+ <b><input type="text" name="check_route" size="22" value="[value check_route]"></b>
</td>
</tr>
<tr>
@@ -295,7 +296,7 @@
</td>
<td align="left" colspan="3" class="contentbar1">
<b>
- <input type=text name=check_num size=22 value="[value check_num]">
+ <input type="text" name="check_num" size="22" value="[value check_num]">
</b>
</td>
</tr>
@@ -306,12 +307,12 @@
</td>
<td align="left" colspan="3" class="contentbar1">
<b>
- <input type=text name=check_bank_phone size=22 value="[value check_bank_phone]">
+ <input type="text" name="check_bank_phone" size="22" value="[value check_bank_phone]">
</b>
</td>
</tr>
<tr>
- <td colspan=4 class=contentbar1> </td>
+ <td colspan="4" class="contentbar1"> </td>
</tr>
</table>
</td>
@@ -319,7 +320,7 @@
</table>
</div>
<div
- id=purchase_order
+ id="purchase_order"
style="
Position:Absolute;
Left:0; Top:0;
@@ -331,26 +332,26 @@
<tr>
<td>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
- <tr class="contentbar2">
- <td class="contentbar2" colspan="2">
+ <tr class="titletab_small">
+ <td class="titletab_small" colspan="2">
<b> [L]P.O. Information[/L] </b>
</td>
- <td colspan=2 class="contentbar2"> </td>
+ <td colspan="2" class="titletab_small"> </td>
</tr>
[if !variable PO_ALWAYS]
<tr>
- <td align=right class="contentbar1" width="30%">
+ <td align="right" class="contentbar1" width="30%">
[error name=credit_limit_ok std_label="[L]PO Number[/L]" required=1]
</td>
- <td align=left colspan=3 class="contentbar1">
+ <td align="left" colspan="3" class="contentbar1">
<b>
- <input name=po_number value="[value po_number]" size=14>
+ <input name="po_number" value="[value po_number]" size="14">
</b>
</td>
</tr>
[/if]
<tr>
- <td colspan=4 class=contentbar1> </td>
+ <td colspan="4" class="contentbar1"> </td>
</tr>
[if type=data
@@ -359,10 +360,10 @@
compare=0.01]
<tr>
- <td align=right valign=top class=contentbar1>
+ <td align="right" valign="top" class="contentbar1">
<b> Available credit </b>
</td>
- <td align=left colspan=3 class=contentbar1>
+ <td align="left" colspan="3" class="contentbar1">
[currency]
[data table=userdb col=credit_limit key="[data session username]"]
[/currency]
@@ -381,7 +382,7 @@
[/if]
<tr>
- <td colspan=4 class=contentbar1> </td>
+ <td colspan="4" class="contentbar1"> </td>
</tr>
</table>
1.2 +10 -10 interchange/dist/standard/include/checkout/old_browser_payment
rev 1.2, prev_rev 1.1
Index: old_browser_payment
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/old_browser_payment,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- old_browser_payment 25 Apr 2004 17:07:49 -0000 1.1
+++ old_browser_payment 26 Jan 2005 17:51:13 -0000 1.2
@@ -6,12 +6,12 @@
<td>
<table border=0 cellspacing=0 cellpadding=4 width="100%">
<tr>
- <td colspan="2" class="contentbar2" width="30%">
+ <td colspan="2" class="titletab_small" width="30%">
<b>
[error std_label="[L]Credit Card Information[/L]" name=mv_credit_card_valid]
</b>
</td>
- <td class="contentbar2">
+ <td class="titletab_small">
[calc]
my $accepted = $Variable->{CREDIT_CARDS_ACCEPTED};
my (@out);
@@ -29,10 +29,10 @@
</td>
</tr>
<tr>
- <td align=right class="contentbar1" width="30%">
+ <td align=right class="contentbar1" width="30%"><br>
<b>[L]Card Number[/L]: </b>
</td>
- <td colspan=2 class="contentbar1">
+ <td colspan=2 class="contentbar1"><br>
<b><input type=text name=mv_credit_card_number size=22></b>
</td>
</tr>
@@ -113,11 +113,11 @@
<td>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
- <td class="contentbar2" colspan="2" width="30%">
+ <td class="titletab_small" colspan="2" width="30%">
<b> [L]Check Information[/L]</b>
</td>
- <td class="contentbar2"> </td>
- <td class="contentbar2"> </td>
+ <td class="titletab_small"> </td>
+ <td class="titletab_small"> </td>
</tr>
<tr>
<td align="right" class="contentbar1">
@@ -174,11 +174,11 @@
<tr>
<td>
<table border="0" cellspacing="0" cellpadding="0" width="100%">
- <tr class="contentbar2">
- <td class="contentbar2" colspan="2">
+ <tr class="titletab_small">
+ <td class="titletab_small" colspan="2">
<b> [L]P.O. Information[/L] </b>
</td>
- <td colspan=2 class="contentbar2"> </td>
+ <td colspan=2 class="titletab_small"> </td>
</tr>
<tr>
<td align=right class="contentbar1" width="30%">
1.2 +3 -3 interchange/dist/standard/include/checkout/payment_select
rev 1.2, prev_rev 1.1
Index: payment_select
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/payment_select,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- payment_select 25 Apr 2004 17:07:49 -0000 1.1
+++ payment_select 26 Jan 2005 17:51:13 -0000 1.2
@@ -1,9 +1,9 @@
<table cellspacing="0" cellpadding="0" width="100%">
<tr>
<td>
- <table border="0" cellspacing="0" cellpadding="0" width="100%">
- <tr class="contentbar2">
- <td colspan=4 class="contentbar2"><b>[L]Payment Method[/L]</b></td>
+ <table border="0" cellspacing="0" cellpadding="4" width="100%">
+ <tr class="titletab_small">
+ <td colspan=4 class="titletab_small"><b>[L] Payment Method[/L]</b></td>
</tr>
<tr>
<td colspan=4 class="contentbar1"> </td>
1.3 +3 -3 interchange/dist/standard/include/checkout/shipping_address
rev 1.3, prev_rev 1.2
Index: shipping_address
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/shipping_address,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shipping_address 28 Jun 2004 19:24:00 -0000 1.2
+++ shipping_address 26 Jan 2005 17:51:13 -0000 1.3
@@ -1,12 +1,12 @@
<table cellspacing=0 cellpadding=0 width="100%">
<tr>
<td>
- <table border=0 align="center" cellspacing=0 width="100%">
+ <table border=0 align="center" cellspacing="0" cellpadding="4" width="100%">
<tr>
<td colspan="4"> </td>
</tr>
- <tr class="contentbar2">
- <td class="contentbar2" colspan=4>
+ <tr class="titletab_small">
+ <td class="titletab_small" colspan=4>
<b> [L]Shipping Address[/L]<b> <i>([L]primary[/L])</i>
</td>
</tr>
1.2 +18 -18 interchange/dist/standard/include/checkout/shopping_cart
rev 1.2, prev_rev 1.1
Index: shopping_cart
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/checkout/shopping_cart,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shopping_cart 25 Apr 2004 17:07:49 -0000 1.1
+++ shopping_cart 26 Jan 2005 17:51:13 -0000 1.2
@@ -1,11 +1,11 @@
<table cellspacing=0 cellpadding=5 border=0 width="100%">
- <tr class=contentbar2>
- <td class=contentbar2> <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] </b></td>
+ <tr class="titletab_small">
+ <td class="titletab_small"> <b>[L]Remove[/L]</b></td>
+ <td class="titletab_small"><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"><b>[L]Price[/L]</b></td>
+ <td class="titletab_small"><b>[L]Extension[/L] </b></td>
</tr>
<tbody>
@@ -13,16 +13,16 @@
[then]
[item-list modular=1]
- <tr class="[item-alternate 2]maincontent[else]contentbar1[/else][/item-alternate]">
- <td align=center valign=top>
+ <tr class="[item-alternate 2]cartnorm[else]cartalt[/else][/item-alternate]">
+ <td 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>
[if scratch dealer]
[if-item-data pricing sku]
- <br>[page quantity [item-code]]
+ <br><a href="[area href="quantity [item-code]"]" class="cartlink">
[L]QUANTITY PRICING[/L]</a>
[/if-item-data]
[/if]
@@ -39,21 +39,21 @@
[seti weight][summary amount=`[item-quantity] * [item-field weight]`][/seti]
[/if-item-field]
</td>
- <td align=center valign=top>
+ <td valign=top>
<input type=text name="[quantity-name]" value="[item-quantity]" size=3>
</td>
- <td align=right>
+ <td>
[item-discount-price]
[if discount [item-code]]<br>[msg arg.0="[item-discount]"]Item is discounted %s[/msg][/if]
</td>
- <td align=right>[item-subtotal]</td>
+ <td>[item-subtotal]</td>
</tr>
[/item-list]
[/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>
@@ -68,7 +68,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>
@@ -103,8 +103,8 @@
[/else]
[/if]
<tr>
- <td align=left class=contentbar2>[L]TOTAL[/L]:</td>
- <td align=right class=contentbar2>[total-cost]</td>
+ <td align=left class="titletab_small">[L]TOTAL[/L]:</td>
+ <td align=right class="titletab_small">[total-cost]</td>
</tr>
</table>
</td>
1.2 +2 -2 interchange/dist/standard/include/forum/reply_form
rev 1.2, prev_rev 1.1
Index: reply_form
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/forum/reply_form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reply_form 25 Apr 2004 17:07:49 -0000 1.1
+++ reply_form 26 Jan 2005 17:51:13 -0000 1.2
@@ -36,8 +36,8 @@
<input TYPE="checkbox" NAME="anon" [if cgi anon]CHECKED[/if]> [L]Post Anonymously[/L]
[/if]
<br>
-<input type="submit" name="operation" VALUE="[L]Submit[/L]">
-<input type="submit" name="operation" VALUE="[L]Preview[/L]">
+<input type="submit" name="operation" VALUE="[L]Submit[/L]" class="button2">
+<input type="submit" name="operation" VALUE="[L]Preview[/L]" class="button2">
<select NAME="commtype">
<option VALUE="2"[selected cgi=1 name=commtype value=2]>[L]Plain Old Text[/L]</option>
<option VALUE="3"[selected cgi=1 name=commtype value=3]>[L]HTML Formatted[/L]</option>
1.2 +7 -7 interchange/dist/standard/include/forum/submit_form
rev 1.2, prev_rev 1.1
Index: submit_form
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/forum/submit_form,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- submit_form 25 Apr 2004 17:07:49 -0000 1.1
+++ submit_form 26 Jan 2005 17:51:13 -0000 1.2
@@ -9,14 +9,14 @@
<input TYPE="HIDDEN" NAME="artid" VALUE="[loop-data forum artid]">
<input TYPE="HIDDEN" NAME="parent" VALUE="[loop-code]">
<input TYPE="HIDDEN" NAME="mv_arg" VALUE="[loop-code]">
-<table BORDER="0" CELLSPACING="0" CELLPADDING="1">
+<table BORDER="0" CELLSPACING="0" CELLPADDING="4">
+<!--
<tr><td WIDTH="130" ALIGN="RIGHT">[L]Name[/L]: </td><td WIDTH="500">
[page href=forum_user arg="[loop-data forum username]"][data table=userdb column=nickname key="[loop-data forum username]"][ [page logout][L]Log Out[/L]</a> ]</td></tr>
+-->
-
-
-<tr><td ALIGN="RIGHT">[L]Subject[/L]: </td>
-<td><input TYPE="text" NAME="subject" VALUE="[loop-calc]
+<tr><td ALIGN="RIGHT"><br>[L]Subject[/L]: </td>
+<td><br><input TYPE="text" NAME="subject" VALUE="[loop-calc]
my $subj = $CGI->{subject} || q{[loop-data forum subject]};
$subj = "Re: $subj" unless $subj =~ /^\s*re:/i;
return $Tag->filter('restrict_html', $subj);
@@ -50,8 +50,8 @@
<input TYPE="checkbox" NAME="anon" [if cgi anon]CHECKED[/if]> [L]Post Anonymously[/L]
[/if]
<br>
-<input TYPE="SUBMIT" NAME="operation" VALUE="Submit">
-<input TYPE="SUBMIT" NAME="operation" VALUE="Preview">
+<input TYPE="SUBMIT" NAME="operation" VALUE="Submit" class="button2">
+<input TYPE="SUBMIT" NAME="operation" VALUE="Preview" class="button2">
<select NAME="commtype">
<option VALUE="2">[L]Plain Old Text[/L]</option>
<option VALUE="3"[selected name=commtype cgi=1 value=3]>[L]HTML Formatted (no wiki)[/L]</option>
1.2 +40 -38 interchange/dist/standard/include/layout/leftonly
rev 1.2, prev_rev 1.1
Index: leftonly
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/layout/leftonly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leftonly 25 Apr 2004 17:07:49 -0000 1.1
+++ leftonly 26 Jan 2005 17:51:14 -0000 1.2
@@ -7,59 +7,61 @@
</head>
<body>
<!--- top left and right logo --->
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td align=left valign=middle class=logoarea>
- [image src="[scratch logo]"]
+ <td>
+ <a href="[area index]">[image src="[scratch logo]" border="0"]</a>
</td>
- <td style="padding: 0; margin: 0; vertical-align: top" class=logoarea>
- <table align=right>
- <tr>
- <td width="100%" style="padding: 0; margin: 0" class=maincontent>
- <div class=borderdraw></div>
- {{LINE_MENU}}
- </td>
- </tr>
- </table>
+ <td class="linemenu">
+ {{LINE_MENU}}
</td>
</tr>
-</table>
-<!--- menu bar along the top ---><table width="100%" border=0 cellspacing=0 cellpadding=0>
+<!--- menu bar along the top --->
<tr>
- <td width="100%" class="menubar" valign=top>
- {{TOP_MENU}}
+ <td colspan="2">
+ <div width="100%" class="navigation_bar">{{TOP_MENU}}</div>
</td>
</tr>
-</table>
-{{BREADCRUMBS?}}
-<!--- menu bar along the top ---><table width="100%" border=0 cellspacing=0 cellpadding=0>
<tr>
- <td width="100%" class="bread" valign=top>
- {{BREADCRUMBS}}
+ <td colspan="2">
+ {{BREADCRUMBS?}}
+ <div width="100%" class="breadcrumb_bar">{{BREADCRUMBS}}</div>
+ {{/BREADCRUMBS?}}
</td>
</tr>
</table>
-{{/BREADCRUMBS?}}
<!--- left category column, main content column, and right special column --->
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td width="20%" valign="top" align="left" class="leftarea">
- {{LEFT}}
- </td>
- <td width="80%" valign=top style="[if scratch dhtml_browser]padding-left: 10px[/if]" class=maincontent>
-{{TOP?}}
- <div align=center>{{TOP}}</div>
-{{/TOP?}}
- {{:DEFAULT}}
-{{BOTTOM?}}
- <div align=center>{{BOTTOM}}</div>
-{{/BOTTOM?}}
- </td>
+ <td class="left" valign="top">
+ <div class="left_table">
+ {{LEFT}}
+ </div>
+ </td>
+ <td class="center_leftonly">
+ <div class="center_padding" align="center">
+ <div class="center_table">
+ {{TOP?}}
+ {{TOP}}
+ {{/TOP?}}
+ {{:DEFAULT}}
+ </div>
+ </div>
+ <div class="center_padding" align="center">
+ {{BOTTOM?}}
+ <div class="specials">
+ {{BOTTOM}}
+ </div>
+ {{/BOTTOM?}}
+ </div>
+ </td>
</tr>
+</table>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td colspan=2>
- {{COPYRIGHT}}
- </td>
+ <td>
+ {{COPYRIGHT}}
+ </td>
</tr>
</table>
[if session admin]
1.2 +43 -43 interchange/dist/standard/include/layout/leftright
rev 1.2, prev_rev 1.1
Index: leftright
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/layout/leftright,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leftright 25 Apr 2004 17:07:49 -0000 1.1
+++ leftright 26 Jan 2005 17:51:14 -0000 1.2
@@ -7,66 +7,66 @@
</head>
<body>
<!--- top left and right logo --->
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td align=left valign=middle class=logoarea>
- [image src="[scratch logo]"]
+ <td bgcolor="white">
+ <a href="[area index]">[image src="[scratch logo]" border="0"]</a>
</td>
- <td style="padding: 0; margin: 0; vertical-align: top" class=logoarea>
- <table align=right>
- <tr>
- <td width="100%" style="margin: 0; padding: 0" class=maincontent>
- <div class=borderdraw></div>
- {{LINE_MENU}}
- </td>
- </tr>
- </table>
+ <td class="linemenu" align="right">
+ {{LINE_MENU}}
</td>
</tr>
-</table>
-
<!--- menu bar along the top --->
-<table width="100%" border=0 cellspacing=0 cellpadding=0>
<tr>
- <td width="100%" class="menubar" valign=top>
- {{TOP_MENU}}
+ <td colspan="2">
+ <div width="100%" class="navigation_bar">{{TOP_MENU}}</div>
</td>
</tr>
-</table>
-{{BREADCRUMBS?}}
-<!--- menu bar along the top ---><table width="100%" border=0 cellspacing=0 cellpadding=0>
<tr>
- <td width="100%" class="bread" valign=top>
- {{BREADCRUMBS}}
+ <td colspan="2">
+ {{BREADCRUMBS?}}
+ <div width="100%" class="breadcrumb_bar">{{BREADCRUMBS}}</div>
+ {{/BREADCRUMBS?}}
</td>
</tr>
</table>
-{{/BREADCRUMBS?}}
<!--- left category column, main content column, and right special column --->
-<table width="100%" border=0 cellspacing=0 cellpadding=0>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td width="20%" valign=top align=left class=leftarea>
- {{LEFT}}
- </td>
- <td width="60%" valign=top style="[if scratch dhtml_browser]padding-left: 10px[/if]" class=maincontent>
-{{TOP?}}
- <div align=center>{{TOP}}</div>
-{{/TOP?}}
- {{:DEFAULT}}
-{{BOTTOM?}}
- <div align=center>{{BOTTOM}}</div>
-{{/BOTTOM?}}
- </td>
- <td width="20%" valign=top align=left class=rightarea>
- {{RIGHT}}
- </td>
+ <td class="left" valign="top">
+ <div class="left_table">
+ {{LEFT}}
+ </div>
+ </td>
+ <td class="center">
+ <div class="center_padding" align="center">
+ <div class="center_table">
+ {{TOP?}}
+ {{TOP}}
+ {{/TOP?}}
+ {{:DEFAULT}}
+ </div>
+ </div>
+ <div class="center_padding" align="center">
+ {{BOTTOM?}}
+ <div class="specials">
+ {{BOTTOM}}
+ </div>
+ {{/BOTTOM?}}
+ </div>
+ </td>
+ <td class="right">
+ {{RIGHT}}
+ </td>
</tr>
+</table>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td colspan=3>
- {{COPYRIGHT}}
- </td>
+ <td>
+ {{COPYRIGHT}}
+ </td>
</tr>
-</table>
+</table>
[if session admin]
[and scratch editable]
[page href="admin/edit_page" form="page_name=@@MV_PAGE@@"]Edit page data</a>
1.2 +33 -40 interchange/dist/standard/include/layout/noleft
rev 1.2, prev_rev 1.1
Index: noleft
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/layout/noleft,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- noleft 25 Apr 2004 17:07:49 -0000 1.1
+++ noleft 26 Jan 2005 17:51:14 -0000 1.2
@@ -7,64 +7,57 @@
</head>
<body>
<!--- top left and right logo --->
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td align=left valign=middle class=logoarea>
- [image src="[scratch logo]"]
+ <td>
+ <a href="[area index]">[image src="[scratch logo]" border="0"]</a>
</td>
- <td style="padding: 0; margin: 0; vertical-align: top" class=logoarea>
- <table align=right>
- <tr>
- <td width="100%" style="padding: 0; margin: 0" class=maincontent>
- <div class=borderdraw></div>
- {{LINE_MENU}}
- </td>
- </tr>
- </table>
+ <td class="linemenu">
+ {{LINE_MENU}}
</td>
</tr>
-</table>
-
<!--- menu bar along the top --->
-<table width="100%" border=0 cellspacing=0 cellpadding=0>
<tr>
- <td width="100%" class="menubar" valign=top>
- {{TOP_MENU}}
+ <td colspan="2">
+ <div width="100%" class="navigation_bar">{{TOP_MENU}}</div>
</td>
</tr>
-</table>
-{{BREADCRUMBS?}}
-<!--- menu bar along the top ---><table width="100%" border=0 cellspacing=0 cellpadding=0>
<tr>
- <td width="100%" class="bread" valign=top>
- {{BREADCRUMBS}}
+ <td colspan="2">
+ {{BREADCRUMBS?}}
+ <div width="100%" class="breadcrumb_bar">{{BREADCRUMBS}}</div>
+ {{/BREADCRUMBS?}}
</td>
</tr>
</table>
-{{/BREADCRUMBS?}}
-<!--- main content column --->
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
- <td valign="top" align="left">
-{{TOP?}}
- <div align=center>{{TOP}}</div>
-{{/TOP?}}
- {{:DEFAULT}}
-{{BOTTOM?}}
- <div align=center>{{BOTTOM}}</div>
-{{/BOTTOM?}}
- </td>
+<!--- left category column, main content column, and right special column --->
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
+<tr>
+ <td class="center_noleft" align="center">
+ <div class="center_table">
+ {{TOP?}}
+ {{TOP}}
+ {{/TOP?}}
+ {{:DEFAULT}}
+ </div>
+ {{BOTTOM?}}
+ <div class="specials">
+ {{BOTTOM}}
+ </div>
+ {{/BOTTOM?}}
+ </td>
</tr>
+</table>
+<table cellspacing="0" cellpadding="0" border="0" width="100%" align="center">
<tr>
- <td>
- {{COPYRIGHT}}
- </td>
+ <td>
+ {{COPYRIGHT}}
+ </td>
</tr>
</table>
[if session admin]
-[if-mm page]
+[and scratch editable]
[page href="admin/edit_page" form="page_name=@@MV_PAGE@@"]Edit page data</a>
-[/if-mm]
[/if]
{{EDIT_CONTROLS}}
</body>
1.2 +6 -5 interchange/dist/standard/include/menus/Top.txt
rev 1.2, prev_rev 1.1
Index: Top.txt
===================================================================
RCS file: /var/cvs/interchange/dist/standard/include/menus/Top.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Top.txt 25 Apr 2004 17:07:49 -0000 1.1
+++ Top.txt 26 Jan 2005 17:51:14 -0000 1.2
@@ -4,8 +4,9 @@
003 Top x003 `$Scratch->{ui_class} eq 'Items'` item admin/item mv_data_table=products Items 0 Add and edit items displayed for sale on the site B4.gif B4_b.gif B4_b.gif icon_item.gif
004 Top x004 `$Scratch->{ui_class} eq 'Content'` content admin/content Content 1 Create, edit, upload and download pages B5.gif B5_b.gif B5_b.gif icon_pages.gif
005 Top x005 `$Scratch->{ui_class} eq 'Design'` layout admin/menu_editor Menus 0 Organize site navigation menus B6.gif B6_b.gif B6_b.gif icon_design.gif
-006 Top x006 `$Scratch->{ui_class} eq 'Merchandising'` item admin/merchandising Merchandising 1 Set up quantity pricing, up-sell, promotions, and affiliates B7.gif B7_b.gif B7_b.gif icon_merch.gif
-007 x007 `$Scratch->{ui_class} eq 'Misc'` misc admin/genfunction Miscellaneous 0 Legacy and other functions icon_regen.gif
-008 Top x008 `$Scratch->{ui_class} eq 'Tables'` gentable admin/gentable Tables 0 Table Manager: Edit, view, import, export, upload, and download your tables. B8.gif B8_b.gif B8_b.gif icon_tab.png
-009 Top x009 `$Scratch->{ui_class} eq 'Reports'` orderstats admin/orderstats Reports 0 View statistics on orders and site traffic, create custom reports B8.gif B8_b.gif B8_b.gif icon_stats.gif
-010 Top x010 `$Scratch->{ui_class} eq 'Admin'` admin admin/preferences Administration 0 Administrator and developer-oriented tools B9.gif B9_b.gif B9_b.gif icon_config.gif
+006 x006 admin/content Content 0
+007 Top x007 `$Scratch->{ui_class} eq 'Merchandising'` item admin/merchandising Merchandising 1 Set up quantity pricing, up-sell, promotions, and affiliates B7.gif B7_b.gif B7_b.gif icon_merch.gif
+008 x008 `$Scratch->{ui_class} eq 'Misc'` misc admin/genfunction Miscellaneous 0 Legacy and other functions icon_regen.gif
+009 Top x009 `$Scratch->{ui_class} eq 'Tables'` gentable admin/gentable Tables 0 Table Manager: Edit, view, import, export, upload, and download your tables. B8.gif B8_b.gif B8_b.gif icon_tab.png
+010 Top x010 `$Scratch->{ui_class} eq 'Reports'` orderstats admin/orderstats Reports 0 View statistics on orders and site traffic, create custom reports B8.gif B8_b.gif B8_b.gif icon_stats.gif
+011 Top x011 `$Scratch->{ui_class} eq 'Admin'` admin admin/preferences Administration 0 Administrator and developer-oriented tools B9.gif B9_b.gif B9_b.gif icon_config.gif
More information about the interchange-cvs
mailing list