Skip to content

Commit fe28b9b

Browse files
gburtongburton
committed
Merge pull request #1 from osCommerce/master
Merge Initial BS Changes
2 parents 6cccf16 + 963ff26 commit fe28b9b

74 files changed

Lines changed: 9249 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎catalog/account.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
require(DIR_WS_INCLUDES . 'template_top.php');
2525
?>
2626

27-
<h1><?php echo HEADING_TITLE; ?></h1>
27+
<div class="page-header">
28+
<h1><?php echo HEADING_TITLE; ?></h1>
29+
</div>
2830

2931
<?php
3032
if ($messageStack->size('account') > 0) {

‎catalog/account_edit.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@
123123
require('includes/form_check.js.php');
124124
?>
125125

126-
<h1><?php echo HEADING_TITLE; ?></h1>
126+
<div class="page-header">
127+
<h1><?php echo HEADING_TITLE; ?></h1>
128+
</div>
127129

128130
<?php
129131
if ($messageStack->size('account_edit') > 0) {

‎catalog/account_history.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
require(DIR_WS_INCLUDES . 'template_top.php');
2626
?>
2727

28-
<h1><?php echo HEADING_TITLE; ?></h1>
28+
<div class="page-header">
29+
<h1><?php echo HEADING_TITLE; ?></h1>
30+
</div>
2931

3032
<div class="contentContainer">
3133

‎catalog/account_history_info.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
require(DIR_WS_INCLUDES . 'template_top.php');
4040
?>
4141

42-
<h1><?php echo HEADING_TITLE; ?></h1>
42+
<div class="page-header">
43+
<h1><?php echo HEADING_TITLE; ?></h1>
44+
</div>
4345

4446
<div class="contentContainer">
4547
<h2><?php echo sprintf(HEADING_ORDER_NUMBER, $HTTP_GET_VARS['order_id']) . ' <span class="contentText">(' . $order->info['orders_status'] . ')</span>'; ?></h2>

‎catalog/account_newsletters.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@
4747
require(DIR_WS_INCLUDES . 'template_top.php');
4848
?>
4949

50-
<h1><?php echo HEADING_TITLE; ?></h1>
50+
<div class="page-header">
51+
<h1><?php echo HEADING_TITLE; ?></h1>
52+
</div>
5153

5254
<?php echo tep_draw_form('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
5355

‎catalog/account_notifications.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
require(DIR_WS_INCLUDES . 'template_top.php');
7474
?>
7575

76-
<h1><?php echo HEADING_TITLE; ?></h1>
76+
<div class="page-header">
77+
<h1><?php echo HEADING_TITLE; ?></h1>
78+
</div>
7779

7880
<?php echo tep_draw_form('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
7981

‎catalog/account_password.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
require('includes/form_check.js.php');
6565
?>
6666

67-
<h1><?php echo HEADING_TITLE; ?></h1>
67+
<div class="page-header">
68+
<h1><?php echo HEADING_TITLE; ?></h1>
69+
</div>
6870

6971
<?php
7072
if ($messageStack->size('account_password') > 0) {

‎catalog/address_book.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
require(DIR_WS_INCLUDES . 'template_top.php');
2626
?>
2727

28-
<h1><?php echo HEADING_TITLE; ?></h1>
28+
<div class="page-header">
29+
<h1><?php echo HEADING_TITLE; ?></h1>
30+
</div>
2931

3032
<?php
3133
if ($messageStack->size('addressbook') > 0) {

‎catalog/address_book_process.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@
254254
}
255255
?>
256256

257-
<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>
257+
<div class="page-header">
258+
<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>
259+
</div>
258260

259261
<?php
260262
if ($messageStack->size('addressbook') > 0) {

‎catalog/advanced_search.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ function popupWindow(url) {
107107
}
108108
//--></script>
109109

110-
<h1><?php echo HEADING_TITLE_1; ?></h1>
110+
<div class="page-header">
111+
<h1><?php echo HEADING_TITLE_1; ?></h1>
112+
</div>
111113

112114
<?php
113115
if ($messageStack->size('search') > 0) {

0 commit comments

Comments
 (0)