mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Added help text to sso switching and removed redundant divs

Просмотр исходного кода
Этот коммит содержится в:
JoramWilander
2016-02-17 10:32:22 -05:00
родитель 6ffcfaa2f3
Коммит e3ab89e1c4
4 изменённых файлов: 119 добавлений и 117 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
web/react/components/claim/claim_account.jsx
Просмотреть файл

@@ -43,11 +43,7 @@ export default class ClaimAccount extends React.Component {
); );
} }
return ( return content;
<div>
{content}
</div>
);
} }
} }

111
web/react/components/claim/email_to_sso.jsx
Просмотреть файл

@@ -70,62 +70,69 @@ class EmailToSSO extends React.Component {
const uiType = Utils.toTitleCase(this.props.type) + ' SSO'; const uiType = Utils.toTitleCase(this.props.type) + ' SSO';
return ( return (
<div className='col-sm-12'> <div>
<div className='signup-team__container'> <h3>
<h3> <FormattedMessage
id='claim.email_to_sso.title'
defaultMessage='Switch Email/Password Account to {uiType}'
values={{
uiType: uiType
}}
/>
</h3>
<form onSubmit={this.submit}>
<p>
<FormattedMessage <FormattedMessage
id='claim.email_to_sso.title' id='claim.email_to_sso.ssoType'
defaultMessage='Switch Email/Password Account to {uiType}' defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO. You must already have a valid {type} account'
values={{
type: Utils.toTitleCase(this.props.type)
}}
/>
</p>
<p>
<FormattedMessage
id='claim.email_to_sso.ssoNote'
defaultMessage='You must already have a valid {type} account'
values={{
type: Utils.toTitleCase(this.props.type)
}}
/>
</p>
<p>
<FormattedMessage
id='claim.email_to_sso.enterPwd'
defaultMessage='Enter the password for your {team} {site} account'
values={{
team: this.props.teamDisplayName,
site: global.window.mm_config.SiteName
}}
/>
</p>
<div className={formClass}>
<input
type='password'
className='form-control'
name='password'
ref='password'
placeholder={this.props.intl.formatMessage(holders.pwd)}
spellCheck='false'
/>
</div>
{error}
<button
type='submit'
className='btn btn-primary'
>
<FormattedMessage
id='claim.email_to_sso.switchTo'
defaultMessage='Switch account to {uiType}'
values={{ values={{
uiType: uiType uiType: uiType
}} }}
/> />
</h3> </button>
<form onSubmit={this.submit}> </form>
<p>
<FormattedMessage
id='claim.email_to_sso.ssoType'
defaultMessage='Upon claiming your account, you will only be able to login with {type} SSO'
values={{
type: Utils.toTitleCase(this.props.type)
}}
/>
</p>
<p>
<FormattedMessage
id='claim.email_to_sso.enterPwd'
defaultMessage='Enter the password for your {team} {site} account'
values={{
team: this.props.teamDisplayName,
site: global.window.mm_config.SiteName
}}
/>
</p>
<div className={formClass}>
<input
type='password'
className='form-control'
name='password'
ref='password'
placeholder={this.props.intl.formatMessage(holders.pwd)}
spellCheck='false'
/>
</div>
{error}
<button
type='submit'
className='btn btn-primary'
>
<FormattedMessage
id='claim.email_to_sso.switchTo'
defaultMessage='Switch account to {uiType}'
values={{
uiType: uiType
}}
/>
</button>
</form>
</div>
</div> </div>
); );
} }
@@ -141,4 +148,4 @@ EmailToSSO.propTypes = {
teamDisplayName: React.PropTypes.string.isRequired teamDisplayName: React.PropTypes.string.isRequired
}; };
export default injectIntl(EmailToSSO); export default injectIntl(EmailToSSO);

116
web/react/components/claim/sso_to_email.jsx
Просмотреть файл

@@ -86,69 +86,67 @@ class SSOToEmail extends React.Component {
const uiType = Utils.toTitleCase(this.props.currentType) + ' SSO'; const uiType = Utils.toTitleCase(this.props.currentType) + ' SSO';
return ( return (
<div className='col-sm-12'> <div>
<div className='signup-team__container'> <h3>
<h3> <FormattedMessage
id='claim.sso_to_email.title'
defaultMessage='Switch {type} Account to Email'
values={{
type: uiType
}}
/>
</h3>
<form onSubmit={this.submit}>
<p>
<FormattedMessage <FormattedMessage
id='claim.sso_to_email.title' id='claim.sso_to_email.description'
defaultMessage='Switch {type} Account to Email' defaultMessage='Upon changing your account type, you will only be able to login with your email and password.'
/>
</p>
<p>
<FormattedMessage
id='claim.sso_to_email_newPwd'
defaultMessage='Enter a new password for your {team} {site} account'
values={{
team: this.props.teamDisplayName,
site: global.window.mm_config.SiteName
}}
/>
</p>
<div className={formClass}>
<input
type='password'
className='form-control'
name='password'
ref='password'
placeholder={formatMessage(holders.newPwd)}
spellCheck='false'
/>
</div>
<div className={formClass}>
<input
type='password'
className='form-control'
name='passwordconfirm'
ref='passwordconfirm'
placeholder={formatMessage(holders.confirm)}
spellCheck='false'
/>
</div>
{error}
<button
type='submit'
className='btn btn-primary'
>
<FormattedMessage
id='claim.sso_to_email.switchTo'
defaultMessage='Switch {type} to email and password'
values={{ values={{
type: uiType type: uiType
}} }}
/> />
</h3> </button>
<form onSubmit={this.submit}> </form>
<p>
<FormattedMessage
id='claim.sso_to_email.description'
defaultMessage='Upon changing your account type, you will only be able to login with your email and password.'
/>
</p>
<p>
<FormattedMessage
id='claim.sso_to_email_newPwd'
defaultMessage='Enter a new password for your {team} {site} account'
values={{
team: this.props.teamDisplayName,
site: global.window.mm_config.SiteName
}}
/>
</p>
<div className={formClass}>
<input
type='password'
className='form-control'
name='password'
ref='password'
placeholder={formatMessage(holders.newPwd)}
spellCheck='false'
/>
</div>
<div className={formClass}>
<input
type='password'
className='form-control'
name='passwordconfirm'
ref='passwordconfirm'
placeholder={formatMessage(holders.confirm)}
spellCheck='false'
/>
</div>
{error}
<button
type='submit'
className='btn btn-primary'
>
<FormattedMessage
id='claim.sso_to_email.switchTo'
defaultMessage='Switch {type} to email and password'
values={{
type: uiType
}}
/>
</button>
</form>
</div>
</div> </div>
); );
} }
@@ -164,4 +162,4 @@ SSOToEmail.propTypes = {
teamDisplayName: React.PropTypes.string.isRequired teamDisplayName: React.PropTypes.string.isRequired
}; };
export default injectIntl(SSOToEmail); export default injectIntl(SSOToEmail);

3
web/static/i18n/en.json
Просмотреть файл

@@ -548,6 +548,7 @@
"claim.email_to_sso.pwd": "Password", "claim.email_to_sso.pwd": "Password",
"claim.email_to_sso.title": "Switch Email/Password Account to {uiType}", "claim.email_to_sso.title": "Switch Email/Password Account to {uiType}",
"claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO", "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
"claim.email_to_sso.ssoNote": "You must already have a valid {type} account",
"claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account", "claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account",
"claim.email_to_sso.switchTo": "Switch account to {uiType}", "claim.email_to_sso.switchTo": "Switch account to {uiType}",
"claim.sso_to_email.enterPwd": "Please enter a password.", "claim.sso_to_email.enterPwd": "Please enter a password.",
@@ -1269,4 +1270,4 @@
"intro_messages.beginning": "Beginning of {name}", "intro_messages.beginning": "Beginning of {name}",
"intro_messages.invite": "Invite others to this {type}", "intro_messages.invite": "Invite others to this {type}",
"intro_messages.setHeader": "Set a Header" "intro_messages.setHeader": "Set a Header"
} }