From 10a527abd661e74eed2618281caf833d97d55288 Mon Sep 17 00:00:00 2001
From: gburton <oscshops@gmail.com>
Date: Fri, 9 Jan 2015 18:49:44 +0000
Subject: [PATCH] Display of checkboxes

Line up checkboxes
---
 account_newsletters.php                       | 10 ++++++----
 account_notifications.php                     | 19 +++++++++++--------
 advanced_search.php                           |  6 ++----
 create_account.php                            | 13 +++++--------
 includes/modules/address_book_details.php     | 10 +++-------
 .../cm_cs_product_notifications.php           |  4 ++--
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/account_newsletters.php b/account_newsletters.php
index 3abf636b4..b09c82f43 100644
--- a/account_newsletters.php
+++ b/account_newsletters.php
@@ -58,10 +58,12 @@
     <div class="form-group">
       <label class="control-label col-xs-4"><?php echo  MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></label>
       <div class="col-xs-8">
-        <label class="checkbox-inline">
-          <?php echo tep_draw_checkbox_field('newsletter_general', '1', (($newsletter['customers_newsletter'] == '1') ? true : false)); ?>
-        </label>
-        <?php if (tep_not_null(MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION)) echo '<span class="help-block">' . MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION . '</span>'; ?>
+        <div class="checkbox">
+          <label>
+            <?php echo tep_draw_checkbox_field('newsletter_general', '1', (($newsletter['customers_newsletter'] == '1') ? true : false)); ?>
+            <?php if (tep_not_null(MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION)) echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?>
+          </label>
+        </div>
       </div>
     </div>
   </div>
diff --git a/account_notifications.php b/account_notifications.php
index 75f14cc91..60d69e773 100644
--- a/account_notifications.php
+++ b/account_notifications.php
@@ -89,10 +89,12 @@
     <div class="form-group">
       <label class="control-label col-xs-4"><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></label>
       <div class="col-xs-8">
-        <label class="checkbox-inline">
-          <?php echo tep_draw_checkbox_field('product_global', '1', (($global['global_product_notifications'] == '1') ? true : false)); ?>
-        </label>
-        <?php if (tep_not_null(GLOBAL_NOTIFICATIONS_DESCRIPTION)) echo '<span class="help-block">' . GLOBAL_NOTIFICATIONS_DESCRIPTION . '</span>'; ?>
+        <div class="checkbox">
+          <label>
+            <?php echo tep_draw_checkbox_field('product_global', '1', (($global['global_product_notifications'] == '1') ? true : false)); ?>
+            <?php if (tep_not_null(GLOBAL_NOTIFICATIONS_DESCRIPTION)) echo GLOBAL_NOTIFICATIONS_DESCRIPTION; ?>
+          </label>
+        </div>
       </div>
     </div>
   </div>
@@ -121,10 +123,11 @@
       $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)) {
 ?>
-      <label class="checkbox-inline">
-        <?php echo tep_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true); ?>
-      </label>
-      <?php echo '<span class="help-block">' . $products['products_name'] . '</span>'; ?>
+      <div class="checkbox">
+        <label>
+          <?php echo tep_draw_checkbox_field('products[' . $counter . ']', $products['products_id'], true) . $products['products_name']; ?>
+        </label>
+      </div>
 <?php
       }
 ?>
