Give buttons a css definition (report #66)

osCommerce · Nov 12, 2010 · 2ee42d8 · 2ee42d8
1 parent 90b28ab
commit 2ee42d8
Show file tree

Hide file tree

Showing 27 changed files with 75 additions and 68 deletions.
diff --git a/catalog/account_edit.php b/catalog/account_edit.php
@@ -200,8 +200,8 @@
 
     <br />
 
-    <div>
-      <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+    <div class="buttonSet">
+      <span class="buttonAction"><?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>

diff --git a/catalog/account_history.php b/catalog/account_history.php
@@ -84,7 +84,7 @@
   }
 ?>
 
-  <div class="contentText">
+  <div class="buttonSet">
     <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ACCOUNT, '', 'SSL')); ?>
   </div>
 </div>

diff --git a/catalog/account_history_info.php b/catalog/account_history_info.php
@@ -182,7 +182,7 @@
   if (DOWNLOAD_ENABLED == 'true') include(DIR_WS_MODULES . 'downloads.php');
 ?>
 
-  <div>
+  <div class="buttonSet">
     <?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>

diff --git a/catalog/account_newsletters.php b/catalog/account_newsletters.php
@@ -63,8 +63,8 @@
     </table>
   </div>
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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>

diff --git a/catalog/account_notifications.php b/catalog/account_notifications.php
@@ -149,8 +149,8 @@
   }
 ?>
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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>

diff --git a/catalog/account_password.php b/catalog/account_password.php
@@ -97,8 +97,8 @@
     </table>
   </div>
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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>

diff --git a/catalog/address_book.php b/catalog/address_book.php
@@ -72,13 +72,14 @@
 
   </div>
 
-  <div>
+  <div class="buttonSet">
 
 <?php
   if (tep_count_customer_address_book_entries() < MAX_ADDRESS_BOOK_ENTRIES) {
 ?>
 
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_ADD_ADDRESS, 'home', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'), 'primary'); ?></span>
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_ADD_ADDRESS, 'home', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'), 'primary'); ?></span>
+
 <?php
   }
 ?>

diff --git a/catalog/address_book_process.php b/catalog/address_book_process.php
@@ -311,8 +311,8 @@
       }
 ?>
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_hidden_field('action', 'process') . tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_hidden_field('action', 'process') . tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
 
     <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', $back_link); ?>
   </div>

diff --git a/catalog/advanced_search_result.php b/catalog/advanced_search_result.php
@@ -315,7 +315,7 @@
 
   <br />
 
-  <div>
+  <div class="buttonSet">
     <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_ADVANCED_SEARCH, tep_get_all_get_params(array('sort', 'page')), 'NONSSL', true, false)); ?>
   </div>
 </div>

diff --git a/catalog/checkout_success.php b/catalog/checkout_success.php
@@ -99,10 +99,14 @@
     <h3><?php echo TEXT_THANKS_FOR_SHOPPING; ?></h3>
   </div>
 
-<?php if (DOWNLOAD_ENABLED == 'true') include(DIR_WS_MODULES . 'downloads.php'); ?>
+<?php
+  if (DOWNLOAD_ENABLED == 'true') {
+    include(DIR_WS_MODULES . 'downloads.php');
+  }
+?>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
   </div>
 </div>
 

diff --git a/catalog/conditions.php b/catalog/conditions.php
@@ -26,8 +26,8 @@
     <?php echo TEXT_INFORMATION; ?>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/contact_us.php b/catalog/contact_us.php
@@ -94,8 +94,8 @@
     </table>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
   </div>
 </div>
 

diff --git a/catalog/cookie_usage.php b/catalog/cookie_usage.php
@@ -34,8 +34,8 @@
     <?php echo TEXT_INFORMATION; ?>
   </div>
 
-  <div style="float: right; clear: both;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/create_account.php b/catalog/create_account.php
@@ -444,8 +444,8 @@
     </table>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'person', null, 'primary'); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'person', null, 'primary'); ?></span>
   </div>
 </div>
 

