MAGETWO-34984: Invert new admin styles scope

zanilee · zanilee · commit 397668589e1f · 2015-03-24T09:58:05.000+02:00
- removing admin__scope
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -12,7 +12,7 @@
  * @see \Magento\AdminNotification\Block\Window
  */
 ?>
-<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification admin__scope">
+<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
     <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
         <div class="popup-inner">
             <div class="popup-header">
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -10,7 +10,7 @@
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages */ ?>
 
 <?php $lastCritical = $block->getLastCritical();?>
-<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?> admin__scope">
+<div id="system_messages" class="message-system<?php if ($lastCritical): ?> message-system-unread<?php endif; ?>">
     <div class="message-system-inner">
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div id="system_messages_list" class="admin__scope" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
     <ul class="message-system-list">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?php echo $block->getItemClass($message);?>">
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js b/app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js
@@ -20,9 +20,7 @@ define([
         },
 
         open: function (severity) {
-            var superMethod = $.proxy(this._super, this),
-                listTemplate,
-                fullTemplate;
+            var superMethod = $.proxy(this._super, this);
 
             $.ajax({
                 url: this.options.ajaxUrl,
@@ -38,12 +36,12 @@ define([
                 });
 
                 tmpl = $(tmpl);
-                listTemplate = $('<ul class="message-system-list"></ul>').append(tmpl);
-                fullTemplate = $('<div class="admin__scope"></div>').append(listTemplate);
 
-                this.element
-                    .html(fullTemplate)
-                    .trigger('contentUpdated');
+                this.element.html(
+                    $('<ul />', {
+                        'class': 'message-system-list'
+                    }).append(tmpl)
+                ).trigger('contentUpdated');
 
                 superMethod();
             }, this));
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -27,10 +27,8 @@
 
         <main class="page-content" id="anchor-content">
             <?php echo $block->getChildHtml('main-top'); ?>
-            <div class="admin__scope">
-                <div class="messages" id="messages" data-container-for="messages">
-                    <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-                </div>
+            <div class="messages" id="messages" data-container-for="messages">
+                <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
             </div>
             <?php echo $block->getChildHtml('page_main_actions'); ?>
             <?php if ($block->getChildHtml('left')): ?>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <!-- TODO: refactor form styles and js -->
-<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-warning" style="display: none;">
+<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-warning" style="display: none;">
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
@@ -31,7 +31,7 @@
     </div>
 </div>
 
-<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-warning" style="display: none;">
+<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-warning" style="display: none;">
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
@@ -53,7 +53,7 @@
     </div>
 </div>
 
-<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="backup-options" style="display: none;">
+<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="backup-options" style="display: none;">
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
@@ -103,7 +103,7 @@
     </div>
  </div>
 
-<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog admin__scope" id="rollback-request-password" style="display: none;">
+<div data-mage-init='{"modalPopup": {}}' class="fade backup-dialog" id="rollback-request-password" style="display: none;">
     <div class="popup popup-notice">
         <div class="popup-inner">
             <div class="popup-header">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
@@ -24,11 +24,9 @@ $categoryId = $block->getCategoryId();
 <?php if ($block->hasStoreRootCategory()): ?>
     <?php echo $block->getTabsHtml() ?>
 <?php else: ?>
-<div class="admin__scope">
-    <div class="messages">
-        <div class="message message-notice">
-            <div><?php echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
-        </div>
+<div class="messages">
+    <div class="message message-notice">
+        <div><?php echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
     </div>
 </div>
 
@@ -52,7 +50,7 @@ $categoryId = $block->getCategoryId();
     <div id="category_tab_content"></div>
 </form>
 
-<div data-id="information-dialog-category" class="messages admin__scope" style="display: none;">
+<div data-id="information-dialog-category" class="messages" style="display: none;">
     <div class="message message-notice">
         <div><?php echo __('This operation can take much time'); ?></div>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -30,7 +30,7 @@
     </div>
 </div>
 
-<div data-id="information-dialog-tree" class="messages admin__scope" style="display: none;">
+<div data-id="information-dialog-tree" class="messages" style="display: none;">
     <div class="message message-notice">
        <div><?php echo __('This operation can take much time'); ?></div>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml
@@ -17,11 +17,11 @@
     <input name="form_key" type="hidden" value="<?php echo $block->escapeHtml($block->getFormKey()) ?>" />
     <?php echo $block->getChildHtml('form') ?>
 </form>
-<div class="admin__scope">
-    <div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?php echo $block->getUiId('content-header') ?>>
-        <?php echo $block->getButtonsHtml('header') ?>
-    </div>
+
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?php echo $block->getUiId('content-header') ?>>
+    <?php echo $block->getButtonsHtml('header') ?>
 </div>
+
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
@@ -47,11 +47,9 @@
             <span><?php echo __('Remove Product From Websites') ?></span>
         </legend>
         <br>
-        <div class="admin__scope">
-            <div class="messages">
-                <div class="message message-notice">
-                    <div><?php echo __("Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?></div>
-                </div>
+        <div class="messages">
+            <div class="message message-notice">
+                <div><?php echo __("Items that you do not want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?></div>
             </div>
         </div>
         <div class="store-scope">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -17,12 +17,10 @@
     </div>
     <div class="fieldset-wrapper-content" id="product-custom-options-content">
         <fieldset class="fieldset">
-            <div class="admin__scope">
-                <div class="messages">
-                    <div class="message message-error" id="dynamic-price-warning" style="display: none;">
-                        <div class="message-inner">
-                            <div class="message-content"><?php echo __('Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.') ?></div>
-                        </div>
+            <div class="messages">
+                <div class="message message-error" id="dynamic-price-warning" style="display: none;">
+                    <div class="message-inner">
+                        <div class="message-content"><?php echo __('Bundle with dynamic pricing cannot include custom defined options. Options will not be saved.') ?></div>
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -11,11 +11,9 @@
     <legend class="legend"><span><?php echo __('Product In Websites') ?></span></legend>
     <br>
     <?php if ($block->getProductId()): ?>
-    <div class="admin__scope">
-        <div class="messages">
-            <div class="message message-notice">
-                <?php echo __("Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?>
-            </div>
+    <div class="messages">
+        <div class="message message-notice">
+            <?php echo __("Items that you don't want to show in the catalog or search results should have status 'Disabled' in the desired store.") ?>
         </div>
     </div>
     <?php endif; ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
@@ -11,7 +11,7 @@
 <div id="<?php echo $block->getNameInLayout() ?>" style="display: none" data-role="dialog" data-id="affected-attribute-set-selector">
     <form action="">
 
-        <div class="messages admin__scope">
+        <div class="messages">
             <div class="message message-notice notice">
                 <div><?php echo __("Attribute set comprising all selected configurable attributes need to be in order to save generated variations.") ?></div>
             </div>
diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml b/app/code/Magento/GoogleShopping/view/adminhtml/templates/captcha.phtml
@@ -9,11 +9,9 @@
 ?>
 
 <?php if ($block->getGcontentCaptchaToken() && $block->getGcontentCaptchaUrl()): ?>
-<div class="admin__scope">
-    <div class="messages">
-        <div class="message message-error error">
-            <div><img src="<?php echo $block->getGcontentCaptchaUrl() ?>"> <input type="text" id="user_confirm"> <?php echo $block->getConfirmButtonHtml() ?></div>
-        </div>
+<div class="messages">
+    <div class="message message-error error">
+        <div><img src="<?php echo $block->getGcontentCaptchaUrl() ?>"> <input type="text" id="user_confirm"> <?php echo $block->getConfirmButtonHtml() ?></div>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
@@ -8,11 +8,9 @@
     <div class="legend">
         <span><?php echo __('Status'); ?></span>
     </div><br>
-    <div class="admin__scope">
-        <div class="messages">
-            <div class="message message-success success">
-                <div><?php echo $block->getStatusMessage(); ?>hh</div>
-            </div>
+    <div class="messages">
+        <div class="message message-success success">
+            <div><?php echo $block->getStatusMessage(); ?>hh</div>
         </div>
     </div>
 </div>
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
@@ -9,9 +9,7 @@
  */
 ?>
 <div><p><?php echo __('The integration you selected asks you to approve access to the following:'); ?></p></div>
-<div class="admin__scope">
-    <div id="integration-activate-permissions-tabs">
-        <?php echo $block->getChildHtml('tabs'); ?>
-    </div>
-    <div id="integrations-activate-permissions-content"></div>
-</div>
+<div id="integration-activate-permissions-tabs">
+    <?php echo $block->getChildHtml('tabs'); ?>
+</div>
+<div id="integrations-activate-permissions-content"></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -74,7 +74,7 @@ require([
 
 <div id="integration-popup-container" style="display: none;"></div>
 <div id="integration-delete-container"
-     class="messages admin__scope"
+     class="messages"
      style="display: none;"
      title="<?php echo __('Are you sure ?'); ?>">
     <div class="message message-notice notice">
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -7,11 +7,9 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="admin__scope">
-    <div class="messages">
-        <div class="message message-notice message-in-rating-edit">
-            <div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
-        </div>
+<div class="messages">
+    <div class="message message-notice message-in-rating-edit">
+        <div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
     </div>
 </div>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
@@ -7,11 +7,9 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="admin__scope">
-    <div class="message message-notice">
-        <div class="message-inner">
-            <div class="message-content"><?php echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
-        </div>
+<div class="message message-notice">
+    <div class="message-inner">
+        <div class="message-content"><?php echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
     </div>
 </div>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -21,11 +21,9 @@
                 <?php $_code = $_rate->getCode() ?>
                 <li>
                    <?php if ($_rate->getErrorMessage()): ?>
-                       <div class="admin__scope">
-                           <div class="messages">
-                               <div class="message message-error error">
-                                   <div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
-                               </div>
+                       <div class="messages">
+                           <div class="message message-error error">
+                               <div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
                            </div>
                        </div>
                    <?php else: ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml
@@ -26,13 +26,9 @@
 
                 <container name="page.content" as="page_content" htmlTag="main" htmlId="anchor-content" htmlClass="page-content">
                     <container name="main.top" as="main-top" label="main-top"/>
-                    <container name="page.main.actions.wrapper" htmlTag="div" htmlClass="admin__scope">
-                        <container name="page.main.actions" as="page_main_actions" htmlTag="div" htmlClass="page-main-actions"/>
-                    </container>
-                    <container name="message-wrapper.scope" htmlTag="div" htmlClass="admin__scope">
-                        <container name="messages.wrapper" as="messages.wrapper" htmlTag="div" htmlId="messages">
-                            <container name="page.messages" as="page.messages"/>
-                        </container>
+                    <container name="page.main.actions" as="page_main_actions" htmlTag="div" htmlClass="page-main-actions"/>
+                    <container name="messages.wrapper" as="messages.wrapper" htmlTag="div" htmlId="messages">
+                        <container name="page.messages" as="page.messages"/>
                     </container>
                     <container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns">
                         <container name="admin.scope.col.wrap" as="admin-scope-col-wrap" htmlTag="div" htmlClass="admin__scope-old"> <!-- ToDo UI: remove this wrapper remove with old styles removal -->
@@ -43,10 +39,8 @@
                     </container>
                 </container>
                 <container name="js" as="js" label="JavaScript"/>
-                <container name="page.footer.wrapper" after="page.content" as="page_footer_wrapper" htmlTag="div" htmlClass="admin__scope">
-                    <container htmlTag="footer" htmlClass="page-footer">
-                        <container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
-                    </container>
+                <container htmlTag="footer" htmlClass="page-footer">
+                    <container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
                 </container>
             </container>
             <container name="before.body.end" as="before_body_end" label="Before Body End" after="-"/>
diff --git a/app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml b/app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml
@@ -26,15 +26,11 @@
 
                 <container name="page.content" as="page_content" htmlTag="main" htmlId="anchor-content" htmlClass="page-content">
                     <container name="main.top" as="main-top" label="main-top"/>
-                    <container name="page.main.actions.wrapper" htmlTag="div" htmlClass="admin__scope">
-                        <container name="page.main.actions" as="page_main_actions" htmlTag="div" htmlClass="page-main-actions"/>
+                    <container name="page.main.actions" as="page_main_actions" htmlTag="div" htmlClass="page-main-actions"/>
+                    <container name="messages.wrapper" as="messages.wrapper" htmlTag="div" htmlId="messages">
+                        <container name="page.messages" as="page.messages"/>
                     </container>
-                    <container name="message-wrapper.scope" htmlTag="div" htmlClass="admin__scope">
-                        <container name="messages.wrapper" as="messages.wrapper" htmlTag="div" htmlId="messages">
-                            <container name="page.messages" as="page.messages"/>
-                        </container>
-                    </container>
-                    <container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns row admin__scope-old">
+                    <container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns row">
                         <!-- ToDo UI: remove 'main-col' & 'side-col' class names after new sidebar implemented -->
                         <container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col col-m-9 col-m-push-3">
                             <container name="admin.scope.col.wrap" as="admin-scope-col-wrap" htmlTag="div" htmlClass="admin__scope-old"> <!-- ToDo UI: remove this wrapper remove with old styles removal -->
@@ -47,10 +43,8 @@
                     </container>
                 </container>
                 <container name="js" as="js" label="JavaScript"/>
-                <container name="page.footer.wrapper" after="page.content" as="page_footer_wrapper" htmlTag="div" htmlClass="admin__scope">
-                    <container htmlTag="footer" htmlClass="page-footer">
-                        <container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
-                    </container>
+                <container htmlTag="footer" htmlClass="page-footer">
+                    <container name="footer" htmlTag="div" htmlClass="page-footer-content row" />
                 </container>
             </container>
             <container name="before.body.end" as="before_body_end" label="Before Body End" after="-"/>
diff --git a/app/code/Magento/Ui/view/base/templates/form/default.phtml b/app/code/Magento/Ui/view/base/templates/form/default.phtml
@@ -15,13 +15,11 @@ $formConfig = $block->getRenderContext()->getConfigBuilder()->toJsonNew($block->
         }
     }
 </script>
-<div class="admin__scope">
 <div data-role="spinner" data-component="<?php echo $block->getDataScope(); ?>.areas" class="grid-loading-mask">
     <div class="spinner">
         <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
     </div>
 </div>
-</div>
 <div data-bind="scope: '<?php echo $block->getDataScope(); ?>.areas'">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
diff --git a/app/code/Magento/Ui/view/base/web/templates/content/content.html b/app/code/Magento/Ui/view/base/web/templates/content/content.html
diff --git a/app/code/Magento/Ui/view/base/web/templates/fieldset/fieldset.html b/app/code/Magento/Ui/view/base/web/templates/fieldset/fieldset.html
diff --git a/app/code/Magento/Ui/view/base/web/templates/tab.html b/app/code/Magento/Ui/view/base/web/templates/tab.html
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
