Permalink
Browse files

Integrate the 960 Grid System CSS framework into the core template

Replace contentHeading CSS definition with h2
  • Loading branch information...
1 parent 3160abc commit 7549069f00c32b48589275a8d6ac5cef75e3eaee @haraldpdl haraldpdl committed Oct 13, 2010
Showing with 163 additions and 150 deletions.
  1. +6 −6 catalog/account.php
  2. +3 −2 catalog/account_edit.php
  3. +1 −1 catalog/account_history.php
  4. +3 −3 catalog/account_history_info.php
  5. +1 −1 catalog/account_newsletters.php
  6. +3 −3 catalog/account_notifications.php
  7. +1 −1 catalog/account_password.php
  8. +2 −2 catalog/address_book.php
  9. +1 −1 catalog/address_book_process.php
  10. +1 −1 catalog/advanced_search.php
  11. +4 −4 catalog/checkout_confirmation.php
  12. +3 −3 catalog/checkout_payment.php
  13. +3 −5 catalog/checkout_payment_address.php
  14. +3 −5 catalog/checkout_shipping.php
  15. +3 −5 catalog/checkout_shipping_address.php
  16. +5 −5 catalog/create_account.php
  17. +1 −0 catalog/ext/960gs/960.css
  18. +1 −0 catalog/ext/960gs/960_24_col.css
  19. +1 −0 catalog/ext/960gs/rtl_960.css
  20. +1 −0 catalog/ext/960gs/rtl_960_24_col.css
  21. +8 −2 catalog/includes/column_left.php
  22. +7 −1 catalog/includes/column_right.php
  23. +2 −2 catalog/includes/footer.php
  24. +3 −3 catalog/includes/header.php
  25. +1 −1 catalog/includes/modules/address_book_details.php
  26. +1 −1 catalog/includes/modules/downloads.php
  27. +1 −3 catalog/includes/modules/new_products.php
  28. +27 −29 catalog/includes/modules/product_listing.php
  29. +8 −8 catalog/includes/modules/upcoming_products.php
  30. +7 −12 catalog/includes/template_bottom.php
  31. +5 −12 catalog/includes/template_top.php
  32. +12 −10 catalog/index.php
  33. +2 −2 catalog/login.php
  34. +1 −1 catalog/product_reviews.php
  35. +1 −1 catalog/product_reviews_info.php
  36. +1 −1 catalog/reviews.php
  37. +4 −2 catalog/shipping.php
  38. +1 −1 catalog/shopping_cart.php
  39. +21 −5 catalog/stylesheet.css
  40. +3 −5 catalog/tell_a_friend.php
