aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl/vintage
diff options
context:
space:
mode:
Diffstat (limited to 'tpl/vintage')
-rw-r--r--tpl/vintage/404.html2
-rw-r--r--tpl/vintage/addlink.html2
-rw-r--r--tpl/vintage/changepassword.html4
-rw-r--r--tpl/vintage/changetag.html2
-rw-r--r--tpl/vintage/configure.html19
-rw-r--r--tpl/vintage/daily.html20
-rw-r--r--tpl/vintage/dailyrss.html46
-rw-r--r--tpl/vintage/editlink.html24
-rw-r--r--tpl/vintage/error.html25
-rw-r--r--tpl/vintage/export.html5
-rw-r--r--tpl/vintage/feed.atom.html6
-rw-r--r--tpl/vintage/feed.rss.html2
-rw-r--r--tpl/vintage/import.html2
-rw-r--r--tpl/vintage/includes.html20
-rw-r--r--tpl/vintage/install.html2
-rw-r--r--tpl/vintage/linklist.html36
-rw-r--r--tpl/vintage/linklist.paging.html17
-rw-r--r--tpl/vintage/loginform.html44
-rw-r--r--tpl/vintage/opensearch.html4
-rw-r--r--tpl/vintage/page.footer.html6
-rw-r--r--tpl/vintage/page.header.html22
-rw-r--r--tpl/vintage/picwall.html2
-rw-r--r--tpl/vintage/pluginsadmin.html6
-rw-r--r--tpl/vintage/tag.cloud.html4
-rw-r--r--tpl/vintage/thumbnails.html4
-rw-r--r--tpl/vintage/tools.html14
26 files changed, 201 insertions, 139 deletions
diff --git a/tpl/vintage/404.html b/tpl/vintage/404.html
index 53e98e2e..0fef0f08 100644
--- a/tpl/vintage/404.html
+++ b/tpl/vintage/404.html
@@ -10,7 +10,7 @@
10<div class="error-container"> 10<div class="error-container">
11 <h1>404 Not found <small>Oh crap!</small></h1> 11 <h1>404 Not found <small>Oh crap!</small></h1>
12 <p>{$error_message}</p> 12 <p>{$error_message}</p>
13 <p>Would you mind <a href="?">clicking here</a>?</p> 13 <p>Would you mind <a href="{$base_path}/">clicking here</a>?</p>
14</div> 14</div>
15{include="page.footer"} 15{include="page.footer"}
16</body> 16</body>
diff --git a/tpl/vintage/addlink.html b/tpl/vintage/addlink.html
index da50f45e..ade08c7c 100644
--- a/tpl/vintage/addlink.html
+++ b/tpl/vintage/addlink.html
@@ -5,7 +5,7 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="headerform"> 7 <div id="headerform">
8 <form method="GET" action="" name="addform" class="addform"> 8 <form method="GET" action="{$base_path}/admin/shaare" name="addform" class="addform">
9 <input type="text" name="post" class="linkurl"> 9 <input type="text" name="post" class="linkurl">
10 <input type="submit" value="Add link" class="bigbutton"> 10 <input type="submit" value="Add link" class="bigbutton">
11 </form> 11 </form>
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">&nbsp; &nbsp; 8 Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
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 160286a5..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
@@ -16,7 +16,7 @@
16 <tr> 16 <tr>
17 <td><b>Home link:</b></td> 17 <td><b>Home link:</b></td>
18 <td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label 18 <td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label
19 for="titleLink">(default value is: ?)</label></td> 19 for="titleLink">(default value is: {$base_path}/)</label></td>
20 </tr> 20 </tr>
21 21
22 <tr> 22 <tr>
@@ -33,6 +33,19 @@
33 </tr> 33 </tr>
34 34
35 <tr> 35 <tr>
36 <td><b>Description formatter:</b></td>
37 <td>
38 <select name="formatter" id="formatter">
39 {loop="$formatter_available"}
40 <option value="{$value}" {if="$value===$formatter"}selected{/if}>
41 {$value|ucfirst}
42 </option>
43 {/loop}
44 </select>
45 </td>
46 </tr>
47
48 <tr>
36 <td><b>Timezone:</b></td> 49 <td><b>Timezone:</b></td>
37 <td> 50 <td>
38 <select id="continent" name="continent"> 51 <select id="continent" name="continent">
@@ -146,7 +159,7 @@
146 {if="! $gd_enabled"} 159 {if="! $gd_enabled"}
147 {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t} 160 {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
148 {elseif="$thumbnails_enabled"} 161 {elseif="$thumbnails_enabled"}
149 <a href="?do=thumbs_update">{'Synchonize thumbnails'|t}</a> 162 <a href="{$base_path}/admin/thumbnails">{'Synchonize thumbnails'|t}</a>
150 {/if} 163 {/if}
151 </label> 164 </label>
152 </td> 165 </td>
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html
index 00f18e26..74f6cdc7 100644
--- a/tpl/vintage/daily.html
+++ b/tpl/vintage/daily.html
@@ -14,9 +14,9 @@
14 14
15 <div class="dailyAbout"> 15 <div class="dailyAbout">
16 All links of one day<br>in a single page.<br> 16 All links of one day<br>in a single page.<br>
17 {if="$previousday"} <a href="?do=daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if} 17 {if="$previousday"} <a href="{$base_path}/daily&amp;day={$previousday}"><b>&lt;</b>Previous day</a>{else}<b>&lt;</b>Previous day{/if}
18 - 18 -
19 {if="$nextday"}<a href="?do=daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if} 19 {if="$nextday"}<a href="{$base_path}/daily&amp;day={$nextday}">Next day<b>&gt;</b></a>{else}Next day<b>&gt;</b>{/if}
20 <br> 20 <br>
21 21
22 {loop="$daily_about_plugin"} 22 {loop="$daily_about_plugin"}
@@ -24,13 +24,13 @@
24 {/loop} 24 {/loop}
25 25
26 <br> 26 <br>
27 <a href="?do=dailyrss" title="1 RSS entry per day"><img src="img/feed-icon-14x14.png" alt="rss_feed">Daily RSS Feed</a> 27 <a href="{$base_path}/daily-rss" title="1 RSS entry per day"><img src="{$asset_path}/img/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a>
28 </div> 28 </div>
29 29
30 <div class="dailyTitle"> 30 <div class="dailyTitle">
31 <img src="img/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> 31 <img src="{$asset_path}/img/floral_left.png#" width="51" height="50" class="nomobile" alt="floral_left">
32 The Daily Shaarli 32 The Daily Shaarli
33 <img src="img/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"> 33 <img src="{$asset_path}/img/floral_right.png#" width="51" height="50" class="nomobile" alt="floral_right">
34 </div> 34 </div>
35 35
36 <div class="dailyDate"> 36 <div class="dailyDate">
@@ -52,13 +52,13 @@
52 {$link=$value} 52 {$link=$value}
53 <div class="dailyEntry"> 53 <div class="dailyEntry">
54 <div class="dailyEntryPermalink"> 54 <div class="dailyEntryPermalink">
55 <a href="?{$value.shorturl}"> 55 <a href="{$base_path}/?{$value.shorturl}">
56 <img src="img/squiggle.png" width="25" height="26" title="permalink" alt="permalink"> 56 <img src="{$asset_path}/img/squiggle.png#" width="25" height="26" title="permalink" alt="permalink">
57 </a> 57 </a>
58 </div> 58 </div>
59 {if="!$hide_timestamps || $is_logged_in"} 59 {if="!$hide_timestamps || $is_logged_in"}
60 <div class="dailyEntryLinkdate"> 60 <div class="dailyEntryLinkdate">
61 <a href="?{$value.shorturl}">{function="strftime('%c', $link.timestamp)"}</a> 61 <a href="{$base_path}/?{$value.shorturl}">{function="strftime('%c', $link.timestamp)"}</a>
62 </div> 62 </div>
63 {/if} 63 {/if}
64 {if="$link.tags"} 64 {if="$link.tags"}
@@ -101,9 +101,9 @@
101 {$value} 101 {$value}
102 {/loop} 102 {/loop}
103 </div> 103 </div>
104 <div id="closing"><img src="img/squiggle_closing.png" width="66" height="61" alt="-"></div> 104 <div id="closing"><img src="{$asset_path}/img/squiggle_closing.png#" width="66" height="61" alt="-"></div>
105</div> 105</div>
106{include="page.footer"} 106{include="page.footer"}
107<script src="js/thumbnails.min.js?v={$version_hash}"></script> 107<script src="{$asset_path}/js/thumbnails.min.js?v={$version_hash}#"></script>
108</body> 108</body>
109</html> 109</html>
diff --git a/tpl/vintage/dailyrss.html b/tpl/vintage/dailyrss.html
index f589b06e..ff19bbfb 100644
--- a/tpl/vintage/dailyrss.html
+++ b/tpl/vintage/dailyrss.html
@@ -1,16 +1,32 @@
1<item> 1<?xml version="1.0" encoding="UTF-8"?>
2 <title>{$title} - {function="strftime('%A %e %B %Y', $daydate)"}</title> 2<rss version="2.0">
3 <guid>{$absurl}</guid> 3 <channel>
4 <link>{$absurl}</link> 4 <title>Daily - {$title}</title>
5 <pubDate>{$rssdate}</pubDate> 5 <link>{$index_url}</link>
6 <description><![CDATA[ 6 <description>Daily shaared bookmarks</description>
7 {loop="links"} 7 <language>{$language}</language>
8 <h3><a href="{$value.url}">{$value.title}</a></h3> 8 <copyright>{$index_url}</copyright>
9 <small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br> 9 <generator>Shaarli</generator>
10 {$value.url}</small><br> 10
11 {if="$value.thumbnail"}<img src="{$index_url}{$value.thumbnail}#" alt="thumbnail" />{/if}<br> 11 {loop="$days"}
12 {if="$value.description"}{$value.formatedDescription}{/if} 12 <item>
13 <br><br><hr> 13 <title>{$value.date_human} - {$title}</title>
14 <guid>{$value.absolute_url}</guid>
15 <link>{$value.absolute_url}</link>
16 <pubDate>{$value.date_rss}</pubDate>
17 <description><![CDATA[
18 {loop="$value.links"}
19 <h3><a href="{$value.url}">{$value.title}</a></h3>
20 <small>
21 {if="!$hide_timestamps"}{$value.created|format_date} - {/if}{if="$value.tags"}{$value.tags}{/if}<br>
22 {$value.url}
23 </small><br>
24 {if="$value.thumbnail"}<img src="{$index_url}{$value.thumbnail}#" alt="thumbnail" />{/if}<br>
25 {if="$value.description"}{$value.description}{/if}
26 <br><br><hr>
14 {/loop} 27 {/loop}
15 ]]></description> 28 ]]></description>
16</item> 29 </item>
30 {/loop}
31 </channel>
32</rss><!-- Cached version of {$page_url} -->
diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html
index 5fa7d194..eb8807b5 100644
--- a/tpl/vintage/editlink.html
+++ b/tpl/vintage/editlink.html
@@ -1,21 +1,16 @@
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();"
8{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();" 7{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();"
9{else}onload="document.linkform.lf_tags.focus();"{/if} > 8{else}onload="document.linkform.lf_tags.focus();"{/if} >
10<div id="pageheader"> 9<div id="pageheader">
11 {if="$source !== 'firefoxsocialapi'"}
12 {include="page.header"} 10 {include="page.header"}
13 {else}
14 <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div> 11 <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div>
15 {/if}
16 <div id="editlinkform"> 12 <div id="editlinkform">
17 <form method="post" name="linkform"> 13 <form method="post" name="linkform" action="{$base_path}/admin/shaare">
18 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
19 {if="isset($link.id)"} 14 {if="isset($link.id)"}
20 <input type="hidden" name="lf_id" value="{$link.id}"> 15 <input type="hidden" name="lf_id" value="{$link.id}">
21 {/if} 16 {/if}
@@ -26,7 +21,16 @@
26 <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input" 21 <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input"
27 data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" ><br> 22 data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" ><br>
28 23
29 {loop="$edit_link_plugin"} 24 {if="$formatter==='markdown'"}
25 <div class="md_help">
26 {'Description will be rendered with'|t}
27 <a href="http://daringfireball.net/projects/markdown/syntax" title="{'Markdown syntax documentation'|t}">
28 {'Markdown syntax'|t}
29 </a>.
30 </div>
31 {/if}
32
33 {loop="$edit_link_plugin"}
30 {$value} 34 {$value}
31 {/loop} 35 {/loop}
32 36
@@ -38,21 +42,19 @@
38 &nbsp;<label for="lf_private"><i>Private</i></label><br><br> 42 &nbsp;<label for="lf_private"><i>Private</i></label><br><br>
39 {/if} 43 {/if}
40 <input type="submit" value="Save" name="save_edit" class="bigbutton"> 44 <input type="submit" value="Save" name="save_edit" class="bigbutton">
41 <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton">
42 {if="!$link_is_new && isset($link.id)"} 45 {if="!$link_is_new && isset($link.id)"}
43 <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}" 46 <a href="{$base_path}/admin/shaare/delete?id={$link.id}&amp;token={$token}"
44 name="delete_link" class="bigbutton" 47 name="delete_link" class="bigbutton"
45 onClick="return confirmDeleteLink();"> 48 onClick="return confirmDeleteLink();">
46 {'Delete'|t} 49 {'Delete'|t}
47 </a> 50 </a>
48 {/if} 51 {/if}
49 <input type="hidden" name="token" value="{$token}"> 52 <input type="hidden" name="token" value="{$token}">
53 <input type="hidden" name="source" value="{$source}">
50 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if} 54 {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if}
51 </form> 55 </form>
52 </div> 56 </div>
53</div> 57</div>
54{if="$source !== 'firefoxsocialapi'"}
55{include="page.footer"} 58{include="page.footer"}
56{/if}
57</body> 59</body>
58</html> 60</html>
diff --git a/tpl/vintage/error.html b/tpl/vintage/error.html
new file mode 100644
index 00000000..64f54cd2
--- /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="{$base_path}/">clicking here</a>?</p>
22</div>
23{include="page.footer"}
24</body>
25</html>
diff --git a/tpl/vintage/export.html b/tpl/vintage/export.html
index 67c3d05f..c30e3b0a 100644
--- a/tpl/vintage/export.html
+++ b/tpl/vintage/export.html
@@ -5,12 +5,13 @@
5 <div id="pageheader"> 5 <div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="toolsdiv"> 7 <div id="toolsdiv">
8 <form method="GET"> 8 <form method="POST" action="{$base_path}/admin/export">
9 <input type="hidden" name="do" value="export">
10 Selection:<br> 9 Selection:<br>
11 <input type="radio" name="selection" value="all" checked="true"> All<br> 10 <input type="radio" name="selection" value="all" checked="true"> All<br>
12 <input type="radio" name="selection" value="private"> Private<br> 11 <input type="radio" name="selection" value="private"> Private<br>
13 <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
14 <br> 15 <br>
15 <input type="checkbox" name="prepend_note_url" id="prepend_note_url"> 16 <input type="checkbox" name="prepend_note_url" id="prepend_note_url">
16 <label for="prepend_note_url"> 17 <label for="prepend_note_url">
diff --git a/tpl/vintage/feed.atom.html b/tpl/vintage/feed.atom.html
index 49798e85..5919bb49 100644
--- a/tpl/vintage/feed.atom.html
+++ b/tpl/vintage/feed.atom.html
@@ -6,13 +6,13 @@
6 <updated>{$last_update}</updated> 6 <updated>{$last_update}</updated>
7 {/if} 7 {/if}
8 <link rel="self" href="{$self_link}#" /> 8 <link rel="self" href="{$self_link}#" />
9 <link rel="search" type="application/opensearchdescription+xml" href="{$index_url}?do=opensearch#" 9 <link rel="search" type="application/opensearchdescription+xml" href="{$index_url}open-search#"
10 title="Shaarli search - {$shaarlititle}" /> 10 title="Shaarli search - {$shaarlititle}" />
11 {loop="$feed_plugins_header"} 11 {loop="$feed_plugins_header"}
12 {$value} 12 {$value}
13 {/loop} 13 {/loop}
14 <author> 14 <author>
15 <name>{$index_url}</name> 15 <name>{$pagetitle}</name>
16 <uri>{$index_url}</uri> 16 <uri>{$index_url}</uri>
17 </author> 17 </author>
18 <id>{$index_url}</id> 18 <id>{$index_url}</id>
diff --git a/tpl/vintage/feed.rss.html b/tpl/vintage/feed.rss.html
index ee3fef88..4be8202f 100644
--- a/tpl/vintage/feed.rss.html
+++ b/tpl/vintage/feed.rss.html
@@ -8,7 +8,7 @@
8 <copyright>{$index_url}</copyright> 8 <copyright>{$index_url}</copyright>
9 <generator>Shaarli</generator> 9 <generator>Shaarli</generator>
10 <atom:link rel="self" href="{$self_link}" /> 10 <atom:link rel="self" href="{$self_link}" />
11 <atom:link rel="search" type="application/opensearchdescription+xml" href="{$index_url}?do=opensearch#" 11 <atom:link rel="search" type="application/opensearchdescription+xml" href="{$index_url}open-search#"
12 title="Shaarli search - {$shaarlititle}" /> 12 title="Shaarli search - {$shaarlititle}" />
13 {loop="$feed_plugins_header"} 13 {loop="$feed_plugins_header"}
14 {$value} 14 {$value}
diff --git a/tpl/vintage/import.html b/tpl/vintage/import.html
index bb9e4a56..7d6eac76 100644
--- a/tpl/vintage/import.html
+++ b/tpl/vintage/import.html
@@ -6,7 +6,7 @@
6 {include="page.header"} 6 {include="page.header"}
7 <div id="uploaddiv"> 7 <div id="uploaddiv">
8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize}). 8 Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize}).
9 <form method="POST" action="?do=import" enctype="multipart/form-data" 9 <form method="POST" action="{$base_path}/admin/import" enctype="multipart/form-data"
10 name="uploadform" id="uploadform"> 10 name="uploadform" id="uploadform">
11 <input type="hidden" name="token" value="{$token}"> 11 <input type="hidden" name="token" value="{$token}">
12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}"> 12 <input type="hidden" name="MAX_FILE_SIZE" value="{$maxfilesize}">
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html
index 2efb6b10..eac05701 100644
--- a/tpl/vintage/includes.html
+++ b/tpl/vintage/includes.html
@@ -3,15 +3,19 @@
3<meta name="format-detection" content="telephone=no" /> 3<meta name="format-detection" content="telephone=no" />
4<meta name="viewport" content="width=device-width,initial-scale=1.0" /> 4<meta name="viewport" content="width=device-width,initial-scale=1.0" />
5<meta name="referrer" content="same-origin"> 5<meta name="referrer" content="same-origin">
6<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=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}?do=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'"}
11 <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" />
12{/if}
10{loop="$plugins_includes.css_files"} 13{loop="$plugins_includes.css_files"}
11<link type="text/css" rel="stylesheet" href="{$value}#"/> 14<link type="text/css" rel="stylesheet" href="{$base_path}/{$value}#"/>
12{/loop} 15{/loop}
13{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}
14<link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> 17<link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
18 title="Shaarli search - {$shaarlititle|htmlspecialchars}" />
15{if="! empty($links) && count($links) === 1"} 19{if="! empty($links) && count($links) === 1"}
16 {$link=reset($links)} 20 {$link=reset($links)}
17 <meta property="og:title" content="{$link.title}" /> 21 <meta property="og:title" content="{$link.title}" />
@@ -19,12 +23,12 @@
19 <meta property="og:url" content="{$index_url}?{$link.shorturl}" /> 23 <meta property="og:url" content="{$index_url}?{$link.shorturl}" />
20 {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description} 24 {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description}
21 <meta property="og:description" content="{function="mb_substr(strip_tags($ogDescription), 0, 300)"}" /> 25 <meta property="og:description" content="{function="mb_substr(strip_tags($ogDescription), 0, 300)"}" />
22 {if="$link.thumbnail"} 26 {if="!empty($link.thumbnail)"}
23 <meta property="og:image" content="{$index_url}{$link.thumbnail}" /> 27 <meta property="og:image" content="{$index_url}{$link.thumbnail}" />
24 {/if} 28 {/if}
25 {if="!$hide_timestamps || $is_logged_in"} 29 {if="!$hide_timestamps || $is_logged_in"}
26 <meta property="article:published_time" content="{$link.created->format(DateTime::ATOM)}" /> 30 <meta property="article:published_time" content="{$link.created->format(DateTime::ATOM)}" />
27 {if="$link.updated"} 31 {if="!empty($link.updated)"}
28 <meta property="article:modified_time" content="{$link.updated->format(DateTime::ATOM)}" /> 32 <meta property="article:modified_time" content="{$link.updated->format(DateTime::ATOM)}" />
29 {/if} 33 {/if}
30 {/if} 34 {/if}
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 dcb14e90..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>
@@ -66,12 +65,12 @@
66 tagged 65 tagged
67 {loop="$exploded_tags"} 66 {loop="$exploded_tags"}
68 <span class="linktag" title="Remove tag"> 67 <span class="linktag" title="Remove tag">
69 <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a> 68 <a href="{$base_path}/remove-tag/{function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
70 </span> 69 </span>
71 {/loop} 70 {/loop}
72 {elseif="$search_tags === false"} 71 {elseif="$search_tags === false"}
73 <span class="linktag" title="Remove tag"> 72 <span class="linktag" title="Remove tag">
74 <a href="?">untagged <span class="remove">x</span></a> 73 <a href="{$base_path}/">untagged <span class="remove">x</span></a>
75 </span> 74 </span>
76 {/if} 75 {/if}
77 </div> 76 </div>
@@ -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="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}&amp;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="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="?{$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="?{$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"}
@@ -133,7 +131,7 @@
133 <a href="{$value.real_url}"><span class="linkurl" title="Short link">{$value.url}</span></a><br> 131 <a href="{$value.real_url}"><span class="linkurl" title="Short link">{$value.url}</span></a><br>
134 {if="$value.tags"} 132 {if="$value.tags"}
135 <div class="linktaglist"> 133 <div class="linktaglist">
136 {loop="$value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value}</a></span> {/loop} 134 {loop="$value.taglist"}<span class="linktag" title="Add tag"><a href="{$base_path}/add-tag/{$value|urlencode}">{$value}</a></span> {/loop}
137 </div> 135 </div>
138 {/if} 136 {/if}
139 137
@@ -154,7 +152,7 @@
154</div> 152</div>
155 153
156 {include="page.footer"} 154 {include="page.footer"}
157<script src="js/thumbnails.min.js"></script> 155<script src="{$asset_path}/js/thumbnails.min.js#"></script>
158 156
159</body> 157</body>
160</html> 158</html>
diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html
index 35149a6b..79daf16c 100644
--- a/tpl/vintage/linklist.paging.html
+++ b/tpl/vintage/linklist.paging.html
@@ -1,11 +1,11 @@
1<div class="paging"> 1<div class="paging">
2{if="$is_logged_in"} 2{if="$is_logged_in"}
3 <div class="paging_privatelinks"> 3 <div class="paging_privatelinks">
4 <a href="?visibility=private"> 4 <a href="{$base_path}/admin/isibility/private">
5 {if="$visibility=='private'"} 5 {if="$visibility=='private'"}
6 <img src="img/private_16x16_active.png" width="16" height="16" title="Click to see all links" alt="Click to see all links"> 6 <img src="{$asset_path}/img/private_16x16_active.png#" width="16" height="16" title="Click to see all links" alt="Click to see all links">
7 {else} 7 {else}
8 <img src="img/private_16x16.png" width="16" height="16" title="Click to see only private links" alt="Click to see only private links"> 8 <img src="{$asset_path}/img/private_16x16.png#" width="16" height="16" title="Click to see only private links" alt="Click to see only private links">
9 {/if} 9 {/if}
10 </a> 10 </a>
11 11
@@ -23,10 +23,15 @@
23 </div> 23 </div>
24 {/loop} 24 {/loop}
25 <div class="paging_linksperpage"> 25 <div class="paging_linksperpage">
26 Links per page: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a> 26 Links per page:
27 <form method="GET" class="linksperpage"><input type="text" name="linksperpage" size="2"></form> 27 <a href="{$base_path}/links-per-page?nb=20">20</a>
28 <a href="{$base_path}/links-per-page?nb=50">50</a>
29 <a href="{$base_path}/links-per-page?nb=100">100</a>
30 <form method="GET" class="linksperpage" action="{$base_path}/links-per-page">
31 <input type="text" name="nb" size="2">
32 </form>
28 </div> 33 </div>
29 {if="$previous_page_url"} <a href="{$previous_page_url}" class="paging_older">&#x25C4;Older</a> {/if} 34 {if="$previous_page_url"} <a href="{$previous_page_url}" class="paging_older">&#x25C4;Older</a> {/if}
30 <div class="paging_current">page {$page_current} / {$page_max} </div> 35 {if="$page_max>1"}<div class="paging_current">page {$page_current} / {$page_max} </div>{/if}
31 {if="$next_page_url"} <a href="{$next_page_url}" class="paging_newer">Newer&#x25BA;</a> {/if} 36 {if="$next_page_url"} <a href="{$next_page_url}" class="paging_newer">Newer&#x25BA;</a> {/if}
32</div> 37</div>
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index 0f7d6387..6aa20ab1 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" action="{$base_path}/login">
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/opensearch.html b/tpl/vintage/opensearch.html
index 3fcc30b7..1c7f279b 100644
--- a/tpl/vintage/opensearch.html
+++ b/tpl/vintage/opensearch.html
@@ -3,8 +3,8 @@
3 <ShortName>Shaarli search - {$pagetitle}</ShortName> 3 <ShortName>Shaarli search - {$pagetitle}</ShortName>
4 <Description>Shaarli search - {$pagetitle}</Description> 4 <Description>Shaarli search - {$pagetitle}</Description>
5 <Url type="text/html" template="{$serverurl}?searchterm={searchTerms}" /> 5 <Url type="text/html" template="{$serverurl}?searchterm={searchTerms}" />
6 <Url type="application/atom+xml" template="{$serverurl}?do=atom&amp;searchterm={searchTerms}"/> 6 <Url type="application/atom+xml" template="{$serverurl}feed/atom?searchterm={searchTerms}"/>
7 <Url type="application/rss+xml" template="{$serverurl}?do=rss&amp;searchterm={searchTerms}"/> 7 <Url type="application/rss+xml" template="{$serverurl}feed/rss?searchterm={searchTerms}"/>
8 <InputEncoding>UTF-8</InputEncoding> 8 <InputEncoding>UTF-8</InputEncoding>
9 <Developer>Shaarli Community - https://github.com/shaarli/Shaarli/</Developer> 9 <Developer>Shaarli Community - https://github.com/shaarli/Shaarli/</Developer>
10 <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAHRklE 10 <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAAHRklE
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html
index a3380841..0fe4c736 100644
--- a/tpl/vintage/page.footer.html
+++ b/tpl/vintage/page.footer.html
@@ -23,12 +23,14 @@
23</div> 23</div>
24{/if} 24{/if}
25 25
26<script src="js/shaarli.min.js"></script> 26<script src="{$asset_path}/js/shaarli.min.js#"></script>
27 27
28{if="$is_logged_in"} 28{if="$is_logged_in"}
29<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> 29<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
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/page.header.html b/tpl/vintage/page.header.html
index 40c53e5b..0a33523b 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -18,22 +18,22 @@
18{else} 18{else}
19<li><a href="{$titleLink}" class="nomobile">Home</a></li> 19<li><a href="{$titleLink}" class="nomobile">Home</a></li>
20 {if="$is_logged_in"} 20 {if="$is_logged_in"}
21 <li><a href="?do=logout">Logout</a></li> 21 <li><a href="{$base_path}/admin/logout">Logout</a></li>
22 <li><a href="?do=tools">Tools</a></li> 22 <li><a href="{$base_path}/admin/tools">Tools</a></li>
23 <li><a href="?do=addlink">Add link</a></li> 23 <li><a href="{$base_path}/admin/add-shaare">Add link</a></li>
24 {elseif="$openshaarli"} 24 {elseif="$openshaarli"}
25 <li><a href="?do=tools">Tools</a></li> 25 <li><a href="{$base_path}/admin/tools">Tools</a></li>
26 <li><a href="?do=addlink">Add link</a></li> 26 <li><a href="{$base_path}/admin/add-shaare">Add link</a></li>
27 {else} 27 {else}
28 <li><a href="?do=login">Login</a></li> 28 <li><a href="{$base_path}/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}/feed/rss?{$searchcrits}" class="nomobile">RSS Feed</a></li>
31 {if="$showatom"} 31 {if="$showatom"}
32 <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li> 32 <li><a href="{$feedurl}/feed/atom?{$searchcrits}" class="nomobile">ATOM Feed</a></li>
33 {/if} 33 {/if}
34 <li><a href="?do=tagcloud">Tag cloud</a></li> 34 <li><a href="{$base_path}/tags/cloud">Tag cloud</a></li>
35 <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li> 35 <li><a href="{$base_path}/picture-wall{function="ltrim($searchcrits, '&')"}">Picture wall</a></li>
36 <li><a href="?do=daily">Daily</a></li> 36 <li><a href="{$base_path}/daily">Daily</a></li>
37 {loop="$plugins_header.buttons_toolbar"} 37 {loop="$plugins_header.buttons_toolbar"}
38 <li><a 38 <li><a
39 {loop="$value.attr"} 39 {loop="$value.attr"}
diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html
index b3a16791..da3aa36c 100644
--- a/tpl/vintage/picwall.html
+++ b/tpl/vintage/picwall.html
@@ -38,6 +38,6 @@
38 38
39{include="page.footer"} 39{include="page.footer"}
40 40
41<script src="js/thumbnails.min.js"></script> 41<script src="{$asset_path}/js/thumbnails.min.js#"></script>
42</body> 42</body>
43</html> 43</html>
diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html
index 63b45cac..d0972cd1 100644
--- a/tpl/vintage/pluginsadmin.html
+++ b/tpl/vintage/pluginsadmin.html
@@ -16,7 +16,7 @@
16</noscript> 16</noscript>
17 17
18<div id="pluginsadmin"> 18<div id="pluginsadmin">
19 <form action="?do=save_pluginadmin" method="POST"> 19 <form action="{$base_path}/admin/plugins" method="POST">
20 <section id="enabled_plugins"> 20 <section id="enabled_plugins">
21 <h1>Enabled Plugins</h1> 21 <h1>Enabled Plugins</h1>
22 22
@@ -86,9 +86,10 @@
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="?do=save_pluginadmin" method="POST"> 92 <form action="{$base_path}/admin/plugins" method="POST">
92 <section id="plugin_parameters"> 93 <section id="plugin_parameters">
93 <h1>Enabled Plugin Parameters</h1> 94 <h1>Enabled Plugin Parameters</h1>
94 95
@@ -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/tag.cloud.html b/tpl/vintage/tag.cloud.html
index d93bf4f9..5d21f239 100644
--- a/tpl/vintage/tag.cloud.html
+++ b/tpl/vintage/tag.cloud.html
@@ -12,8 +12,8 @@
12 12
13 <div id="cloudtag"> 13 <div id="cloudtag">
14 {loop="$tags"} 14 {loop="$tags"}
15 <a href="?addtag={$key|urlencode}" class="count">{$value.count}</a><a 15 <a href="{$base_path}/add-tag/{$key|urlencode}" class="count">{$value.count}</a><a
16 href="?searchtags={$key|urlencode}" style="font-size:{$value.size}em;">{$key}</a> 16 href="{$base_path}/?searchtags={$key|urlencode}" style="font-size:{$value.size}em;">{$key}</a>
17 {loop="$value.tag_plugin"} 17 {loop="$value.tag_plugin"}
18 {$value} 18 {$value}
19 {/loop} 19 {/loop}
diff --git a/tpl/vintage/thumbnails.html b/tpl/vintage/thumbnails.html
index 79aebf8d..18f296f7 100644
--- a/tpl/vintage/thumbnails.html
+++ b/tpl/vintage/thumbnails.html
@@ -20,9 +20,9 @@
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="{$asset_path}/js/thumbnails_update.min.js?v={$version_hash}#"></script>
27</body> 27</body>
28</html> 28</html>
diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html
index 1cef726e..1125bba9 100644
--- a/tpl/vintage/tools.html
+++ b/tpl/vintage/tools.html
@@ -5,17 +5,17 @@
5<div id="pageheader"> 5<div id="pageheader">
6 {include="page.header"} 6 {include="page.header"}
7 <div id="toolsdiv"> 7 <div id="toolsdiv">
8 <a href="?do=configure"><b>Configure your Shaarli</b><span>: Change Title, timezone...</span></a> 8 <a href="{$base_path}/admin/configure"><b>Configure your Shaarli</b><span>: Change Title, timezone...</span></a>
9 <br><br> 9 <br><br>
10 <a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a> 10 <a href="{$base_path}/admin/plugins"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>
11 <br><br> 11 <br><br>
12 {if="!$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a> 12 {if="!$openshaarli"}<a href="{$base_path}/admin/password"><b>Change password</b><span>: Change your password.</span></a>
13 <br><br>{/if} 13 <br><br>{/if}
14 <a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a> 14 <a href="{$base_path}/admin/tags"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>
15 <br><br> 15 <br><br>
16 <a href="?do=import"><b>Import</b><span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> 16 <a href="{$base_path}/admin/import"><b>Import</b><span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a>
17 <br><br> 17 <br><br>
18 <a href="?do=export"><b>Export</b><span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a> 18 <a href="{$base_path}/admin/export"><b>Export</b><span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a>
19 <br><br> 19 <br><br>
20 <a class="smallbutton" 20 <a class="smallbutton"
21 onclick="return alertBookmarklet();" 21 onclick="return alertBookmarklet();"
@@ -24,7 +24,7 @@
24 var%20url%20=%20location.href; 24 var%20url%20=%20location.href;
25 var%20title%20=%20document.title%20||%20url; 25 var%20title%20=%20document.title%20||%20url;
26 window.open( 26 window.open(
27 '{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+ 27 '{$pageabsaddr}admin/shaare?post='%20+%20encodeURIComponent(url)+
28 '&amp;title='%20+%20encodeURIComponent(title)+ 28 '&amp;title='%20+%20encodeURIComponent(title)+
29 '&amp;description='%20+%20encodeURIComponent(document.getSelection())+ 29 '&amp;description='%20+%20encodeURIComponent(document.getSelection())+
30 '&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1' 30 '&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1'