matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-22 04:02:40 +03:00
Code Activity

Warn that members won't be invited to the new room in room settings

Browse Source
This commit is contained in:
Travis Ralston
2019-03-14 17:11:44 -06:00
parent 5ded646db0
commit 788041a774
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/views/settings/tabs/_SettingsTab.scss
View File

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_SettingsTab_warningText {
color: $warning-color;
}
.mx_SettingsTab_heading { .mx_SettingsTab_heading {
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;

14
src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
View File

@@ -67,9 +67,17 @@ export default class AdvancedRoomSettingsTab extends React.Component {
let roomUpgradeButton; let roomUpgradeButton;
if (this.state.upgradeRecommendation && this.state.upgradeRecommendation.needsUpgrade) { if (this.state.upgradeRecommendation && this.state.upgradeRecommendation.needsUpgrade) {
roomUpgradeButton = ( roomUpgradeButton = (
<AccessibleButton onClick={this._upgradeRoom} kind='primary'> <div>
{_t("Upgrade room to version %(ver)s", {ver: this.state.upgradeRecommendation.version})} <p className='mx_SettingsTab_warningText'>
</AccessibleButton> {_t(
"Members of the room will be required to click a link to join the new room. No " +
"one will be automatically joined or invited to the new room.",
)}
</p>
<AccessibleButton onClick={this._upgradeRoom} kind='primary'>
{_t("Upgrade room to version %(ver)s", {ver: this.state.upgradeRecommendation.version})}
</AccessibleButton>
</div>
); );
} }