diff options
| author | Emilien Klein <emilien@klein.st> | 2015-02-21 14:45:48 +0100 |
|---|---|---|
| committer | Emilien Klein <emilien@klein.st> | 2015-02-21 14:45:48 +0100 |
| commit | 0c5746061e49fb857ce2c170ade8ad7dc594a405 (patch) | |
| tree | f77585efe4d00c7a81c4599fdaed951d01b2459e /tpl | |
| parent | be3f0b4ec361f63a6fa4ed8291c912c9a426cd16 (diff) | |
| parent | 329e0768792b4fd22e548c0e1c4153aec3d6bcd1 (diff) | |
| download | Shaarli-0c5746061e49fb857ce2c170ade8ad7dc594a405.tar.gz Shaarli-0c5746061e49fb857ce2c170ade8ad7dc594a405.tar.zst Shaarli-0c5746061e49fb857ce2c170ade8ad7dc594a405.zip | |
Merge pull request #120 from ArthurHoaro/optionalupdate
shaarli/Shaarli#34: Make update check optional
Diffstat (limited to 'tpl')
| -rw-r--r-- | tpl/configure.html | 4 | ||||
| -rw-r--r-- | tpl/install.html | 25 |
2 files changed, 18 insertions, 11 deletions
diff --git a/tpl/configure.html b/tpl/configure.html index c096018b..887be327 100644 --- a/tpl/configure.html +++ b/tpl/configure.html | |||
| @@ -30,6 +30,10 @@ | |||
| 30 | <input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" {if="!empty($GLOBALS['config']['ENABLE_RSS_PERMALINKS'])"}checked{/if}/><label for="enableRssPermalinks"> Switches the RSS feed URLs between full URLs and shortlinks. Enabling it will show a permalink in the description, and the feed item will be linked to the absolute URL. Disabling it swaps this behaviour around (permalink in title and link in description). RSS Permalinks are currently <b>{if="$GLOBALS['config']['ENABLE_RSS_PERMALINKS']"}enabled{else}disabled{/if}</b></label> | 30 | <input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" {if="!empty($GLOBALS['config']['ENABLE_RSS_PERMALINKS'])"}checked{/if}/><label for="enableRssPermalinks"> Switches the RSS feed URLs between full URLs and shortlinks. Enabling it will show a permalink in the description, and the feed item will be linked to the absolute URL. Disabling it swaps this behaviour around (permalink in title and link in description). RSS Permalinks are currently <b>{if="$GLOBALS['config']['ENABLE_RSS_PERMALINKS']"}enabled{else}disabled{/if}</b></label> |
| 31 | </td> | 31 | </td> |
| 32 | </tr> | 32 | </tr> |
| 33 | <tr><td valign="top"><b>Update:</b></td><td> | ||
| 34 | <input type="checkbox" name="updateCheck" id="updateCheck" {if="!empty($GLOBALS['config']['ENABLE_UPDATECHECK'])"}checked{/if}/> | ||
| 35 | <label for="updateCheck"> Notify me when a new release is ready</label></td> | ||
| 36 | </tr> | ||
| 33 | <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> | 37 | <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> |
| 34 | </table> | 38 | </table> |
| 35 | </form> | 39 | </form> |
diff --git a/tpl/install.html b/tpl/install.html index df42bf6d..88eb540e 100644 --- a/tpl/install.html +++ b/tpl/install.html | |||
| @@ -3,17 +3,20 @@ | |||
| 3 | <head>{include="includes"}{$timezone_js}</head> | 3 | <head>{include="includes"}{$timezone_js}</head> |
| 4 | <body onload="document.installform.setlogin.focus();"> | 4 | <body onload="document.installform.setlogin.focus();"> |
| 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="#" 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> |
| 12 | {$timezone_html} | 12 | {$timezone_html} |
| 13 | <tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr> | 13 | <tr><td><b>Page title:</b></td><td><input type="text" name="title" size="30"></td></tr> |
| 14 | <tr><td colspan="2"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> | 14 | <tr><td valign="top"><b>Update:</b></td><td> |
| 15 | </table> | 15 | <input type="checkbox" name="updateCheck" id="updateCheck" checked="checked"><label for="updateCheck"> Notify me when a new release is ready</label></td> |
| 16 | </form> | 16 | </tr> |
| 17 | <tr><td colspan="2"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> | ||
| 18 | </table> | ||
| 19 | </form> | ||
| 17 | </div> | 20 | </div> |
| 18 | {include="page.footer"} | 21 | {include="page.footer"} |
| 19 | </body> | 22 | </body> |