Merge branch 'main' into productjs

MahoCommerce · Dec 12, 2024 · fe17744 · fe17744
2 parents baae30c + b7b0046
commit fe17744
Show file tree

Hide file tree

Showing 84 changed files with 115 additions and 143 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Button.php b/app/code/core/Mage/Adminhtml/Block/Widget/Button.php
@@ -47,6 +47,6 @@ protected function _toHtml()
             . ' style="' . $this->getStyle() . '"'
             . ($this->getValue() ? ' value="' . $this->getValue() . '"' : '')
             . ($this->getDisabled() ? ' disabled="disabled"' : '')
-            . '><span><span><span>' . $this->getLabel() . '</span></span></span></button>' . $this->getAfterHtml();
+            . '>' . $this->getLabel() . '</button>' . $this->getAfterHtml();
     }
 }
diff --git a/app/design/adminhtml/default/default/template/api/roles.phtml b/app/design/adminhtml/default/default/template/api/roles.phtml
@@ -15,7 +15,7 @@
         <tr>
             <td style="width:50%;"><h3><?= $this->__('Roles') ?></h3></td>
             <td class="form-buttons">
-            <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><span><span><?= $this->__('Add New Role') ?></span></span></span></button>
+            <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><?= $this->__('Add New Role') ?></span></button>
             </td>
         </tr>
     </table>

diff --git a/app/design/adminhtml/default/default/template/api/users.phtml b/app/design/adminhtml/default/default/template/api/users.phtml
@@ -15,7 +15,7 @@
     <tr>
         <td style="width:50%;"><h3><?= $this->__('Users') ?></h3></td>
         <td class="a-right">
-        <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><span><span><?= $this->__('Add New User') ?></span></span></span></button>
+        <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><?= $this->__('Add New User') ?></span></button>
         </td>
     </tr>
 </table>

diff --git a/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml b/app/design/adminhtml/default/default/template/catalog/product/composite/configure.phtml
@@ -26,8 +26,8 @@
             <div id="product_composite_configure_form_additional" style="display:none;"></div>
             <div id="product_composite_configure_form_confirmed" style="display:none;"></div>
             <div class="buttons-set a-right">
-                <button type="button" class="scalable" onclick="productConfigure.onCancelBtn()" id="product_composite_configure_form_cancel"><span><span><span><?= Mage::helper('catalog')->__('Cancel') ?></span></span></span></button>
-                <button type="submit" class="scalable"><span><span><span><?= Mage::helper('catalog')->__('OK') ?></span></span></span></button>
+                <button type="button" class="scalable" onclick="productConfigure.onCancelBtn()" id="product_composite_configure_form_cancel"><span><?= Mage::helper('catalog')->__('Cancel') ?></span></button>
+                <button type="submit" class="scalable"><span><?= Mage::helper('catalog')->__('OK') ?></span></button>
             </div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />

diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/group.phtml
@@ -65,7 +65,7 @@ var groupPriceRowTemplate = '<tr>'
     + '<input type="hidden" name="<?= $_htmlName ?>[{{index}}][is_percent]" value="<?php if ($this->getIsPercent()) : ?>1<?php else: ?>0<?php endif ?>" id="group_price_row_{{index}}_is_percent" /></td>'
     + '<td class="last"><input type="hidden" name="<?= $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="group_price_row_{{index}}_delete" />'
     + '<button title="<?= $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete Group Price')) ?>" type="button" class="scalable delete icon-btn delete-product-option" id="group_price_row_{{index}}_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
