Merge branch 'mainline_develop' into indexers

Author: irenelagno

.gitignore

@@ -32,6 +32,8 @@ atlassian*
 
 /pub/media/*.*
 !/pub/media/.htaccess
+/pub/media/attribute/*
+!/pub/media/attribute/.htaccess
 /pub/media/analytics/*
 /pub/media/catalog/*
 !/pub/media/catalog/.htaccess

PULL_REQUEST_TEMPLATE.md

@@ -4,8 +4,8 @@
 <!--- Provide a description of the changes proposed in the pull request -->
 
 ### Fixed Issues (if relevant)
-<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant  -->
-1. magento/magetno2#<issue_number>: Issue title
+<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant  -->
+1. magento/magento2#<issue_number>: Issue title
 2. ...
 
 ### Manual testing scenarios

README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 

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

@@ -17,10 +17,10 @@
                    name="notification_window"
                    as="notification_window"
                    acl="Magento_AdminNotification::show_toolbar"
-                   template="notification/window.phtml"/>
+                   template="Magento_AdminNotification::notification/window.phtml"/>
         </referenceContainer>
         <referenceContainer name="header">
-            <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="toolbar_entry.phtml"/>
+            <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
         </referenceContainer>
     </body>
 </page>

app/code/Magento/Analytics/Api/Data/LinkInterface.php

@@ -21,16 +21,4 @@ public function getUrl();
      * @return string
      */
     public function getInitializationVector();
-
-    /**
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url);
-
-    /**
-     * @param string $initializationVector
-     * @return void
-     */
-    public function setInitializationVector($initializationVector);
 }

app/code/Magento/Analytics/Block/Adminhtml/System/Config/AdditionalComment.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+/**
+ * Provides field with additional information
+ */
+class AdditionalComment extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $html = '<div class="config-additional-comment-title">' . $element->getLabel() . '</div>';
+        $html .= '<div class="config-additional-comment-content">' . $element->getComment() . '</div>';
+        return $this->decorateRowHtml($element, $html);
+    }
+
+    /**
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param string $html
+     * @return string
+     */
+    private function decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
+    {
+        return sprintf(
+            '<tr id="row_%s"><td colspan="3"><div class="config-additional-comment">%s</div></td></tr>',
+            $element->getHtmlId(),
+            $html
+        );
+    }
+}

app/code/Magento/Analytics/Block/Adminhtml/System/Config/CollectionTimeLabel.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Analytics\Block\Adminhtml\System\Config;
+
+/**
+ * Provides label with default Time Zone
+ */
+class CollectionTimeLabel extends \Magento\Config\Block\System\Config\Form\Field
+{
+    /**
+     * Add default time zone to comment
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        $timeZoneCode = $this->_localeDate->getConfigTimezone();
+        $getLongTimeZoneName = \IntlTimeZone::createTimeZone($timeZoneCode)->getDisplayName();
+        $element->setData(
+            'comment',
+            sprintf("%s (%s)", $getLongTimeZoneName, $timeZoneCode)
+        );
+        return parent::render($element);
+    }
+}

app/code/Magento/Analytics/Block/Adminhtml/System/Config/SubscriptionStatusLabel.php

@@ -39,16 +39,15 @@ public function __construct(
     }
 
     /**
-     * Unset some non-related element parameters
+     * Add Subscription status to comment
      *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
-        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
         $element->setData(
-            'value',
+            'comment',
             $this->prepareLabelValue()
         );
         return parent::render($element);

app/code/Magento/Analytics/Controller/Adminhtml/BasicTier/SignUp.php renamed to app/code/Magento/Analytics/Controller/Adminhtml/BIEssentials/SignUp.php

@@ -3,36 +3,38 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Analytics\Controller\Adminhtml\BasicTier;
+namespace Magento\Analytics\Controller\Adminhtml\BIEssentials;
 
 use Magento\Backend\App\Action;
-use Magento\Config\Model\Config;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Class SignUp
  *
- * Provides link to Basic Tier signup
+ * Provides link to BI Essentials signup
  */
 class SignUp extends Action
 {
     /**
+     * Path to config value with URL to BI Essentials sign-up page.
+     *
      * @var string
      */
-    private $basicTierUrlPath = 'analytics/url/basic_tier';
+    private $urlBIEssentialsConfigPath = 'analytics/url/bi_essentials';
 
     /**
-     * @var Config
+     * @var ScopeConfigInterface
      */
     private $config;
 
     /**
      * @param Context $context
-     * @param Config $config
+     * @param ScopeConfigInterface $config
      */
     public function __construct(
         Context $context,
-        Config $config
+        ScopeConfigInterface $config
     ) {
         $this->config = $config;
         parent::__construct($context);
@@ -45,18 +47,18 @@ public function __construct(
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Analytics::report_basic_tier');
+        return $this->_authorization->isAllowed('Magento_Analytics::bi_essentials');
     }
 
     /**
-     * Provides link to Basic Tier signup
+     * Provides link to BI Essentials signup
      *
      * @return \Magento\Framework\Controller\AbstractResult
      */
     public function execute()
     {
         return $this->resultRedirectFactory->create()->setUrl(
-            $this->config->getConfigDataValue($this->basicTierUrlPath)
+            $this->config->getValue($this->urlBIEssentialsConfigPath)
         );
     }
 }

app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Activate.php

@@ -16,14 +16,12 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class Activate
- *
- * Activates subscription with Free Tier program
+ * Activates subscription to Magento BI Advanced Reporting.
  */
 class Activate extends Action
 {
     /**
-     * Resource for managing subscription to Magento Analytics.
+     * Resource for managing subscription to Magento BI.
      *
      * @var Subscription
      */
@@ -35,7 +33,7 @@ class Activate extends Action
     private $logger;
 
     /**
-     * Resource for managing last notification time about subscription to Magento Analytics.
+     * Resource for managing last notification time about subscription to Magento BI.
      *
      * @var NotificationTime
      */
@@ -79,7 +77,7 @@ protected function _isAllowed()
     }
 
     /**
-     * Activate subscription to Magento Analytics via AJAX.
+     * Activate subscription to Magento BI via AJAX.
      *
      * @return Json
      */