Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BC] Removed double span element from HTML buttons #3123

Merged
merged 2 commits into from
May 9, 2023
Merged

[BC] Removed double span element from HTML buttons #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a77a0
Removed double span element
fballiano Mar 29, 2023
8e71217
Merge branch 'next' into spanspan2
fballiano May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/msrp/popup.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="additional-addtocart-box">
<?php echo $this->getChildHtml(); ?>
</div>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><span><span><?php echo $this->__('Add to Cart') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add to Cart')) ?>" class="button btn-cart" id="map-popup-button"><?php echo $this->__('Add to Cart') ?></button>
</form>
</div>
<div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo $this->__('Price'); ?>:</strong> <span style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
Expand Down
6 changes: 3 additions & 3 deletions app/design/frontend/base/default/template/catalog/product/compare/list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
'<?php echo $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
Expand Down Expand Up @@ -135,7 +135,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
'<?php echo $this->helper('catalog/product_compare')->getAddToCartUrlCustom($_item, false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
</p>
<?php else: ?>
Expand All @@ -161,7 +161,7 @@ $_params = $this->escapeHtml(json_encode(['form_key' => $this->getFormKey()]));
</tbody>
</table>
<div class="buttons-set">
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Close Window')) ?>" class="button" onclick="window.close();"><?php echo $this->__('Close Window') ?></button>
<span class="please-wait" id="compare-list-please-wait" style="display:none;">
<img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo Mage::helper('core')->quoteEscape($this->__('Please wait...')) ?>" title="<?php echo $this->__('Please wait...') ?>" class="v-middle" /> <?php echo $this->__('Please wait...') ?>
</span>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/compare/sidebar.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
<script type="text/javascript">decorateList('compare-items')</script>
<div class="actions">
<a href="<?php echo $_helper->getClearListUrl() ?>" onclick="return confirm('<?php echo Mage::helper('core')->quoteEscape($this->__('Are you sure you would like to remove all products from your comparison?')) ?>');"><?php echo $this->__('Clear All') ?></a>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><span><span><?php echo $this->__('Compare') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Compare')) ?>" class="button" onclick="popWin('<?php echo $_helper->getListUrl() ?>','compare','top:0,left:0,width=820,height=600,resizable=yes,scrollbars=yes')"><?php echo $this->__('Compare') ?></button>
</div>
<?php else: ?>
<p class="empty"><?php echo $this->__('You have no items to compare.') ?></p>
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/base/default/template/catalog/product/list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>"
class="button btn-cart"
onclick="customFormSubmit('<?php echo $_cartUrl ?>', '<?php echo $_params ?>', 'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
</p>
<?php else: ?>
Expand Down Expand Up @@ -120,7 +120,7 @@
title="<?php echo $this->quoteEscape($this->__('Add to Cart')) ?>"
class="button btn-cart"
onclick="customFormSubmit('<?php echo $_cartUrl ?>', '<?php echo $_params ?>', 'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/new.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<label for="qty"><?php echo $this->__('Qty:') ?></label>
<input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
<?php endif ?>
<button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
<button type="button" title="<?php echo $buttonTitle ?>" id="product-addtocart-button" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?php echo $buttonTitle ?></button>
<?php echo $this->getChildHtml('', true, true) ?>
</div>
<?php endif ?>
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
'<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'<?php echo $this->getAddToCartUrlCustom($_product, [], false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<?php else: ?>
<p class="availability out-of-stock"><span><?php echo $this->__('Out of stock') ?></span></p>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalogsearch/advanced/form.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<script type="text/javascript">decorateList('advanced-search-list')</script>
</div>
<div class="buttons-set">
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><?php echo $this->__('Search') ?></button>
</div>
</form>
<script type="text/javascript">
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $catalogSearchHelper = $this->helper('catalogsearch');
<div class="form-search">
<label for="search"><?php echo $this->__('Search:') ?></label>
<input id="search" type="text" name="<?php echo $catalogSearchHelper->getQueryParamName() ?>" value="<?php echo $catalogSearchHelper->getEscapedQueryText() ?>" class="input-text" maxlength="<?php echo $catalogSearchHelper->getMaxQueryLength();?>" />
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><span><span><?php echo $this->__('Search') ?></span></span></button>
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Search')) ?>" class="button"><?php echo $this->__('Search') ?></button>
<div id="search_autocomplete" class="search-autocomplete"></div>
<script type="text/javascript">
//<![CDATA[
Expand Down
6 changes: 3 additions & 3 deletions app/design/frontend/base/default/template/checkout/cart.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
<tr>
<td colspan="50" class="a-right">
<?php if($this->getContinueShoppingUrl()): ?>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><span><span><?php echo $this->__('Continue Shopping') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Continue Shopping')) ?>" class="button btn-continue" onclick="setLocation('<?php echo Mage::helper('core')->quoteEscape($this->getContinueShoppingUrl()) ?>')"><?php echo $this->__('Continue Shopping') ?></button>
<?php endif ?>
<button type="submit" name="update_cart_action" value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><span><span><?php echo $this->__('Update Shopping Cart'); ?></span></span></button>
<button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo $this->__('Clear Shopping Cart'); ?></span></span></button>
<button type="submit" name="update_cart_action" value="update_qty" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Shopping Cart')); ?>" class="button btn-update"><?php echo $this->__('Update Shopping Cart'); ?></button>
<button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Clear Shopping Cart')); ?>" class="button btn-empty" id="empty_cart_button"><?php echo $this->__('Clear Shopping Cart'); ?></button>
</td>
</tr>
</tfoot>
Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/base/default/template/checkout/cart/coupon.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
</div>
<div class="buttons-set">
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>"><span><span><?php echo $this->__('Apply Coupon') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>" class="button" onclick="discountForm.submit(false)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Apply Coupon')) ?>"><?php echo $this->__('Apply Coupon') ?></button>
<?php if(strlen($this->getCouponCode())): ?>
&nbsp; <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>"><span><span><?php echo $this->__('Cancel Coupon') ?></span></span></button>
&nbsp; <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>" class="button" onclick="discountForm.submit(true)" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Cancel Coupon')) ?>"><?php echo $this->__('Cancel Coupon') ?></button>
<?php endif ?>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/checkout/cart/crosssell.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'<?php echo $this->getAddToCartUrlCustom($_item, [], false) ?>',
'<?php echo $_params ?>',
'post')">
<span><span><?php echo $this->__('Add to Cart') ?></span></span>
<?php echo $this->__('Add to Cart') ?>
</button>
<ul class="add-to-links">
<?php if ($this->helper('wishlist')->isAllow()) : ?>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/checkout/cart/item/configure/updatecart.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<label for="qty"><?php echo $this->__('Qty:') ?></label>
<input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Qty')) ?>" class="input-text qty" />
<?php endif ?>
<button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><span><span><?php echo $buttonTitle ?></span></span></button>
<button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" onclick="productAddToCartForm.submit(this)"><?php echo $buttonTitle ?></button>
<?php echo $this->getChildHtml('', true, true) ?>
</div>
<?php endif ?>
4 changes: 2 additions & 2 deletions app/design/frontend/base/default/template/checkout/cart/shipping.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</li>
</ul>
<div class="buttons-set">
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get a Quote')) ?>" onclick="coShippingMethodForm.submit()" class="button"><span><span><?php echo $this->__('Get a Quote') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Get a Quote')) ?>" onclick="coShippingMethodForm.submit()" class="button"><?php echo $this->__('Get a Quote') ?></button>
</div>
</form>
<script type="text/javascript">
Expand Down Expand Up @@ -96,7 +96,7 @@
<?php endforeach ?>
</dl>
<div class="buttons-set">
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>"><span><span><?php echo $this->__('Update Total') ?></span></span></button>
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>" class="button" name="do" value="<?php echo Mage::helper('core')->quoteEscape($this->__('Update Total')) ?>"><?php echo $this->__('Update Total') ?></button>
</div>
<?php echo $this->getBlockHtml('formkey') ?>
</form>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/checkout/cart/sidebar.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<?php if($_cartQty && $this->isPossibleOnepageCheckout()): ?>
<div class="actions">
<?php echo $this->getChildHtml('extra_actions') ?>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><span><span><?php echo $this->__('Checkout') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Checkout')) ?>" class="button" onclick="setLocation('<?php echo $this->getCheckoutUrl() ?>')"><?php echo $this->__('Checkout') ?></button>
</div>
<?php endif ?>
<?php $_items = $this->getRecentItems() ?>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/checkout/multishipping/address/select.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<div class="multiple-checkout">
<div class="page-title title-buttons">
<h1><?php echo $this->__('Change Billing Address') ?></h1>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo $this->__('Add New Address') ?></span></span></button>
<button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Add New Address')) ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><?php echo $this->__('Add New Address') ?></button>
</div>
<?php echo $this->getMessagesBlock()->toHtml() ?>
<?php $_index=0 ?>
Expand Down
Loading