-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Changes for Town Square read only on web small screen size. Overlay m… #1092
Changes for Town Square read only on web small screen size. Overlay m… #1092
Conversation
5dc25c4
to
e2002b7
Compare
@jasonblais these are changes that were missed on the first pass: |
@dmeza Three notes 1 - The "Add Members" option for channels now says 3 - How do I get to this screen? I wasn't able to find it |
7df1179
to
aab1155
Compare
@jasonblais rebased to lastes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
components/navbar/navbar.jsx
Outdated
); | ||
|
||
if (!ChannelStore.isDefault(channel)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this shouldn't be inside this if statement or else you won't be able to leave a read only channel that isn't the town square (assuming we ever support those)
{link}{' '} | ||
<FormattedMessage | ||
id='navbar.addOne' | ||
defaultMessage='to add one.' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of concatenating the sentence, can you structure it like this so that the translator has more control over the sentence?
addOne = (
<div>
<FormattedMessage
id='navbar.clickToAddHeader'
defaultMessage='{clickHere} to add one.'
values={{
clickHere: link
}}
/>
</div>
);
</a> | ||
); | ||
addOne = ( | ||
<div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this div is necessary, but if you want to maintain the original spacing, you could use
addOne = (
<React.Fragment>
<br/>
<FormattedMessage .../>
</React.Fragment>
);
aab1155
to
9c079b5
Compare
@hmhealey rebased to latest from master and made the changes requested. |
<br/> | ||
<FormattedMessage | ||
id='navbar.clickToAddHeader' | ||
defaultMessage='{link} to add one.' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The defaultMessage uses {link}
instead of {clickHere}
. Otherwise, it looks good
9c079b5
to
0245282
Compare
@hmhealey rebased and made the change. |
mattermost#1092) * Changes for Town Square read only on web small screen size. Overlay menu options. * fix bug that displays dot menu with empty option on small screen devices.
mattermost#1092) * Changes for Town Square read only on web small screen size. Overlay menu options. * fix bug that displays dot menu with empty option on small screen devices.
mattermost#1092) * Changes for Town Square read only on web small screen size. Overlay menu options. * fix bug that displays dot menu with empty option on small screen devices.
Summary
These changes when
"ExperimentalTownSquareIsReadOnly": true.
for TownSquare for small screen size:Click here to add one.
Header in the Info overlay.They were missed on the original changes to:
Hide edit able elements for Town Square in Channel View.
bafea1d
Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
make check-style
to check for style errors (required for all pull requests)make test
to ensure unit and component tests passedvia @dmeza