Merge branch 'develop' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into config2

Conflicts:
	dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
	dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml

Author: sivaschenko

Gruntfile.js

@@ -9,7 +9,9 @@ module.exports = function (grunt) {
 
     //  Required plugins
     //  _____________________________________________
-    var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
+
+    var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
+        svgo = require('imagemin-svgo');
 
     require('./dev/tools/grunt/tasks/mage-minify')(grunt);
 
@@ -21,8 +23,6 @@ module.exports = function (grunt) {
         pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
     });
 
-    var svgo = require('imagemin-svgo');
-
     //  Configuration
     //  _____________________________________________
 
@@ -318,7 +318,8 @@ module.exports = function (grunt) {
 
         cssmin: {
             options: {
-                report: 'gzip'
+                report: 'gzip',
+                keepSpecialComments: 0
             },
             setup: {
                 files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
             }
         },
 
+        //  Concatenation
+        //  ---------------------------------------------
+
+        concat: {
+            options: {
+                stripBanners: true,
+                banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
+            },
+            setup: {
+                src: '<%= path.css.setup %>/setup.css',
+                dest: '<%= path.css.setup %>/setup.css'
+            }
+        },
+
 
         //  Watches files for changes and runs tasks based on the changed files
         //  ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
             grunt.task.run([
                 'less:' + component,
                 'autoprefixer:' + component,
-                'cssmin:' + component
+                'cssmin:' + component,
+                'concat:' + component
             ]);
         }
         if (component == undefined) {

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -66,7 +66,7 @@ public function getUnreadMessages()
     /**
      * Retrieve popup title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getPopupTitle()
     {

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
     protected $_config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory
     ) {
@@ -114,7 +114,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

@@ -69,7 +69,7 @@ public function getIdentity()
     public function isDisplayed()
     {
         return $this->_authorization->isAllowed(
-            'Magento_Adminhtml::cache'
+            'Magento_Backend::cache'
         ) && count(
             $this->_getCacheTypesForRefresh()
         ) > 0;

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -129,7 +129,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {

app/code/Magento/AdminNotification/etc/acl.xml

@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::system_other_settings">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::system_other_settings">
                         <resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
                             <resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
                             <resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_AdminNotification" before="Magento_Adminhtml" />
+            <module name="Magento_AdminNotification" before="Magento_Backend" />
         </route>
     </router>
 </config>

app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="notifications">

app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

@@ -24,7 +24,7 @@
                 <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                 <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
                 <time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
-                <button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
+                <button type="button" class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
                 <div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo  __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
                     <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                     <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -2,45 +2,60 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*jshint jquery:true*/
 define([
-    "jquery",
-    "jquery/ui",
-    "jquery/template"
-], function($){
-
-    $.template(
-        'systemMessageDialog',
-        '<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
-    );
+    'jquery',
+    'mage/template',
+    'jquery/ui'
+], function ($, mageTemplate) {
+    'use strict';
 
     $.widget('mage.systemMessageDialog', $.ui.dialog, {
         options: {
-            systemMessageTemplate: 'systemMessageDialog'
+            systemMessageTemplate:
+                '<% _.each(data.items, function(item) { %>' +
+                    '<li class="<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
+                        '<%= item.text %>' +
+                    '</li>' +
+                '<% }); %>'
         },
-        open: function(severity) {
+
+        open: function (severity) {
             var superMethod = $.proxy(this._super, this);
+
             $.ajax({
                 url: this.options.ajaxUrl,
                 type: 'GET',
-                data: {severity: severity}
-            }).done($.proxy(function(data) {
+                data: {
+                    severity: severity
+                }
+            }).done($.proxy(function (data) {
+                var tmpl = mageTemplate(this.options.systemMessageTemplate, {
+                    data: {
+                        items: data
+                    }
+                });
+
+                tmpl = $(tmpl);
+
                 this.element.html(
-                    $('<ul />', {'class': "message-system-list"}).append(
-                        $.tmpl(this.options.systemMessageTemplate, data)
-                    )
+                    $('<ul />', {
+                        'class': 'message-system-list'
+                    }).append(tmpl)
                 ).trigger('contentUpdated');
+
                 superMethod();
             }, this));
+
             return this;
         }
     });
 
-    $(document).ready(function(){
-        $('#system_messages .message-system-short .error').on('click', function() {
+    $(document).ready(function () {
+        $('#system_messages .message-system-short .error').on('click', function () {
             $('#message-system-all').systemMessageDialog('open', 1);
         });
-        $('#system_messages .message-system-short .warning').on('click', function() {
+
+        $('#system_messages .message-system-short .warning').on('click', function () {
             $('#message-system-all').systemMessageDialog('open', 2);
         });
     });

app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php

@@ -47,14 +47,14 @@
     $this->createRules()->setData(
         [
             'role_id' => $admGroupRole->getId(),
-            'resource_id' => 'Magento_Adminhtml::all',
+            'resource_id' => 'Magento_Backend::all',
             'privileges' => null,
             'permission' => 'allow',
         ]
     )->save();
 } else {
     /** @var \Magento\Authorization\Model\Rules $rule */
     foreach ($rulesCollection as $rule) {
-        $rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
+        $rule->setData('resource_id', 'Magento_Backend::all')->save();
     }
 }

app/code/Magento/Backend/App/Router.php

@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,

app/code/Magento/Backend/Block/Dashboard.php

@@ -31,7 +31,7 @@ protected function _prepareLayout()
 
         $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
 
-        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
             $block = $this->getLayout()->createBlock(

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
 
         $timezoneLocal = $this->_scopeConfig->getValue(
             $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php

@@ -110,7 +110,6 @@ protected function _prepareColumns()
             'items',
             [
                 'header' => __('Items'),
-                'align' => 'right',
                 'type' => 'number',
                 'sortable' => false,
                 'index' => 'items_count'
@@ -122,8 +121,7 @@ protected function _prepareColumns()
         $this->addColumn(
             'total',
             [
-                'header' => __('Grand Total'),
-                'align' => 'right',
+                'header' => __('Total'),
                 'sortable' => false,
                 'type' => 'currency',
                 'currency_code' => $baseCurrencyCode,

app/code/Magento/Backend/Block/Dashboard/Sales.php

@@ -71,6 +71,6 @@ protected function _prepareLayout()
         $sales = $collection->getFirstItem();
 
         $this->addTotal(__('Lifetime Sales'), $sales->getLifetime());
-        $this->addTotal(__('Average Orders'), $sales->getAverage());
+        $this->addTotal(__('Average Order'), $sales->getAverage());
     }
 }

app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

@@ -91,23 +91,25 @@ protected function _prepareColumns()
             'orders_avg_amount',
             [
                 'header' => __('Average'),
-                'align' => 'right',
                 'sortable' => false,
                 'type' => 'currency',
                 'currency_code' => $baseCurrencyCode,
-                'index' => 'orders_avg_amount'
+                'index' => 'orders_avg_amount',
+                'header_css_class' => 'col-avg',
+                'column_css_class' => 'col-avg'
             ]
         );
 
         $this->addColumn(
             'orders_sum_amount',
             [
                 'header' => __('Total'),
-                'align' => 'right',
                 'sortable' => false,
                 'type' => 'currency',
                 'currency_code' => $baseCurrencyCode,
-                'index' => 'orders_sum_amount'
+                'index' => 'orders_sum_amount',
+                'header_css_class' => 'col-total',
+                'column_css_class' => 'col-total'
             ]
         );