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

File tree

74 files changed

+9249
-187
lines changed

Some content is hidden

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

74 files changed

+9249
-187
lines changed

‎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) {

‎catalog/advanced_search_result.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@
130130
require(DIR_WS_INCLUDES . 'template_top.php');
131131
?>
132132

133-
<h1><?php echo HEADING_TITLE_2; ?></h1>
133+
<div class="page-header">
134+
<h1><?php echo HEADING_TITLE_2; ?></h1>
135+
</div>
134136

135137
<div class="contentContainer">
136138

‎catalog/checkout_confirmation.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@
9090
require(DIR_WS_INCLUDES . 'template_top.php');
9191
?>
9292

93-
<h1><?php echo HEADING_TITLE; ?></h1>
93+
<div class="page-header">
94+
<h1><?php echo HEADING_TITLE; ?></h1>
95+
</div>
9496

9597
<?php
9698
if ($messageStack->size('checkout_confirmation') > 0) {

‎catalog/checkout_payment.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ function rowOutEffect(object) {
120120
//--></script>
121121
<?php echo $payment_modules->javascript_validation(); ?>
122122

123-
<h1><?php echo HEADING_TITLE; ?></h1>
123+
<div class="page-header">
124+
<h1><?php echo HEADING_TITLE; ?></h1>
125+
</div>
124126

125127
<?php echo tep_draw_form('checkout_payment', tep_href_link(FILENAME_CHECKOUT_CONFIRMATION, '', 'SSL'), 'post', 'onsubmit="return check_form();"', true); ?>
126128

‎catalog/checkout_payment_address.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,9 @@ function check_form_optional(form_name) {
245245
//--></script>
246246
<?php require(DIR_WS_INCLUDES . 'form_check.js.php'); ?>
247247

248-
<h1><?php echo HEADING_TITLE; ?></h1>
248+
<div class="page-header">
249+
<h1><?php echo HEADING_TITLE; ?></h1>
250+
</div>
249251

250252
<?php
251253
if ($messageStack->size('checkout_address') > 0) {

‎catalog/checkout_shipping.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ function rowOutEffect(object) {
202202
}
203203
//--></script>
204204

205-
<h1><?php echo HEADING_TITLE; ?></h1>
205+
<div class="page-header">
206+
<h1><?php echo HEADING_TITLE; ?></h1>
207+
</div>
206208

207209
<?php echo tep_draw_form('checkout_address', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'), 'post', '', true) . tep_draw_hidden_field('action', 'process'); ?>
208210

‎catalog/checkout_shipping_address.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ function check_form_optional(form_name) {
257257
//--></script>
258258
<?php require(DIR_WS_INCLUDES . 'form_check.js.php'); ?>
259259

260-
<h1><?php echo HEADING_TITLE; ?></h1>
260+
<div class="page-header">
261+
<h1><?php echo HEADING_TITLE; ?></h1>
262+
</div>
261263

262264
<?php
263265
if ($messageStack->size('checkout_address') > 0) {

‎catalog/checkout_success.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
require(DIR_WS_INCLUDES . 'template_top.php');
4343
?>
4444

45-
<h1><?php echo HEADING_TITLE; ?></h1>
45+
<div class="page-header">
46+
<h1><?php echo HEADING_TITLE; ?></h1>
47+
</div>
4648

4749
<?php echo tep_draw_form('order', tep_href_link(FILENAME_CHECKOUT_SUCCESS, 'action=update', 'SSL')); ?>
4850

‎catalog/conditions.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
require(DIR_WS_INCLUDES . 'template_top.php');
2020
?>
2121

22-
<h1><?php echo HEADING_TITLE; ?></h1>
22+
<div class="page-header">
23+
<h1><?php echo HEADING_TITLE; ?></h1>
24+
</div>
2325

2426
<div class="contentContainer">
2527
<div class="contentText">

‎catalog/contact_us.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
require(DIR_WS_INCLUDES . 'template_top.php');
5151
?>
5252

53-
<h1><?php echo HEADING_TITLE; ?></h1>
53+
<div class="page-header">
54+
<h1><?php echo HEADING_TITLE; ?></h1>
55+
</div>
5456

5557
<?php
5658
if ($messageStack->size('contact') > 0) {

‎catalog/cookie_usage.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
require(DIR_WS_INCLUDES . 'template_top.php');
2020
?>
2121

22-
<h1><?php echo HEADING_TITLE; ?></h1>
22+
<div class="page-header">
23+
<h1><?php echo HEADING_TITLE; ?></h1>
24+
</div>
2325

2426
<div class="contentContainer">
2527
<div class="contentText">

‎catalog/create_account.php

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

261-
<h1><?php echo HEADING_TITLE; ?></h1>
261+
<div class="page-header">
262+
<h1><?php echo HEADING_TITLE; ?></h1>
263+
</div>
262264

263265
<?php
264266
if ($messageStack->size('create_account') > 0) {

‎catalog/create_account_success.php

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

30-
<h1><?php echo HEADING_TITLE; ?></h1>
30+
<div class="page-header">
31+
<h1><?php echo HEADING_TITLE; ?></h1>
32+
</div>
3133

3234
<div class="contentContainer">
3335
<div class="contentText">

0 commit comments

Comments
 (0)