diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-01-26 11:41:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-26 11:41:10 +0100 |
commit | c653ae3bfb11f663a52f55817e6d02a66d0852c8 (patch) | |
tree | d5a03a3e425180f1fafb646c8ec68a4b8458d0b3 /tpl/default | |
parent | 1410dce2db310e71b5e683b0871c2f28d8807844 (diff) | |
parent | 27ceea2aeeed69b43fef4ebff35ec8004fcc2e45 (diff) | |
download | Shaarli-c653ae3bfb11f663a52f55817e6d02a66d0852c8.tar.gz Shaarli-c653ae3bfb11f663a52f55817e6d02a66d0852c8.tar.zst Shaarli-c653ae3bfb11f663a52f55817e6d02a66d0852c8.zip |
Render login page through Slim controller (#1401)
Render login page through Slim controller
Diffstat (limited to 'tpl/default')
-rw-r--r-- | tpl/default/404.html | 2 | ||||
-rw-r--r-- | tpl/default/error.html | 22 | ||||
-rw-r--r-- | tpl/default/loginform.html | 60 | ||||
-rw-r--r-- | tpl/default/page.header.html | 4 |
4 files changed, 49 insertions, 39 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html index 472566a6..09737b4b 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html | |||
@@ -6,7 +6,7 @@ | |||
6 | <body> | 6 | <body> |
7 | <div id="pageheader"> | 7 | <div id="pageheader"> |
8 | {include="page.header"} | 8 | {include="page.header"} |
9 | <div class="center" id="page404" class="page404-container"> | 9 | <div id="pageError" class="page-error-container center"> |
10 | <h2>{'Sorry, nothing to see here.'|t}</h2> | 10 | <h2>{'Sorry, nothing to see here.'|t}</h2> |
11 | <img src="img/sad_star.png" alt=""> | 11 | <img src="img/sad_star.png" alt=""> |
12 | <p>{$error_message}</p> | 12 | <p>{$error_message}</p> |
diff --git a/tpl/default/error.html b/tpl/default/error.html new file mode 100644 index 00000000..ef1dfd73 --- /dev/null +++ b/tpl/default/error.html | |||
@@ -0,0 +1,22 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> | ||
3 | <head> | ||
4 | {include="includes"} | ||
5 | </head> | ||
6 | <body> | ||
7 | <div id="pageheader"> | ||
8 | {include="page.header"} | ||
9 | <div id="pageError" class="page-error-container center"> | ||
10 | <h2>{$message}</h2> | ||
11 | |||
12 | {if="!empty($stacktrace)"} | ||
13 | <pre> | ||
14 | {$stacktrace} | ||
15 | </pre> | ||
16 | {/if} | ||
17 | |||
18 | <img src="img/sad_star.png" alt=""> | ||
19 | </div> | ||
20 | {include="page.footer"} | ||
21 | </body> | ||
22 | </html> | ||
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 761aec0c..90c2b2b6 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -5,44 +5,32 @@ | |||
5 | </head> | 5 | </head> |
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | {if="!$user_can_login"} | 8 | <div class="pure-g"> |
9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> | 9 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
10 | <div class="pure-u-2-24"></div> | 10 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24 login-form-container"> |
11 | <div class="pure-u-20-24"> | 11 | <form method="post" name="loginform"> |
12 | <p>{'You have been banned after too many failed login attempts. Try again later.'|t}</p> | 12 | <h2 class="window-title">{'Login'|t}</h2> |
13 | </div> | 13 | <div> |
14 | <div class="pure-u-2-24"> | 14 | <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}" |
15 | <i class="fa fa-times pure-alert-close"></i> | 15 | {if="!empty($username)"}value="{$username}"{/if} class="autofocus"> |
16 | </div> | ||
17 | <div> | ||
18 | <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" class="autofocus"> | ||
19 | </div> | ||
20 | <div class="remember-me"> | ||
21 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" | ||
22 | {if="$remember_user_default"}checked="checked"{/if}> | ||
23 | <label for="longlastingsessionform">{'Remember me'|t}</label> | ||
24 | </div> | ||
25 | <div> | ||
26 | <input type="submit" value="{'Login'|t}" class="bigbutton"> | ||
27 | </div> | ||
28 | <input type="hidden" name="token" value="{$token}"> | ||
29 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} | ||
30 | </form> | ||
16 | </div> | 31 | </div> |
32 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | ||
17 | </div> | 33 | </div> |
18 | {else} | ||
19 | <div class="pure-g"> | ||
20 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> | ||
21 | <div id="login-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24 login-form-container"> | ||
22 | <form method="post" name="loginform"> | ||
23 | <h2 class="window-title">{'Login'|t}</h2> | ||
24 | <div> | ||
25 | <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}" | ||
26 | {if="!empty($username)"}value="{$username}"{/if} class="autofocus"> | ||
27 | </div> | ||
28 | <div> | ||
29 | <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" class="autofocus"> | ||
30 | </div> | ||
31 | <div class="remember-me"> | ||
32 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" | ||
33 | {if="$remember_user_default"}checked="checked"{/if}> | ||
34 | <label for="longlastingsessionform">{'Remember me'|t}</label> | ||
35 | </div> | ||
36 | <div> | ||
37 | <input type="submit" value="{'Login'|t}" class="bigbutton"> | ||
38 | </div> | ||
39 | <input type="hidden" name="token" value="{$token}"> | ||
40 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} | ||
41 | </form> | ||
42 | </div> | ||
43 | <div class="pure-u-lg-1-3 pure-u-1-8"></div> | ||
44 | </div> | ||
45 | {/if} | ||
46 | 34 | ||
47 | {include="page.footer"} | 35 | {include="page.footer"} |
48 | </body> | 36 | </body> |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 4f063dc3..82f8ebf1 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -60,7 +60,7 @@ | |||
60 | </li> | 60 | </li> |
61 | {else} | 61 | {else} |
62 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-login"> | 62 | <li class="pure-menu-item pure-u-lg-0 shaarli-menu-mobile" id="shaarli-menu-mobile-login"> |
63 | <a href="?do=login" class="pure-menu-link">{'Login'|t}</a> | 63 | <a href="/login" class="pure-menu-link">{'Login'|t}</a> |
64 | </li> | 64 | </li> |
65 | {/if} | 65 | {/if} |
66 | </ul> | 66 | </ul> |
@@ -80,7 +80,7 @@ | |||
80 | </li> | 80 | </li> |
81 | {if="!$is_logged_in"} | 81 | {if="!$is_logged_in"} |
82 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> | 82 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> |
83 | <a href="?do=login" class="pure-menu-link" | 83 | <a href="/login" class="pure-menu-link" |
84 | data-open-id="header-login-form" | 84 | data-open-id="header-login-form" |
85 | id="login-button" aria-label="{'Login'|t}" title="{'Login'|t}"> | 85 | id="login-button" aria-label="{'Login'|t}" title="{'Login'|t}"> |
86 | <i class="fa fa-user" aria-hidden="true"></i> | 86 | <i class="fa fa-user" aria-hidden="true"></i> |