diff --git a/advanced_search.php b/advanced_search.php
index 1d685b781..864e517a3 100644
--- a/advanced_search.php
+++ b/advanced_search.php
@@ -161,11 +161,9 @@ function check_form() {
     <div class="form-group">
       <label for="entryIncludeSubs" class="control-label col-xs-3"><?php echo ENTRY_INCLUDE_SUBCATEGORIES; ?></label>
       <div class="col-xs-9">
-        <div class="checkbox-inline">
+        <div class="checkbox">
           <label>
-            <?php
-            echo tep_draw_checkbox_field('inc_subcat', '1', true, 'id="entryIncludeSubs"');
-            ?>
+            <?php echo tep_draw_checkbox_field('inc_subcat', '1', true, 'id="entryIncludeSubs"'); ?>
           </label>
         </div>
       </div>
diff --git a/create_account.php b/create_account.php
index f38864b15..642d30049 100644
--- a/create_account.php
+++ b/create_account.php
@@ -481,17 +481,14 @@
       </div>
     </div>
     <div class="form-group">
-      <div class="col-xs-offset-3 col-sm-9">
+      <label for="inputNewsletter" class="control-label col-xs-3"><?php echo ENTRY_NEWSLETTER; ?></label>
+      <div class="col-xs-9">
         <div class="checkbox">
-          <label for="inputNewsletter">
-            <?php
-              echo tep_draw_checkbox_field('newsletter', '1', NULL, 'id="inputNewsletter"') . ' '  . ENTRY_NEWSLETTER; 
-			?>
+          <label>
+            <?php echo tep_draw_checkbox_field('newsletter', '1', NULL, 'id="inputNewsletter"'); ?>
+            <?php if (tep_not_null(ENTRY_NEWSLETTER_TEXT)) echo ENTRY_NEWSLETTER_TEXT; ?>
           </label>
         </div>
-      <?php
-        if (tep_not_null(ENTRY_NEWSLETTER_TEXT)) echo '<span class="help-block">' . ENTRY_NEWSLETTER_TEXT . '</span>';
-      ?>
       </div>
     </div>
   
diff --git a/includes/modules/address_book_details.php b/includes/modules/address_book_details.php
index 5c5f05150..bc486e118 100644
--- a/includes/modules/address_book_details.php
+++ b/includes/modules/address_book_details.php
@@ -181,16 +181,12 @@
       <div class="form-group">
         <label for="primary" class="control-label col-xs-3"><?php echo SET_AS_PRIMARY; ?></label>
         <div class="col-xs-9">
-          <div class="checkbox-inline">
+          <div class="checkbox">
             <label>
-              <?php
-              echo tep_draw_checkbox_field('primary', 'on', false, 'id="primary"');
-              ?>
+              <?php echo tep_draw_checkbox_field('primary', 'on', false, 'id="primary"'); ?>
+              <?php if (tep_not_null(ENTRY_NEWSLETTER_TEXT)) echo ENTRY_NEWSLETTER_TEXT; ?>
             </label>
           </div>
-          <?php
-          if (tep_not_null(ENTRY_NEWSLETTER_TEXT)) echo '<span class="help-block">' . ENTRY_NEWSLETTER_TEXT . '</span>';
-          ?>
         </div>
       </div>
 
diff --git a/includes/modules/content/checkout_success/cm_cs_product_notifications.php b/includes/modules/content/checkout_success/cm_cs_product_notifications.php
index e8cff0350..3f1e2ea98 100755
--- a/includes/modules/content/checkout_success/cm_cs_product_notifications.php
+++ b/includes/modules/content/checkout_success/cm_cs_product_notifications.php
@@ -60,11 +60,11 @@ function execute() {
           $products_query = tep_db_query("select products_id, products_name from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$order_id . "' order by products_name");
           while ($products = tep_db_fetch_array($products_query)) {
             if ( !isset($products_displayed[$products['products_id']]) ) {
-              $products_displayed[$products['products_id']] = '<label class="checkbox-inline"> ' . tep_draw_checkbox_field('notify[]', $products['products_id']) . ' ' . $products['products_name'] . '</label>';
+              $products_displayed[$products['products_id']] = '<div class="checkbox"><label> ' . tep_draw_checkbox_field('notify[]', $products['products_id']) . ' ' . $products['products_name'] . '</label></div>';
             }
           }
 
-          $products_notifications = implode('<br />', $products_displayed);
+          $products_notifications = implode('', $products_displayed);
 
           ob_start();
           include(DIR_WS_MODULES . 'content/' . $this->group . '/templates/product_notifications.php');