Merge pull request #66 from magento-webdev/develop

[UI] Sprint 30

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

@@ -100,7 +100,7 @@ protected function _prepareForm()
                 'label' => __('Date From'),
                 'title' => __('Date From'),
                 'name' => 'date_from',
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat
                 //'required' => true
             ]
@@ -112,7 +112,7 @@ protected function _prepareForm()
                 'label' => __('Date To'),
                 'title' => __('Date To'),
                 'name' => 'date_to',
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat
                 //'required' => true
             ]

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

@@ -226,7 +226,7 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
                 $element->setCanBeEmpty(true);
                 break;
             case 'date':
-                $element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
+                $element->setImage($this->getViewFileUrl('images/grid-cal.png'));
                 $element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
                 break;
             case 'multiline':

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

@@ -99,7 +99,7 @@ public function getHtml()
             '",
                     buttonImage: "' .
             $this->getViewFileUrl(
-                'images/grid-cal.gif'
+                'images/grid-cal.png'
             ) . '",
                         buttonText: "' . $this->escapeHtml(__('Date selector')) .
             '",

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

@@ -139,7 +139,7 @@ public function getHtml()
                         dateFormat: "' . $format . '",
                         timeFormat: "' . $timeFormat . '",
                         showsTime: ' . ($this->getColumn()->getFilterTime() ? 'true' : 'false') . ',
-                        buttonImage: "' . $this->getViewFileUrl('images/grid-cal.gif') . '",
+                        buttonImage: "' . $this->getViewFileUrl('images/grid-cal.png') . '",
                         buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
                         from: {
                             id: "' . $htmlId . '_from"

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

@@ -123,7 +123,7 @@ protected function _prepareForm()
                 'name' => 'default_value_date',
                 'label' => __('Default Value'),
                 'title' => __('Default Value'),
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'value' => $attributeObject->getDefaultValue(),
                 'date_format' => $dateFormat
             ]

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

@@ -91,7 +91,7 @@ public function getCalendarDateHtml()
         )->setClass(
             'product-custom-option datetime-picker input-text'
         )->setImage(
-            $this->getViewFileUrl('Magento_Core::calendar.gif')
+            $this->getViewFileUrl('Magento_Core::calendar.png')
         )->setDateFormat(
             $this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
         )->setValue(

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

@@ -8,7 +8,7 @@
 <widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
     <widget id="new_products" class="Magento\Catalog\Block\Product\Widget\NewWidget" is_email_compatible="true"
-            placeholder_image="Magento_Catalog::images/product_widget_new.gif" ttl="86400">
+            placeholder_image="Magento_Catalog::images/product_widget_new.png" ttl="86400">
         <label translate="true">Catalog New Products List</label>
         <description translate="true">List of Products that are set as New</description>
         <parameters>
@@ -87,7 +87,7 @@
     <widget id="catalog_product_link"
             class="Magento\Catalog\Block\Product\Widget\Link"
             is_email_compatible="true"
-            placeholder_image="Magento_Catalog::images/product_widget_link.gif">
+            placeholder_image="Magento_Catalog::images/product_widget_link.png">
         <label translate="true">Catalog Product Link</label>
         <description translate="true">Link to a Specified Product</description>
         <parameters>
@@ -126,7 +126,7 @@
     <widget id="catalog_category_link"
             class="Magento\Catalog\Block\Category\Widget\Link"
             is_email_compatible="true"
-            placeholder_image="Magento_Catalog::images/category_widget_link.gif">
+            placeholder_image="Magento_Catalog::images/category_widget_link.png">
         <label translate="true">Catalog Category Link</label>
         <description translate="true">Link to a Specified Category</description>
         <parameters>

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

@@ -26,7 +26,7 @@
     </div>
 <?php if ($this->getRoot()): ?>
     <div class="tree-holder">
-        <div id="tree-div" style="width:100%; overflow:auto;"></div>
+        <div id="tree-div" class="tree-wrapper"></div>
     </div>
 </div>
 <div data-id="information-dialog-tree" style="display: none;">

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

@@ -201,7 +201,7 @@
     bottom: 5px;
     top: auto;
     margin: auto;
-    background: url(Magento_Backend::images/draggable-handle-bg.gif) no-repeat;
+    background: url(Magento_Backend::images/draggable-handle-bg.png) no-repeat;
     z-index: 2;
 }
 

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

@@ -196,7 +196,7 @@ protected function _prepareForm()
                 'name' => 'from_date',
                 'label' => __('From Date'),
                 'title' => __('From Date'),
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
                 'date_format' => $dateFormat
             ]
@@ -208,7 +208,7 @@ protected function _prepareForm()
                 'name' => 'to_date',
                 'label' => __('To Date'),
                 'title' => __('To Date'),
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'input_format' => \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT,
                 'date_format' => $dateFormat
             ]

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

@@ -356,7 +356,7 @@ public function getDateInput($attribute, $part = 'from')
         )->setValue(
             $value
         )->setImage(
-            $this->getViewFileUrl('Magento_Core::calendar.gif')
+            $this->getViewFileUrl('Magento_Core::calendar.png')
         )->setDateFormat(
             $this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
         )->setClass(

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

@@ -8,7 +8,7 @@
 <widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
     <widget id="products_list" class="Magento\CatalogWidget\Block\Product\ProductsList" is_email_compatible="true"
-            placeholder_image="Magento_CatalogWidget::images/products_list.gif" ttl="86400">
+            placeholder_image="Magento_CatalogWidget::images/products_list.png" ttl="86400">
         <label translate="true">Catalog Products List</label>
         <description translate="true">List of Products</description>
         <parameters>

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

@@ -11,8 +11,8 @@
     <label class="label"><span><?php echo __('To ensure the security of your transactions') ?></span></label>
     <div class="control">
         <div class="nested">
-            <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>
-            <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>
+            <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>
+            <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>
         </div>
     </div>
 </div>

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

@@ -125,7 +125,7 @@ protected function _prepareForm()
             [
                 'name' => 'custom_theme_from',
                 'label' => __('Custom Design From'),
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat,
                 'disabled' => $isElementDisabled,
                 'class' => 'validate-date validate-date-range date-range-custom_theme-from'
@@ -138,7 +138,7 @@ protected function _prepareForm()
             [
                 'name' => 'custom_theme_to',
                 'label' => __('Custom Design To'),
-                'image' => $this->getViewFileUrl('images/grid-cal.gif'),
+                'image' => $this->getViewFileUrl('images/grid-cal.png'),
                 'date_format' => $dateFormat,
                 'disabled' => $isElementDisabled,
                 'class' => 'validate-date validate-date-range date-range-custom_theme-to'

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

@@ -8,7 +8,7 @@
 <widgets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../Magento/Widget/etc/widget.xsd">
     <widget id="cms_page_link" class="Magento\Cms\Block\Widget\Page\Link" is_email_compatible="true"
-            placeholder_image="Magento_Cms::images/widget_page_link.gif">
+            placeholder_image="Magento_Cms::images/widget_page_link.png">
         <label translate="true">CMS Page Link</label>
         <description translate="true">Link to a CMS Page</description>
         <parameters>
@@ -43,7 +43,7 @@
         </parameters>
     </widget>
     <widget id="cms_static_block" class="Magento\Cms\Block\Widget\Block"
-            placeholder_image="Magento_Cms::images/widget_block.gif">
+            placeholder_image="Magento_Cms::images/widget_block.png">
         <label translate="true">CMS Static Block</label>
         <description translate="true">Contents of a Static Block</description>
         <parameters>

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

@@ -98,7 +98,7 @@ protected function _applyTypeSpecificConfigCustomer(
                 $element->setCanBeEmpty(true);
                 break;
             case 'date':
-                $element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
+                $element->setImage($this->getViewFileUrl('images/grid-cal.png'));
                 $element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
                 break;
             case 'multiline':

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

@@ -138,7 +138,7 @@ public function getFieldHtml()
             'class' => $this->getHtmlClass(),
             'value' => $this->getValue(),
             'date_format' => $this->getDateFormat(),
-            'image' => $this->getViewFileUrl('Magento_Core::calendar.gif'),
+            'image' => $this->getViewFileUrl('Magento_Core::calendar.png'),
         ]);
         return $this->dateElement->getHtml();
     }

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

@@ -23,10 +23,10 @@
                       </button>
                   </span>
                   <span class="file-upload-success hidden">
-                      <img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-success.gif') ?>">
+                      <img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-success.png') ?>">
                   </span>
                   <span class="file-upload-failure hidden">
-                      <img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-error.gif') ?>">
+                      <img src="<?php echo $this->getViewFileUrl('Magento_DesignEditor::images/i_msg-error.png') ?>">
                   </span>
               </span>
               <div class="progressbar upload-progress"></div>