Skip to content

Commit c068c8e

Browse files
author
Dale Sikkema
committed
MAGETWO-44189: Does not work to switch the language in the admin area
- apply new style to the legal section
1 parent 96878e4 commit c068c8e

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,18 @@
5353
<block class="Magento\Framework\View\Element\Template" name="page.actions.toolbar" template="Magento_Backend::pageactions.phtml" after="-"/>
5454
</referenceContainer>
5555
<referenceContainer name="footer">
56-
<container name="legal" htmlTag="div" htmlClass="footer-legal col-m-12">
57-
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
58-
<block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright" />
59-
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
60-
<arguments>
61-
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
62-
</arguments>
63-
</block>
56+
<container name="legal" htmlTag="div" htmlClass="footer-legal">
57+
<container name="legal.copyright" htmlTag="p" htmlClass="copyright col-m-6">
58+
<block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright" />
59+
</container>
60+
<container name="legal.system" htmlTag="div" htmlClass="footer-legal-system col-m-6">
61+
<block class="Magento\Backend\Block\Page\Footer" name="version" as="version" />
62+
<block class="Magento\Framework\View\Element\Template" name="report" as="report" template="Magento_Backend::page/report.phtml">
63+
<arguments>
64+
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
65+
</arguments>
66+
</block>
67+
</container>
6468
</container>
6569
</referenceContainer>
6670
<referenceContainer name="backend.page">

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
// @codingStandardsIgnoreFile
88

99
?>
10-
<p class="copyright">
11-
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
12-
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
13-
</p>
10+
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11+
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353

5454
// Copyright
5555
.copyright {
56+
text-align: left;
5657
margin-bottom: -.2rem;
5758
position: relative;
5859
.link-copyright {
@@ -85,15 +86,10 @@
8586

8687
.footer-legal {
8788
padding-top: 1rem;
88-
text-align: right;
8989
}
9090

91-
// Locale switcher
92-
.locale-switcher {
93-
.label {
94-
display: block;
95-
margin-bottom: 1rem;
96-
}
91+
.footer-legal-system {
92+
text-align: right;
9793
}
9894

9995
//

0 commit comments

Comments
 (0)