Skip to content

Commit 5dc4782

Browse files
BurntimeXBurntimeX
authored
Merge pull request #6139 from WoltLab/login-form-builder
Migrate login form to a form builder form
2 parents 12f3d62 + 720c312 commit 5dc4782

File tree

5 files changed

+164
-239
lines changed

5 files changed

+164
-239
lines changed

‎com.woltlab.wcf/templates/login.tpl

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,6 @@
88
<woltlab-core-notice type="info">{lang}wcf.user.login.forceLogin{/lang}</woltlab-core-notice>
99
{/if}
1010

11-
{if !$errorField|empty && $errorField == 'cookie'}
12-
<woltlab-core-notice type="error">{lang}wcf.user.login.error.cookieRequired{/lang}</woltlab-core-notice>
13-
{else}
14-
{include file='shared_formError'}
15-
{/if}
16-
17-
<form id="loginForm" method="post" action="{$loginController}">
18-
<dl{if $errorField == 'username'} class="formError"{/if}>
19-
<dt>
20-
<label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label> <span class="formFieldRequired">*</span>
21-
</dt>
22-
<dd>
23-
<input type="text" id="username" name="username" value="{$username}" required autofocus class="long" autocomplete="username">
24-
{if $errorField == 'username'}
25-
<small class="innerError">
26-
{if $errorType == 'empty'}
27-
{lang}wcf.global.form.error.empty{/lang}
28-
{else}
29-
{lang}wcf.user.username.error.{@$errorType}{/lang}
30-
{/if}
31-
</small>
32-
{/if}
33-
</dd>
34-
</dl>
35-
36-
<dl{if $errorField == 'password'} class="formError"{/if}>
37-
<dt>
38-
<label for="password">{lang}wcf.user.password{/lang}</label> <span class="formFieldRequired">*</span>
39-
</dt>
40-
<dd>
41-
<input type="password" id="password" name="password" value="{$password}" required class="long" autocomplete="current-password">
42-
{if $errorField == 'password'}
43-
<small class="innerError">
44-
{if $errorType == 'empty'}
45-
{lang}wcf.global.form.error.empty{/lang}
46-
{else}
47-
{lang}wcf.user.password.error.{@$errorType}{/lang}
48-
{/if}
49-
</small>
50-
{/if}
51-
{if $__userAuthConfig->canChangePassword}
52-
<small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
53-
{/if}
54-
</dd>
55-
</dl>
56-
57-
{event name='fields'}
58-
59-
{include file='shared_captcha' supportsAsyncCaptcha=true}
60-
61-
<div class="formSubmit">
62-
<input type="submit" value="{lang}wcf.user.button.login{/lang}" accesskey="s">
63-
{csrfToken}
64-
</div>
65-
66-
{include file='thirdPartySsoButtons'}
67-
</form>
68-
69-
<p class="formFieldRequiredNotice">
70-
<span class="formFieldRequired">*</span>
71-
{lang}wcf.global.form.required{/lang}
72-
</p>
11+
{unsafe:$form->getHtml()}
7312

7413
{include file='authFlowFooter'}

‎wcfsetup/install/files/acp/templates/login.tpl

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,60 +6,6 @@
66
</div>
77
</header>
88

9-
{if !$errorField|empty && $errorField == 'cookie'}
10-
<woltlab-core-notice type="error">{lang}wcf.user.login.error.cookieRequired{/lang}</woltlab-core-notice>
11-
{else}
12-
{include file='shared_formError'}
13-
{/if}
14-
15-
<form id="loginForm" method="post" action="{$loginController}">
16-
<dl{if $errorField == 'username'} class="formError"{/if}>
17-
<dt>
18-
<label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label> <span class="formFieldRequired">*</span>
19-
</dt>
20-
<dd>
21-
<input type="text" id="username" name="username" value="{$username}" required autofocus class="long" autocomplete="username">
22-
{if $errorField == 'username'}
23-
<small class="innerError">
24-
{if $errorType == 'empty'}
25-
{lang}wcf.global.form.error.empty{/lang}
26-
{else}
27-
{lang}wcf.user.username.error.{@$errorType}{/lang}
28-
{/if}
29-
</small>
30-
{/if}
31-
</dd>
32-
</dl>
33-
34-
<dl{if $errorField == 'password'} class="formError"{/if}>
35-
<dt>
36-
<label for="password">{lang}wcf.user.password{/lang}</label> <span class="formFieldRequired">*</span>
37-
</dt>
38-
<dd>
39-
<input type="password" id="password" name="password" value="{$password}" required class="long" autocomplete="current-password">
40-
{if $errorField == 'password'}
41-
<small class="innerError">
42-
{if $errorType == 'empty'}
43-
{lang}wcf.global.form.error.empty{/lang}
44-
{else}
45-
{lang}wcf.user.password.error.{@$errorType}{/lang}
46-
{/if}
47-
</small>
48-
{/if}
49-
</dd>
50-
</dl>
51-
52-
{include file='shared_captcha' supportsAsyncCaptcha=true}
53-
54-
<div class="formSubmit">
55-
<input type="submit" value="{lang}wcf.user.button.login{/lang}" accesskey="s">
56-
{csrfToken}
57-
</div>
58-
</form>
59-
60-
<p class="formFieldRequiredNotice">
61-
<span class="formFieldRequired">*</span>
62-
{lang}wcf.global.form.required{/lang}
63-
</p>
9+
{unsafe:$form->getHtml()}
6410

6511
{include file='footer'}

0 commit comments

Comments
 (0)