Skip to content

Commit ab9e85c

Browse files
author
Leonid Poluyanov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-32565
2 parents 495f835 + 5a00464 commit ab9e85c

File tree

938 files changed

+4024
-9090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

938 files changed

+4024
-9090
lines changed

Gruntfile.js

Lines changed: 415 additions & 105 deletions
Large diffs are not rendered by default.

app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function _prepareForm()
100100
'label' => __('Date From'),
101101
'title' => __('Date From'),
102102
'name' => 'date_from',
103-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
103+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
104104
'date_format' => $dateFormat
105105
//'required' => true
106106
]
@@ -112,7 +112,7 @@ protected function _prepareForm()
112112
'label' => __('Date To'),
113113
'title' => __('Date To'),
114114
'name' => 'date_to',
115-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
115+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
116116
'date_format' => $dateFormat
117117
//'required' => true
118118
]

app/code/Magento/Backend/Block/Widget/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
226226
$element->setCanBeEmpty(true);
227227
break;
228228
case 'date':
229-
$element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
229+
$element->setImage($this->getViewFileUrl('images/grid-cal.png'));
230230
$element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
231231
break;
232232
case 'multiline':

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function getHtml()
9999
'",
100100
buttonImage: "' .
101101
$this->getViewFileUrl(
102-
'images/grid-cal.gif'
102+
'images/grid-cal.png'
103103
) . '",
104104
buttonText: "' . $this->escapeHtml(__('Date selector')) .
105105
'",

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function getHtml()
139139
dateFormat: "' . $format . '",
140140
timeFormat: "' . $timeFormat . '",
141141
showsTime: ' . ($this->getColumn()->getFilterTime() ? 'true' : 'false') . ',
142-
buttonImage: "' . $this->getViewFileUrl('images/grid-cal.gif') . '",
142+
buttonImage: "' . $this->getViewFileUrl('images/grid-cal.png') . '",
143143
buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
144144
from: {
145145
id: "' . $htmlId . '_from"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ protected function _prepareForm()
123123
'name' => 'default_value_date',
124124
'label' => __('Default Value'),
125125
'title' => __('Default Value'),
126-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
126+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
127127
'value' => $attributeObject->getDefaultValue(),
128128
'date_format' => $dateFormat
129129
]

app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function getCalendarDateHtml()
9191
)->setClass(
9292
'product-custom-option datetime-picker input-text'
9393
)->setImage(
94-
$this->getViewFileUrl('Magento_Core::calendar.gif')
94+
$this->getViewFileUrl('Magento_Core::calendar.png')
9595
)->setDateFormat(
9696
$this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
9797
)->setValue(

app/code/Magento/Catalog/etc/widget.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
1010
<widget id="new_products" class="Magento\Catalog\Block\Product\Widget\NewWidget" is_email_compatible="true"
11-
placeholder_image="Magento_Catalog::images/product_widget_new.gif" ttl="86400">
11+
placeholder_image="Magento_Catalog::images/product_widget_new.png" ttl="86400">
1212
<label translate="true">Catalog New Products List</label>
1313
<description translate="true">List of Products that are set as New</description>
1414
<parameters>
@@ -87,7 +87,7 @@
8787
<widget id="catalog_product_link"
8888
class="Magento\Catalog\Block\Product\Widget\Link"
8989
is_email_compatible="true"
90-
placeholder_image="Magento_Catalog::images/product_widget_link.gif">
90+
placeholder_image="Magento_Catalog::images/product_widget_link.png">
9191
<label translate="true">Catalog Product Link</label>
9292
<description translate="true">Link to a Specified Product</description>
9393
<parameters>
@@ -126,7 +126,7 @@
126126
<widget id="catalog_category_link"
127127
class="Magento\Catalog\Block\Category\Widget\Link"
128128
is_email_compatible="true"
129-
placeholder_image="Magento_Catalog::images/category_widget_link.gif">
129+
placeholder_image="Magento_Catalog::images/category_widget_link.png">
130130
<label translate="true">Catalog Category Link</label>
131131
<description translate="true">Link to a Specified Category</description>
132132
<parameters>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
<?php if ($this->getRoot()): ?>
2828
<div class="tree-holder">
29-
<div id="tree-div" style="width:100%; overflow:auto;"></div>
29+
<div id="tree-div" class="tree-wrapper"></div>
3030
</div>
3131
</div>
3232
<div data-id="information-dialog-tree" style="display: none;">
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/code/Magento/Catalog/view/adminhtml/web/product/product.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
bottom: 5px;
202202
top: auto;
203203
margin: auto;
204-
background: url(Magento_Backend::images/draggable-handle-bg.gif) no-repeat;
204+
background: url(Magento_Backend::images/draggable-handle-bg.png) no-repeat;
205205
z-index: 2;
206206
}
207207

app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected function _prepareForm()
196196
'name' => 'from_date',
197197
'label' => __('From Date'),
198198
'title' => __('From Date'),
199-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
199+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
200200
'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
201201
'date_format' => $dateFormat
202202
]
@@ -208,7 +208,7 @@ protected function _prepareForm()
208208
'name' => 'to_date',
209209
'label' => __('To Date'),
210210
'title' => __('To Date'),
211-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
211+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
212212
'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
213213
'date_format' => $dateFormat
214214
]

