PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Rename GeneralSettingsTab to GeneralUserSettingsTab

Browse source
This commit is contained in:
Travis Ralston 2019-01-25 17:55:35 -07:00
parent c204cd7be3
commit b7d0dd4408
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/_components.scss
View file

@ -138,7 +138,7 @@
@import "./views/settings/_Notifications.scss"; @import "./views/settings/_Notifications.scss";
@import "./views/settings/_PhoneNumbers.scss"; @import "./views/settings/_PhoneNumbers.scss";
@import "./views/settings/_ProfileSettings.scss"; @import "./views/settings/_ProfileSettings.scss";
@import "./views/settings/tabs/_GeneralSettingsTab.scss"; @import "./views/settings/tabs/_GeneralUserSettingsTab.scss";
@import "./views/settings/tabs/_HelpSettingsTab.scss"; @import "./views/settings/tabs/_HelpSettingsTab.scss";
@import "./views/settings/tabs/_PreferencesSettingsTab.scss"; @import "./views/settings/tabs/_PreferencesSettingsTab.scss";
@import "./views/settings/tabs/_SecuritySettingsTab.scss"; @import "./views/settings/tabs/_SecuritySettingsTab.scss";

20
res/css/views/settings/tabs/_GeneralSettingsTab.scss → res/css/views/settings/tabs/_GeneralUserSettingsTab.scss
View file

@ -14,33 +14,33 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_GeneralSettingsTab_changePassword, .mx_GeneralUserSettingsTab_changePassword,
.mx_GeneralSettingsTab_themeSection { .mx_GeneralUserSettingsTab_themeSection {
display: block; display: block;
} }
.mx_GeneralSettingsTab_changePassword .mx_Field, .mx_GeneralUserSettingsTab_changePassword .mx_Field,
.mx_GeneralSettingsTab_themeSection .mx_Field { .mx_GeneralUserSettingsTab_themeSection .mx_Field {
display: block; display: block;
margin-right: 100px; // Align with the other fields on the page margin-right: 100px; // Align with the other fields on the page
} }
.mx_GeneralSettingsTab_changePassword .mx_Field input { .mx_GeneralUserSettingsTab_changePassword .mx_Field input {
display: block; display: block;
width: calc(100% - 20px); // subtract 10px padding on left and right width: calc(100% - 20px); // subtract 10px padding on left and right
} }
.mx_GeneralSettingsTab_changePassword .mx_Field:first-child { .mx_GeneralUserSettingsTab_changePassword .mx_Field:first-child {
margin-top: 0; margin-top: 0;
} }
.mx_GeneralSettingsTab_themeSection .mx_Field select { .mx_GeneralUserSettingsTab_themeSection .mx_Field select {
display: block; display: block;
width: 100%; width: 100%;
} }
.mx_GeneralSettingsTab_accountSection > .mx_EmailAddresses, .mx_GeneralUserSettingsTab_accountSection > .mx_EmailAddresses,
.mx_GeneralSettingsTab_accountSection > .mx_PhoneNumbers, .mx_GeneralUserSettingsTab_accountSection > .mx_PhoneNumbers,
.mx_GeneralSettingsTab_languageInput { .mx_GeneralUserSettingsTab_languageInput {
margin-right: 100px; // Align with the other fields on the page margin-right: 100px; // Align with the other fields on the page
} }

4
src/components/views/dialogs/UserSettingsDialog.js
View file

@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
import {Tab, TabbedView} from "../../structures/TabbedView"; import {Tab, TabbedView} from "../../structures/TabbedView";
import {_t, _td} from "../../../languageHandler"; import {_t, _td} from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton"; import AccessibleButton from "../elements/AccessibleButton";
import GeneralSettingsTab from "../settings/tabs/GeneralSettingsTab"; import GeneralUserSettingsTab from "../settings/tabs/GeneralUserSettingsTab";
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import LabsSettingsTab from "../settings/tabs/LabsSettingsTab"; import LabsSettingsTab from "../settings/tabs/LabsSettingsTab";
@ -56,7 +56,7 @@ export default class UserSettingsDialog extends React.Component {
tabs.push(new Tab( tabs.push(new Tab(
_td("General"), _td("General"),
"mx_UserSettingsDialog_settingsIcon", "mx_UserSettingsDialog_settingsIcon",
<GeneralSettingsTab />, <GeneralUserSettingsTab />,
)); ));
tabs.push(new Tab( tabs.push(new Tab(
_td("Notifications"), _td("Notifications"),

10
src/components/views/settings/tabs/GeneralSettingsTab.js → src/components/views/settings/tabs/GeneralUserSettingsTab.js
View file

@ -36,7 +36,7 @@ const sdk = require('../../../../index');
const Modal = require("../../../../Modal"); const Modal = require("../../../../Modal");
const dis = require("../../../../dispatcher"); const dis = require("../../../../dispatcher");
export default class GeneralSettingsTab extends React.Component { export default class GeneralUserSettingsTab extends React.Component {
static childContextTypes = { static childContextTypes = {
matrixClient: PropTypes.instanceOf(MatrixClient), matrixClient: PropTypes.instanceOf(MatrixClient),
}; };
@ -123,7 +123,7 @@ export default class GeneralSettingsTab extends React.Component {
const ChangePassword = sdk.getComponent("views.settings.ChangePassword"); const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
const passwordChangeForm = ( const passwordChangeForm = (
<ChangePassword <ChangePassword
className="mx_GeneralSettingsTab_changePassword" className="mx_GeneralUserSettingsTab_changePassword"
rowClassName="" rowClassName=""
buttonKind="primary" buttonKind="primary"
onError={this._onPasswordChangeError} onError={this._onPasswordChangeError}
@ -131,7 +131,7 @@ export default class GeneralSettingsTab extends React.Component {
); );
return ( return (
<div className="mx_SettingsTab_section mx_GeneralSettingsTab_accountSection"> <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_accountSection">
<span className="mx_SettingsTab_subheading">{_t("Account")}</span> <span className="mx_SettingsTab_subheading">{_t("Account")}</span>
<p className="mx_SettingsTab_subsectionText"> <p className="mx_SettingsTab_subsectionText">
{_t("Set a new account password...")} {_t("Set a new account password...")}
@ -152,7 +152,7 @@ export default class GeneralSettingsTab extends React.Component {
return ( return (
<div className="mx_SettingsTab_section"> <div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Language and region")}</span> <span className="mx_SettingsTab_subheading">{_t("Language and region")}</span>
<LanguageDropdown className="mx_GeneralSettingsTab_languageInput" <LanguageDropdown className="mx_GeneralUserSettingsTab_languageInput"
onOptionChange={this._onLanguageChange} value={this.state.language} /> onOptionChange={this._onLanguageChange} value={this.state.language} />
</div> </div>
); );
@ -162,7 +162,7 @@ export default class GeneralSettingsTab extends React.Component {
// TODO: Re-enable theme selection once the themes actually work // TODO: Re-enable theme selection once the themes actually work
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag"); const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
return ( return (
<div className="mx_SettingsTab_section mx_GeneralSettingsTab_themeSection"> <div className="mx_SettingsTab_section mx_GeneralUserSettingsTab_themeSection">
<span className="mx_SettingsTab_subheading">{_t("Theme")}</span> <span className="mx_SettingsTab_subheading">{_t("Theme")}</span>
<Field id="theme" label={_t("Theme")} element="select" disabled={true} <Field id="theme" label={_t("Theme")} element="select" disabled={true}
value={this.state.theme} onChange={this._onThemeChange}> value={this.state.theme} onChange={this._onThemeChange}>