Skip to content

Commit a865c27

Browse files
AlecRustAlecRust
authored
Consistent button type (hestiacp#3039)
1 parent 443d1dd commit a865c27

File tree

12 files changed

+91
-43
lines changed

12 files changed

+91
-43
lines changed

‎web/templates/pages/add_cron.html‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
</select>
4343
</div>
4444
<div class="u-pt10">
45-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
45+
<button type="submit" class="button button-secondary">
46+
<?=_('generate');?>
47+
</button>
4648
</div>
4749
</form>
4850
</div>
@@ -71,7 +73,9 @@
7173
</select>
7274
</div>
7375
<div class="u-pt10">
74-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
76+
<button type="submit" class="button button-secondary">
77+
<?=_('generate');?>
78+
</button>
7579
</div>
7680
</form>
7781
</div>
@@ -139,7 +143,9 @@
139143
</select>
140144
</div>
141145
<div class="u-pt10">
142-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
146+
<button type="submit" class="button button-secondary">
147+
<?=_('generate');?>
148+
</button>
143149
</div>
144150
</form>
145151
</div>
@@ -210,7 +216,9 @@
210216
</select>
211217
</div>
212218
<div class="u-pt10">
213-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
219+
<button type="submit" class="button button-secondary">
220+
<?=_('generate');?>
221+
</button>
214222
</div>
215223
</form>
216224
</div>
@@ -321,7 +329,9 @@
321329
</select>
322330
</div>
323331
<div class="u-pt10">
324-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
332+
<button type="submit" class="button button-secondary">
333+
<?=_('generate');?>
334+
</button>
325335
</div>
326336
</form>
327337
</div>

‎web/templates/pages/edit_cron.html‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
</select>
4343
</div>
4444
<div class="u-pt10">
45-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
45+
<button type="submit" class="button button-secondary">
46+
<?=_('generate');?>
47+
</button>
4648
</div>
4749
</form>
4850
</div>
@@ -71,7 +73,9 @@
7173
</select>
7274
</div>
7375
<div class="u-pt10">
74-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
76+
<button type="submit" class="button button-secondary">
77+
<?=_('generate');?>
78+
</button>
7579
</div>
7680
</form>
7781
</div>
@@ -139,7 +143,9 @@
139143
</select>
140144
</div>
141145
<div class="u-pt10">
142-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
146+
<button type="submit" class="button button-secondary">
147+
<?=_('generate');?>
148+
</button>
143149
</div>
144150
</form>
145151
</div>
@@ -210,7 +216,9 @@
210216
</select>
211217
</div>
212218
<div class="u-pt10">
213-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
219+
<button type="submit" class="button button-secondary">
220+
<?=_('generate');?>
221+
</button>
214222
</div>
215223
</form>
216224
</div>
@@ -321,7 +329,9 @@
321329
</select>
322330
</div>
323331
<div class="u-pt10">
324-
<input type="submit" value="<?=_('generate');?>" class="button button-secondary">
332+
<button type="submit" class="button button-secondary">
333+
<?=_('generate');?>
334+
</button>
325335
</div>
326336
</form>
327337
</div>

‎web/templates/pages/generate_ssl.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ <h1 class="form-title"><?=_('Generating CSR');?></h1>
5858
<input type="text" class="form-control" name="v_org" id="v_org" value="<?=htmlentities(trim($v_org, "'")) ?>">
5959
</div>
6060
<div class="u-side-by-side">
61-
<div><input type="submit" class="button" name="generate" value="<?=_('Ok');?>"></div>
62-
<div><input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="<?=$back?>"></div>
61+
<button type="submit" class="button" name="generate">
62+
<?=_('Ok');?>
63+
</button>
64+
<button type="button" class="button button-secondary" onclick="<?=$back?>">
65+
<?=_('Back');?>
66+
</button>
6367
</div>
6468
</div>
6569
</div>

‎web/templates/pages/list_ssl.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ <h1 class="form-title"><?=_('Generating CSR');?></h1>
4141
<textarea class="form-control u-min-height100" name="v_csr" id="v_csr"><?=$v_csr ?></textarea>
4242
</div>
4343
<div>
44-
<input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="<?=$back ?>">
44+
<button type="button" class="button button-secondary" onclick="<?=$back?>">
45+
<?=_('Back');?>
46+
</button>
4547
</div>
4648
</div>
4749
</div>

‎web/templates/pages/login/login.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ <h1 class="login-title">
1111
<?php if (isset($error)) echo $error ?>
1212
<div class="u-mb20">
1313
<label for="user" class="form-label"><?=_('Username');?></label>
14-
<input type="text" class="form-control" name="user" id="user" tabindex="1" autofocus>
14+
<input type="text" class="form-control" name="user" id="user" autofocus>
1515
</div>
16-
<button tabindex="3" type="submit" class="button">
16+
<button type="submit" class="button">
1717
<i class="fas fa-sign-in-alt"></i><?=_('Next');?>
1818
</button>
1919
</form>

‎web/templates/pages/login/login_1.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ <h1 class="login-title">
1313
<label for="password" class="form-label u-side-by-side">
1414
<?=_('Password');?>
1515
<?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
16-
<a tabindex="5" class="label-link" href="/reset/">
16+
<a class="label-link" href="/reset/">
1717
<?=_('forgot password');?>
1818
</a>
1919
<?php } ?>
2020
</label>
21-
<input type="password" class="form-control" name="password" id="password" tabindex="2" autofocus>
21+
<input type="password" class="form-control" name="password" id="password" autofocus>
2222
</div>
2323
<div class="u-side-by-side">
24-
<button tabindex="3" type="submit" class="button">
24+
<button type="submit" class="button">
2525
<i class="fas fa-sign-in-alt"></i><?=_('Login');?>
2626
</button>
27-
<input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="location.href='/login/?logout=true'">
27+
<button type="button" class="button button-secondary" onclick="location.href='/login/?logout=true'">
28+
<?=_('Back');?>
29+
</button>
2830
</div>
2931
</form>
3032
</div>

