Merge remote-tracking branch 'origin/MAGETWO-54634' into bugfixes

Natalia Momotenko · Natalia Momotenko · commit 1c4e0102b426 · 2016-07-05T16:31:29.000+03:00
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Name.php
@@ -23,7 +23,7 @@ public function render(\Magento\Framework\DataObject $row)
         /** @var \Magento\Integration\Model\Integration $row */
         $text = parent::render($row);
         if (!$this->isUrlSecure($row->getEndpoint()) || !$this->isUrlSecure($row->getIdentityLinkUrl())) {
-            $text .= '<span class="icon-error"><span>Integration not secure</span></span>';
+            $text .= '<span class="security-notice"><span>' . __("Integration not secure") . '</span></span>';
         }
         return $text;
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/NameTest.php
@@ -101,7 +101,7 @@ public function endpointDataProvider()
             [
                 'http://myurl',
                 'Custom Integration',
-                'Custom Integration<span class="icon-error"><span>Integration not secure</span></span>'
+                'Custom Integration<span class="security-notice"><span>Integration not secure</span></span>'
             ]
         ];
     }
diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml
@@ -8,9 +8,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <css src="Magento_Integration::integration.css"/>
-    </head>
     <update handle="adminhtml_integration_grid_block"/>
     <body>
         <referenceBlock name="content">
diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <css src="Magento_Integration::integration.css"/>
-    </head>
     <update handle="adminhtml_integration_edit"/>
     <body>
         <referenceBlock name="content">
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
@@ -14,4 +14,4 @@
 <div id="integration-activate-permissions-tabs">
     <?php echo $block->getChildHtml('tabs'); ?>
 </div>
-<div id="integrations-activate-permissions-content"></div>
+<div id="integrations-activate-permissions-content"></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
@@ -24,22 +24,20 @@
 </fieldset>
 <?php if (!$block->isTreeEmpty()): ?>
     <script>
-require(["jquery", "Magento_User/js/roles-tree"], function($){
+        require(["jquery", "Magento_User/js/roles-tree"], function($){
+            $.widget('mage.rolesTree', $.mage.rolesTree, {
+                _checkNode: function(event) {},
+                _checkNodes: function() {
+                    this._super();
+                    this.element.jstree('disable_hotkeys').jstree('hide_checkboxes')
+                        .find('li.jstree-unchecked').hide().end().find('li.jstree-checked').attr('rel', 'disabled');
+                }
+            });
 
-    $.widget('mage.rolesTree', $.mage.rolesTree, {
-        _checkNode: function(event) {},
-        _checkNodes: function() {
-            this._super();
-            this.element.jstree('disable_hotkeys').jstree('hide_checkboxes')
-                .find('li.jstree-unchecked').hide().end().find('li.jstree-checked').attr('rel', 'disabled');
-        }
-    });
-
-    $('[data-role="resource-tree"]').rolesTree({
-        'treeInitData': <?php /* @escapeNotVerified */ echo $block->getResourcesTreeJson() ?>,
-        'treeInitSelectedData': <?php /* @escapeNotVerified */ echo $block->getSelectedResourcesJson() ?>
-    });
-
-});
-</script>
+            $('[data-role="resource-tree"]').rolesTree({
+                'treeInitData': <?php /* @escapeNotVerified */ echo $block->getResourcesTreeJson() ?>,
+                'treeInitSelectedData': <?php /* @escapeNotVerified */ echo $block->getSelectedResourcesJson() ?>
+            });
+        });
+    </script>
 <?php endif ?>
diff --git a/app/code/Magento/Integration/view/adminhtml/web/integration.css b/app/code/Magento/Integration/view/adminhtml/web/integration.css
diff --git a/app/design/adminhtml/Magento/backend/Magento_Integration/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Integration/web/css/source/_module.less
@@ -0,0 +1,79 @@
+// /**
+//  * Copyright © 2016 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.adminhtml-integration-index {
+    .data-grid {
+        .action {
+            &:extend(.abs-action-reset all);
+
+            &[disabled] {
+                color: @color-gray-light2;
+                cursor: not-allowed;
+                opacity: 0.6;
+            }
+
+            &:hover {
+                &:before {
+                    color: @color-gray-middle3;
+                }
+            }
+
+            &:before {
+                &:extend(.abs-icon all);
+            }
+
+            &.edit {
+                &:before {
+                    content: @icon-edit__content;
+                }
+            }
+
+            &.info {
+                &:before {
+                    content: @icon-info__content;
+                }
+            }
+
+            &.delete {
+                &:before {
+                    content: @icon-delete__content;
+                }
+            }
+        }
+    }
+
+    .security-notice {
+        color: @color-red11;
+        font-size: @font-size__tiny;
+        margin-left: 1.5rem;
+        vertical-align: middle;
+
+        &:before {
+            &:extend(.abs-icon all);
+            content: @icon-warning__content;
+            margin-right: @indent__xs;
+        }
+    }
+
+    input[readonly] {
+        cursor: copy;
+    }
+
+    .ui-dialog {
+        .ui-dialog-buttonpane {
+            float: none;
+
+            .ui-dialog-buttonset {
+                text-align: right;
+            }
+        }
+    }
+
+    .no-close {
+        .ui-dialog-titlebar-close {
+            display: none;
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function render(\Magento\Framework\DataObject $row)`
`23`	`23`	`/** @var \Magento\Integration\Model\Integration $row */`
`24`	`24`	`$text = parent::render($row);`
`25`	`25`	`if (!$this->isUrlSecure($row->getEndpoint()) \|\| !$this->isUrlSecure($row->getIdentityLinkUrl())) {`
`26`		`- $text .= '<span class="icon-error"><span>Integration not secure</span></span>';`
	`26`	`+ $text .= '<span class="security-notice"><span>' . __("Integration not secure") . '</span></span>';`
`27`	`27`	`}`
`28`	`28`	`return $text;`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function endpointDataProvider()`
`101`	`101`	`[`
`102`	`102`	`'http://myurl',`
`103`	`103`	`'Custom Integration',`
`104`		`- 'Custom Integration<span class="icon-error"><span>Integration not secure</span></span>'`
	`104`	`+ 'Custom Integration<span class="security-notice"><span>Integration not secure</span></span>'`
`105`	`105`	`]`
`106`	`106`	`];`
`107`	`107`	`}`