Merge branch 'MAGETWO-52835' into MAGETWO-52836

Author: akaplya

app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml

@@ -17,7 +17,7 @@
 <script id="translate-form-template" type="text/x-magento-template">
     <form id="<%- data.id %>">
         <% _.each(data.items, function(item, i) { %>
-            <div class="magento_table_container">
+            <div class="translate-table-container">
                 <table class="table">
                     <% _.each(item, function(value, index) { %>
                         <tr>

app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml

@@ -18,7 +18,7 @@
 <script id="translate-form-template" type="text/x-magento-template">
     <form id="<%- data.id %>">
         <% _.each(data.items, function(item, i) { %>
-            <div class="magento_table_container">
+            <div class="translate-table-container">
                 <table cellspacing="0" class="table">
                     <% _.each(item, function(value, index) { %>
                         <tr>

app/design/adminhtml/Magento/backend/Magento_Customer/web/css/source/_module.less

@@ -0,0 +1,17 @@
+// /**
+//  * Copyright © 2016 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//  General rule hides group legend and shows first field label instead
+//  in app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+//  This must be reset for Customer Address page
+.address-item-edit-content {
+    .admin__field {
+        legend {
+            &.admin__field-label {
+                opacity: 1;
+            }
+        }
+    }
+}

app/design/adminhtml/Magento/backend/Magento_Translation/web/css/source/_module.less

@@ -0,0 +1,69 @@
+// /**
+//  * Copyright © 2016 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Inline translations
+//  _____________________________________________
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@translate-inline-title__z-index: @menu__z-index + 1;
+
+//
+//  Form
+//  ---------------------------------------------
+
+.translate-table-container {
+    table {
+        width: 100%;
+    }
+
+    td {
+        background: none;
+        padding: @indent__xs;
+        text-align: left;
+
+        &.value {
+            .input-text {
+                width: 100%;
+            }
+        }
+    }
+
+    th {
+        &.label {
+            border: none;
+            font-weight: @font-weight__bold;
+            padding: @indent__xs;
+            text-align: left;
+            width: 150px;
+        }
+    }
+}
+
+//
+//  Special tags
+//  ---------------------------------------------
+
+.translate-inline-title {
+    display: block;
+    left: 0;
+    position: absolute;
+    top: 0;
+    z-index: @translate-inline-title__z-index;
+}
+
+//  Script tag that placed between menu and page wrapper
+.translate-inline-script {
+    .menu-wrapper ~ & {
+        display: block;
+        left: @menu__width;
+        position: absolute;
+        top: 0;
+        z-index: @translate-inline-title__z-index;
+    }
+}

lib/internal/Magento/Framework/EntityManager/MetadataPool.php

@@ -106,4 +106,15 @@ public function getHydrator($entityType)
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         return $objectManager->get(HydratorPool::class)->getHydrator($entityType);
     }
+
+    /**
+     * Check if entity type configuration was set to metadata
+     *
+     * @param string $entityType
+     * @return bool
+     */
+    public function hasConfiguration($entityType)
+    {
+        return isset($this->metadata[$entityType]);
+    }
 }

lib/internal/Magento/Framework/EntityManager/Test/Unit/TypeResolverTest.php

@@ -17,10 +17,16 @@ class TypeResolverTest extends \PHPUnit_Framework_TestCase
      */
     private $resolver;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $metadataPoolMock;
+
     public function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->resolver = new \Magento\Framework\EntityManager\TypeResolver();
+        $this->metadataPoolMock = $this->getMock('\Magento\Framework\EntityManager\MetadataPool', [], [], '', false);
+        $this->resolver = new \Magento\Framework\EntityManager\TypeResolver($this->metadataPoolMock);
     }
 
     /**
@@ -31,6 +37,13 @@ public function setUp()
     public function testResolve($dataObject, $interfaceName)
     {
         $customerDataObject = $this->objectManager->getObject($dataObject);
+        $this->metadataPoolMock->expects($this->any())
+            ->method('hasConfiguration')
+            ->willReturnMap(
+                [
+                   [$interfaceName, true]
+                ]
+            );
         $this->assertEquals($interfaceName, $this->resolver->resolve($customerDataObject));
     }
 

lib/internal/Magento/Framework/EntityManager/TypeResolver.php

@@ -10,6 +10,11 @@
  */
 class TypeResolver
 {
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @var array
      */
@@ -18,6 +23,15 @@ class TypeResolver
         \Magento\SalesRule\Model\Rule\Interceptor::class => \Magento\SalesRule\Api\Data\RuleInterface::class
     ];
 
+    /**
+     * TypeResolver constructor.
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(MetadataPool $metadataPool)
+    {
+        $this->metadataPool = $metadataPool;
+    }
+
     /**
      * @param object $type
      * @return string
@@ -45,6 +59,12 @@ public function resolve($type)
             throw new \Exception('Unable to determine data interface for ' . $className);
         }
 
-        return reset($dataInterfaces);
+        foreach ($dataInterfaces as $dataInterface) {
+            if ($this->metadataPool->hasConfiguration($dataInterface)) {
+                $this->typeMapping[$className] = $dataInterface;
+            }
+        }
+
+        return $this->typeMapping[$className];
     }
 }