diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-05-29 12:32:14 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-06-11 09:30:56 +0200 |
commit | b74b96bfbd0b778ac50fd17f5e107c51435b1678 (patch) | |
tree | fd2debc510c2c51e9b75e2081a31a10e9c02ad06 /tpl | |
parent | 684e662a58b02bde225e44d3677987b6fc3adf0b (diff) | |
download | Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.gz Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.tar.zst Shaarli-b74b96bfbd0b778ac50fd17f5e107c51435b1678.zip |
Adds ConfigJson which handle the configuration in JSON format.
Also use the Updater to make the transition
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/linklist.html | 2 | ||||
-rw-r--r-- | tpl/tools.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tpl/linklist.html b/tpl/linklist.html index c0d42006..2316f145 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html | |||
@@ -88,7 +88,7 @@ | |||
88 | </span> | 88 | </span> |
89 | <br> | 89 | <br> |
90 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} | 90 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} |
91 | {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} | 91 | {if="!$hide_timestamps || isLoggedIn()"} |
92 | <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span> | 92 | <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span> |
93 | {else} | 93 | {else} |
94 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> | 94 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> |
diff --git a/tpl/tools.html b/tpl/tools.html index 78b81663..29ade725 100644 --- a/tpl/tools.html +++ b/tpl/tools.html | |||
@@ -9,7 +9,7 @@ | |||
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="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a> |
11 | <br><br> | 11 | <br><br> |
12 | {if="!$GLOBALS['config']['OPEN_SHAARLI']"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a> | 12 | {if="$openshaarli"}<a href="?do=changepasswd"><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="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a> |
15 | <br><br> | 15 | <br><br> |