Merge branch 'MAGETWO-83183-update-access-denied' into MAGETWO-83013-ReleaseNotification

Author: Joan He

app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

@@ -12,12 +12,22 @@
  * @see \Magento\Backend\Block\Denied
  */
 ?>
-<h1 class="page-heading"><?= /* @escapeNotVerified */ __('Access denied') ?></h1>
-<?php if (!$block->hasAvailableResources()): ?>
-<p>
-<?= /* @escapeNotVerified */ __('Please try to sign out and sign in again.') ?><br/>
-<?= /* @escapeNotVerified */ __('If you continue to receive this message, please contact the store owner.') ?>
-</p>
-<?php else: ?>
-<p><?= /* @escapeNotVerified */ __('You need more permissions to access this.') ?></p>
-<?php endif?>
+<hr class="access-denied-hr"/>
+<div class="access-denied-page">
+    <h2 class="page-heading"><?= $block->escapeHtml(__('Sorry, you need permissions to view this content.')) ?></h2>
+    <?php if (!$block->hasAvailableResources()): ?>
+        <strong><?= $block->escapeHtml(__('Next steps')) ?></strong>
+        <ul>
+            <li><span><?= $block->escapeHtml(__('If you think this is an error, try signing out and signing in again.'))  ?></span></li>
+            <li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
+            <li>
+                <span><?= $block->escapeHtml(__('Return to ')) ?>
+                    <a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
+                        <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
+                </span>
+            </li>
+        </ul>
+    <?php else: ?>
+        <p><?= $block->escapeHtml(__('Access denied.')) ?></p>
+    <?php endif?>
+</div>

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

@@ -19,3 +19,4 @@
 @import 'module/pages/_dashboard.less';
 @import 'module/pages/_login.less';
 @import 'module/pages/_cache-management.less';
+@import 'module/pages/_access-denied.less';

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_access-denied.less

@@ -0,0 +1,34 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+// Access Error Page
+// ---------------------------------------------
+
+.access-denied-hr {
+  height: 0.2rem;
+  border: 0;
+  box-shadow: 0 10px 10px -10px #b4b3b3 inset;
+}
+
+.access-denied-page {
+  margin: 3.5rem 0 10rem 0;
+
+  h2 {
+    margin-bottom: 3rem;
+  }
+
+  ul {
+    li {
+      font-size: @font-size__s;
+      margin: 2rem 0 2rem 3rem;
+
+      span {
+        font-size: @font-size__base;
+        margin-left: 1rem;
+      }
+    }
+  }
+}

dev/tests/functional/tests/app/Magento/Search/Test/Constraint/AssertSynonymRestrictedAccess.php

@@ -18,7 +18,7 @@ class AssertSynonymRestrictedAccess extends AbstractConstraint
     /**
      * Access denied text.
      */
-    const ACCESS_DENIED_TEXT = 'Access denied';
+    const ACCESS_DENIED_TEXT = 'Sorry, you need permissions to view this content.';
 
     /**
      * Assert that access to synonym group index page is restricted.

dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleRestrictedAccess.php

@@ -16,7 +16,7 @@
  */
 class AssertUserRoleRestrictedAccess extends AbstractConstraint
 {
-    const DENIED_ACCESS = 'Access denied';
+    const DENIED_ACCESS = 'Sorry, you need permissions to view this content.';
 
     /**
      * Asserts that user has only related permissions.

dev/tests/integration/testsuite/Magento/Swatches/Controller/Adminhtml/Iframe/ShowTest.php

@@ -25,7 +25,7 @@ public function testAclAccess()
         $this->dispatch('backend/swatches/iframe/show/');
 
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode());
-        $this->assertNotContains('Access denied', $this->getResponse()->getBody());
+        $this->assertNotContains('Sorry, you need permissions to view this content.', $this->getResponse()->getBody());
     }
 
     /**
@@ -43,6 +43,6 @@ public function testAclAccessDenied()
         $this->dispatch('backend/swatches/iframe/show/');
 
         $this->assertEquals(403, $this->getResponse()->getHttpResponseCode());
-        $this->assertContains('Access denied', $this->getResponse()->getBody());
+        $this->assertContains('Sorry, you need permissions to view this content.', $this->getResponse()->getBody());
     }
 }