Merge branch 'MAGETWO-51969' of github.corp.magento.com:magento-firedrakes/magento2ce into MAGETWO-51969

NadiyaS · NadiyaS · commit 355cf2bf383d · 2016-04-19T11:15:34.000+03:00
diff --git a/app/code/Magento/Security/view/adminhtml/layout/security_session_activity.xml b/app/code/Magento/Security/view/adminhtml/layout/security_session_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-popup" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Magento_Security::css/activity.css"/>
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Security\Block\Adminhtml\Session\Activity" name="session.activity" template="Magento_Security::session/activity.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/Security/view/adminhtml/page_layout/admin-popup.xml b/app/code/Magento/Security/view/adminhtml/page_layout/admin-popup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
+    <container name="backend.session.activity">
+        <container name="after.body.start" as="after.body.start" label="Page Top" before="-"/>
+        <container name="page.wrapper" as="page_wrapper" htmlTag="div" htmlClass="page-wrapper">
+            <container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns">
+                <container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col">
+                    <container name="content" as="content" />
+                </container>
+            </container>
+            <container name="js" as="js" label="JavaScript"/>
+        </container>
+        <container name="before.body.end" as="before_body_end" label="Before Body End" after="-"/>
+    </container>
+</layout>
