[PLT-6996] On "About Mattermost", add notes with links to notice.txt which has list of copyrights of open source components used (#7315)
* on "About Mattermost", add notes with links to notice.txt which has list of copyrights of open source components used * remove apps from link * Minor UI update
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
967a0df0f8
Коммит
6a10941cb3
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
import {Modal} from 'react-bootstrap';
|
import {Modal} from 'react-bootstrap';
|
||||||
|
|
||||||
import {FormattedMessage} from 'react-intl';
|
import {FormattedMessage, FormattedHTMLMessage} from 'react-intl';
|
||||||
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
|
|
||||||
@@ -167,7 +167,15 @@ export default class AboutBuildModal extends React.Component {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className='about-modal__hash form-group padding-top x2'>
|
<div className='about-modal__notice form-group padding-top x2'>
|
||||||
|
<p>
|
||||||
|
<FormattedHTMLMessage
|
||||||
|
id='about.notice'
|
||||||
|
defaultMessage='Mattermost is made possible by the open source software used in our <a href="https://about.mattermost.com/platform-notice-txt/" target="_blank">platform</a>, <a href="https://about.mattermost.com/desktop-notice-txt/" target="_blank">desktop</a> and <a href="https://about.mattermost.com/mobile-notice-txt/" target="_blank">mobile</a> apps.'
|
||||||
|
/>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className='about-modal__hash'>
|
||||||
<p>
|
<p>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='about.hash'
|
id='about.hash'
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
"about.hash": "Build Hash:",
|
"about.hash": "Build Hash:",
|
||||||
"about.hashee": "EE Build Hash:",
|
"about.hashee": "EE Build Hash:",
|
||||||
"about.licensed": "Licensed to:",
|
"about.licensed": "Licensed to:",
|
||||||
|
"about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
|
||||||
"about.number": "Build Number:",
|
"about.number": "Build Number:",
|
||||||
"about.teamEditionLearn": "Join the Mattermost community at ",
|
"about.teamEditionLearn": "Join the Mattermost community at ",
|
||||||
"about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
|
"about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
|
||||||
|
|||||||
@@ -87,6 +87,18 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.about-modal__notice {
|
||||||
|
@include opacity(.8);
|
||||||
|
font-size: .79em;
|
||||||
|
text-align: right;
|
||||||
|
|
||||||
|
p {
|
||||||
|
&:first-child {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.about-modal__logo {
|
.about-modal__logo {
|
||||||
@include opacity(.9);
|
@include opacity(.9);
|
||||||
padding: 0 40px 0 20px;
|
padding: 0 40px 0 20px;
|
||||||
|
|||||||
@@ -141,7 +141,18 @@ exports[`components/AboutBuildModal should match snapshot for enterprise edition
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="about-modal__hash form-group padding-top x2"
|
className="about-modal__notice form-group padding-top x2"
|
||||||
|
>
|
||||||
|
<p>
|
||||||
|
<FormattedHTMLMessage
|
||||||
|
defaultMessage="Mattermost is made possible by the open source software used in our <a href=\\"https://about.mattermost.com/platform-notice-txt/\\" target=\\"_blank\\">platform</a>, <a href=\\"https://about.mattermost.com/desktop-notice-txt/\\" target=\\"_blank\\">desktop</a> and <a href=\\"https://about.mattermost.com/mobile-notice-txt/\\" target=\\"_blank\\">mobile</a> apps."
|
||||||
|
id="about.notice"
|
||||||
|
values={Object {}}
|
||||||
|
/>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className="about-modal__hash"
|
||||||
>
|
>
|
||||||
<p>
|
<p>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
@@ -315,7 +326,18 @@ exports[`components/AboutBuildModal should match snapshot for team edition 1`] =
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className="about-modal__hash form-group padding-top x2"
|
className="about-modal__notice form-group padding-top x2"
|
||||||
|
>
|
||||||
|
<p>
|
||||||
|
<FormattedHTMLMessage
|
||||||
|
defaultMessage="Mattermost is made possible by the open source software used in our <a href=\\"https://about.mattermost.com/platform-notice-txt/\\" target=\\"_blank\\">platform</a>, <a href=\\"https://about.mattermost.com/desktop-notice-txt/\\" target=\\"_blank\\">desktop</a> and <a href=\\"https://about.mattermost.com/mobile-notice-txt/\\" target=\\"_blank\\">mobile</a> apps."
|
||||||
|
id="about.notice"
|
||||||
|
values={Object {}}
|
||||||
|
/>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className="about-modal__hash"
|
||||||
>
|
>
|
||||||
<p>
|
<p>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user