aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'tpl')
-rw-r--r--tpl/default/404.html2
-rw-r--r--tpl/default/error.html22
-rw-r--r--tpl/default/loginform.html60
-rw-r--r--tpl/default/page.header.html4
-rw-r--r--tpl/default/tag.cloud.html1
-rw-r--r--tpl/default/thumbnails.html2
-rw-r--r--tpl/vintage/error.html25
-rw-r--r--tpl/vintage/loginform.html44
-rw-r--r--tpl/vintage/page.header.html2
-rw-r--r--tpl/vintage/thumbnails.html2
10 files changed, 97 insertions, 67 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>
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html
index b9c0b162..7839fcca 100644
--- a/tpl/default/tag.cloud.html
+++ b/tpl/default/tag.cloud.html
@@ -32,6 +32,7 @@
32 {/if} 32 {/if}
33 autocomplete="off" data-multiple data-autofirst data-minChars="1" 33 autocomplete="off" data-multiple data-autofirst data-minChars="1"
34 data-list="{loop="$tags"}{$key}, {/loop}" 34 data-list="{loop="$tags"}{$key}, {/loop}"
35 class="autofocus"
35 > 36 >
36 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button> 37 <button type="submit" class="search-button" aria-label="{'Search'|t}"><i class="fa fa-search" aria-hidden="true"></i></button>
37 </form> 38 </form>
diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html
index f1939798..5f9bef08 100644
--- a/tpl/default/thumbnails.html
+++ b/tpl/default/thumbnails.html
@@ -38,7 +38,7 @@
38 </div> 38 </div>
39 </div> 39 </div>
40 40
41 <input type="hidden" name="ids" value="{function="implode($ids, ',')"}" /> 41 <input type="hidden" name="ids" value="{function="implode(',', $ids)"}" />
42 </div> 42 </div>
43</div> 43</div>
44 44
diff --git a/tpl/vintage/error.html b/tpl/vintage/error.html
new file mode 100644
index 00000000..b6e62be0
--- /dev/null
+++ b/tpl/vintage/error.html
@@ -0,0 +1,25 @@
1<!DOCTYPE html>
2<html>
3<head>
4 {include="includes"}
5</head>
6<body>
7<div id="pageheader">
8 {include="page.header"}
9</div>
10<div class="error-container">
11 <h1>Error</h1>
12 <p>{$message}</p>
13
14 {if="!empty($stacktrace)"}
15 <br>
16 <pre>
17 {$stacktrace}
18 </pre>
19 {/if}
20
21 <p>Would you mind <a href="?">clicking here</a>?</p>
22</div>
23{include="page.footer"}
24</body>
25</html>
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index 0f7d6387..a3792066 100644
--- a/tpl/vintage/loginform.html
+++ b/tpl/vintage/loginform.html
@@ -2,36 +2,30 @@
2<html> 2<html>
3<head>{include="includes"}</head> 3<head>{include="includes"}</head>
4<body 4<body
5{if="$user_can_login"} 5{if="empty($username)"}
6 {if="empty($username)"} 6 onload="document.loginform.login.focus();"
7 onload="document.loginform.login.focus();" 7{else}
8 {else} 8 onload="document.loginform.password.focus();"
9 onload="document.loginform.password.focus();"
10 {/if}
11{/if}> 9{/if}>
12<div id="pageheader"> 10<div id="pageheader">
13 {include="page.header"} 11 {include="page.header"}
14 12
15 <div id="headerform"> 13 <div id="headerform">
16 {if="!$user_can_login"} 14 <form method="post" name="loginform">
17 You have been banned from login after too many failed attempts. Try later. 15 <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"
18 {else} 16 {if="!empty($username)"}value="{$username}"{/if}>
19 <form method="post" name="loginform"> 17 </label>
20 <label for="login">Login: <input type="text" id="login" name="login" tabindex="1" 18 <label for="password">Password: <input type="password" id="password" name="password" tabindex="2">
21 {if="!empty($username)"}value="{$username}"{/if}> 19 </label>
22 </label> 20 <input type="submit" value="Login" class="bigbutton" tabindex="4">
23 <label for="password">Password: <input type="password" id="password" name="password" tabindex="2"> 21 <label for="longlastingsession">
24 </label> 22 <input type="checkbox" name="longlastingsession"
25 <input type="submit" value="Login" class="bigbutton" tabindex="4"> 23 id="longlastingsession" tabindex="3"
26 <label for="longlastingsession"> 24 {if="$remember_user_default"}checked="checked"{/if}>
27 <input type="checkbox" name="longlastingsession" 25 Stay signed in (Do not check on public computers)</label>
28 id="longlastingsession" tabindex="3" 26 <input type="hidden" name="token" value="{$token}">
29 {if="$remember_user_default"}checked="checked"{/if}> 27 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
30 Stay signed in (Do not check on public computers)</label> 28 </form>
31 <input type="hidden" name="token" value="{$token}">
32 {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if}
33 </form>
34 {/if}
35 </div> 29 </div>
36</div> 30</div>
37 31
diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index 40c53e5b..a37926d2 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -25,7 +25,7 @@
25 <li><a href="?do=tools">Tools</a></li> 25 <li><a href="?do=tools">Tools</a></li>
26 <li><a href="?do=addlink">Add link</a></li> 26 <li><a href="?do=addlink">Add link</a></li>
27 {else} 27 {else}
28 <li><a href="?do=login">Login</a></li> 28 <li><a href="/login">Login</a></li>
29 {/if} 29 {/if}
30 <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li> 30 <li><a href="{$feedurl}?do=rss{$searchcrits}" class="nomobile">RSS Feed</a></li>
31 {if="$showatom"} 31 {if="$showatom"}
diff --git a/tpl/vintage/thumbnails.html b/tpl/vintage/thumbnails.html
index 79aebf8d..5cad845b 100644
--- a/tpl/vintage/thumbnails.html
+++ b/tpl/vintage/thumbnails.html
@@ -20,7 +20,7 @@
20 </div> 20 </div>
21</div> 21</div>
22 22
23<input type="hidden" name="ids" value="{function="implode($ids, ',')"}" /> 23<input type="hidden" name="ids" value="{function="implode(',', $ids)"}" />
24 24
25{include="page.footer"} 25{include="page.footer"}
26<script src="js/thumbnails_update.min.js?v={$version_hash}"></script> 26<script src="js/thumbnails_update.min.js?v={$version_hash}"></script>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:59:59 +0000