diff options
author | Arthur <arthur@hoa.ro> | 2016-07-09 07:19:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-09 07:19:48 +0200 |
commit | 649af5b501d2a90448242f53764ff693e9854039 (patch) | |
tree | 23cde80a7ee2949e552c48939ae22fa462cfa0fc /tpl | |
parent | a9cfa38df92bd2e1e2c00a67b6ac1516a2116ade (diff) | |
parent | 5ff23f02b80ec6ddee28dee869171ee8e3656b7c (diff) | |
download | Shaarli-649af5b501d2a90448242f53764ff693e9854039.tar.gz Shaarli-649af5b501d2a90448242f53764ff693e9854039.tar.zst Shaarli-649af5b501d2a90448242f53764ff693e9854039.zip |
Merge pull request #570 from ArthurHoaro/config-manager
Introduce a configuration manager
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/configure.html | 114 | ||||
-rw-r--r-- | tpl/daily.html | 2 | ||||
-rw-r--r-- | tpl/dailyrss.html | 2 | ||||
-rw-r--r-- | tpl/editlink.html | 4 | ||||
-rw-r--r-- | tpl/linklist.html | 2 | ||||
-rw-r--r-- | tpl/page.header.html | 4 | ||||
-rw-r--r-- | tpl/tools.html | 2 |
7 files changed, 85 insertions, 45 deletions
diff --git a/tpl/configure.html b/tpl/configure.html index 77c8b7d9..ad9a2085 100644 --- a/tpl/configure.html +++ b/tpl/configure.html | |||
@@ -3,48 +3,90 @@ | |||
3 | <head>{include="includes"}</head> | 3 | <head>{include="includes"}</head> |
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 | {$timezone_js} | 7 | {$timezone_js} |
8 | <form method="POST" action="#" name="configform" id="configform"> | 8 | <form method="POST" action="#" name="configform" id="configform"> |
9 | <input type="hidden" name="token" value="{$token}"> | 9 | <input type="hidden" name="token" value="{$token}"> |
10 | <table id="configuration_table"> | 10 | <table id="configuration_table"> |
11 | 11 | ||
12 | <tr><td><b>Page title:</b></td><td><input type="text" name="title" id="title" size="50" value="{$title}"></td></tr> | 12 | <tr> |
13 | <td><b>Page title:</b></td> | ||
14 | <td><input type="text" name="title" id="title" size="50" value="{$title}"></td> | ||
15 | </tr> | ||
13 | 16 | ||
14 | <tr><td><b>Title link:</b></td><td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label for="titleLink">(default value is: ?)</label></td></tr> | 17 | <tr> |
15 | <tr><td><b>Timezone:</b></td><td>{$timezone_form}</td></tr> | 18 | <td><b>Title link:</b></td> |
19 | <td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label | ||
20 | for="titleLink">(default value is: ?)</label></td> | ||
21 | </tr> | ||
22 | <tr> | ||
23 | <td><b>Timezone:</b></td> | ||
24 | <td>{$timezone_form}</td> | ||
25 | </tr> | ||
16 | 26 | ||
17 | <tr><td><b>Redirector</b></td><td><input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br>(e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER)</td></tr> | 27 | <tr> |
28 | <td><b>Redirector</b></td> | ||
29 | <td> | ||
30 | <input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br> | ||
31 | (e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER) | ||
32 | </td> | ||
33 | </tr> | ||
18 | 34 | ||
19 | <tr><td><b>Security:</b></td><td><input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" {if="!empty($GLOBALS['disablesessionprotection'])"}checked{/if}><label for="disablesessionprotection"> Disable session cookie hijacking protection (Check this if you get disconnected often or if your IP address changes often.)</label></td></tr> | 35 | <tr> |
36 | <td><b>Security:</b></td> | ||
37 | <td> | ||
38 | <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" | ||
39 | {if="$private_links_default"}checked{/if}> | ||
40 | <label | ||
41 | for="disablesessionprotection"> Disable session cookie hijacking protection (Check this if you get | ||
42 | disconnected often or if your IP address changes often.)</label> | ||
43 | </td> | ||
44 | </tr> | ||
20 | 45 | ||
21 | <tr><td valign="top"><b>New link:</b></td><td> | 46 | <tr> |
22 | <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" {if="!empty($GLOBALS['privateLinkByDefault'])"}checked{/if}/><label for="privateLinkByDefault"> All new links are private by default</label></td> | 47 | <td valign="top"><b>New link:</b></td> |
23 | </tr> | 48 | <td> |
24 | <tr> | 49 | <input type="checkbox" name="privateLinkByDefault" id="privateLinkByDefault" |
25 | <td valign="top"><b>RSS direct links</b></td> | 50 | {if="$private_links_default"}checked{/if}/> |
26 | <td> | 51 | <label for="privateLinkByDefault"> |
27 | <input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" {if="!empty($GLOBALS['config']['ENABLE_RSS_PERMALINKS'])"}checked{/if}/> | 52 | All new links are private by default |
28 | <label for="enableRssPermalinks"> | 53 | </label> |
29 | Disable it to use permalinks in RSS feed instead of direct links to your shaared links. Currently <b>{if="$GLOBALS['config']['ENABLE_RSS_PERMALINKS']"}enabled{else}disabled{/if}.</b> | 54 | </td> |
30 | </label> | 55 | </tr> |
31 | </td> | 56 | <tr> |
32 | </tr> | 57 | <td valign="top"><b>RSS direct links</b></td> |
33 | <tr> | 58 | <td> |
34 | <td valign="top"><b>Hide public links</b></td> | 59 | <input type="checkbox" name="enableRssPermalinks" id="enableRssPermalinks" |
35 | <td> | 60 | {if="$enable_rss_permalinks"}checked{/if}/> |
36 | <input type="checkbox" name="hidePublicLinks" id="hidePublicLinks" {if="!empty($GLOBALS['config']['HIDE_PUBLIC_LINKS'])"}checked{/if}/><label for="hidePublicLinks"> | 61 | <label for="enableRssPermalinks"> |
37 | Do not show any links if the user is not logged in.</label> | 62 | Disable it to use permalinks in RSS feed instead of direct links to your shaared links. Currently <b> |
38 | </td> | 63 | {if="$enable_rss_permalinks"}enabled{else}disabled{/if}.</b> |
39 | </tr> | 64 | </label> |
40 | <tr><td valign="top"><b>Update:</b></td><td> | 65 | </td> |
41 | <input type="checkbox" name="updateCheck" id="updateCheck" {if="!empty($GLOBALS['config']['ENABLE_UPDATECHECK'])"}checked{/if}/> | 66 | </tr> |
42 | <label for="updateCheck"> Notify me when a new release is ready</label></td> | 67 | <tr> |
43 | </tr> | 68 | <td valign="top"><b>Hide public links</b></td> |
69 | <td> | ||
70 | <input type="checkbox" name="hidePublicLinks" id="hidePublicLinks" | ||
71 | {if="$hide_public_links"}checked{/if}/> | ||
72 | <label for="hidePublicLinks"> Do not show any links if the user is not logged in.</label> | ||
73 | </td> | ||
74 | </tr> | ||
75 | <tr> | ||
76 | <td valign="top"><b>Update:</b></td> | ||
77 | <td> | ||
78 | <input type="checkbox" name="updateCheck" id="updateCheck" | ||
79 | {if="$enable_update_check"}checked{/if}/> | ||
80 | <label for="updateCheck"> Notify me when a new release is ready</label> | ||
81 | </td> | ||
82 | </tr> | ||
44 | 83 | ||
45 | <tr><td></td><td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td></tr> | 84 | <tr> |
46 | </table> | 85 | <td></td> |
47 | </form> | 86 | <td class="right"><input type="submit" name="Save" value="Save config" class="bigbutton"></td> |
87 | </tr> | ||
88 | </table> | ||
89 | </form> | ||
48 | </div> | 90 | </div> |
49 | {include="page.footer"} | 91 | {include="page.footer"} |
50 | </body> | 92 | </body> |
diff --git a/tpl/daily.html b/tpl/daily.html index 063dc89a..dde1f376 100644 --- a/tpl/daily.html +++ b/tpl/daily.html | |||
@@ -53,7 +53,7 @@ | |||
53 | <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"> | 53 | <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink"> |
54 | </a> | 54 | </a> |
55 | </div> | 55 | </div> |
56 | {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} | 56 | {if="!$hide_timestamps || isLoggedIn()"} |
57 | <div class="dailyEntryLinkdate"> | 57 | <div class="dailyEntryLinkdate"> |
58 | <a href="?{$link.linkdate|smallHash}">{function="strftime('%c', $link.timestamp)"}</a> | 58 | <a href="?{$link.linkdate|smallHash}">{function="strftime('%c', $link.timestamp)"}</a> |
59 | </div> | 59 | </div> |
diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html index 4133ca3e..b14a3859 100644 --- a/tpl/dailyrss.html +++ b/tpl/dailyrss.html | |||
@@ -6,7 +6,7 @@ | |||
6 | <description><![CDATA[ | 6 | <description><![CDATA[ |
7 | {loop="links"} | 7 | {loop="links"} |
8 | <h3><a href="{$value.url}">{$value.title}</a></h3> | 8 | <h3><a href="{$value.url}">{$value.title}</a></h3> |
9 | <small>{if="!$GLOBALS['config']['HIDE_TIMESTAMPS']"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br> | 9 | <small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br> |
10 | {$value.url}</small><br> | 10 | {$value.url}</small><br> |
11 | {if="$value.thumbnail"}{$value.thumbnail}{/if}<br> | 11 | {if="$value.thumbnail"}{$value.thumbnail}{/if}<br> |
12 | {if="$value.description"}{$value.formatedDescription}{/if} | 12 | {if="$value.description"}{$value.formatedDescription}{/if} |
diff --git a/tpl/editlink.html b/tpl/editlink.html index 14a2e6c8..441b5302 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html | |||
@@ -25,7 +25,7 @@ | |||
25 | {$value} | 25 | {$value} |
26 | {/loop} | 26 | {/loop} |
27 | 27 | ||
28 | {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} | 28 | {if="($link_is_new && $default_private_links) || $link.private == true"} |
29 | <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> | 29 | <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> |
30 | <label for="lf_private"><i>Private</i></label><br> | 30 | <label for="lf_private"><i>Private</i></label><br> |
31 | {else} | 31 | {else} |
@@ -43,12 +43,10 @@ | |||
43 | {if="$source !== 'firefoxsocialapi'"} | 43 | {if="$source !== 'firefoxsocialapi'"} |
44 | {include="page.footer"} | 44 | {include="page.footer"} |
45 | {/if} | 45 | {/if} |
46 | {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"} | ||
47 | <script src="inc/awesomplete.min.js#"></script> | 46 | <script src="inc/awesomplete.min.js#"></script> |
48 | <script src="inc/awesomplete-multiple-tags.js#"></script> | 47 | <script src="inc/awesomplete-multiple-tags.js#"></script> |
49 | <script> | 48 | <script> |
50 | awesompleteUniqueTag('#lf_tags'); | 49 | awesompleteUniqueTag('#lf_tags'); |
51 | </script> | 50 | </script> |
52 | {/if} | ||
53 | </body> | 51 | </body> |
54 | </html> | 52 | </html> |
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/page.header.html b/tpl/page.header.html index 3a09ecd9..0012c689 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html | |||
@@ -21,14 +21,14 @@ | |||
21 | <li><a href="?do=logout">Logout</a></li> | 21 | <li><a href="?do=logout">Logout</a></li> |
22 | <li><a href="?do=tools">Tools</a></li> | 22 | <li><a href="?do=tools">Tools</a></li> |
23 | <li><a href="?do=addlink">Add link</a></li> | 23 | <li><a href="?do=addlink">Add link</a></li> |
24 | {elseif="$GLOBALS['config']['OPEN_SHAARLI']"} | 24 | {elseif="$openshaarli"} |
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="?do=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="$GLOBALS['config']['SHOW_ATOM']"} | 31 | {if="$showatom"} |
32 | <li><a href="{$feedurl}?do=atom{$searchcrits}" class="nomobile">ATOM Feed</a></li> | 32 | <li><a href="{$feedurl}?do=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="?do=tagcloud">Tag cloud</a></li> |
diff --git a/tpl/tools.html b/tpl/tools.html index 7b4eba09..9e45caad 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> |