Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-46664

Author: YevSent

app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml

@@ -41,6 +41,8 @@
                     <block class="Magento\Backend\Block\Widget\Grid\Column" as="package">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Design</argument>
+                            <argument name="type" xsi:type="string">options</argument>
+                            <argument name="options" xsi:type="options" model="Magento\Framework\View\Design\Theme\Label\Options"/>
                             <argument name="width" xsi:type="string">150px</argument>
                             <argument name="index" xsi:type="string">design</argument>
                         </arguments>

app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js

@@ -61,15 +61,16 @@ define([
         },
 
         changeUrl: function (paramName, paramValue, defaultValue) {
+            var decode = window.decodeURIComponent;
             var urlPaths = this.options.url.split('?'),
                 baseUrl = urlPaths[0],
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
                 paramData = {},
                 parameters;
             for (var i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
-                paramData[parameters[0]] = parameters[1] !== undefined
-                    ? window.decodeURIComponent(parameters[1].replace(/\+/g, '%20'))
+                paramData[decode(parameters[0])] = parameters[1] !== undefined
+                    ? decode(parameters[1].replace(/\+/g, '%20'))
                     : '';
             }
             paramData[paramName] = paramValue;

app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml

@@ -23,7 +23,7 @@
 <?php else: ?>
     <div class="message error">
         <div>
-            <?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search'); ?></a>
+            <?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
         </div>
     </div>
 <?php endif; ?>
@@ -44,7 +44,7 @@
     <div class="message notice">
         <div>
             <?php /* @escapeNotVerified */ echo __("Don't see what you're looking for?"); ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search'); ?></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
         </div>
     </div>
 <?php endif; ?>

app/code/Magento/Checkout/Model/ConfigProviderInterface.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\Checkout\Model;
 
+/**
+ * Interface ConfigProviderInterface
+ * @api
+ */
 interface ConfigProviderInterface
 {
 

app/code/Magento/Checkout/view/frontend/web/js/view/payment.js

@@ -53,7 +53,7 @@ define(
                 stepNavigator.registerStep(
                     'payment',
                     null,
-                    $t('Review & Payments'),
+                    'Review & Payments',
                     this.isVisible,
                     _.bind(this.navigate, this),
                     20

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -83,7 +83,7 @@ define(
                     stepNavigator.registerStep(
                         'shipping',
                         '',
-                        $t('Shipping'),
+                        'Shipping',
                         this.visible, _.bind(this.navigate, this),
                         10
                     );

app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html

@@ -7,7 +7,7 @@
 <ul class="opc-progress-bar">
     <!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
         <li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
-            <span data-bind="text: item.title, click: $parent.navigateTo"></span>
+            <span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
         </li>
     <!-- /ko -->
 </ul>

app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

@@ -6,6 +6,8 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
+use Magento\Cms\Model\Block;
+
 class Save extends \Magento\Cms\Controller\Adminhtml\Block
 {
     /**
@@ -21,6 +23,14 @@ public function execute()
         $data = $this->getRequest()->getPostValue();
         if ($data) {
             $id = $this->getRequest()->getParam('block_id');
+
+            if (isset($data['is_active']) && $data['is_active'] === 'true') {
+                $data['is_active'] = Block::STATUS_ENABLED;
+            }
+            if (empty($data['block_id'])) {
+                $data['block_id'] = null;
+            }
+
             $model = $this->_objectManager->create('Magento\Cms\Model\Block')->load($id);
             if (!$model->getId() && $id) {
                 $this->messageManager->addError(__('This block no longer exists.'));

app/code/Magento/Cms/Model/Block.php

@@ -21,6 +21,13 @@ class Block extends \Magento\Framework\Model\AbstractModel implements BlockInter
      */
     const CACHE_TAG = 'cms_block';
 
+    /**#@+
+     * Block's statuses
+     */
+    const STATUS_ENABLED = 1;
+    const STATUS_DISABLED = 0;
+
+    /**#@-*/
     /**
      * @var string
      */
@@ -224,4 +231,14 @@ public function getStores()
     {
         return $this->hasData('stores') ? $this->getData('stores') : $this->getData('store_id');
     }
+
+    /**
+     * Prepare block's statuses.
+     *
+     * @return array
+     */
+    public function getAvailableStatuses()
+    {
+        return [self::STATUS_ENABLED => __('Enabled'), self::STATUS_DISABLED => __('Disabled')];
+    }
 }

app/code/Magento/Cms/Model/Block/Source/IsActive.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Model\Block\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Class IsActive
+ */
+class IsActive implements OptionSourceInterface
+{
+    /**
+     * @var \Magento\Cms\Model\Block
+     */
+    protected $cmsBlock;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Cms\Model\Block $cmsBlock
+     */
+    public function __construct(\Magento\Cms\Model\Block $cmsBlock)
+    {
+        $this->cmsBlock = $cmsBlock;
+    }
+
+    /**
+     * Get options
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $availableOptions = $this->cmsBlock->getAvailableStatuses();
+        $options = [];
+        foreach ($availableOptions as $key => $value) {
+            $options[] = [
+                'label' => $value,
+                'value' => $key,
+            ];
+        }
+        return $options;
+    }
+}