Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Introduce jQuery compatible CSS design layout

  • Loading branch information...
commit 7f7749c463a391b5bc2a1d51f8b7aca9f9ccbb31 1 parent 3468522
@haraldpdl haraldpdl authored
Showing with 2,525 additions and 4,153 deletions.
  1. +33 −177 catalog/account.php
  2. +59 −82 catalog/account_edit.php
  3. +36 −78 catalog/account_history.php
  4. +89 −127 catalog/account_history_info.php
  5. +20 −71 catalog/account_newsletters.php
  6. +56 −114 catalog/account_notifications.php
  7. +34 −70 catalog/account_password.php
  8. +46 −111 catalog/address_book.php
  9. +50 −96 catalog/address_book_process.php
  10. +45 −84 catalog/advanced_search.php
  11. +12 −24 catalog/advanced_search_result.php
  12. +134 −172 catalog/checkout_confirmation.php
  13. +121 −200 catalog/checkout_payment.php
  14. +99 −191 catalog/checkout_payment_address.php
  15. +114 −180 catalog/checkout_shipping.php
  16. +99 −185 catalog/checkout_shipping_address.php
  17. +30 −51 catalog/checkout_success.php
  18. +12 −33 catalog/conditions.php
  19. +37 −79 catalog/contact_us.php
  20. +20 −40 catalog/cookie_usage.php
  21. +122 −182 catalog/create_account.php
  22. +12 −37 catalog/create_account_success.php
  23. +6 −0 catalog/includes/application_top.php
  24. +11 −19 catalog/includes/boxes/best_sellers.php
  25. +10 −17 catalog/includes/boxes/categories.php
  26. +13 −19 catalog/includes/boxes/currencies.php
  27. +12 −17 catalog/includes/boxes/information.php
  28. +13 −23 catalog/includes/boxes/languages.php
  29. +11 −21 catalog/includes/boxes/manufacturer_info.php
  30. +14 −21 catalog/includes/boxes/manufacturers.php
  31. +10 −21 catalog/includes/boxes/order_history.php
  32. +12 −19 catalog/includes/boxes/product_notifications.php
  33. +6 −15 catalog/includes/boxes/product_social_bookmarks.php
  34. +13 −18 catalog/includes/boxes/reviews.php
  35. +11 −16 catalog/includes/boxes/search.php
  36. +30 −32 catalog/includes/boxes/shopping_cart.php
  37. +10 −15 catalog/includes/boxes/specials.php
  38. +9 −19 catalog/includes/boxes/whats_new.php
  39. +15 −19 catalog/includes/footer.php
  40. +26 −13 catalog/includes/header.php
  41. +2 −1  catalog/includes/languages/english/checkout_confirmation.php
  42. +75 −72 catalog/includes/modules/address_book_details.php
  43. +24 −17 catalog/includes/modules/also_purchased_products.php
  44. +65 −44 catalog/includes/modules/checkout_new_address.php
  45. +28 −38 catalog/includes/modules/downloads.php
  46. +20 −16 catalog/includes/modules/new_products.php
  47. +64 −55 catalog/includes/modules/product_listing.php
  48. +19 −29 catalog/includes/modules/upcoming_products.php
  49. +1 −1  catalog/includes/template_top.php
  50. +60 −91 catalog/index.php
  51. +37 −109 catalog/login.php
  52. +12 −37 catalog/logoff.php
  53. +29 −60 catalog/password_forgotten.php
  54. +12 −37 catalog/privacy.php
  55. +69 −103 catalog/product_info.php
  56. +64 −109 catalog/product_reviews.php
  57. +34 −70 catalog/product_reviews_info.php
  58. +47 −79 catalog/product_reviews_write.php
  59. +49 −53 catalog/products_new.php
  60. +45 −73 catalog/reviews.php
  61. +10 −37 catalog/shipping.php
  62. +58 −126 catalog/shopping_cart.php
  63. +25 −41 catalog/specials.php
  64. +20 −30 catalog/ssl_check.php
  65. +92 −24 catalog/stylesheet.css
  66. +52 −93 catalog/tell_a_friend.php
