Merge remote-tracking branch 'origin/MAGETWO-83183-update-access-denied' into MAGETWO-83013-ReleaseNotification

Author: Joan He

app/code/Magento/Backend/i18n/en_US.csv

@@ -214,10 +214,13 @@ YTD,YTD
 "Admin session lifetime must be greater than or equal to 60 seconds","Admin session lifetime must be greater than or equal to 60 seconds"
 Order,Order
 "Order #%1","Order #%1"
-"Access denied","Access denied"
-"Please try to sign out and sign in again.","Please try to sign out and sign in again."
-"If you continue to receive this message, please contact the store owner.","If you continue to receive this message, please contact the store owner."
 "You need more permissions to access this.","You need more permissions to access this."
+"Sorry, you need permissions to view this content.","Sorry, you need permissions to view this content."
+"Next steps","Next steps"
+"If you think this is an error, try signing out and signing in again.","If you think this is an error, try signing out and signing in again."
+"Contact a system administrator or store owner to gain permissions.","Contact a system administrator or store owner to gain permissions."
+"Return to","Return to"
+"previous page","previous page"
 "Welcome, please sign in","Welcome, please sign in"
 Username,Username
 "user name","user name"

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

@@ -9,25 +9,21 @@
 ?>
 <?php
 /**
- * @see \Magento\Backend\Block\Denied
+ * @see \Magento\Backend\Block\Template
  */
 ?>
 <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?>
+    <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>
 </div>