Skip to content

Commit 2dc9fd5

Browse files
kenjiskenjis
authored
Merge pull request #140 from kenjis/fix-indent-in-view
style: fix indentation in view files
2 parents 4f7d155 + 8e3affb commit 2dc9fd5

File tree

3 files changed

+64
-64
lines changed

3 files changed

+64
-64
lines changed

‎.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ end_of_line = lf
1111
insert_final_newline = true
1212
trim_trailing_whitespace = true
1313

14-
[*.md]
15-
trim_trailing_whitespace = false
14+
[*.yml]
15+
indent_size = 2

‎src/Views/email_2fa_verify.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
<?= $this->section('main') ?>
66

77
<div class="container d-flex justify-content-center p-5">
8-
<div class="card col-5 shadow-sm">
9-
<div class="card-body">
10-
<h5 class="card-title mb-5"><?= lang('Auth.emailEnterCode') ?></h5>
8+
<div class="card col-5 shadow-sm">
9+
<div class="card-body">
10+
<h5 class="card-title mb-5"><?= lang('Auth.emailEnterCode') ?></h5>
1111

12-
<p><?= lang('Auth.emailConfirmCode') ?></p>
12+
<p><?= lang('Auth.emailConfirmCode') ?></p>
1313

14-
<?php if (session('error') !== null) : ?>
15-
<div class="alert alert-danger"><?= session('error') ?></div>
16-
<?php endif ?>
14+
<?php if (session('error') !== null) : ?>
15+
<div class="alert alert-danger"><?= session('error') ?></div>
16+
<?php endif ?>
1717

18-
<form action="<?= site_url(route_to('auth-action-verify')) ?>" method="post">
19-
<?= csrf_field() ?>
18+
<form action="<?= site_url(route_to('auth-action-verify')) ?>" method="post">
19+
<?= csrf_field() ?>
2020

21-
<!-- Code -->
22-
<div class="mb-2">
23-
<input type="number" class="form-control" name="token" placeholder="000000"
24-
inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" required />
25-
</div>
21+
<!-- Code -->
22+
<div class="mb-2">
23+
<input type="number" class="form-control" name="token" placeholder="000000"
24+
inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" required />
25+
</div>
2626

27-
<div class="d-grid col-8 mx-auto m-3">
28-
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.confirm') ?></button>
29-
</div>
27+
<div class="d-grid col-8 mx-auto m-3">
28+
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.confirm') ?></button>
29+
</div>
3030

31-
</form>
32-
</div>
33-
</div>
31+
</form>
32+
</div>
33+
</div>
3434
</div>
3535

3636
<?= $this->endSection() ?>

‎src/Views/login.php

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@
44

55
<?= $this->section('main') ?>
66

7-
<div class="container d-flex justify-content-center p-5">
8-
<div class="card col-5 shadow-sm">
9-
<div class="card-body">
10-
<h5 class="card-title mb-5"><?= lang('Auth.login') ?></h5>
7+
<div class="container d-flex justify-content-center p-5">
8+
<div class="card col-5 shadow-sm">
9+
<div class="card-body">
10+
<h5 class="card-title mb-5"><?= lang('Auth.login') ?></h5>
1111

12-
<?php if (session('error') !== null) : ?>
13-
<div class="alert alert-danger" role="alert"><?= session('error') ?></div>
14-
<?php endif ?>
12+
<?php if (session('error') !== null) : ?>
13+
<div class="alert alert-danger" role="alert"><?= session('error') ?></div>
14+
<?php endif ?>
1515

16-
<form action="<?= route_to('login') ?>" method="post">
17-
<?= csrf_field() ?>
16+
<form action="<?= route_to('login') ?>" method="post">
17+
<?= csrf_field() ?>
1818

19-
<!-- Email -->
20-
<div class="mb-2">
21-
<input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
22-
</div>
19+
<!-- Email -->
20+
<div class="mb-2">
21+
<input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
22+
</div>
2323

24-
<!-- Password -->
25-
<div class="mb-2">
26-
<input type="password" class="form-control" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
27-
</div>
24+
<!-- Password -->
25+
<div class="mb-2">
26+
<input type="password" class="form-control" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
27+
</div>
2828

2929
<!-- Remember me -->
30-
<?php if (setting('Auth.sessionConfig')['allowRemembering']): ?>
31-
<div class="form-check">
32-
<label class="form-check-label">
33-
<input type="checkbox" name="remember" class="form-check-input" <?php if (old('remember')): ?> checked<?php endif ?>>
34-
<?= lang('Auth.rememberMe') ?>
35-
</label>
36-
</div>
37-
<?php endif; ?>
38-
39-
<div class="d-grid col-8 mx-auto m-3">
40-
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.login') ?></button>
41-
</div>
42-
43-
<?php if (setting('Auth.allowMagicLinkLogins')) : ?>
44-
<p class="text-center"><?= lang('Auth.forgotPassword') ?> <a href="<?= route_to('magic-link') ?>"><?= lang('Auth.useMagicLink') ?></a></p>
45-
<?php endif ?>
46-
47-
<?php if (setting('Auth.allowRegistration')) : ?>
48-
<p class="text-center"><?= lang('Auth.needAccount') ?> <a href="<?= route_to('register') ?>"><?= lang('Auth.register') ?></a></p>
49-
<?php endif ?>
50-
51-
</form>
52-
</div>
53-
</div>
54-
</div>
30+
<?php if (setting('Auth.sessionConfig')['allowRemembering']): ?>
31+
<div class="form-check">
32+
<label class="form-check-label">
33+
<input type="checkbox" name="remember" class="form-check-input" <?php if (old('remember')): ?> checked<?php endif ?>>
34+
<?= lang('Auth.rememberMe') ?>
35+
</label>
36+
</div>
37+
<?php endif; ?>
38+
39+
<div class="d-grid col-8 mx-auto m-3">
40+
<button type="submit" class="btn btn-primary btn-block"><?= lang('Auth.login') ?></button>
41+
</div>
42+
43+
<?php if (setting('Auth.allowMagicLinkLogins')) : ?>
44+
<p class="text-center"><?= lang('Auth.forgotPassword') ?> <a href="<?= route_to('magic-link') ?>"><?= lang('Auth.useMagicLink') ?></a></p>
45+
<?php endif ?>
46+
47+
<?php if (setting('Auth.allowRegistration')) : ?>
48+
<p class="text-center"><?= lang('Auth.needAccount') ?> <a href="<?= route_to('register') ?>"><?= lang('Auth.register') ?></a></p>
49+
<?php endif ?>
50+
51+
</form>
52+
</div>
53+
</div>
54+
</div>
5555

5656
<?= $this->endSection() ?>

0 commit comments

Comments
 (0)