app/code/Magento/CatalogSearch/Block/Advanced/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public function getDateInput($attribute, $part = 'from')
356356
)->setValue(
357357
$value
358358
)->setImage(
359-
$this->getViewFileUrl('Magento_Core::calendar.gif')
359+
$this->getViewFileUrl('Magento_Core::calendar.png')
360360
)->setDateFormat(
361361
$this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
362362
)->setClass(

app/code/Magento/CatalogWidget/etc/widget.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
1010
<widget id="products_list" class="Magento\CatalogWidget\Block\Product\ProductsList" is_email_compatible="true"
11-
placeholder_image="Magento_CatalogWidget::images/products_list.gif" ttl="86400">
11+
placeholder_image="Magento_CatalogWidget::images/products_list.png" ttl="86400">
1212
<label translate="true">Catalog Products List</label>
1313
<description translate="true">List of Products</description>
1414
<parameters>
Binary file not shown.

app/code/Magento/Centinel/view/frontend/templates/logo.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<label class="label"><span><?php echo __('To ensure the security of your transactions') ?></span></label>
1212
<div class="control">
1313
<div class="nested">
14-
<a href="#" title="<?php echo __('Verified by Visa') ?> " data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Centinel\Helper\Data')->getVisaLearnMorePageUrl()?>","windowName":"verifiedByVisa","width":815,"height":600,"centerScreen":1,"location":0,"status":1,"scrollbars":1,"resizable":1}}'><img src="<?php echo $this->getViewFileUrl('Magento_Centinel::images/vbv_ltbg_71x57.gif'); ?>" alt="<?php echo __('Verified by Visa') ?>" /></a>
15-
<a href="#" title="<?php echo __('MasterCard SecureCode'); ?>" data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Centinel\Helper\Data')->getMastercardLearnMorePageUrl()?>","windowName":"secureCode","width":600,"height":403,"centerScreen":1,"location":0,"status":1,"scrollbars":1,"resizable":1}}'><img src="<?php echo $this->getViewFileUrl('Magento_Centinel::images/sc_learn_62x34.gif'); ?>" alt="<?php echo __('MasterCard SecureCode') ?>" /></a>
14+
<a href="#" title="<?php echo __('Verified by Visa') ?> " data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Centinel\Helper\Data')->getVisaLearnMorePageUrl()?>","windowName":"verifiedByVisa","width":815,"height":600,"centerScreen":1,"location":0,"status":1,"scrollbars":1,"resizable":1}}'><img src="<?php echo $this->getViewFileUrl('Magento_Centinel::images/vbv_ltbg_71x57.png'); ?>" alt="<?php echo __('Verified by Visa') ?>" /></a>
15+
<a href="#" title="<?php echo __('MasterCard SecureCode'); ?>" data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Centinel\Helper\Data')->getMastercardLearnMorePageUrl()?>","windowName":"secureCode","width":600,"height":403,"centerScreen":1,"location":0,"status":1,"scrollbars":1,"resizable":1}}'><img src="<?php echo $this->getViewFileUrl('Magento_Centinel::images/sc_learn_62x34.png'); ?>" alt="<?php echo __('MasterCard SecureCode') ?>" /></a>
1616
</div>
1717
</div>
1818
</div>
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected function _prepareForm()
125125
[
126126
'name' => 'custom_theme_from',
127127
'label' => __('Custom Design From'),
128-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
128+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
129129
'date_format' => $dateFormat,
130130
'disabled' => $isElementDisabled,
131131
'class' => 'validate-date validate-date-range date-range-custom_theme-from'
@@ -138,7 +138,7 @@ protected function _prepareForm()
138138
[
139139
'name' => 'custom_theme_to',
140140
'label' => __('Custom Design To'),
141-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
141+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
142142
'date_format' => $dateFormat,
143143
'disabled' => $isElementDisabled,
144144
'class' => 'validate-date validate-date-range date-range-custom_theme-to'

app/code/Magento/Cms/etc/widget.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
1010
<widget id="cms_page_link" class="Magento\Cms\Block\Widget\Page\Link" is_email_compatible="true"
11-
placeholder_image="Magento_Cms::images/widget_page_link.gif">
11+
placeholder_image="Magento_Cms::images/widget_page_link.png">
1212
<label translate="true">CMS Page Link</label>
1313
<description translate="true">Link to a CMS Page</description>
1414
<parameters>
@@ -43,7 +43,7 @@
4343
</parameters>
4444
</widget>
4545
<widget id="cms_static_block" class="Magento\Cms\Block\Widget\Block"
46-
placeholder_image="Magento_Cms::images/widget_block.gif">
46+
placeholder_image="Magento_Cms::images/widget_block.png">
4747
<label translate="true">CMS Static Block</label>
4848
<description translate="true">Contents of a Static Block</description>
4949
<parameters>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-391 Bytes
Binary file not shown.

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/GenericMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected function _applyTypeSpecificConfigCustomer(
9898
$element->setCanBeEmpty(true);
9999
break;
100100
case 'date':
101-
$element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
101+
$element->setImage($this->getViewFileUrl('images/grid-cal.png'));
102102
$element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
103103
break;
104104
case 'multiline':

app/code/Magento/Customer/Block/Widget/Dob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public function getFieldHtml()
138138
'class' => $this->getHtmlClass(),
139139
'value' => $this->getValue(),
140140
'date_format' => $this->getDateFormat(),
141-
'image' => $this->getViewFileUrl('Magento_Core::calendar.gif'),
141+
'image' => $this->getViewFileUrl('Magento_Core::calendar.png'),
142142
]);
143143
return $this->dateElement->getHtml();
144144
}

app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/uploader.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</button>
2424
</span>
2525
<span class="file-upload-success hidden">
26-
<img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-success.gif') ?>">
26+
<img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-success.png') ?>">
2727
</span>
2828
<span class="file-upload-failure hidden">
29-
<img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-error.gif') ?>">
29+
<img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-error.png') ?>">
3030
</span>
3131
</span>
3232
<div class="progressbar upload-progress"></div>

0 commit comments

Comments
 (0)