diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-07-26 14:43:10 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-07-26 14:43:10 +0200 |
commit | 9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9 (patch) | |
tree | 9bfc3c9b185eb0c185d23146d44d42dd6685a4da /tpl | |
parent | bc583903adfd768f115fae438e4d9ed1043682d9 (diff) | |
download | Shaarli-9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9.tar.gz Shaarli-9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9.tar.zst Shaarli-9fbc42294e7667c5ef19cafa0d1fcfbc1c0f36a9.zip |
New basePath: fix officiel plugin paths and vintage template
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/vintage/changepassword.html | 4 | ||||
-rw-r--r-- | tpl/vintage/changetag.html | 2 | ||||
-rw-r--r-- | tpl/vintage/configure.html | 2 | ||||
-rw-r--r-- | tpl/vintage/editlink.html | 4 | ||||
-rw-r--r-- | tpl/vintage/export.html | 2 | ||||
-rw-r--r-- | tpl/vintage/includes.html | 6 | ||||
-rw-r--r-- | tpl/vintage/install.html | 2 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 28 | ||||
-rw-r--r-- | tpl/vintage/loginform.html | 2 | ||||
-rw-r--r-- | tpl/vintage/page.footer.html | 4 | ||||
-rw-r--r-- | tpl/vintage/pluginsadmin.html | 2 | ||||
-rw-r--r-- | tpl/vintage/thumbnails.html | 1 |
12 files changed, 30 insertions, 29 deletions
diff --git a/tpl/vintage/changepassword.html b/tpl/vintage/changepassword.html index c40daf9d..7e37b9a3 100644 --- a/tpl/vintage/changepassword.html +++ b/tpl/vintage/changepassword.html | |||
@@ -4,7 +4,7 @@ | |||
4 | <body onload="document.changepasswordform.oldpassword.focus();"> | 4 | <body onload="document.changepasswordform.oldpassword.focus();"> |
5 | <div id="pageheader"> | 5 | <div id="pageheader"> |
6 | {include="page.header"} | 6 | {include="page.header"} |
7 | <form method="POST" action="#" name="changepasswordform" id="changepasswordform"> | 7 | <form method="POST" action="{$base_path}/admin/password" name="changepasswordform" id="changepasswordform"> |
8 | Old password: <input type="password" name="oldpassword"> | 8 | Old password: <input type="password" name="oldpassword"> |
9 | New password: <input type="password" name="setpassword"> | 9 | New password: <input type="password" name="setpassword"> |
10 | <input type="hidden" name="token" value="{$token}"> | 10 | <input type="hidden" name="token" value="{$token}"> |
@@ -12,4 +12,4 @@ | |||
12 | </div> | 12 | </div> |
13 | {include="page.footer"} | 13 | {include="page.footer"} |
14 | </body> | 14 | </body> |
15 | </html> \ No newline at end of file | 15 | </html> |
diff --git a/tpl/vintage/changetag.html b/tpl/vintage/changetag.html index 670a8dd7..6ef60252 100644 --- a/tpl/vintage/changetag.html +++ b/tpl/vintage/changetag.html | |||
@@ -5,7 +5,7 @@ | |||
5 | <body onload="document.changetag.fromtag.focus();"> | 5 | <body onload="document.changetag.fromtag.focus();"> |
6 | <div id="pageheader"> | 6 | <div id="pageheader"> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | <form method="POST" action="" name="changetag" id="changetag"> | 8 | <form method="POST" action="{$base_path}/admin/tags" name="changetag" id="changetag"> |
9 | <input type="hidden" name="token" value="{$token}"> | 9 | <input type="hidden" name="token" value="{$token}"> |
10 | <div> | 10 | <div> |
11 | <label for="fromtag">Tag:</label> | 11 | <label for="fromtag">Tag:</label> |
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html index c5861aae..ba4f3f71 100644 --- a/tpl/vintage/configure.html +++ b/tpl/vintage/configure.html | |||
@@ -4,7 +4,7 @@ | |||
4 | <body onload="document.configform.title.focus();"> | 4 | <body onload="document.configform.title.focus();"> |
5 | <div id="pageheader"> | 5 | <div id="pageheader"> |
6 | {include="page.header"} | 6 | {include="page.header"} |
7 | <form method="POST" action="#" name="configform" id="configform"> | 7 | <form method="POST" action="{$base_path}/admin/configure" name="configform" id="configform"> |
8 | <input type="hidden" name="token" value="{$token}"> | 8 | <input type="hidden" name="token" value="{$token}"> |
9 | <table id="configuration_table"> | 9 | <table id="configuration_table"> |
10 | 10 | ||
diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html index ccf8c677..c3671b1f 100644 --- a/tpl/vintage/editlink.html +++ b/tpl/vintage/editlink.html | |||
@@ -1,7 +1,6 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html> |
3 | <head>{include="includes"} | 3 | <head>{include="includes"} |
4 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> | ||
5 | </head> | 4 | </head> |
6 | <body | 5 | <body |
7 | {if="$link.title==''"}onload="document.linkform.lf_title.focus();" | 6 | {if="$link.title==''"}onload="document.linkform.lf_title.focus();" |
@@ -10,9 +9,8 @@ | |||
10 | <div id="pageheader"> | 9 | <div id="pageheader"> |
11 | {include="page.header"} | 10 | {include="page.header"} |
12 | <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div> | 11 | <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div> |
13 | {/if} | ||
14 | <div id="editlinkform"> | 12 | <div id="editlinkform"> |
15 | <form method="post" name="linkform"> | 13 | <form method="post" name="linkform" action="{$base_path}/admin/shaare"> |
16 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 14 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> |
17 | {if="isset($link.id)"} | 15 | {if="isset($link.id)"} |
18 | <input type="hidden" name="lf_id" value="{$link.id}"> | 16 | <input type="hidden" name="lf_id" value="{$link.id}"> |
diff --git a/tpl/vintage/export.html b/tpl/vintage/export.html index feee307c..c30e3b0a 100644 --- a/tpl/vintage/export.html +++ b/tpl/vintage/export.html | |||
@@ -10,6 +10,8 @@ | |||
10 | <input type="radio" name="selection" value="all" checked="true"> All<br> | 10 | <input type="radio" name="selection" value="all" checked="true"> All<br> |
11 | <input type="radio" name="selection" value="private"> Private<br> | 11 | <input type="radio" name="selection" value="private"> Private<br> |
12 | <input type="radio" name="selection" value="public"> Public<br> | 12 | <input type="radio" name="selection" value="public"> Public<br> |
13 | <input type="hidden" name="token" value="{$token}"> | ||
14 | |||
13 | <br> | 15 | <br> |
14 | <input type="checkbox" name="prepend_note_url" id="prepend_note_url"> | 16 | <input type="checkbox" name="prepend_note_url" id="prepend_note_url"> |
15 | <label for="prepend_note_url"> | 17 | <label for="prepend_note_url"> |
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html index aa2381c6..eac05701 100644 --- a/tpl/vintage/includes.html +++ b/tpl/vintage/includes.html | |||
@@ -6,14 +6,14 @@ | |||
6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}feed/rss?{$searchcrits}#" title="RSS Feed" /> | 6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}feed/rss?{$searchcrits}#" title="RSS Feed" /> |
7 | <link rel="alternate" type="application/atom+xml" href="{$feedurl}feed/atom?{$searchcrits}#" title="ATOM Feed" /> | 7 | <link rel="alternate" type="application/atom+xml" href="{$feedurl}feed/atom?{$searchcrits}#" title="ATOM Feed" /> |
8 | <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" /> | 8 | <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" /> |
9 | <link type="text/css" rel="stylesheet" href="css/shaarli.min.css" /> | 9 | <link type="text/css" rel="stylesheet" href="{$asset_path}/css/shaarli.min.css#" /> |
10 | {if="$formatter==='markdown'"} | 10 | {if="$formatter==='markdown'"} |
11 | <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" /> | 11 | <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" /> |
12 | {/if} | 12 | {/if} |
13 | {loop="$plugins_includes.css_files"} | 13 | {loop="$plugins_includes.css_files"} |
14 | <link type="text/css" rel="stylesheet" href="{$value}#"/> | 14 | <link type="text/css" rel="stylesheet" href="{$base_path}/{$value}#"/> |
15 | {/loop} | 15 | {/loop} |
16 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if} | 16 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="{$base_path}/data/user.css#" />{/if} |
17 | <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#" | 17 | <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#" |
18 | title="Shaarli search - {$shaarlititle|htmlspecialchars}" /> | 18 | title="Shaarli search - {$shaarlititle|htmlspecialchars}" /> |
19 | {if="! empty($links) && count($links) === 1"} | 19 | {if="! empty($links) && count($links) === 1"} |
diff --git a/tpl/vintage/install.html b/tpl/vintage/install.html index aca890d6..8c10b2cb 100644 --- a/tpl/vintage/install.html +++ b/tpl/vintage/install.html | |||
@@ -5,7 +5,7 @@ | |||
5 | <div id="install"> | 5 | <div id="install"> |
6 | <h1>Shaarli</h1> | 6 | <h1>Shaarli</h1> |
7 | It looks like it's the first time you run Shaarli. Please configure it:<br> | 7 | It looks like it's the first time you run Shaarli. Please configure it:<br> |
8 | <form method="POST" action="#" name="installform" id="installform"> | 8 | <form method="POST" action="{$base_path}/install" name="installform" id="installform"> |
9 | <table> | 9 | <table> |
10 | <tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr> | 10 | <tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr> |
11 | <tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr> | 11 | <tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr> |
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 8db8f70b..00896eb5 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -1,7 +1,6 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html> |
3 | <head> | 3 | <head> |
4 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> | ||
5 | {include="includes"} | 4 | {include="includes"} |
6 | </head> | 5 | </head> |
7 | <body> | 6 | <body> |
@@ -84,7 +83,7 @@ | |||
84 | <div class="thumbnail"> | 83 | <div class="thumbnail"> |
85 | <a href="{$value.real_url}"> | 84 | <a href="{$value.real_url}"> |
86 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} | 85 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
87 | <img data-src="{$value.thumbnail}#" class="b-lazy" | 86 | <img data-src="{$base_path}/{$value.thumbnail}#" class="b-lazy" |
88 | src="" | 87 | src="" |
89 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 88 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
90 | </a> | 89 | </a> |
@@ -93,17 +92,16 @@ | |||
93 | <div class="linkcontainer"> | 92 | <div class="linkcontainer"> |
94 | {if="$is_logged_in"} | 93 | {if="$is_logged_in"} |
95 | <div class="linkeditbuttons"> | 94 | <div class="linkeditbuttons"> |
96 | <form method="GET" class="buttoneditform"> | 95 | <a href="{$base_path}/admin/shaare/{$value.id}" title="Edit" class="button_edit"> |
97 | <input type="hidden" name="edit_link" value="{$value.id}"> | 96 | <img src="{$asset_path}/img/edit_icon.png#"> |
98 | <input type="image" alt="Edit" src="{$asset_path}/img/edit_icon.png#" title="Edit" class="button_edit"> | 97 | </a> |
99 | </form><br> | 98 | <br> |
100 | <form method="GET" class="buttoneditform"> | 99 | <a href="{$base_path}/admin/shaare/delete?id={$value.id}&token={$token}" label="Delete" |
101 | <input type="hidden" name="lf_linkdate" value="{$value.id}"> | 100 | onClick="return confirmDeleteLink();" |
102 | <input type="hidden" name="token" value="{$token}"> | 101 | class="button_delete" |
103 | <input type="hidden" name="delete_link"> | 102 | > |
104 | <input type="image" alt="Delete" src="{$asset_path}/img/delete_icon.png#" title="Delete" | 103 | <img src="{$asset_path}/img/delete_icon.png#"> |
105 | class="button_delete" onClick="return confirmDeleteLink();"> | 104 | </a> |
106 | </form> | ||
107 | </div> | 105 | </div> |
108 | {/if} | 106 | {/if} |
109 | <span class="linktitle"> | 107 | <span class="linktitle"> |
@@ -114,7 +112,7 @@ | |||
114 | {if="!$hide_timestamps || $is_logged_in"} | 112 | {if="!$hide_timestamps || $is_logged_in"} |
115 | {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} | 113 | {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'} |
116 | <span class="linkdate" title="Permalink"> | 114 | <span class="linkdate" title="Permalink"> |
117 | <a href="{$base_path}/?{$value.shorturl}"> | 115 | <a href="{$base_path}/shaare/{$value.shorturl}"> |
118 | <span title="{$updated}"> | 116 | <span title="{$updated}"> |
119 | {$value.created|format_date} | 117 | {$value.created|format_date} |
120 | {if="$value.updated_timestamp"}*{/if} | 118 | {if="$value.updated_timestamp"}*{/if} |
@@ -123,7 +121,7 @@ | |||
123 | </a> - | 121 | </a> - |
124 | </span> | 122 | </span> |
125 | {else} | 123 | {else} |
126 | <span class="linkdate" title="Short link here"><a href="{$base_path}/?{$value.shorturl}">permalink</a> - </span> | 124 | <span class="linkdate" title="Short link here"><a href="{$base_path}/shaare/{$value.shorturl}">permalink</a> - </span> |
127 | {/if} | 125 | {/if} |
128 | 126 | ||
129 | {loop="$value.link_plugin"} | 127 | {loop="$value.link_plugin"} |
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html index a3792066..6aa20ab1 100644 --- a/tpl/vintage/loginform.html +++ b/tpl/vintage/loginform.html | |||
@@ -11,7 +11,7 @@ | |||
11 | {include="page.header"} | 11 | {include="page.header"} |
12 | 12 | ||
13 | <div id="headerform"> | 13 | <div id="headerform"> |
14 | <form method="post" name="loginform"> | 14 | <form method="post" name="loginform" action="{$base_path}/login"> |
15 | <label for="login">Login: <input type="text" id="login" name="login" tabindex="1" | 15 | <label for="login">Login: <input type="text" id="login" name="login" tabindex="1" |
16 | {if="!empty($username)"}value="{$username}"{/if}> | 16 | {if="!empty($username)"}value="{$username}"{/if}> |
17 | </label> | 17 | </label> |
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index 6d9021e3..0fe4c736 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html | |||
@@ -30,5 +30,7 @@ | |||
30 | {/if} | 30 | {/if} |
31 | 31 | ||
32 | {loop="$plugins_footer.js_files"} | 32 | {loop="$plugins_footer.js_files"} |
33 | <script src="{$value}#"></script> | 33 | <script src="{$base_path}/{$value}#"></script> |
34 | {/loop} | 34 | {/loop} |
35 | |||
36 | <input type="hidden" name="js_base_path" value="{$base_path}" /> | ||
diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html index a04c77c2..d0972cd1 100644 --- a/tpl/vintage/pluginsadmin.html +++ b/tpl/vintage/pluginsadmin.html | |||
@@ -86,6 +86,7 @@ | |||
86 | <input type="submit" value="Save"/> | 86 | <input type="submit" value="Save"/> |
87 | </div> | 87 | </div> |
88 | </section> | 88 | </section> |
89 | <input type="hidden" name="token" value="{$token}"> | ||
89 | </form> | 90 | </form> |
90 | 91 | ||
91 | <form action="{$base_path}/admin/plugins" method="POST"> | 92 | <form action="{$base_path}/admin/plugins" method="POST"> |
@@ -124,6 +125,7 @@ | |||
124 | </div> | 125 | </div> |
125 | </div> | 126 | </div> |
126 | </section> | 127 | </section> |
128 | <input type="hidden" name="token" value="{$token}"> | ||
127 | </form> | 129 | </form> |
128 | 130 | ||
129 | </div> | 131 | </div> |
diff --git a/tpl/vintage/thumbnails.html b/tpl/vintage/thumbnails.html index a1537f9c..18f296f7 100644 --- a/tpl/vintage/thumbnails.html +++ b/tpl/vintage/thumbnails.html | |||
@@ -23,7 +23,6 @@ | |||
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 | <input type="hidden" name="js_base_path" value="{$base_path}" /> | ||
27 | <script src="{$asset_path}/js/thumbnails_update.min.js?v={$version_hash}#"></script> | 26 | <script src="{$asset_path}/js/thumbnails_update.min.js?v={$version_hash}#"></script> |
28 | </body> | 27 | </body> |
29 | </html> | 28 | </html> |