-    + '<span><?= $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete')) ?></span></button></td>'
+    + '<?= $this->jsQuoteEscape(Mage::helper('catalog')->__('Delete')) ?></button></td>'
     + '</tr>';
 
 var groupPriceControl = {

diff --git a/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml b/app/design/adminhtml/default/default/template/catalog/product/edit/price/tier.phtml
@@ -70,7 +70,7 @@ var tierPriceRowTemplate = '<tr>'
     + '<td><input class="<?= $_htmlClass ?> required-entry <?= $_priceValueValidation ?>" type="text" name="<?= $_htmlName ?>[{{index}}][price]" value="{{price}}" id="tier_price_row_{{index}}_price" /></td>'
     + '<td class="last"><input type="hidden" name="<?= $_htmlName ?>[{{index}}][delete]" class="delete" value="" id="tier_price_row_{{index}}_delete" />'
     + '<button title="<?= Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__("Delete Tier")) ?>" type="button" class="scalable delete icon-btn delete-product-option" id="tier_price_row_{{index}}_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
-    + '<span><span><span><?= Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__("Delete")) ?></span></span></span></button></td>'
+    + '<?= Mage::helper('core')->jsQuoteEscape(Mage::helper('catalog')->__("Delete")) ?></button></td>'
     + '</tr>';
 
 var tierPriceControl = {

diff --git a/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml b/app/design/adminhtml/default/default/template/currencysymbol/grid.phtml
@@ -39,8 +39,8 @@
                         </colgroup>
                         <thead>
                             <tr class="headings">
-                                <th><span class="nobr"><span class="not-sort"><?= $this->__('Currency') ?></span></span></th>
-                                <th><span class="nobr"><span class="not-sort"><?= $this->__('Symbol') ?><span class="required"><em>*</em></span></span></span></th>
+                                <th><span class="nobr"><span class="not-sort"><?= $this->__('Currency') ?></th>
+                                <th><span class="nobr"><span class="not-sort"><?= $this->__('Symbol') ?><span class="required"><em>*</em></span></th>
                             </tr>
                         </thead>
                         <tbody>

diff --git a/app/design/adminhtml/default/default/template/dashboard/salebar.phtml b/app/design/adminhtml/default/default/template/dashboard/salebar.phtml
@@ -17,7 +17,7 @@
             <div class="entry-edit">
                 <div class="entry-edit-head"><h4><?= $_total['label'] ?></h4></div>
                 <fieldset class="a-center bold">
-                    <span class="nowrap" style="font-size:18px;"><?= $_total['value'] ?><span style="font-size:14px; color:#686868;"><?= $_total['decimals'] ?></span></span>
+                    <span class="nowrap" style="font-size:18px;"><?= $_total['value'] ?><span style="font-size:14px; color:#686868;"><?= $_total['decimals'] ?>
                 </fieldset>
             </div>
             <?php endforeach ?>

diff --git a/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml b/app/design/adminhtml/default/default/template/dashboard/totalbar.phtml
@@ -20,7 +20,7 @@
             <?php foreach( $this->getTotals() as $_total ): ?>
                 <td class="a-center bold">
                     <span><?= $_total['label'] ?></span><br />
-                    <span class="nowrap" style="font-size:18px; color:#EA7601;"><?= $_total['value'] ?><span style="font-size:14px; color:#DE8946;"><?= $_total['decimals'] ?></span></span>
+                    <span class="nowrap" style="font-size:18px; color:#EA7601;"><?= $_total['value'] ?><span style="font-size:14px; color:#DE8946;"><?= $_total['decimals'] ?>
                 </td>
             <?php endforeach ?>
             </tr>

diff --git a/...ign/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml b/...ign/adminhtml/default/default/template/downloadable/product/edit/downloadable/links.phtml
@@ -166,7 +166,7 @@ var linkTemplate = '<tr id="downloadable_link_{{id}}">'+
     '</td>'+
     '<td class="a-center"><input type="text" name="downloadable[link][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
     '<td>'+
-    '<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><span><span><?= $this->jsQuoteEscape(Mage::helper('downloadable')->__('Delete')) ?></span></span></span></button>'+
+    '<button id="downloadable_link_{{id}}_delete_button" type="button" class="scalable delete icon-btn delete-link-item"><span><?= $this->jsQuoteEscape(Mage::helper('downloadable')->__('Delete')) ?></span></button>'+
     '</td>'+
 '</tr>';
 

diff --git a/...n/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml b/...n/adminhtml/default/default/template/downloadable/product/edit/downloadable/samples.phtml
@@ -93,7 +93,7 @@ var sampleTemplate = '<tr id="downloadable_sample_{{id}}">'+
                         '</td>'+
                         '<td class="a-center"><input type="text" name="downloadable[sample][{{id}}][sort_order]" value="{{sort_order}}" class="input-text sort" /></td>'+
                         '<td>'+
-                            '<button type="button" class="scalable delete icon-btn delete-sample-item"><span><span><span>Delete</span></span></span></button>'+
+                            '<button type="button" class="scalable delete icon-btn delete-sample-item"><span>Delete</span></button>'+
                         '</td>'+
                     '</tr>';
 var sampleItems = {

diff --git a/app/design/adminhtml/default/default/template/giftmessage/popup.phtml b/app/design/adminhtml/default/default/template/giftmessage/popup.phtml
@@ -23,8 +23,8 @@
                 <?= $this->getChildHtml() ?>
             </div>
             <div class="buttons-set a-right">
-                <button type="button" class="scalable" id="gift_options_cancel_button"><span><span><span><?= Mage::helper('giftmessage')->__('Cancel') ?></span></span></span></button>
-                <button type="button" class="scalable" id="gift_options_ok_button"><span><span><span><?= Mage::helper('giftmessage')->__('OK') ?></span></span></span></button>
+                <button type="button" class="scalable" id="gift_options_cancel_button"><span><?= Mage::helper('giftmessage')->__('Cancel') ?></span></button>
+                <button type="button" class="scalable" id="gift_options_ok_button"><span><?= Mage::helper('giftmessage')->__('OK') ?></span></button>
             </div>
         </div>
     </div>

diff --git a/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml b/app/design/adminhtml/default/default/template/importexport/export/form/after.phtml
@@ -19,7 +19,7 @@
         <div id="export_filter_grid_container" class="fieldset"><!-- --></div>
     </form>
     <div class="a-right">
-        <button class="scalable" type="button" onclick="getFile();"><span><span><span><?= $this->__('Continue') ?></span></span></span></button>
+        <button class="scalable" type="button" onclick="getFile();"><span><?= $this->__('Continue') ?></span></button>
     </div>
 </div>
 <script type="text/javascript">

diff --git a/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml b/app/design/adminhtml/default/default/template/newsletter/preview/iframeswitcher.phtml
@@ -26,7 +26,7 @@
         <?php if (!Mage::app()->isSingleStoreMode()) :?>
         <p class="switcher">
             <?= $this->getChildHtml('store_switcher') ?>
-            <button class="button" onclick="preview();"><span><span><span><?= $this->__('Preview') ?></span></span></span></button>
+            <button class="button" onclick="preview();"><span><?= $this->__('Preview') ?></span></button>
         </p>
         <?php endif ?>
     </div>

diff --git a/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml b/app/design/adminhtml/default/default/template/newsletter/subscriber/list.phtml
@@ -29,7 +29,7 @@
         <option value="<?= $_queue['value'] ?>"><?= $_queue['label'] ?> #<?= $_queue['value'] ?></option>
     <?php endforeach ?>
     </select>
-    <button class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?= Mage::helper('newsletter')->__('Add to Queue') ?></span></span></span></button>
+    <button class="scalable" onclick="subscriberController.addToQueue();"><span><?= Mage::helper('newsletter')->__('Add to Queue') ?></span></button>
 </div>
 <?php endif ?>
 <script type="text/javascript">

diff --git a/app/design/adminhtml/default/default/template/newsletter/template/list.phtml b/app/design/adminhtml/default/default/template/newsletter/template/list.phtml
@@ -17,7 +17,7 @@
         <tr>
             <td style="width:50%;"><h3><?= $this->getHeaderText() ?></h3></td>
             <td class="form-buttons">
-                <button class="scalable add" onclick="window.location='<?= $this->getCreateUrl() ?>'"><span><span><span><?= Mage::helper('newsletter')->__('Add New Template') ?></span></span></span></button>
+                <button class="scalable add" onclick="window.location='<?= $this->getCreateUrl() ?>'"><span><?= Mage::helper('newsletter')->__('Add New Template') ?></span></button>
             </td>
         </tr>
     </table>

diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button-simple.phtml
@@ -34,12 +34,12 @@ $logo = $this->getSkinUrl('images/logo-large.gif', ['_area' => 'adminhtml', '_pa
                     <form id="oauth_authorize_confirm" action="<?= $this->getConfirmUrl() ?>" method="get">
                         <input type="hidden" name="oauth_token" value="<?= $this->escapeHtml($this->getToken()) ?>">
                         <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Authorize')) ?>">
-                            <span><span><?= $this->__('Authorize') ?></span></span></button>
+                            <?= $this->__('Authorize') ?></button>
                     </form>
                     <form id="oauth_authorize_reject" action="<?= $this->getRejectUrl() ?>" method="get">
                         <input type="hidden" name="oauth_token" value="<?= $this->escapeHtml($this->getToken()) ?>">
                         <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Reject')) ?>">
-                            <span><span><?= $this->__('Reject') ?></span></span></button>
+                            <?= $this->__('Reject') ?></button>
                     </form>
                 <?php endif ?>
             </div>

diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/button.phtml
@@ -31,11 +31,11 @@
                 <p><?= $this->__('After authorization application will have access to you account.') ?></p>
                 <form id="oauth_authorize_confirm" action="<?= $this->getConfirmUrl() ?>" method="get">
                     <input type="hidden" name="oauth_token" value="<?= $this->escapeHtml($this->getToken()) ?>">
-                    <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Authorize')) ?>"><span><span><?= $this->__('Authorize') ?></span></span></button>
+                    <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Authorize')) ?>"><?= $this->__('Authorize') ?></button>
                 </form>
                 <form id="oauth_authorize_reject" action="<?= $this->getRejectUrl() ?>" method="get">
                     <input type="hidden" name="oauth_token" value="<?= $this->escapeHtml($this->getToken()) ?>">
-                    <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Reject')) ?>"><span><span><?= $this->__('Reject') ?></span></span></button>
+                    <button type="submit" class="button" title="<?= $this->quoteEscape($this->__('Reject')) ?>"><?= $this->__('Reject') ?></button>
                 </form>
             <?php endif ?>
         </div>

diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/confirm-simple.phtml
@@ -31,7 +31,7 @@
             <button type="submit" class="button"
                     onclick="window.close();"
                     title="<?= $this->quoteEscape($this->__('Close')) ?>">
-                <span><span><?= $this->__('Close') ?></span></span>
+                <?= $this->__('Close') ?>
             </button>
         </div>
     </div>

diff --git a/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml b/app/design/adminhtml/default/default/template/oauth/authorize/reject-simple.phtml
@@ -26,7 +26,7 @@
                 <?= $this->getMessagesBlock()->toHtml() ?>
             </div>
             <button type="submit" class="button" onclick="window.close();" title="<?= $this->quoteEscape($this->__('Close')) ?>">
-                <span><span><?= $this->__('Close') ?></span></span>
+                <?= $this->__('Close') ?>
             </button>
         </div>
     </div>

diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/api_wizard.phtml
@@ -14,9 +14,9 @@
 ?>
 <div class="pp-buttons-container">
     <button onclick="javascript:window.open('<?= $this->getButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?= $this->getHtmlId() ?>">
-        <span><span><span><?= $this->escapeHtml($this->getButtonLabel()) ?></span></span></span>
+        <span><?= $this->escapeHtml($this->getButtonLabel()) ?></span>
     </button>
     <button onclick="javascript:window.open('<?= $this->getSandboxButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?= $this->getSandboxHtmlId() ?>">
-        <span><span><span><?= $this->escapeHtml($this->getSandboxButtonLabel()) ?></span></span></span>
+        <span><?= $this->escapeHtml($this->getSandboxButtonLabel()) ?></span>
     </button>
 </div>
diff --git a/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml b/app/design/adminhtml/default/default/template/paypal/system/config/bml_api_wizard.phtml
@@ -14,6 +14,6 @@
 ?>
 <div class="pp-buttons-container">
     <button onclick="javascript:window.open('<?= $this->getButtonUrl()?>', 'bmlapiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=550, height=550'); return false;" class="scalable" type="button" id="<?= $this->getHtmlId() ?>">
-        <span><span><span><?= $this->escapeHtml($this->getButtonLabel()) ?></span></span></span>
+        <span><?= $this->escapeHtml($this->getButtonLabel()) ?></span>
     </button>
 </div>
diff --git a/app/design/adminhtml/default/default/template/permissions/roles.phtml b/app/design/adminhtml/default/default/template/permissions/roles.phtml
@@ -17,8 +17,8 @@
         <tr>
             <td style="width:50%;"><h3><?= $this->__('Roles') ?></h3></td>
             <td class="form-buttons">
-            <button class="scalable" onclick="window.location='<?= $this->getRefreshRolesUrl() ?>'"><span><span><span><?= $this->__('Refresh Roles') ?></span></span></span></button>
-            <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><span><span><?= $this->__('Add New Role') ?></span></span></span></button>
+            <button class="scalable" onclick="window.location='<?= $this->getRefreshRolesUrl() ?>'"><span><?= $this->__('Refresh Roles') ?></span></button>
+            <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><?= $this->__('Add New Role') ?></span></button>
             </td>
         </tr>
     </table>

diff --git a/app/design/adminhtml/default/default/template/permissions/users.phtml b/app/design/adminhtml/default/default/template/permissions/users.phtml
@@ -15,7 +15,7 @@
     <tr>
         <td style="width:50%;"><h3><?= $this->__('Users') ?></h3></td>
         <td class="a-right">
-        <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><span><span><?= $this->__('Add New User') ?></span></span></span></button>
+        <button class="scalable add" onclick="window.location='<?= $this->getAddNewUrl() ?>'"><span><?= $this->__('Add New User') ?></span></button>
         </td>
     </tr>
 </table>

diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
@@ -67,7 +67,7 @@
                             <input type="hidden" name="price" value="<?= $item->getPrice() ?>">
                             <input type="text" name="qty" value="<?= $item->getQty()*1 ?>" class="input-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
                             <button type="button" class="scalable delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
-                                <span><span><span><?= Mage::helper('sales')->__('Delete') ?></span></span></span>
+                                <span><?= Mage::helper('sales')->__('Delete') ?></span>
                             </button>
                         </td>
                     </tr>

diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
@@ -178,7 +178,7 @@
         <div class="buttons-set a-right">
             <?= $this->getPrintButton() ?>
             <button type="button" class="scalable SavePackagesBtn save" onclick="hidePackedWindow();" title="<?= Mage::helper('sales')->__('Products should be added to package(s)') ?>">
-                <span><span><span><?= Mage::helper('sales')->__('OK') ?></span></span></span>
+                <span><?= Mage::helper('sales')->__('OK') ?></span>
             </button>
         </div>
     </div>