mirror of
https://github.com/discourse/discourse.git
synced 2025-09-07 12:02:53 +08:00
UX: Use 'tel' input type for 2FA token inputs.
This commit is contained in:
parent
8296f493ed
commit
70f14da732
8 changed files with 17 additions and 30 deletions
|
@ -21,10 +21,10 @@ export default Ember.Controller.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
toggleSecondFactor(enable) {
|
toggleSecondFactor(enable) {
|
||||||
if (!this.get('second_factor_token')) return;
|
if (!this.get('secondFactorToken')) return;
|
||||||
this.set('loading', true);
|
this.set('loading', true);
|
||||||
|
|
||||||
this.get('content').toggleSecondFactor(this.get('second_factor_token'), enable)
|
this.get('content').toggleSecondFactor(this.get('secondFactorToken'), enable)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
if (response.error) {
|
if (response.error) {
|
||||||
this.set('errorMessage', response.error);
|
this.set('errorMessage', response.error);
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
{{text-field value=value
|
||||||
|
type="tel"
|
||||||
|
pattern='[0-9]{6}'
|
||||||
|
maxlength='6'
|
||||||
|
id="login-second-factor"
|
||||||
|
autocorrect="off"
|
||||||
|
autocapitalize="off"
|
||||||
|
autofocus="autofocus"}}
|
|
@ -45,13 +45,7 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{{#second-factor-form}}
|
{{#second-factor-form}}
|
||||||
{{text-field value=loginSecondFactor
|
{{second-factor-input value=loginSecondFactor}}
|
||||||
pattern='[0-9]{6}'
|
|
||||||
maxlength='6'
|
|
||||||
id="login-second-factor"
|
|
||||||
autocorrect="off"
|
|
||||||
autocapitalize="off"
|
|
||||||
autofocus="autofocus"}}
|
|
||||||
{{/second-factor-form}}
|
{{/second-factor-form}}
|
||||||
</form>
|
</form>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -34,13 +34,7 @@
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
{{#second-factor-form}}
|
{{#second-factor-form}}
|
||||||
{{text-field value=loginSecondFactor
|
{{second-factor-input value=loginSecondFactor}}
|
||||||
pattern='[0-9]{6}'
|
|
||||||
maxlength='6'
|
|
||||||
id="login-second-factor"
|
|
||||||
autocorrect="off"
|
|
||||||
autocapitalize="off"
|
|
||||||
autofocus="autofocus"}}
|
|
||||||
{{/second-factor-form}}
|
{{/second-factor-form}}
|
||||||
</form>
|
</form>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -19,12 +19,7 @@
|
||||||
|
|
||||||
<div class="control-group">
|
<div class="control-group">
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
{{text-field value=second_factor_token
|
{{second-factor-input value=secondFactorToken}}
|
||||||
pattern='[0-9]{6}'
|
|
||||||
maxlength='6'
|
|
||||||
id="second-factor-token"
|
|
||||||
classNames="input-large"
|
|
||||||
autofocus="autofocus"}}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class='instructions'>
|
<div class='instructions'>
|
||||||
|
@ -70,12 +65,7 @@
|
||||||
<label class="control-label input-prepend">{{i18n 'login.second_factor_label'}}</label>
|
<label class="control-label input-prepend">{{i18n 'login.second_factor_label'}}</label>
|
||||||
|
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
{{text-field value=second_factor_token
|
{{second-factor-input value=secondFactorToken}}
|
||||||
pattern='[0-9]{6}'
|
|
||||||
maxlength='6'
|
|
||||||
id="second-factor-token"
|
|
||||||
classNames="input-large"
|
|
||||||
autofocus="autofocus"}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
1
app/views/common/_second_factor_text_field.html.erb
Normal file
1
app/views/common/_second_factor_text_field.html.erb
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6, type: 'tel') %>
|
|
@ -10,7 +10,7 @@
|
||||||
<%= form_tag(method: "post") do%>
|
<%= form_tag(method: "post") do%>
|
||||||
<h2><%=t "login.second_factor_title" %></h2>
|
<h2><%=t "login.second_factor_title" %></h2>
|
||||||
<%= label_tag(:second_factor_token, t("login.second_factor_description")) %>
|
<%= label_tag(:second_factor_token, t("login.second_factor_description")) %>
|
||||||
<div><%= text_field_tag(:second_factor_token, pattern: '[0-9]{6}', maxlength: 6) %></div>
|
<div><%= render 'common/second_factor_text_field' %></div>
|
||||||
<%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
|
<%= submit_tag(t("submit"), class: "btn btn-large btn-primary") %>
|
||||||
<%end%>
|
<%end%>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<% if @second_factor_required %>
|
<% if @second_factor_required %>
|
||||||
<%=form_tag({}, method: :put) do %>
|
<%=form_tag({}, method: :put) do %>
|
||||||
<%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
|
<%= label_tag(:second_factor_token, t('login.second_factor_description')) %>
|
||||||
<%= text_field_tag(:second_factor_token, nil, autofocus: true, pattern: '[0-9]{6}', maxlength: 6) %><br><br>
|
<%= render 'common/second_factor_text_field' %><br><br>
|
||||||
<%= submit_tag t('submit')%>
|
<%= submit_tag t('submit')%>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue