diff options
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/configure.html | 114 | ||||
-rw-r--r-- | tpl/daily.html | 12 | ||||
-rw-r--r-- | tpl/dailyrss.html | 4 | ||||
-rw-r--r-- | tpl/editlink.html | 37 | ||||
-rw-r--r-- | tpl/export.bookmarks.html | 2 | ||||
-rw-r--r-- | tpl/feed.atom.html | 9 | ||||
-rw-r--r-- | tpl/feed.rss.html | 5 | ||||
-rw-r--r-- | tpl/import.html | 38 | ||||
-rw-r--r-- | tpl/includes.html | 3 | ||||
-rw-r--r-- | tpl/linklist.html | 33 | ||||
-rw-r--r-- | tpl/linklist.paging.html | 9 | ||||
-rw-r--r-- | tpl/loginform.html | 4 | ||||
-rw-r--r-- | tpl/page.header.html | 13 | ||||
-rw-r--r-- | tpl/picwall.html | 2 | ||||
-rw-r--r-- | tpl/pluginsadmin.html | 11 | ||||
-rw-r--r-- | tpl/tagcloud.html | 2 | ||||
-rw-r--r-- | tpl/tools.html | 10 |
17 files changed, 202 insertions, 106 deletions
diff --git a/tpl/configure.html b/tpl/configure.html index 77c8b7d9..983bcd08 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="$session_protection_disabled"}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..eba0af3b 100644 --- a/tpl/daily.html +++ b/tpl/daily.html | |||
@@ -42,25 +42,25 @@ | |||
42 | <div class="clear"></div> | 42 | <div class="clear"></div> |
43 | 43 | ||
44 | {if="$linksToDisplay"} | 44 | {if="$linksToDisplay"} |
45 | {loop="cols"} | 45 | {loop="$cols"} |
46 | {if="isset($value[0])"} | 46 | {if="isset($value[0])"} |
47 | <div id="daily_col{$counter+1}"> | 47 | <div id="daily_col{$counter+1}"> |
48 | {loop="value"} | 48 | {loop="$value"} |
49 | {$link=$value} | 49 | {$link=$value} |
50 | <div class="dailyEntry"> | 50 | <div class="dailyEntry"> |
51 | <div class="dailyEntryPermalink"> | 51 | <div class="dailyEntryPermalink"> |
52 | <a href="?{$link.linkdate|smallHash}"> | 52 | <a href="?{$value.shorturl}"> |
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="?{$value.shorturl}">{function="strftime('%c', $link.timestamp)"}</a> |
59 | </div> | 59 | </div> |
60 | {/if} | 60 | {/if} |
61 | {if="$link.tags"} | 61 | {if="$link.tags"} |
62 | <div class="dailyEntryTags"> | 62 | <div class="dailyEntryTags"> |
63 | {loop="link.taglist"} | 63 | {loop="$link.taglist"} |
64 | {$value} - | 64 | {$value} - |
65 | {/loop} | 65 | {/loop} |
66 | </div> | 66 | </div> |
diff --git a/tpl/dailyrss.html b/tpl/dailyrss.html index 4133ca3e..ddbd6c5e 100644 --- a/tpl/dailyrss.html +++ b/tpl/dailyrss.html | |||
@@ -4,9 +4,9 @@ | |||
4 | <link>{$absurl}</link> | 4 | <link>{$absurl}</link> |
5 | <pubDate>{$rssdate}</pubDate> | 5 | <pubDate>{$rssdate}</pubDate> |
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..870cc168 100644 --- a/tpl/editlink.html +++ b/tpl/editlink.html | |||
@@ -8,13 +8,18 @@ | |||
8 | {elseif="$link.description==''"}onload="document.linkform.lf_description.focus();" | 8 | {elseif="$link.description==''"}onload="document.linkform.lf_description.focus();" |
9 | {else}onload="document.linkform.lf_tags.focus();"{/if} > | 9 | {else}onload="document.linkform.lf_tags.focus();"{/if} > |
10 | <div id="pageheader"> | 10 | <div id="pageheader"> |
11 | {if="$source !== 'firefoxsocialapi'"} | 11 | {if="$source !== 'firefoxsocialapi'"} |
12 | {include="page.header"} | 12 | {include="page.header"} |
13 | {/if} | 13 | {else} |
14 | <div id="editlinkform"> | 14 | <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div> |
15 | <form method="post" name="linkform"> | 15 | {/if} |
16 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | 16 | <div id="editlinkform"> |
17 | <label for="lf_url"><i>URL</i></label><br><input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input"><br> | 17 | <form method="post" name="linkform"> |
18 | <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> | ||
19 | {if="isset($link.id)"} | ||
20 | <input type="hidden" name="lf_id" value="{$link.id}"> | ||
21 | {/if} | ||
22 | <label for="lf_url"><i>URL</i></label><br><input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input"><br> | ||
18 | <label for="lf_title"><i>Title</i></label><br><input type="text" name="lf_title" id="lf_title" value="{$link.title}" class="lf_input"><br> | 23 | <label for="lf_title"><i>Title</i></label><br><input type="text" name="lf_title" id="lf_title" value="{$link.title}" class="lf_input"><br> |
19 | <label for="lf_description"><i>Description</i></label><br><textarea name="lf_description" id="lf_description" rows="4" cols="25">{$link.description}</textarea><br> | 24 | <label for="lf_description"><i>Description</i></label><br><textarea name="lf_description" id="lf_description" rows="4" cols="25">{$link.description}</textarea><br> |
20 | <label for="lf_tags"><i>Tags</i></label><br> | 25 | <label for="lf_tags"><i>Tags</i></label><br> |
@@ -25,30 +30,28 @@ | |||
25 | {$value} | 30 | {$value} |
26 | {/loop} | 31 | {/loop} |
27 | 32 | ||
28 | {if="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"} | 33 | {if="($link_is_new && $default_private_links) || $link.private == true"} |
29 | <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> | 34 | <input type="checkbox" checked="checked" name="lf_private" id="lf_private"> |
30 | <label for="lf_private"><i>Private</i></label><br> | 35 | <label for="lf_private"><i>Private</i></label><br> |
31 | {else} | 36 | {else} |
32 | <input type="checkbox" name="lf_private" id="lf_private"> | 37 | <input type="checkbox" name="lf_private" id="lf_private"> |
33 | <label for="lf_private"><i>Private</i></label><br> | 38 | <label for="lf_private"><i>Private</i></label><br> |
34 | {/if} | 39 | {/if} |
35 | <input type="submit" value="Save" name="save_edit" class="bigbutton"> | 40 | <input type="submit" value="Save" name="save_edit" class="bigbutton"> |
36 | <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton"> | 41 | <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton"> |
37 | {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton delete" onClick="return confirmDeleteLink();">{/if} | 42 | {if="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton delete" onClick="return confirmDeleteLink();">{/if} |
38 | <input type="hidden" name="token" value="{$token}"> | 43 | <input type="hidden" name="token" value="{$token}"> |
39 | {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if} | 44 | {if="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer}">{/if} |
40 | </form> | 45 | </form> |
41 | </div> | 46 | </div> |
42 | </div> | 47 | </div> |
43 | {if="$source !== 'firefoxsocialapi'"} | 48 | {if="$source !== 'firefoxsocialapi'"} |
44 | {include="page.footer"} | 49 | {include="page.footer"} |
45 | {/if} | 50 | {/if} |
46 | {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"} | ||
47 | <script src="inc/awesomplete.min.js#"></script> | 51 | <script src="inc/awesomplete.min.js#"></script> |
48 | <script src="inc/awesomplete-multiple-tags.js#"></script> | 52 | <script src="inc/awesomplete-multiple-tags.js#"></script> |
49 | <script> | 53 | <script> |
50 | awesompleteUniqueTag('#lf_tags'); | 54 | awesompleteUniqueTag('#lf_tags'); |
51 | </script> | 55 | </script> |
52 | {/if} | ||
53 | </body> | 56 | </body> |
54 | </html> | 57 | </html> |
diff --git a/tpl/export.bookmarks.html b/tpl/export.bookmarks.html index da733257..127a5c20 100644 --- a/tpl/export.bookmarks.html +++ b/tpl/export.bookmarks.html | |||
@@ -5,6 +5,6 @@ | |||
5 | Do Not Edit! -->{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} | 5 | Do Not Edit! -->{ignore}The RainTPL loop is formatted to avoid generating extra newlines{/ignore} |
6 | <TITLE>{$pagetitle}</TITLE> | 6 | <TITLE>{$pagetitle}</TITLE> |
7 | <H1>Shaarli export of {$selection} bookmarks on {$date}</H1> | 7 | <H1>Shaarli export of {$selection} bookmarks on {$date}</H1> |
8 | <DL><p>{loop="links"} | 8 | <DL><p>{loop="$links"} |
9 | <DT><A HREF="{$value.url}" ADD_DATE="{$value.timestamp}" PRIVATE="{$value.private}" TAGS="{$value.taglist}">{$value.title}</A>{if="$value.description"}{$eol}<DD>{$value.description}{/if}{/loop} | 9 | <DT><A HREF="{$value.url}" ADD_DATE="{$value.timestamp}" PRIVATE="{$value.private}" TAGS="{$value.taglist}">{$value.title}</A>{if="$value.description"}{$eol}<DD>{$value.description}{/if}{/loop} |
10 | </DL><p> | 10 | </DL><p> |
diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index 2ebb162a..aead0459 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html | |||
@@ -17,7 +17,7 @@ | |||
17 | </author> | 17 | </author> |
18 | <id>{$index_url}</id> | 18 | <id>{$index_url}</id> |
19 | <generator>Shaarli</generator> | 19 | <generator>Shaarli</generator> |
20 | {loop="links"} | 20 | {loop="$links"} |
21 | <entry> | 21 | <entry> |
22 | <title>{$value.title}</title> | 22 | <title>{$value.title}</title> |
23 | {if="$usepermalinks"} | 23 | {if="$usepermalinks"} |
@@ -27,11 +27,10 @@ | |||
27 | {/if} | 27 | {/if} |
28 | <id>{$value.guid}</id> | 28 | <id>{$value.guid}</id> |
29 | {if="$show_dates"} | 29 | {if="$show_dates"} |
30 | <updated>{$value.iso_date}</updated> | 30 | <published>{$value.pub_iso_date}</published> |
31 | <updated>{$value.up_iso_date}</updated> | ||
31 | {/if} | 32 | {/if} |
32 | <content type="html" xml:lang="{$language}"> | 33 | <content type="html" xml:lang="{$language}"><![CDATA[{$value.description}]]></content> |
33 | <![CDATA[{$value.description}]]> | ||
34 | </content> | ||
35 | {loop="$value.taglist"} | 34 | {loop="$value.taglist"} |
36 | <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> | 35 | <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> |
37 | {/loop} | 36 | {/loop} |
diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index 26de7f19..e18dbf9b 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <!-- PubSubHubbub Discovery --> | 12 | <!-- PubSubHubbub Discovery --> |
13 | <atom:link rel="hub" href="{$pubsubhub_url}" /> | 13 | <atom:link rel="hub" href="{$pubsubhub_url}" /> |
14 | {/if} | 14 | {/if} |
15 | {loop="links"} | 15 | {loop="$links"} |
16 | <item> | 16 | <item> |
17 | <title>{$value.title}</title> | 17 | <title>{$value.title}</title> |
18 | <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid> | 18 | <guid isPermaLink="{if="$usepermalinks"}true{else}false{/if}">{$value.guid}</guid> |
@@ -22,7 +22,8 @@ | |||
22 | <link>{$value.url}</link> | 22 | <link>{$value.url}</link> |
23 | {/if} | 23 | {/if} |
24 | {if="$show_dates"} | 24 | {if="$show_dates"} |
25 | <pubDate>{$value.iso_date}</pubDate> | 25 | <pubDate>{$value.pub_iso_date}</pubDate> |
26 | <atom:modified>{$value.up_iso_date}</atom:modified> | ||
26 | {/if} | 27 | {/if} |
27 | <description><![CDATA[{$value.description}]]></description> | 28 | <description><![CDATA[{$value.description}]]></description> |
28 | {loop="$value.taglist"} | 29 | {loop="$value.taglist"} |
diff --git a/tpl/import.html b/tpl/import.html index 6c4f9421..071e1160 100644 --- a/tpl/import.html +++ b/tpl/import.html | |||
@@ -3,19 +3,31 @@ | |||
3 | <head>{include="includes"}</head> | 3 | <head>{include="includes"}</head> |
4 | <body onload="document.uploadform.filetoupload.focus();"> | 4 | <body onload="document.uploadform.filetoupload.focus();"> |
5 | <div id="pageheader"> | 5 | <div id="pageheader"> |
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} bytes). | 8 | Import Netscape HTML bookmarks (as exported from Firefox/Chrome/Opera/Delicious/Diigo...) (Max: {$maxfilesize} bytes). |
9 | <form method="POST" action="?do=upload" enctype="multipart/form-data" name="uploadform" id="uploadform"> | 9 | <form method="POST" action="?do=import" enctype="multipart/form-data" |
10 | <input type="hidden" name="token" value="{$token}"> | 10 | name="uploadform" id="uploadform"> |
11 | <input type="file" name="filetoupload"> | 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}"> |
13 | <input type="submit" name="import_file" value="Import" class="bigbutton"><br> | 13 | <input type="file" name="filetoupload"> |
14 | <input type="checkbox" name="private" id="private"><label for="private"> Import all links as private</label><br> | 14 | <input type="submit" name="import_file" value="Import" class="bigbutton"><br> |
15 | <input type="checkbox" name="overwrite" id="overwrite"><label for="overwrite"> Overwrite existing links</label> | 15 | |
16 | </form> | 16 | <label for="privacy"> Visibility:</label><br> |
17 | </div> | 17 | <input type="radio" name="privacy" value="default" checked="true"> |
18 | Use values from the imported file, default to public<br> | ||
19 | <input type="radio" name="privacy" value="private"> | ||
20 | Import all bookmarks as private<br> | ||
21 | <input type="radio" name="privacy" value="public"> | ||
22 | Import all bookmarks as public<br> | ||
23 | |||
24 | <input type="checkbox" name="overwrite" id="overwrite"> | ||
25 | <label for="overwrite"> Overwrite existing bookmarks</label><br> | ||
26 | <label for="default_tags"> Add default tags</label> | ||
27 | <input type="text" name="default_tags" id="default_tags"> | ||
28 | </form> | ||
29 | </div> | ||
18 | </div> | 30 | </div> |
19 | {include="page.footer"} | 31 | {include="page.footer"} |
20 | </body> | 32 | </body> |
21 | </html> \ No newline at end of file | 33 | </html> |
diff --git a/tpl/includes.html b/tpl/includes.html index f94ce1be..7b2997ce 100644 --- a/tpl/includes.html +++ b/tpl/includes.html | |||
@@ -2,6 +2,7 @@ | |||
2 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 2 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
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 | <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}?do=rss{$searchcrits}#" title="RSS Feed" /> |
6 | <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}?do=atom{$searchcrits}#" title="ATOM Feed" /> |
7 | <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> | 8 | <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> |
@@ -11,4 +12,4 @@ | |||
11 | {loop="$plugins_includes.css_files"} | 12 | {loop="$plugins_includes.css_files"} |
12 | <link type="text/css" rel="stylesheet" href="{$value}#"/> | 13 | <link type="text/css" rel="stylesheet" href="{$value}#"/> |
13 | {/loop} | 14 | {/loop} |
14 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> \ No newline at end of file | 15 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> |
diff --git a/tpl/linklist.html b/tpl/linklist.html index c0d42006..0f1a5e8c 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html | |||
@@ -28,7 +28,17 @@ | |||
28 | <input type="submit" value="Search" class="bigbutton"> | 28 | <input type="submit" value="Search" class="bigbutton"> |
29 | </form> | 29 | </form> |
30 | {loop="$plugins_header.fields_toolbar"} | 30 | {loop="$plugins_header.fields_toolbar"} |
31 | {$value} | 31 | <form |
32 | {loop="$value.attr"} | ||
33 | {$key}="{$value}" | ||
34 | {/loop}> | ||
35 | {loop="$value.inputs"} | ||
36 | <input | ||
37 | {loop="$value"} | ||
38 | {$key}="{$value}" | ||
39 | {/loop}> | ||
40 | {/loop} | ||
41 | </form> | ||
32 | {/loop} | 42 | {/loop} |
33 | </div> | 43 | </div> |
34 | </div> | 44 | </div> |
@@ -63,7 +73,7 @@ | |||
63 | </div> | 73 | </div> |
64 | {/if} | 74 | {/if} |
65 | <ul> | 75 | <ul> |
66 | {loop="links"} | 76 | {loop="$links"} |
67 | <li{if="$value.class"} class="{$value.class}"{/if}> | 77 | <li{if="$value.class"} class="{$value.class}"{/if}> |
68 | <a id="{$value.shorturl}"></a> | 78 | <a id="{$value.shorturl}"></a> |
69 | <div class="thumbnail">{$value.url|thumbnail}</div> | 79 | <div class="thumbnail">{$value.url|thumbnail}</div> |
@@ -71,11 +81,11 @@ | |||
71 | {if="isLoggedIn()"} | 81 | {if="isLoggedIn()"} |
72 | <div class="linkeditbuttons"> | 82 | <div class="linkeditbuttons"> |
73 | <form method="GET" class="buttoneditform"> | 83 | <form method="GET" class="buttoneditform"> |
74 | <input type="hidden" name="edit_link" value="{$value.linkdate}"> | 84 | <input type="hidden" name="edit_link" value="{$value.id}"> |
75 | <input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"> | 85 | <input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"> |
76 | </form><br> | 86 | </form><br> |
77 | <form method="POST" class="buttoneditform"> | 87 | <form method="POST" class="buttoneditform"> |
78 | <input type="hidden" name="lf_linkdate" value="{$value.linkdate}"> | 88 | <input type="hidden" name="lf_linkdate" value="{$value.id}"> |
79 | <input type="hidden" name="token" value="{$token}"> | 89 | <input type="hidden" name="token" value="{$token}"> |
80 | <input type="hidden" name="delete_link"> | 90 | <input type="hidden" name="delete_link"> |
81 | <input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" | 91 | <input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" |
@@ -88,8 +98,17 @@ | |||
88 | </span> | 98 | </span> |
89 | <br> | 99 | <br> |
90 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} | 100 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} |
91 | {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"} | 101 | {if="!$hide_timestamps || isLoggedIn()"} |
92 | <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span> | 102 | {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} |
103 | <span class="linkdate" title="Permalink"> | ||
104 | <a href="?{$value.shorturl}"> | ||
105 | <span title="{$updated}"> | ||
106 | {function="strftime('%c', $value.timestamp)"} | ||
107 | {if="$value.updated_timestamp"}*{/if} | ||
108 | </span> | ||
109 | - permalink | ||
110 | </a> - | ||
111 | </span> | ||
93 | {else} | 112 | {else} |
94 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> | 113 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> |
95 | {/if} | 114 | {/if} |
@@ -101,7 +120,7 @@ | |||
101 | <a href="{$value.real_url}"><span class="linkurl" title="Short link">{$value.url}</span></a><br> | 120 | <a href="{$value.real_url}"><span class="linkurl" title="Short link">{$value.url}</span></a><br> |
102 | {if="$value.tags"} | 121 | {if="$value.tags"} |
103 | <div class="linktaglist"> | 122 | <div class="linktaglist"> |
104 | {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value}</a></span> {/loop} | 123 | {loop="$value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value}</a></span> {/loop} |
105 | </div> | 124 | </div> |
106 | {/if} | 125 | {/if} |
107 | 126 | ||
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html index e91c8f86..86019c01 100644 --- a/tpl/linklist.paging.html +++ b/tpl/linklist.paging.html | |||
@@ -13,7 +13,14 @@ | |||
13 | </div> | 13 | </div> |
14 | {/if} | 14 | {/if} |
15 | {loop="$action_plugin"} | 15 | {loop="$action_plugin"} |
16 | {$value} | 16 | <div class="paging_privatelinks"> |
17 | <a | ||
18 | {loop="$value.attr"} | ||
19 | {$key}="{$value}" | ||
20 | {/loop}> | ||
21 | {$value.html} | ||
22 | </a> | ||
23 | </div> | ||
17 | {/loop} | 24 | {/loop} |
18 | <div class="paging_linksperpage"> | 25 | <div class="paging_linksperpage"> |
19 | 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: <a href="?linksperpage=20">20</a> <a href="?linksperpage=50">50</a> <a href="?linksperpage=100">100</a> |
diff --git a/tpl/loginform.html b/tpl/loginform.html index a49b42d3..84176385 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <html> | 2 | <html> |
3 | <head>{include="includes"}</head> | 3 | <head>{include="includes"}</head> |
4 | <body | 4 | <body |
5 | {if="ban_canLogin()"} | 5 | {if="ban_canLogin($conf)"} |
6 | {if="empty($username)"} | 6 | {if="empty($username)"} |
7 | onload="document.loginform.login.focus();" | 7 | onload="document.loginform.login.focus();" |
8 | {else} | 8 | {else} |
@@ -13,7 +13,7 @@ | |||
13 | {include="page.header"} | 13 | {include="page.header"} |
14 | 14 | ||
15 | <div id="headerform"> | 15 | <div id="headerform"> |
16 | {if="!ban_canLogin()"} | 16 | {if="!ban_canLogin($conf)"} |
17 | You have been banned from login after too many failed attempts. Try later. | 17 | You have been banned from login after too many failed attempts. Try later. |
18 | {else} | 18 | {else} |
19 | <form method="post" name="loginform"> | 19 | <form method="post" name="loginform"> |
diff --git a/tpl/page.header.html b/tpl/page.header.html index 3a09ecd9..cce61ec4 100644 --- a/tpl/page.header.html +++ b/tpl/page.header.html | |||
@@ -21,21 +21,26 @@ | |||
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> |
35 | <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li> | 35 | <li><a href="?do=picwall{$searchcrits}">Picture wall</a></li> |
36 | <li><a href="?do=daily">Daily</a></li> | 36 | <li><a href="?do=daily">Daily</a></li> |
37 | {loop="$plugins_header.buttons_toolbar"} | 37 | {loop="$plugins_header.buttons_toolbar"} |
38 | {$value} | 38 | <li><a |
39 | {loop="$value.attr"} | ||
40 | {$key}="{$value}" | ||
41 | {/loop}> | ||
42 | {$value.html} | ||
43 | </a></li> | ||
39 | {/loop} | 44 | {/loop} |
40 | {/if} | 45 | {/if} |
41 | </ul> | 46 | </ul> |
@@ -43,7 +48,7 @@ | |||
43 | 48 | ||
44 | {if="!empty($plugin_errors) && isLoggedIn()"} | 49 | {if="!empty($plugin_errors) && isLoggedIn()"} |
45 | <ul class="errors"> | 50 | <ul class="errors"> |
46 | {loop="plugin_errors"} | 51 | {loop="$plugin_errors"} |
47 | <li>{$value}</li> | 52 | <li>{$value}</li> |
48 | {/loop} | 53 | {/loop} |
49 | </ul> | 54 | </ul> |
diff --git a/tpl/picwall.html b/tpl/picwall.html index 230c948b..4e227e37 100644 --- a/tpl/picwall.html +++ b/tpl/picwall.html | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | <div class="center"> | 15 | <div class="center"> |
16 | <div id="picwall_container"> | 16 | <div id="picwall_container"> |
17 | {loop="linksToDisplay"} | 17 | {loop="$linksToDisplay"} |
18 | <div class="picwall_pictureframe"> | 18 | <div class="picwall_pictureframe"> |
19 | {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a> | 19 | {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a> |
20 | {loop="$value.picwall_plugin"} | 20 | {loop="$value.picwall_plugin"} |
diff --git a/tpl/pluginsadmin.html b/tpl/pluginsadmin.html index 5ddcf061..ead1734e 100644 --- a/tpl/pluginsadmin.html +++ b/tpl/pluginsadmin.html | |||
@@ -38,11 +38,11 @@ | |||
38 | <tr data-line="{$key}" data-order="{$counter}"> | 38 | <tr data-line="{$key}" data-order="{$counter}"> |
39 | <td class="center"><input type="checkbox" name="{$key}" id="{$key}" checked="checked"></td> | 39 | <td class="center"><input type="checkbox" name="{$key}" id="{$key}" checked="checked"></td> |
40 | <td class="center"> | 40 | <td class="center"> |
41 | <a href="#" | 41 | <a href="#" class="arrow" |
42 | onclick="return orderUp(this.parentNode.parentNode.getAttribute('data-order'));"> | 42 | onclick="return orderUp(this.parentNode.parentNode.getAttribute('data-order'));"> |
43 | ▲ | 43 | ▲ |
44 | </a> | 44 | </a> |
45 | <a href="#" | 45 | <a href="#" class="arrow" |
46 | onclick="return orderDown(this.parentNode.parentNode.getAttribute('data-order'));"> | 46 | onclick="return orderDown(this.parentNode.parentNode.getAttribute('data-order'));"> |
47 | ▼ | 47 | ▼ |
48 | </a> | 48 | </a> |
@@ -104,11 +104,14 @@ | |||
104 | <div class="plugin_parameter"> | 104 | <div class="plugin_parameter"> |
105 | <div class="float_label"> | 105 | <div class="float_label"> |
106 | <label for="{$key}"> | 106 | <label for="{$key}"> |
107 | <code>{$key}</code> | 107 | <code>{$key}</code><br> |
108 | {if="isset($value.desc)"} | ||
109 | {$value.desc} | ||
110 | {/if} | ||
108 | </label> | 111 | </label> |
109 | </div> | 112 | </div> |
110 | <div class="float_input"> | 113 | <div class="float_input"> |
111 | <input name="{$key}" value="{$value}" id="{$key}"/> | 114 | <input name="{$key}" value="{$value.value}" id="{$key}"/> |
112 | </div> | 115 | </div> |
113 | </div> | 116 | </div> |
114 | {/loop} | 117 | {/loop} |
diff --git a/tpl/tagcloud.html b/tpl/tagcloud.html index e449f293..05e45273 100644 --- a/tpl/tagcloud.html +++ b/tpl/tagcloud.html | |||
@@ -11,7 +11,7 @@ | |||
11 | </div> | 11 | </div> |
12 | 12 | ||
13 | <div id="cloudtag"> | 13 | <div id="cloudtag"> |
14 | {loop="tags"} | 14 | {loop="$tags"} |
15 | <span class="count">{$value.count}</span><a | 15 | <span class="count">{$value.count}</span><a |
16 | href="?searchtags={$key|urlencode}" style="font-size:{$value.size}em;">{$key}</a> | 16 | href="?searchtags={$key|urlencode}" style="font-size:{$value.size}em;">{$key}</a> |
17 | {loop="$value.tag_plugin"} | 17 | {loop="$value.tag_plugin"} |
diff --git a/tpl/tools.html b/tpl/tools.html index 78b81663..e06d239d 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> |
@@ -50,12 +50,15 @@ | |||
50 | Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli. | 50 | Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli. |
51 | </span> | 51 | </span> |
52 | </a><br><br> | 52 | </a><br><br> |
53 | |||
54 | {if="$sslenabled"} | ||
53 | <a class="smallbutton" onclick="activateFirefoxSocial(this)"> | 55 | <a class="smallbutton" onclick="activateFirefoxSocial(this)"> |
54 | <b>✚Add to Firefox social</b> | 56 | <b>✚Add to Firefox social</b> |
55 | </a> | 57 | </a> |
56 | <a href="#"> | 58 | <a href="#"> |
57 | <span>⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.</span> | 59 | <span>⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.</span> |
58 | </a><br><br> | 60 | </a><br><br> |
61 | {/if} | ||
59 | 62 | ||
60 | {loop="$tools_plugin"} | 63 | {loop="$tools_plugin"} |
61 | {$value} | 64 | {$value} |
@@ -64,6 +67,7 @@ | |||
64 | <div class="clear"></div> | 67 | <div class="clear"></div> |
65 | 68 | ||
66 | <script> | 69 | <script> |
70 | {if="$sslenabled"} | ||
67 | function activateFirefoxSocial(node) { | 71 | function activateFirefoxSocial(node) { |
68 | var loc = location.href; | 72 | var loc = location.href; |
69 | var baseURL = loc.substring(0, loc.lastIndexOf("/")); | 73 | var baseURL = loc.substring(0, loc.lastIndexOf("/")); |
@@ -79,7 +83,7 @@ | |||
79 | icon32URL: baseURL + "/images/favicon.ico", | 83 | icon32URL: baseURL + "/images/favicon.ico", |
80 | icon64URL: baseURL + "/images/favicon.ico", | 84 | icon64URL: baseURL + "/images/favicon.ico", |
81 | 85 | ||
82 | shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}", | 86 | shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", |
83 | homepageURL: baseURL | 87 | homepageURL: baseURL |
84 | }; | 88 | }; |
85 | node.setAttribute("data-service", JSON.stringify(data)); | 89 | node.setAttribute("data-service", JSON.stringify(data)); |
@@ -87,7 +91,7 @@ | |||
87 | var activate = new CustomEvent("ActivateSocialFeature"); | 91 | var activate = new CustomEvent("ActivateSocialFeature"); |
88 | node.dispatchEvent(activate); | 92 | node.dispatchEvent(activate); |
89 | } | 93 | } |
90 | 94 | {/if} | |
91 | function alertBookmarklet() { | 95 | function alertBookmarklet() { |
92 | alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); | 96 | alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); |
93 | return false; | 97 | return false; |