View
210 catalog/account.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2007 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -24,186 +24,42 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-//--></script>
-
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- if ($messageStack->size('account') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('account'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
+<h1><?php echo HEADING_TITLE; ?></h1>
- if (tep_count_customer_orders() > 0) {
-?>
- <tr>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo OVERVIEW_TITLE; ?></b></td>
- <td class="main"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL') . '"><u>' . OVERVIEW_SHOW_ALL_ORDERS . '</u></a>'; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" align="center" valign="top" width="130"><?php echo '<b>' . OVERVIEW_PREVIOUS_ORDERS . '</b><br>' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- $orders_query = tep_db_query("select o.orders_id, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_ORDERS_STATUS . " s where o.customers_id = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and s.public_flag = '1' order by orders_id desc limit 3");
- while ($orders = tep_db_fetch_array($orders_query)) {
- if (tep_not_null($orders['delivery_name'])) {
- $order_name = $orders['delivery_name'];
- $order_country = $orders['delivery_country'];
- } else {
- $order_name = $orders['billing_name'];
- $order_country = $orders['billing_country'];
- }
-?>
- <tr class="moduleRow" onMouseOver="rowOverEffect(this)" onMouseOut="rowOutEffect(this)" onClick="document.location.href='<?php echo tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $orders['orders_id'], 'SSL'); ?>'">
- <td class="main" width="80"><?php echo tep_date_short($orders['date_purchased']); ?></td>
- <td class="main"><?php echo '#' . $orders['orders_id']; ?></td>
- <td class="main"><?php echo tep_output_string_protected($order_name) . ', ' . $order_country; ?></td>
- <td class="main"><?php echo $orders['orders_status_name']; ?></td>
- <td class="main" align="right"><?php echo $orders['order_total']; ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_VIEW, 'document', tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $orders['orders_id'], 'SSL')); ?></td>
- </tr>
-<?php
- }
-?>
- </table></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
<?php
+ if ($messageStack->size('account') > 0) {
+ echo '<p>' . $messageStack->output('account') . '</p>';
}
?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_ACCOUNT_TITLE; ?></b></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td width="60"><?php echo tep_image(DIR_WS_IMAGES . 'account_personal.gif'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL') . '">' . MY_ACCOUNT_ADDRESS_BOOK . '</a>'; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></td>
- </tr>
- </table></td>
- <td width="10" align="right"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_ORDERS_TITLE; ?></b></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td width="60"><?php echo tep_image(DIR_WS_IMAGES . 'account_orders.gif'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL') . '">' . MY_ORDERS_VIEW . '</a>'; ?></td>
- </tr>
- </table></td>
- <td width="10" align="right"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td width="60"><?php echo tep_image(DIR_WS_IMAGES . 'account_notifications.gif'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_image(DIR_WS_IMAGES . 'arrow_green.gif') . ' <a href="' . tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL') . '">' . EMAIL_NOTIFICATIONS_PRODUCTS . '</a>'; ?></td>
- </tr>
- </table></td>
- <td width="10" align="right"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table>
+
+<div class="contentContainer">
+ <span class="contentHeading"><?php echo MY_ACCOUNT_TITLE; ?></span>
+
+ <div class="contentText">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL') . '">' . MY_ACCOUNT_INFORMATION . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL') . '">' . MY_ACCOUNT_ADDRESS_BOOK . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL') . '">' . MY_ACCOUNT_PASSWORD . '</a>'; ?></li>
+ </ul>
+ </div>
+
+ <span class="contentHeading"><?php echo MY_ORDERS_TITLE; ?></span>
+
+ <div class="contentText">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL') . '">' . MY_ORDERS_VIEW . '</a>'; ?></li>
+ </ul>
+ </div>
+
+ <span class="contentHeading"><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></span>
+
+ <div class="contentText">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL') . '">' . EMAIL_NOTIFICATIONS_NEWSLETTERS . '</a>'; ?></li>
+ <li><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL') . '">' . EMAIL_NOTIFICATIONS_PRODUCTS . '</a>'; ?></li>
+ </ul>
+ </div>
+</div>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
141 catalog/account_edit.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2008 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -123,44 +123,25 @@
require('includes/form_check.js.php');
?>
- <?php echo tep_draw_form('account_edit', tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL'), 'post', 'onSubmit="return check_form(account_edit);"', true) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+<h1><?php echo HEADING_TITLE; ?></h1>
+
<?php
if ($messageStack->size('account_edit') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('account_edit'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
+ echo '<p>' . $messageStack->output('account_edit') . '</p>';
}
?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_ACCOUNT_TITLE; ?></b></td>
- <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" cellspacing="2" cellpadding="2">
+
+<?php echo tep_draw_form('account_edit', tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL'), 'post', 'onSubmit="return check_form(account_edit);"', true) . tep_draw_hidden_field('action', 'process'); ?>
+
+<div class="contentContainer">
+ <div>
+ <span class="contentHeading"><?php echo MY_ACCOUNT_TITLE; ?></span>
+ <span class="inputRequirement" style="float: right;"><?php echo FORM_REQUIRED_INFORMATION; ?></span>
+ </div>
+
+ <div class="contentText">
+ <table border="0" cellspacing="2" cellpadding="2" width="100%">
+
<?php
if (ACCOUNT_GENDER == 'true') {
if (isset($gender)) {
@@ -170,67 +151,63 @@
}
$female = !$male;
?>
- <tr>
- <td class="main"><?php echo ENTRY_GENDER; ?></td>
- <td class="main"><?php echo tep_draw_radio_field('gender', 'm', $male) . '&nbsp;&nbsp;' . MALE . '&nbsp;&nbsp;' . tep_draw_radio_field('gender', 'f', $female) . '&nbsp;&nbsp;' . FEMALE . '&nbsp;' . (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="inputRequirement">' . ENTRY_GENDER_TEXT . '</span>': ''); ?></td>
- </tr>
+
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_GENDER; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_radio_field('gender', 'm', $male) . '&nbsp;&nbsp;' . MALE . '&nbsp;&nbsp;' . tep_draw_radio_field('gender', 'f', $female) . '&nbsp;&nbsp;' . FEMALE . '&nbsp;' . (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="inputRequirement">' . ENTRY_GENDER_TEXT . '</span>': ''); ?></td>
+ </tr>
+
<?php
}
?>
- <tr>
- <td class="main"><?php echo ENTRY_FIRST_NAME; ?></td>
- <td class="main"><?php echo tep_draw_input_field('firstname', $account['customers_firstname']) . '&nbsp;' . (tep_not_null(ENTRY_FIRST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_FIRST_NAME_TEXT . '</span>': ''); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_LAST_NAME; ?></td>
- <td class="main"><?php echo tep_draw_input_field('lastname', $account['customers_lastname']) . '&nbsp;' . (tep_not_null(ENTRY_LAST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_LAST_NAME_TEXT . '</span>': ''); ?></td>
- </tr>
+
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_FIRST_NAME; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('firstname', $account['customers_firstname']) . '&nbsp;' . (tep_not_null(ENTRY_FIRST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_FIRST_NAME_TEXT . '</span>': ''); ?></td>
+ </tr>
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_LAST_NAME; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('lastname', $account['customers_lastname']) . '&nbsp;' . (tep_not_null(ENTRY_LAST_NAME_TEXT) ? '<span class="inputRequirement">' . ENTRY_LAST_NAME_TEXT . '</span>': ''); ?></td>
+ </tr>
+
<?php
if (ACCOUNT_DOB == 'true') {
?>
- <tr>
- <td class="main"><?php echo ENTRY_DATE_OF_BIRTH; ?></td>
- <td class="main"><?php echo tep_draw_input_field('dob', tep_date_short($account['customers_dob'])) . '&nbsp;' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
- </tr>
+
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_DATE_OF_BIRTH; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('dob', tep_date_short($account['customers_dob'])) . '&nbsp;' . (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT) ? '<span class="inputRequirement">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>': ''); ?></td>
+ </tr>
+
<?php
}
?>
- <tr>
- <td class="main"><?php echo ENTRY_EMAIL_ADDRESS; ?></td>
- <td class="main"><?php echo tep_draw_input_field('email_address', $account['customers_email_address']) . '&nbsp;' . (tep_not_null(ENTRY_EMAIL_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_EMAIL_ADDRESS_TEXT . '</span>': ''); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_TELEPHONE_NUMBER; ?></td>
- <td class="main"><?php echo tep_draw_input_field('telephone', $account['customers_telephone']) . '&nbsp;' . (tep_not_null(ENTRY_TELEPHONE_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_TELEPHONE_NUMBER_TEXT . '</span>': ''); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_FAX_NUMBER; ?></td>
- <td class="main"><?php echo tep_draw_input_field('fax', $account['customers_fax']) . '&nbsp;' . (tep_not_null(ENTRY_FAX_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_FAX_NUMBER_TEXT . '</span>': ''); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
+
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_EMAIL_ADDRESS; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('email_address', $account['customers_email_address']) . '&nbsp;' . (tep_not_null(ENTRY_EMAIL_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_EMAIL_ADDRESS_TEXT . '</span>': ''); ?></td>
</tr>
<tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ <td class="fieldKey"><?php echo ENTRY_TELEPHONE_NUMBER; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('telephone', $account['customers_telephone']) . '&nbsp;' . (tep_not_null(ENTRY_TELEPHONE_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_TELEPHONE_NUMBER_TEXT . '</span>': ''); ?></td>
</tr>
<tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
+ <td class="fieldKey"><?php echo ENTRY_FAX_NUMBER; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_input_field('fax', $account['customers_fax']) . '&nbsp;' . (tep_not_null(ENTRY_FAX_NUMBER_TEXT) ? '<span class="inputRequirement">' . ENTRY_FAX_NUMBER_TEXT . '</span>': ''); ?></td>
</tr>
- </table></form>
+ </table>
+
+ <br />
+
+ <div>
+ <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+ </div>
+</div>
+
+</form>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
114 catalog/account_history.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2007 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -25,20 +25,10 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_history.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td>
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<div class="contentContainer">
+
<?php
$orders_total = tep_count_customer_orders();
@@ -59,77 +49,45 @@
$order_name = $history['billing_name'];
}
?>
- <table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo '<b>' . TEXT_ORDER_NUMBER . '</b> ' . $history['orders_id']; ?></td>
- <td class="main" align="right"><?php echo '<b>' . TEXT_ORDER_STATUS . '</b> ' . $history['orders_status_name']; ?></td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="2" cellpadding="4">
- <tr>
- <td class="main" width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($history['date_purchased']) . '<br><b>' . $order_type . '</b> ' . tep_output_string_protected($order_name); ?></td>
- <td class="main" width="30%" valign="top"><?php echo '<b>' . TEXT_ORDER_PRODUCTS . '</b> ' . $products['count'] . '<br><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($history['order_total']); ?></td>
- <td class="smallText" width="20%"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_VIEW, 'document', tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL'), 'primary'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- </table>
+
+ <span class="contentHeading"><?php echo TEXT_ORDER_NUMBER . ' ' . $history['orders_id'] . ' <span class="contentText">(' . $history['orders_status_name'] . ')</span>'; ?></span>
+
+ <div class="contentText">
+ <table border="0" width="100%" cellspacing="2" cellpadding="2">
+ <tr>
+ <td width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($history['date_purchased']) . '<br><b>' . $order_type . '</b> ' . tep_output_string_protected($order_name); ?></td>
+ <td width="30%" valign="top"><?php echo '<b>' . TEXT_ORDER_PRODUCTS . '</b> ' . $products['count'] . '<br><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($history['order_total']); ?></td>
+ <td width="20%" align="right"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_VIEW, 'document', tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL'), 'primary'); ?></td>
+ </tr>
+ </table>
+ </div>
+
<?php
}
- } else {
-?>
- <table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="2" cellpadding="4">
- <tr>
- <td class="main"><?php echo TEXT_NO_PURCHASES; ?></td>
- </tr>
- </table></td>
- </tr>
- </table>
-<?php
- }
?>
- </td>
- </tr>
+
+ <div class="contentText">
+ <p style="float: right;"><?php echo TEXT_RESULT_PAGE . ' ' . $history_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></p>
+
+ <p><?php echo $history_split->display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></p>
+ </div>
+
<?php
- if ($orders_total > 0) {
+ } else {
?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="smallText" valign="top"><?php echo $history_split->display_count(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></td>
- <td class="smallText" align="right"><?php echo TEXT_RESULT_PAGE . ' ' . $history_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></td>
- </tr>
- </table></td>
- </tr>
+
+ <div class="contentText">
+ <p><?php echo TEXT_NO_PURCHASES; ?></p>
+ </div>
+
<?php
}
?>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table>
+
+ <div class="contentText">
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+</div>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
216 catalog/account_history_info.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2007 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -39,191 +39,153 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_history.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+<h1><?php echo HEADING_TITLE; ?></h1>
+
+<div class="contentContainer">
+ <span class="contentHeading"><?php echo sprintf(HEADING_ORDER_NUMBER, $HTTP_GET_VARS['order_id']) . ' <span class="contentText">(' . $order->info['orders_status'] . ')</span>'; ?></span>
+
+ <div class="contentText">
+ <div>
+ <span style="float: right;"><?php echo HEADING_ORDER_TOTAL . ' ' . $order->info['total']; ?></span>
+ <?php echo HEADING_ORDER_DATE . ' ' . tep_date_long($order->info['date_purchased']); ?>
+ </div>
+
+ <table border="0" width="100%" cellspacing="1" cellpadding="2">
<tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+
+<?php
+ if ($order->delivery != false) {
+?>
+ <td width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td class="main" colspan="2"><b><?php echo sprintf(HEADING_ORDER_NUMBER, $HTTP_GET_VARS['order_id']) . ' <small>(' . $order->info['orders_status'] . ')</small>'; ?></b></td>
+ <td><b><?php echo HEADING_DELIVERY_ADDRESS; ?></b></td>
</tr>
<tr>
- <td class="smallText"><?php echo HEADING_ORDER_DATE . ' ' . tep_date_long($order->info['date_purchased']); ?></td>
- <td class="smallText" align="right"><?php echo HEADING_ORDER_TOTAL . ' ' . $order->info['total']; ?></td>
+ <td><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br />'); ?></td>
</tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
-<?php
- if ($order->delivery != false) {
-?>
- <td width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo HEADING_DELIVERY_ADDRESS; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br>'); ?></td>
- </tr>
<?php
if (tep_not_null($order->info['shipping_method'])) {
?>
- <tr>
- <td class="main"><b><?php echo HEADING_SHIPPING_METHOD; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo $order->info['shipping_method']; ?></td>
- </tr>
+ <tr>
+ <td><b><?php echo HEADING_SHIPPING_METHOD; ?></b></td>
+ </tr>
+ <tr>
+ <td><?php echo $order->info['shipping_method']; ?></td>
+ </tr>
<?php
}
?>
- </table></td>
+ </table></td>
<?php
}
?>
- <td width="<?php echo (($order->delivery != false) ? '70%' : '100%'); ?>" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <td width="<?php echo (($order->delivery != false) ? '70%' : '100%'); ?>" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
if (sizeof($order->info['tax_groups']) > 1) {
?>
- <tr>
- <td class="main" colspan="2"><b><?php echo HEADING_PRODUCTS; ?></b></td>
- <td class="smallText" align="right"><b><?php echo HEADING_TAX; ?></b></td>
- <td class="smallText" align="right"><b><?php echo HEADING_TOTAL; ?></b></td>
- </tr>
+ <tr>
+ <td colspan="2"><b><?php echo HEADING_PRODUCTS; ?></b></td>
+ <td align="right"><b><?php echo HEADING_TAX; ?></b></td>
+ <td align="right"><b><?php echo HEADING_TOTAL; ?></b></td>
+ </tr>
<?php
} else {
?>
- <tr>
- <td class="main" colspan="3"><b><?php echo HEADING_PRODUCTS; ?></b></td>
- </tr>
+ <tr>
+ <td colspan="2"><b><?php echo HEADING_PRODUCTS; ?></b></td>
+ <td align="right"><b><?php echo HEADING_TOTAL; ?></b></td>
+ </tr>
<?php
}
for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
echo ' <tr>' . "\n" .
- ' <td class="main" align="right" valign="top" width="30">' . $order->products[$i]['qty'] . '&nbsp;x</td>' . "\n" .
- ' <td class="main" valign="top">' . $order->products[$i]['name'];
+ ' <td align="right" valign="top" width="30">' . $order->products[$i]['qty'] . '&nbsp;x&nbsp;</td>' . "\n" .
+ ' <td valign="top">' . $order->products[$i]['name'];
if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) {
for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
- echo '<br><nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i></small></nobr>';
+ echo '<br /><nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i></small></nobr>';
}
}
echo '</td>' . "\n";
if (sizeof($order->info['tax_groups']) > 1) {
- echo ' <td class="main" valign="top" align="right">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n";
+ echo ' <td valign="top" align="right">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n";
}
- echo ' <td class="main" align="right" valign="top">' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</td>' . "\n" .
+ echo ' <td align="right" valign="top">' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</td>' . "\n" .
' </tr>' . "\n";
}
?>
- </table></td>
- </tr>
- </table></td>
- </tr>
</table></td>
</tr>
+ </table>
+ </div>
+
+ <span class="contentHeading"><?php echo HEADING_BILLING_INFORMATION; ?></span>
+
+ <div class="contentText">
+ <table border="0" width="100%" cellspacing="1" cellpadding="2">
<tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_BILLING_INFORMATION; ?></b></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo HEADING_BILLING_ADDRESS; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br>'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_PAYMENT_METHOD; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo $order->info['payment_method']; ?></td>
- </tr>
- </table></td>
- <td width="70%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <td width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <tr>
+ <td><b><?php echo HEADING_BILLING_ADDRESS; ?></b></td>
+ </tr>
+ <tr>
+ <td><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br />'); ?></td>
+ </tr>
+ <tr>
+ <td><b><?php echo HEADING_PAYMENT_METHOD; ?></b></td>
+ </tr>
+ <tr>
+ <td><?php echo $order->info['payment_method']; ?></td>
+ </tr>
+ </table></td>
+ <td width="70%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) {
- echo ' <tr>' . "\n" .
- ' <td class="main" align="right" width="100%">' . $order->totals[$i]['title'] . '</td>' . "\n" .
- ' <td class="main" align="right">' . $order->totals[$i]['text'] . '</td>' . "\n" .
- ' </tr>' . "\n";
+ echo ' <tr>' . "\n" .
+ ' <td align="right" width="100%">' . $order->totals[$i]['title'] . '</td>' . "\n" .
+ ' <td align="right">' . $order->totals[$i]['text'] . '</td>' . "\n" .
+ ' </tr>' . "\n";
}
?>
- </table></td>
- </tr>
</table></td>
</tr>
+ </table>
+ </div>
+
+ <span class="contentHeading"><?php echo HEADING_ORDER_HISTORY; ?></span>
+
+ <div class="contentText">
+ <table border="0" width="100%" cellspacing="1" cellpadding="2">
<tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_ORDER_HISTORY; ?></b></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
+ <td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
$statuses_query = tep_db_query("select os.orders_status_name, osh.date_added, osh.comments from " . TABLE_ORDERS_STATUS . " os, " . TABLE_ORDERS_STATUS_HISTORY . " osh where osh.orders_id = '" . (int)$HTTP_GET_VARS['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$languages_id . "' and os.public_flag = '1' order by osh.date_added");
while ($statuses = tep_db_fetch_array($statuses_query)) {
- echo ' <tr>' . "\n" .
- ' <td class="main" valign="top" width="70">' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
- ' <td class="main" valign="top" width="70">' . $statuses['orders_status_name'] . '</td>' . "\n" .
- ' <td class="main" valign="top">' . (empty($statuses['comments']) ? '&nbsp;' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
- ' </tr>' . "\n";
+ echo ' <tr>' . "\n" .
+ ' <td valign="top" width="70">' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
+ ' <td valign="top" width="70">' . $statuses['orders_status_name'] . '</td>' . "\n" .
+ ' <td valign="top">' . (empty($statuses['comments']) ? '&nbsp;' : nl2br(tep_output_string_protected($statuses['comments']))) . '</td>' . "\n" .
+ ' </tr>' . "\n";
}
?>
- </table></td>
- </tr>
</table></td>
</tr>
+ </table>
+ </div>
+
<?php
if (DOWNLOAD_ENABLED == 'true') include(DIR_WS_MODULES . 'downloads.php');
?>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT_HISTORY, tep_get_all_get_params(array('order_id')), 'SSL')); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table>
+
+ <div>
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT_HISTORY, tep_get_all_get_params(array('order_id')), 'SSL')); ?>
+ </div>
+</div>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
91 catalog/account_newsletters.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2008 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -47,81 +47,30 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
+<h1><?php echo HEADING_TITLE; ?></h1>
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
+<?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
-function checkBox(object) {
- document.account_newsletter.elements[object].checked = !document.account_newsletter.elements[object].checked;
-}
-//--></script>
+<div class="contentContainer">
+ <span class="contentHeading"><?php echo MY_NEWSLETTERS_TITLE; ?></span>
- <?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <div class="contentText">
+ <table border="0" cellspacing="2" cellpadding="2">
<tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
+ <td><?php echo tep_draw_checkbox_field('newsletter_general', '1', (($newsletter['customers_newsletter'] == '1') ? true : false), 'onclick="checkBox(\'newsletter_general\')"'); ?></td>
+ <td><b><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></b><br /><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?></td>
</tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo MY_NEWSLETTERS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('newsletter_general')">
- <td class="main"><?php echo tep_draw_checkbox_field('newsletter_general', '1', (($newsletter['customers_newsletter'] == '1') ? true : false), 'onclick="checkBox(\'newsletter_general\')"'); ?></td>
- <td class="main"><b><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></b></td>
- </tr>
- <tr>
- <td class="main">&nbsp;</td>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></form>
+ </table>
+ </div>
+
+ <div>
+ <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+</div>
+
+</form>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
170 catalog/account_notifications.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2008 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -73,148 +73,90 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
+<h1><?php echo HEADING_TITLE; ?></h1>
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
+<?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
-function checkBox(object) {
- document.account_notifications.elements[object].checked = !document.account_notifications.elements[object].checked;
-}
-//--></script>
+<div class="contentContainer">
+ <span class="contentHeading"><?php echo MY_NOTIFICATIONS_TITLE; ?></span>
- <?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo MY_NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo MY_NOTIFICATIONS_DESCRIPTION; ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('product_global')">
- <td class="main" width="30"><?php echo tep_draw_checkbox_field('product_global', '1', (($global['global_product_notifications'] == '1') ? true : false), 'onclick="checkBox(\'product_global\')"'); ?></td>
- <td class="main"><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td width="30">&nbsp;</td>
- <td class="main"><?php echo GLOBAL_NOTIFICATIONS_DESCRIPTION; ?></td>
- </tr>
- </table></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
+ <div class="contentText">
+ <?php echo MY_NOTIFICATIONS_DESCRIPTION; ?>
+ </div>
+
+ <span class="contentHeading"><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></span>
+
+ <div class="contentText">
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ <td width="30"><?php echo tep_draw_checkbox_field('product_global', '1', (($global['global_product_notifications'] == '1') ? true : false), 'onclick="checkBox(\'product_global\')"'); ?></td>
+ <td><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b><br /><?php echo GLOBAL_NOTIFICATIONS_DESCRIPTION; ?></td>
</tr>
+ </table>
+ </div>
+
<?php
if ($global['global_product_notifications'] != '1') {
?>
- <tr>
- <td class="main"><b><?php echo NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+
+ <span class="contentHeading"><?php echo NOTIFICATIONS_TITLE; ?></span>
+
+ <div class="contentText">
+
<?php
$products_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
$products_check = tep_db_fetch_array($products_check_query);
if ($products_check['total'] > 0) {
?>
- <tr>
- <td class="main" colspan="2"><?php echo NOTIFICATIONS_DESCRIPTION; ?></td>
- </tr>
+
+ <div><?php echo NOTIFICATIONS_DESCRIPTION; ?></div>
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="2">
+
<?php
$counter = 0;
$products_query = tep_db_query("select pd.products_id, pd.products_name from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_NOTIFICATIONS . " pn where pn.customers_id = '" . (int)$customer_id . "' and pn.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by pd.products_name");
while ($products = tep_db_fetch_array($products_query)) {
?>
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('products[<?php echo $counter; ?>]')">
- <td class="main" width="30"><?php echo tep_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true, 'onclick="checkBox(\'products[' . $counter . ']\')"'); ?></td>
- <td class="main"><b><?php echo $products['products_name']; ?></b></td>
- </tr>
+
+ <tr>
+ <td width="30"><?php echo tep_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true, 'onclick="checkBox(\'products[' . $counter . ']\')"'); ?></td>
+ <td><b><?php echo $products['products_name']; ?></b></td>
+ </tr>
+
<?php
$counter++;
}
+?>
+
+ </table>
+
+<?php
} else {
?>
- <tr>
- <td class="main"><?php echo NOTIFICATIONS_NON_EXISTING; ?></td>
- </tr>
+
+ <div>
+ <?php echo NOTIFICATIONS_NON_EXISTING; ?>
+ </div>
+
<?php
}
?>
- </table></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+
+ </div>
+
<?php
}
?>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></form>
+
+ <div>
+ <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+</div>
+
+</form>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
104 catalog/account_password.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2008 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -68,83 +68,47 @@
require('includes/form_check.js.php');
?>
- <?php echo tep_draw_form('account_password', tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL'), 'post', 'onSubmit="return check_form(account_password);"', true) . tep_draw_hidden_field('action', 'process'); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_account.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+<h1><?php echo HEADING_TITLE; ?></h1>
+
<?php
if ($messageStack->size('account_password') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('account_password'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
+ echo '<p>' . $messageStack->output('account_password') . '</p>';
}
?>
+
+<?php echo tep_draw_form('account_password', tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL'), 'post', 'onSubmit="return check_form(account_password);"', true) . tep_draw_hidden_field('action', 'process'); ?>
+
+<div class="contentContainer">
+ <div>
+ <span class="contentHeading"><?php echo MY_PASSWORD_TITLE; ?></span>
+ <span class="inputRequirement" style="float: right;"><?php echo FORM_REQUIRED_INFORMATION; ?></span>
+ </div>
+
+ <div class="contentText">
+ <table border="0" width="100%" cellspacing="2" cellpadding="2">
<tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_PASSWORD_TITLE; ?></b></td>
- <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" cellspacing="2" cellpadding="2">
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_CURRENT; ?></td>
- <td class="main"><?php echo tep_draw_password_field('password_current') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CURRENT_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CURRENT_TEXT . '</span>': ''); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_NEW; ?></td>
- <td class="main"><?php echo tep_draw_password_field('password_new') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_NEW_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_NEW_TEXT . '</span>': ''); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></td>
- <td class="main"><?php echo tep_draw_password_field('password_confirmation') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
+ <td class="fieldKey"><?php echo ENTRY_PASSWORD_CURRENT; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_password_field('password_current') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CURRENT_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CURRENT_TEXT . '</span>': ''); ?></td>
</tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_PASSWORD_NEW; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_password_field('password_new') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_NEW_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_NEW_TEXT . '</span>': ''); ?></td>
</tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
+ <tr>
+ <td class="fieldKey"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></td>
+ <td class="fieldValue"><?php echo tep_draw_password_field('password_confirmation') . '&nbsp;' . (tep_not_null(ENTRY_PASSWORD_CONFIRMATION_TEXT) ? '<span class="inputRequirement">' . ENTRY_PASSWORD_CONFIRMATION_TEXT . '</span>': ''); ?></td>
</tr>
- </table></form>
+ </table>
+ </div>
+
+ <div>
+ <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+</div>
+
+</form>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
157 catalog/address_book.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2003 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -25,134 +25,69 @@
require(DIR_WS_INCLUDES . 'template_top.php');
?>
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-//--></script>
-
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_address_book.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+<h1><?php echo HEADING_TITLE; ?></h1>
+
<?php
if ($messageStack->size('addressbook') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('addressbook'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
+ echo '<p>' . $messageStack->output('addressbook') . '</p>';
}
?>
- <tr>
- <td class="main"><b><?php echo PRIMARY_ADDRESS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" width="50%" valign="top"><?php echo PRIMARY_ADDRESS_DESCRIPTION; ?></td>
- <td align="right" width="50%" valign="top"><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" align="center" valign="top"><b><?php echo PRIMARY_ADDRESS_TITLE; ?></b><br><?php echo tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" valign="top"><?php echo tep_address_label($customer_id, $customer_default_address_id, true, ' ', '<br>'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo ADDRESS_BOOK_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
+
+<div class="contentContainer">
+ <span class="contentHeading"><?php echo PRIMARY_ADDRESS_TITLE; ?></span>
+
+ <div class="contentText">
+ <div class="ui-widget infoBoxContainer" style="float: right;">
+ <div class="ui-widget-header infoBoxHeading"><?php echo PRIMARY_ADDRESS_TITLE; ?></div>
+
+ <div class="ui-widget-content infoBoxContents">
+ <?php echo tep_address_label($customer_id, $customer_default_address_id, true, ' ', '<br />'); ?>
+ </div>
+ </div>
+
+ <?php echo PRIMARY_ADDRESS_DESCRIPTION; ?>
+ </div>
+
+ <div style="clear: both;"></div>
+
+ <span class="contentHeading"><?php echo ADDRESS_BOOK_TITLE; ?></span>
+
+ <div class="contentText">
+
<?php
$addresses_query = tep_db_query("select address_book_id, entry_firstname as firstname, entry_lastname as lastname, entry_company as company, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from " . TABLE_ADDRESS_BOOK . " where customers_id = '" . (int)$customer_id . "' order by firstname, lastname");
while ($addresses = tep_db_fetch_array($addresses_query)) {
$format_id = tep_get_address_format_id($addresses['country_id']);
?>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)">
- <td class="main"><b><?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?></b><?php if ($addresses['address_book_id'] == $customer_default_address_id) echo '&nbsp;<small><i>' . PRIMARY_ADDRESS . '</i></small>'; ?></td>
- <td class="smallText" align="right"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_EDIT, 'document', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $addresses['address_book_id'], 'SSL')) . ' ' . tep_draw_button(SMALL_IMAGE_BUTTON_DELETE, 'trash', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $addresses['address_book_id'], 'SSL')); ?></td>
- </tr>
- <tr>
- <td colspan="2"><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo tep_address_format($format_id, $addresses, true, ' ', '<br>'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
+
+ <div>
+ <span style="float: right;"><?php echo tep_draw_button(SMALL_IMAGE_BUTTON_EDIT, 'document', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $addresses['address_book_id'], 'SSL')) . ' ' . tep_draw_button(SMALL_IMAGE_BUTTON_DELETE, 'trash', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $addresses['address_book_id'], 'SSL')); ?></span>
+ <p><b><?php echo tep_output_string_protected($addresses['firstname'] . ' ' . $addresses['lastname']); ?></b><?php if ($addresses['address_book_id'] == $customer_default_address_id) echo '&nbsp;<small><i>' . PRIMARY_ADDRESS . '</i></small>'; ?></p>
+ <p style="padding-left: 20px;"><?php echo tep_address_format($format_id, $addresses, true, ' ', '<br />'); ?></p>
+ </div>
+
<?php
}
?>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="smallText"><?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?></td>
+
+ </div>
+
+ <div>
+
<?php
if (tep_count_customer_address_book_entries() < MAX_ADDRESS_BOOK_ENTRIES) {
?>
- <td class="smallText" align="right"><?php echo tep_draw_button(IMAGE_BUTTON_ADD_ADDRESS, 'home', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'), 'primary'); ?></td>
+
+ <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_ADD_ADDRESS, 'home', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'), 'primary'); ?></span>
<?php
}
?>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><?php echo sprintf(TEXT_MAXIMUM_ENTRIES, MAX_ADDRESS_BOOK_ENTRIES); ?></td>
- </tr>
- </table>
+
+ <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
+ </div>
+
+ <p><?php echo sprintf(TEXT_MAXIMUM_ENTRIES, MAX_ADDRESS_BOOK_ENTRIES); ?></p>
+</div>
<?php
require(DIR_WS_INCLUDES . 'template_bottom.php');
View
146 catalog/address_book_process.php
@@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
- Copyright (c) 2008 osCommerce
+ Copyright (c) 2010 osCommerce
Released under the GNU General Public License
*/
@@ -254,98 +254,54 @@
}
?>
- <?php if (!isset($HTTP_GET_VARS['delete'])) echo tep_draw_form('addressbook', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, (isset($HTTP_GET_VARS['edit']) ? 'edit=' . $HTTP_GET_VARS['edit'] : ''), 'SSL'), 'post', 'onSubmit="return check_form(addressbook);"', true); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td class="pageHeading"><?php if (isset($HTTP_GET_VARS['edit'])) { echo HEADING_TITLE_MODIFY_ENTRY; } elseif (isset($HTTP_GET_VARS['delete'])) { echo HEADING_TITLE_DELETE_ENTRY; } else { echo HEADING_TITLE_ADD_ENTRY; } ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_address_book.gif', (isset($HTTP_GET_VARS['edit']) ? HEADING_TITLE_MODIFY_ENTRY : HEADING_TITLE_ADD_ENTRY), HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
+<h1><?php if (isset($HTTP_GET_VARS['edit'])) { echo HEADING_TITLE_MODIFY_ENTRY; } elseif (isset($HTTP_GET_VARS['delete'])) { echo HEADING_TITLE_DELETE_ENTRY; } else { echo HEADING_TITLE_ADD_ENTRY; } ?></h1>
+
<?php
if ($messageStack->size('addressbook') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('addressbook'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
+ echo '<p>' . $messageStack->output('addressbook') . '</p>';
}
+?>
+<?php
if (isset($HTTP_GET_VARS['delete'])) {
?>
- <tr>
- <td class="main"><b><?php echo DELETE_ADDRESS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>