View
@@ -33,28 +33,28 @@
?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo MY_ACCOUNT_TITLE; ?></span>
+ <h2><?php echo MY_ACCOUNT_TITLE; ?></h2>
<div class="contentText">
- <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>); margin: 0;">
<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>
+ <h2><?php echo MY_ORDERS_TITLE; ?></h2>
<div class="contentText">
- <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>); margin: 0;">
<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>
+ <h2><?php echo EMAIL_NOTIFICATIONS_TITLE; ?></h2>
<div class="contentText">
- <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>);">
+ <ul style="list-style-image: url(<?php echo DIR_WS_IMAGES . 'arrow_green.gif'; ?>); margin: 0;">
<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>
View
@@ -135,8 +135,9 @@
<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 class="inputRequirement" style="float: right;"><?php echo FORM_REQUIRED_INFORMATION; ?></div>
+
+ <h2><?php echo MY_ACCOUNT_TITLE; ?></h2>
</div>
<div class="contentText">
@@ -50,7 +50,7 @@
}
?>
- <span class="contentHeading"><?php echo TEXT_ORDER_NUMBER . ' ' . $history['orders_id'] . ' <span class="contentText">(' . $history['orders_status_name'] . ')</span>'; ?></span>
+ <h2><?php echo TEXT_ORDER_NUMBER . ' ' . $history['orders_id'] . ' <span class="contentText">(' . $history['orders_status_name'] . ')</span>'; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="2" cellpadding="2">
@@ -42,7 +42,7 @@
<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>
+ <h2><?php echo sprintf(HEADING_ORDER_NUMBER, $HTTP_GET_VARS['order_id']) . ' <span class="contentText">(' . $order->info['orders_status'] . ')</span>'; ?></h2>
<div class="contentText">
<div>
@@ -124,7 +124,7 @@
</table>
</div>
- <span class="contentHeading"><?php echo HEADING_BILLING_INFORMATION; ?></span>
+ <h2><?php echo HEADING_BILLING_INFORMATION; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="1" cellpadding="2">
@@ -157,7 +157,7 @@
</table>
</div>
- <span class="contentHeading"><?php echo HEADING_ORDER_HISTORY; ?></span>
+ <h2><?php echo HEADING_ORDER_HISTORY; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="1" cellpadding="2">
@@ -52,7 +52,7 @@
<?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo MY_NEWSLETTERS_TITLE; ?></span>
+ <h2><?php echo MY_NEWSLETTERS_TITLE; ?></h2>
<div class="contentText">
<table border="0" cellspacing="2" cellpadding="2">
@@ -78,13 +78,13 @@
<?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo MY_NOTIFICATIONS_TITLE; ?></span>
+ <h2><?php echo MY_NOTIFICATIONS_TITLE; ?></h2>
<div class="contentText">
<?php echo MY_NOTIFICATIONS_DESCRIPTION; ?>
</div>
- <span class="contentHeading"><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></span>
+ <h2><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="0" cellpadding="2">
@@ -99,7 +99,7 @@
if ($global['global_product_notifications'] != '1') {
?>
- <span class="contentHeading"><?php echo NOTIFICATIONS_TITLE; ?></span>
+ <h2><?php echo NOTIFICATIONS_TITLE; ?></h2>
<div class="contentText">
@@ -80,8 +80,8 @@
<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>
+ <h2><?php echo MY_PASSWORD_TITLE; ?></h2>
</div>
<div class="contentText">
View
@@ -34,7 +34,7 @@
?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo PRIMARY_ADDRESS_TITLE; ?></span>
+ <h2><?php echo PRIMARY_ADDRESS_TITLE; ?></h2>
<div class="contentText">
<div class="ui-widget infoBoxContainer" style="float: right;">
@@ -50,7 +50,7 @@
<div style="clear: both;"></div>
- <span class="contentHeading"><?php echo ADDRESS_BOOK_TITLE; ?></span>
+ <h2><?php echo ADDRESS_BOOK_TITLE; ?></h2>
<div class="contentText">
@@ -267,7 +267,7 @@
?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo DELETE_ADDRESS_TITLE; ?></span>
+ <h2><?php echo DELETE_ADDRESS_TITLE; ?></h2>
<div class="contentText">
<p><?php echo DELETE_ADDRESS_DESCRIPTION; ?></p>
@@ -120,7 +120,7 @@ function popupWindow(url) {
<?php echo tep_draw_form('advanced_search', tep_href_link(FILENAME_ADVANCED_SEARCH_RESULT, '', 'NONSSL', false), 'get', 'onSubmit="return check_form(this);"') . tep_hide_session_id(); ?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo HEADING_SEARCH_CRITERIA; ?></span>
+ <h2><?php echo HEADING_SEARCH_CRITERIA; ?></h2>
<div class="contentText">
<div>
@@ -103,7 +103,7 @@
?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo HEADING_SHIPPING_INFORMATION; ?></span>
+ <h2><?php echo HEADING_SHIPPING_INFORMATION; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="1" cellpadding="2">
@@ -193,7 +193,7 @@
</table>
</div>
- <span class="contentHeading"><?php echo HEADING_BILLING_INFORMATION; ?></span>
+ <h2><?php echo HEADING_BILLING_INFORMATION; ?></h2>
<div class="contentText">
<table border="0" width="100%" cellspacing="1" cellpadding="2">
@@ -230,7 +230,7 @@
if ($confirmation = $payment_modules->confirmation()) {
?>
- <span class="contentHeading"><?php echo HEADING_PAYMENT_INFORMATION; ?></span>
+ <h2><?php echo HEADING_PAYMENT_INFORMATION; ?></h2>
<div class="contentText">
<table border="0" cellspacing="0" cellpadding="2">
@@ -263,7 +263,7 @@
if (tep_not_null($order->info['comments'])) {
?>
- <span class="contentHeading"><?php echo '<b>' . HEADING_ORDER_COMMENTS . '</b> <a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '"><span class="orderEdit">(' . TEXT_EDIT . ')</span></a>'; ?></span>
+ <h2><?php echo '<b>' . HEADING_ORDER_COMMENTS . '</b> <a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '"><span class="orderEdit">(' . TEXT_EDIT . ')</span></a>'; ?></h2>
<div class="contentText">
<?php echo nl2br(tep_output_string_protected($order->info['comments'])) . tep_draw_hidden_field('comments', $order->info['comments']); ?>
@@ -140,7 +140,7 @@ function rowOutEffect(object) {
}
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_BILLING_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_BILLING_ADDRESS; ?></h2>
<div class="contentText">
<div class="ui-widget infoBoxContainer" style="float: right;">
@@ -156,7 +156,7 @@ function rowOutEffect(object) {
<div style="clear: both;"></div>
- <span class="contentHeading"><?php echo TABLE_HEADING_PAYMENT_METHOD; ?></span>
+ <h2><?php echo TABLE_HEADING_PAYMENT_METHOD; ?></h2>
<?php
$selection = $payment_modules->selection();
@@ -259,7 +259,7 @@ function rowOutEffect(object) {
</div>
- <span class="contentHeading"><?php echo TABLE_HEADING_COMMENTS; ?></span>
+ <h2><?php echo TABLE_HEADING_COMMENTS; ?></h2>
<div class="contentText">
<?php echo tep_draw_textarea_field('comments', 'soft', '60', '5', $comments); ?>
@@ -261,7 +261,7 @@ function check_form_optional(form_name) {
if ($process == false) {
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_PAYMENT_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_PAYMENT_ADDRESS; ?></h2>
<div class="contentText">
<div class="ui-widget infoBoxContainer" style="float: right;">
@@ -281,7 +281,7 @@ function check_form_optional(form_name) {
if ($addresses_count > 1) {
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_ADDRESS_BOOK_ENTRIES; ?></span>
+ <h2><?php echo TABLE_HEADING_ADDRESS_BOOK_ENTRIES; ?></h2>
<div class="contentText">
<div style="float: right;">
@@ -330,9 +330,7 @@ function check_form_optional(form_name) {
if ($addresses_count < MAX_ADDRESS_BOOK_ENTRIES) {
?>
- <br />
-
- <span class="contentHeading"><?php echo TABLE_HEADING_NEW_PAYMENT_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_NEW_PAYMENT_ADDRESS; ?></h2>
<div class="contentText">
<?php echo TEXT_CREATE_NEW_PAYMENT_ADDRESS; ?>
@@ -192,7 +192,7 @@ function rowOutEffect(object) {
<?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
<div class="contentContainer">
- <span class="contentHeading"><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></h2>
<div class="contentText">
<div class="ui-widget infoBoxContainer" style="float: right;">
@@ -212,7 +212,7 @@ function rowOutEffect(object) {
if (tep_count_shipping_modules() > 0) {
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_SHIPPING_METHOD; ?></span>
+ <h2><?php echo TABLE_HEADING_SHIPPING_METHOD; ?></h2>
<?php
if (sizeof($quotes) > 1 && sizeof($quotes[0]) > 1) {
@@ -319,9 +319,7 @@ function rowOutEffect(object) {
}
?>
- <br />
-
- <span class="contentHeading"><?php echo TABLE_HEADING_COMMENTS; ?></span>
+ <h2><?php echo TABLE_HEADING_COMMENTS; ?></h2>
<div class="contentText">
<?php echo tep_draw_textarea_field('comments', 'soft', '60', '5'); ?>
@@ -273,7 +273,7 @@ function check_form_optional(form_name) {
if ($process == false) {
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_SHIPPING_ADDRESS; ?></h2>
<div class="contentText">
<div class="ui-widget infoBoxContainer" style="float: right;">
@@ -293,7 +293,7 @@ function check_form_optional(form_name) {
if ($addresses_count > 1) {
?>
- <span class="contentHeading"><?php echo TABLE_HEADING_ADDRESS_BOOK_ENTRIES; ?></span>
+ <h2><?php echo TABLE_HEADING_ADDRESS_BOOK_ENTRIES; ?></h2>
<div class="contentText">
<div style="float: right;">
@@ -342,9 +342,7 @@ function check_form_optional(form_name) {
if ($addresses_count < MAX_ADDRESS_BOOK_ENTRIES) {
?>
- <br />
-
- <span class="contentHeading"><?php echo TABLE_HEADING_NEW_SHIPPING_ADDRESS; ?></span>
+ <h2><?php echo TABLE_HEADING_NEW_SHIPPING_ADDRESS; ?></h2>
<div class="contentText">
<?php echo TEXT_CREATE_NEW_SHIPPING_ADDRESS; ?>
View
@@ -270,8 +270,8 @@
<div class="contentContainer">
<div>
- <span class="contentHeading"><?php echo CATEGORY_PERSONAL; ?></span>
<span class="inputRequirement" style="float: right;"><?php echo FORM_REQUIRED_INFORMATION; ?></span>
+ <h2><?php echo CATEGORY_PERSONAL; ?></h2>
</div>
<div class="contentText">
@@ -323,7 +323,7 @@
if (ACCOUNT_COMPANY == 'true') {
?>
- <span class="contentHeading"><?php echo CATEGORY_COMPANY; ?></span>
+ <h2><?php echo CATEGORY_COMPANY; ?></h2>
<div class="contentText">
<table border="0" cellspacing="2" cellpadding="2" width="100%">
@@ -338,7 +338,7 @@
}
?>
- <span class="contentHeading"><?php echo CATEGORY_ADDRESS; ?></span>
+ <h2><?php echo CATEGORY_ADDRESS; ?></h2>
<div class="contentText">
<table border="0" cellspacing="2" cellpadding="2" width="100%">
@@ -408,7 +408,7 @@
</table>
</div>
- <span class="contentHeading"><?php echo CATEGORY_CONTACT; ?></span>
+ <h2><?php echo CATEGORY_CONTACT; ?></h2>
<div class="contentText">
<table border="0" cellspacing="2" cellpadding="2" width="100%">
@@ -427,7 +427,7 @@
</table>
</div>
- <span class="contentHeading"><?php echo CATEGORY_PASSWORD; ?></span>
+ <h2><?php echo CATEGORY_PASSWORD; ?></h2>
<div class="contentText">
<table border="0" cellspacing="2" cellpadding="2" width="100%">

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 7549069

Please sign in to comment.