Skip to content

Commit ae51544

Browse files
committed
fix: remove tutor logo and plugin alias
1 parent 390cdf5 commit ae51544

File tree

5 files changed

+32
-55
lines changed

5 files changed

+32
-55
lines changed

package-lock.json

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
"@fortawesome/free-regular-svg-icons": "6.4.2",
5858
"@fortawesome/free-solid-svg-icons": "6.4.2",
5959
"@fortawesome/react-fontawesome": "0.2.0",
60-
"@openedx-plugins/footer-links": "file:../src/plugins/footer-links",
61-
"@openedx/frontend-plugin-framework": "1.0.2"
60+
"@openedx/frontend-plugin-framework": "^1.0.2"
6261
},
6362
"peerDependencies": {
6463
"@edx/frontend-platform": "^4.0.0 || ^5.0.0",

src/components/Footer.jsx

Lines changed: 25 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
44
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
55
import { ensureConfig } from '@edx/frontend-platform/config';
66
import { AppContext } from '@edx/frontend-platform/react';
7-
import { Image } from '@edx/paragon';
87
import { getConfig } from '@edx/frontend-platform';
98
import { PluginSlot } from '@openedx/frontend-plugin-framework';
109

@@ -48,49 +47,31 @@ class SiteFooter extends React.Component {
4847
const config = getConfig();
4948

5049
return (
51-
<div className="wrapper wrapper-footer">
52-
<footer id="footer" className="tutor-container">
53-
<div className="footer-top">
54-
<div className="powered-area">
55-
<ul className="logo-list">
56-
<PluginSlot id="poweredby_text_slot"><li>{intl.formatMessage(messages['footer.poweredby.text'])}</li></PluginSlot>
57-
<PluginSlot id="tutor_logo_slot">
58-
<li>
59-
<a href="https://docs.tutor.overhang.io" rel="noreferrer" target="_blank">
60-
<Image
61-
src={`${config.LMS_BASE_URL}/theming/asset/images/tutor-logo.png`}
62-
alt={intl.formatMessage(messages['footer.tutorlogo.altText'])}
63-
width="57"
64-
/>
65-
</a>
66-
</li>
67-
</PluginSlot>
68-
<PluginSlot id="openedx_logo_slot">
69-
<li>
70-
<a href="https://open.edx.org" rel="noreferrer" target="_blank">
71-
<Image
72-
src={logo || `${config.LMS_BASE_URL}/theming/asset/images/openedx-logo.png`}
73-
alt={intl.formatMessage(messages['footer.logo.altText'])}
74-
width="79"
75-
/>
76-
</a>
77-
</li>
78-
</PluginSlot>
79-
</ul>
80-
</div>
81-
</div>
82-
<PluginSlot id="footer-middle"><FooterLinks /></PluginSlot>
83-
<PluginSlot id="copyright_text_slot"><span className="copyright-site">{intl.formatMessage(messages['footer.copyright.text'])}</span></PluginSlot>
84-
<PluginSlot id="lang_selector_slot">
85-
{showLanguageSelector && (
86-
<LanguageSelector
87-
options={supportedLanguages}
88-
onSubmit={onLanguageSelected}
89-
/>
90-
)}
91-
</PluginSlot>
92-
</footer>
93-
</div>
50+
<PluginSlot as="footer" id="mfe-global-footer" className="footer border-top py-3 px-4" role="contentinfo">
51+
<PluginSlot id="default-poweredby-logo">
52+
<a
53+
className="d-block"
54+
href={config.LMS_BASE_URL}
55+
aria-label={intl.formatMessage(messages['footer.logo.ariaLabel'])}
56+
>
57+
<img
58+
style={{ maxHeight: 45 }}
59+
src={logo || config.LOGO_TRADEMARK_URL}
60+
alt={intl.formatMessage(messages['footer.logo.altText'])}
61+
/>
62+
</a>
63+
</PluginSlot>
64+
<PluginSlot id="footer-middle"><FooterLinks /></PluginSlot>
65+
<PluginSlot id="language_selector">
66+
{showLanguageSelector && (
67+
<LanguageSelector
68+
options={supportedLanguages}
69+
onSubmit={onLanguageSelected}
70+
/>
71+
)}
72+
</PluginSlot>
73+
<PluginSlot id="copyright_text"><span className="copyright-site mt-2">{intl.formatMessage(messages['footer.copyright.text'])}</span></PluginSlot>
74+
</PluginSlot>
9475
);
9576
}
9677
}

src/components/Footer.messages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const messages = defineMessages({
158158
},
159159
'footer.copyright.text': {
160160
id: 'footer.copyright.text',
161-
defaultMessage: 'Copyrights ©2023. All Rights Reserved.',
161+
defaultMessage: `Copyrights ©${new Date().getFullYear()}. All Rights Reserved.`,
162162
description: 'copyright text for the footer',
163163
},
164164
'footer.ariaLabel': {

src/plugins/footer-links/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import FooterLinks from './footerLinks';
1+
import FooterLinks from './FooterLinks';
22

33
export default FooterLinks;

0 commit comments

Comments
 (0)