Skip to content

Commit

Permalink
Backend: Removed ajax-loader.gif and ajax-loader-tr.gif and migrated …
Browse files Browse the repository at this point in the history
…to loading.svg
  • Loading branch information
fballiano committed Sep 28, 2024
1 parent eb361a6 commit d267aba
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected function _prepareBatchModel()
'icon' => Mage::getDesign()->getSkinUrl('images/fam_bullet_success.gif'),
'bg' => '#DDF'
],
'loader' => Mage::getDesign()->getSkinUrl('images/ajax-loader.gif')
'loader' => Mage::getDesign()->getSkinUrl('images/loading.svg')
],
'template' => '<li style="#{style}" id="#{id}">'
. '<img id="#{id}_img" src="#{image}" class="v-middle" style="margin-right:5px"/>'
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Newsletter/Model/Template.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function getType()
*/
public function isPreprocessed()
{
return strlen($this->getTemplateTextPreprocessed()) > 0;
return strlen($this->getTemplateTextPreprocessed() ?? '') > 0;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div id="loading-mask" style="display:none">
<div class="backdrop"></div>
<p class="loader" id="loading_mask_loader">
<img src="<?= $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
<img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/default/default/template/page.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<div id="loading-mask" style="display:none">
<div class="backdrop"></div>
<p class="loader" id="loading_mask_loader">
<img src="<?= $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
<img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<fieldset>
<legend>Search</legend>
<span id="global_search_indicator" class="autocomplete-indicator" style="display: none">
<img src="<?= $this->getSkinUrl('images/ajax-loader.gif') ?>" alt="<?= Mage::helper('core')->quoteEscape($this->__('Loading...')) ?>" class="v-middle"/>
<img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape($this->__('Loading...')) ?>" class="v-middle"/>
</span>
<?php $defSearch = $this->__('Global Record Search') ?>
<input id="global_search" name="query" type="text" class="input-text" value="<?php if(!empty($query)): ?><?= $query ?><?php else: ?><?= Mage::helper('core')->quoteEscape($defSearch) ?><?php endif ?>" onfocus="if(this.value=='<?= Mage::helper('core')->quoteEscape($defSearch, true) ?>')this.value=''; " onblur="if(this.value=='')this.value='<?= $defSearch ?>';" autocomplete="off" />
Expand Down
2 changes: 1 addition & 1 deletion app/design/adminhtml/default/default/template/popup.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<div id="loading-mask" style="display:none;">
<div class="backdrop"></div>
<p class="loader" id="loading_mask_loader">
<img src="<?= $this->getSkinUrl('images/ajax-loader-tr.gif') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
<img src="<?= $this->getSkinUrl('images/loading.svg') ?>" alt="<?= Mage::helper('core')->quoteEscape(Mage::helper('adminhtml')->__('Loading...')) ?>"/><br/><?= Mage::helper('adminhtml')->__('Please wait...') ?>
</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<li id="liBeforeFinish" style="background-color:#FFD; display:none;">
<img src="<?= $this->getSkinUrl('images/fam_bullet_error.gif') ?>" class="v-middle" style="margin-right:5px"/>
<?= $this->__("Please wait while the indexes are being refreshed.") ?>
<img id="before-finish-wait-img" src="<?= $this->getSkinUrl('images/rule-ajax-loader.gif') ?>" class="v-middle" style="margin-right:5px"/>
<img id="before-finish-wait-img" src="<?= $this->getSkinUrl('images/loading.svg') ?>" class="v-middle" style="margin-right:5px"/>
</li>
<?php endif ?>
<li id="liFinished" style="display:none;">
Expand Down
2 changes: 1 addition & 1 deletion public/skin/adminhtml/default/default/boxes.css
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ ul.item-options li { padding-left:.7em; }
.rule-param-remove { font-weight:normal; color:red; text-decoration:none; }
.rule-param-remove:hover { font-weight:normal; color:blue; text-decoration:none; }
.rule-chooser { border:solid 1px #CCC; margin:5px; padding:5px; display:none; }
.rule-param-wait { padding-left:20px; background-image:url(images/rule-ajax-loader.gif); background-repeat:no-repeat; background-position:0 50%; }
.rule-param-wait { padding-left:20px; background-image:url(images/loading.svg); background-repeat:no-repeat; background-position:0 50%; }

/* Product Customer Defined options */
.custom-options .box {padding:0 1.5em; }
Expand Down
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions public/skin/adminhtml/default/default/images/loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d267aba

Please sign in to comment.