‎web/templates/pages/login/login_2.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ <h1 class="login-title">
1212
<div class="u-mb20">
1313
<label for="twofa" class="form-label u-side-by-side">
1414
<?=_('2FA Token');?>
15-
<a tabindex="5" class="label-link" href="/reset2fa/">
15+
<a class="label-link" href="/reset2fa/">
1616
<?=_('Forgot token');?>
1717
</a>
1818
</label>
19-
<input type="text" class="form-control" name="twofa" id="twofa" tabindex="2" autofocus>
19+
<input type="text" class="form-control" name="twofa" id="twofa" autofocus>
2020
</div>
2121
<div class="u-side-by-side">
22-
<button tabindex="3" type="submit" class="button">
22+
<button type="submit" class="button">
2323
<i class="fas fa-sign-in-alt"></i><?=_('Login');?>
2424
</button>
25-
<input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
25+
<button type="button" class="button button-secondary" onclick="location.href='/login/?logout'">
26+
<?=_('Back');?>
27+
</button>
2628
</div>
2729
</form>
2830
</div>

‎web/templates/pages/login/login_a.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ <h1 class="login-title">
1111
<?php if (isset($error)) echo $error ?>
1212
<div class="u-mb10">
1313
<label for="user" class="form-label"><?=_('Username');?></label>
14-
<input type="text" class="form-control" name="user" id="user" tabindex="1" autofocus>
14+
<input type="text" class="form-control" name="user" id="user" autofocus>
1515
</div>
1616
<div class="u-mb20">
1717
<label for="password" class="form-label u-side-by-side">
1818
<?=_('Password');?>
1919
<?php if ($_SESSION['POLICY_SYSTEM_PASSWORD_RESET'] !== 'no' ) {?>
20-
<a tabindex="5" class="label-link" href="/reset/">
20+
<a class="label-link" href="/reset/">
2121
<?=_('forgot password');?>
2222
</a>
2323
<?php } ?>
2424
</label>
25-
<input type="password" class="form-control" name="password" id="password" tabindex="2" autofocus>
25+
<input type="password" class="form-control" name="password" id="password" autofocus>
2626
</div>
27-
<button tabindex="3" type="submit" class="button">
27+
<button type="submit" class="button">
2828
<i class="fas fa-sign-in-alt"></i><?=_('Next');?>
2929
</button>
3030
</form>

‎web/templates/pages/login/reset2fa.html‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ <h1 class="login-title">
99
</h1>
1010
<?php if (isset($ERROR)) echo $ERROR ?>
1111
<div class="u-mt20">
12-
<input type="button" class="button" value="<?=_('Log in');?>" onclick="location.href='/login/'">
12+
<button type="button" class="button button-secondary" onclick="location.href='/login/'">
13+
<?=_('Log in');?>
14+
</button>
1315
</div>
1416
</div>
1517
<?php } else { ?>
@@ -21,15 +23,19 @@ <h1 class="login-title">
2123
<?php if (isset($ERROR)) echo $ERROR ?>
2224
<div class="u-mb10">
2325
<label for="user" class="form-label"><?=_('Username');?></label>
24-
<input type="text" class="form-control" name="user" id="user" tabindex="1">
26+
<input type="text" class="form-control" name="user" id="user">
2527
</div>
2628
<div class="u-mb20">
2729
<label for="twofa" class="form-label"><?=_('2FA Reset Code');?></label>
28-
<input type="text" class="form-control" name="twofa" id="twofa" tabindex="1">
30+
<input type="text" class="form-control" name="twofa" id="twofa">
2931
</div>
3032
<div class="u-side-by-side">
31-
<input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">
32-
<input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
33+
<button type="submit" class="button">
34+
<?=_('Submit');?>
35+
</button>
36+
<button type="button" class="button button-secondary" onclick="location.href='/login/?logout'">
37+
<?=_('Back');?>
38+
</button>
3339
</div>
3440
</form>
3541
<?php } ?>

‎web/templates/pages/login/reset_1.html‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ <h1 class="login-title">
1010
<?php if (isset($ERROR)) echo $ERROR ?>
1111
<div class="u-mb10">
1212
<label for="user" class="form-label"><?=_('Username');?></label>
13-
<input type="text" class="form-control" name="user" id="user" tabindex="1">
13+
<input type="text" class="form-control" name="user" id="user">
1414
</div>
1515
<div class="u-mb20">
1616
<label for="email" class="form-label"><?=_('Email');?></label>
17-
<input type="email" class="form-control" name="email" id="email" tabindex="1">
17+
<input type="email" class="form-control" name="email" id="email">
1818
</div>
1919
<div class="u-side-by-side">
20-
<input tabindex="2" type="submit" value="<?=_('Submit');?>" class="button">
21-
<input type="button" class="button button-secondary" value="<?=_('Back');?>" onclick="location.href='/login/?logout'">
20+
<button type="submit" class="button">
21+
<?=_('Submit');?>
22+
</button>
23+
<button type="button" class="button button-secondary" onclick="location.href='/login/?logout'">
24+
<?=_('Back');?>
25+
</button>
2226
</div>
2327
</form>
2428
</div>

0 commit comments

Comments
 (0)