tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7905 from nupplaphil/task/numeric_two_factor

Browse source 
Make Two Factor Field numeric
This commit is contained in:
Hypolite Petovan 2019-12-05 16:19:23 -05:00 committed by GitHub
parent 0f476498f3 144d4d9cf5
commit 8ff3ae485d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/smarty3-templates.md
View file

@ -80,7 +80,7 @@ Field parameter:
### field_input.tpl ### field_input.tpl
A single line input field for textual input. A single line input field for any type of input.
Field parameter: Field parameter:
0. Name of the field, 0. Name of the field,
@ -89,7 +89,7 @@ Field parameter:
3. Help text for the input box, 3. Help text for the input box,
4. if set to "required" modern browser will check that this input box is filled when submitting the form, 4. if set to "required" modern browser will check that this input box is filled when submitting the form,
5. if set to "autofocus" modern browser will put the cursur into this box once the page is loaded, 5. if set to "autofocus" modern browser will put the cursur into this box once the page is loaded,
6. if set to "email" or "url" modern browser will check that the filled in value corresponds to an email address or URL. 6. if set, it will be used for the input type, default is `text` (possible types: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#%3Cinput%3E_types).
### field_intcheckbox.tpl ### field_intcheckbox.tpl

2
src/Module/TwoFactor/Verify.php
View file

@ -64,7 +64,7 @@ class Verify extends BaseModule
'$errors_label' => L10n::tt('Error', 'Errors', count(self::$errors)), '$errors_label' => L10n::tt('Error', 'Errors', count(self::$errors)),
'$errors' => self::$errors, '$errors' => self::$errors,
'$recovery_message' => L10n::t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'), '$recovery_message' => L10n::t('Don’t have your phone? <a href="%s">Enter a two-factor recovery code</a>', '2fa/recovery'),
'$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"'], '$verify_code' => ['verify_code', L10n::t('Please enter a code from your authentication app'), '', '', 'required', 'autofocus placeholder="000000"', 'number'],
'$verify_label' => L10n::t('Verify code and complete login'), '$verify_label' => L10n::t('Verify code and complete login'),
]); ]);
} }

8
view/templates/field_input.tpl
View file

@ -1,8 +1,8 @@
<div class='field input' id='wrapper_{{$field.0}}'> <div class="field input" id="wrapper_{{$field.0}}">
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for="id_{{$field.0}}">{{$field.1}}</label>
<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5 nofilter}}{{/if}} aria-describedby='{{$field.0}}_tip'> <input{{if $field.6}} type="{{$field.6}}"{{else}} type="text"{{/if}} name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5 nofilter}}{{/if}} aria-describedby="{{$field.0}}_tip">
{{if $field.3}} {{if $field.3}}
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>