diff --git a/catalog/create_account_success.php b/catalog/create_account_success.php
@@ -34,8 +34,8 @@
     <?php echo TEXT_ACCOUNT_CREATED; ?>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', $origin_href); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', $origin_href); ?></span>
   </div>
 </div>
 

diff --git a/catalog/logoff.php b/catalog/logoff.php
@@ -35,8 +35,8 @@
     <?php echo TEXT_MAIN; ?>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/password_forgotten.php b/catalog/password_forgotten.php
@@ -56,22 +56,18 @@
   <div class="contentText">
     <div><?php echo TEXT_MAIN; ?></div>
 
-    <br />
-
     <table border="0" width="100%" cellspacing="0" cellpadding="2">
       <tr>
         <td class="fieldKey"><?php echo ENTRY_EMAIL_ADDRESS; ?></td>
         <td class="fieldValue"><?php echo tep_draw_input_field('email_address'); ?></td>
       </tr>
     </table>
+  </div>
 
-    <br />
-
-    <div>
-      <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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_LOGIN, '', 'SSL')); ?>
-    </div>
+    <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_LOGIN, '', 'SSL')); ?>
   </div>
 </div>
 

diff --git a/catalog/privacy.php b/catalog/privacy.php
@@ -26,8 +26,8 @@
     <?php echo TEXT_INFORMATION; ?>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/product_info.php b/catalog/product_info.php
@@ -181,18 +181,20 @@
 
 <?php
     }
+?>
+
+  </div>
 
+<?php
     $reviews_query = tep_db_query("select count(*) as count from " . TABLE_REVIEWS . " where products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and reviews_status = 1");
     $reviews = tep_db_fetch_array($reviews_query);
 ?>
 
-    <br />
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']) . tep_draw_button(IMAGE_BUTTON_IN_CART, 'cart', null, 'primary'); ?></span>
 
-    <div>
-      <div style="float: right;"><?php echo tep_draw_hidden_field('products_id', $product_info['products_id']) . tep_draw_button(IMAGE_BUTTON_IN_CART, 'cart', null, 'primary'); ?></div>
-
-      <?php echo tep_draw_button(IMAGE_BUTTON_REVIEWS . (($reviews['count'] > 0) ? ' (' . $reviews['count'] . ')' : ''), 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params())); ?>
-    </div>
+    <?php echo tep_draw_button(IMAGE_BUTTON_REVIEWS . (($reviews['count'] > 0) ? ' (' . $reviews['count'] . ')' : ''), 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params())); ?>
+  </div>
 
 <?php
     if ((USE_CACHE == 'true') && empty($SID)) {
@@ -202,7 +204,6 @@
     }
 ?>
 
-  </div>
 </div>
 
 </form>

diff --git a/catalog/product_reviews.php b/catalog/product_reviews.php
@@ -131,8 +131,8 @@ function popupWindow(url) {
 
   <br />
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_WRITE_REVIEW, 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, tep_get_all_get_params()), 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_WRITE_REVIEW, 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, tep_get_all_get_params()), 'primary'); ?></span>
 
     <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params())); ?>
   </div>

diff --git a/catalog/product_reviews_info.php b/catalog/product_reviews_info.php
@@ -90,8 +90,8 @@ function popupWindow(url) {
 
   <br />
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_WRITE_REVIEW, 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, tep_get_all_get_params(array('reviews_id'))), 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_WRITE_REVIEW, 'comment', tep_href_link(FILENAME_PRODUCT_REVIEWS_WRITE, tep_get_all_get_params(array('reviews_id'))), 'primary'); ?></span>
 
     <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('reviews_id')))); ?>
   </div>

diff --git a/catalog/product_reviews_write.php b/catalog/product_reviews_write.php
@@ -153,14 +153,12 @@ function popupWindow(url) {
         <td class="fieldValue"><?php echo TEXT_BAD . ' ' . tep_draw_radio_field('rating', '1') . ' ' . tep_draw_radio_field('rating', '2') . ' ' . tep_draw_radio_field('rating', '3') . ' ' . tep_draw_radio_field('rating', '4') . ' ' . tep_draw_radio_field('rating', '5') . ' ' . TEXT_GOOD; ?></td>
       </tr>
     </table>
+  </div>
 
-    <br />
-
-    <div>
-      <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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_PRODUCT_REVIEWS, tep_get_all_get_params(array('reviews_id', 'action')))); ?>
-    </div>
+    <?php echo tep_draw_button(IMAGE_BUTTON_BACK, 'triangle-1-w', tep_href_link(FILENAME_PRODUCT_REVIEWS, tep_get_all_get_params(array('reviews_id', 'action')))); ?>
   </div>
 </div>
 

diff --git a/catalog/shipping.php b/catalog/shipping.php
@@ -26,8 +26,8 @@
     <?php echo TEXT_INFORMATION; ?>
   </div>
 
-  <div style="float: right;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_DEFAULT)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/shopping_cart.php b/catalog/shopping_cart.php
@@ -128,31 +128,32 @@
     }
 ?>
 
-    <br />
+  </div>
 
-    <p align="right"><?php echo tep_draw_button(IMAGE_BUTTON_CHECKOUT, 'triangle-1-e', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'), 'primary'); ?></p>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CHECKOUT, 'triangle-1-e', tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'), 'primary'); ?></span>
+  </div>
 
 <?php
     $initialize_checkout_methods = $payment_modules->checkout_initialization_method();
 
     if (!empty($initialize_checkout_methods)) {
 ?>
 
-    <p align="right" style="padding-right: 50px;"><?php echo TEXT_ALTERNATIVE_CHECKOUT_METHODS; ?></p>
+  <p align="right" style="clear: both; padding: 15px 50px 0 0;"><?php echo TEXT_ALTERNATIVE_CHECKOUT_METHODS; ?></p>
 
 <?php
       reset($initialize_checkout_methods);
       while (list(, $value) = each($initialize_checkout_methods)) {
 ?>
 
-    <p align="right"><?php echo $value; ?></p>
+  <p align="right"><?php echo $value; ?></p>
 
 <?php
       }
     }
 ?>
 
-  </div>
 </div>
 
 </form>

diff --git a/catalog/ssl_check.php b/catalog/ssl_check.php
@@ -34,8 +34,8 @@
     <?php echo TEXT_INFORMATION; ?>
   </div>
 
-  <div style="float: right; clear: both;">
-    <?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_LOGIN)); ?>
+  <div class="buttonSet">
+    <span class="buttonAction"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', tep_href_link(FILENAME_LOGIN)); ?></span>
   </div>
 </div>
 

diff --git a/catalog/stylesheet.css b/catalog/stylesheet.css
@@ -131,7 +131,13 @@ table, p {
   margin-left: -30px;
 }
 
+.buttonSet {
+  clear: both;
+}
 
+.buttonAction {
+  float: right;
+}
 
 .boxText { font-family: Verdana, Arial, sans-serif; font-size: 10px; }
 .errorBox { font-family : Verdana, Arial, sans-serif; font-size : 10px; background: #ffb3b5; font-weight: bold; }

diff --git a/catalog/tell_a_friend.php b/catalog/tell_a_friend.php
@@ -161,8 +161,8 @@
     </table>
   </div>
 
-  <div>
-    <span style="float: right;"><?php echo tep_draw_button(IMAGE_BUTTON_CONTINUE, 'triangle-1-e', null, 'primary'); ?></span>
+  <div class="buttonSet">
+    <span class="buttonAction"><?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_PRODUCT_INFO, 'products_id=' . (int)$HTTP_GET_VARS['products_id'])); ?>
   </div>