aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-18 12:40:27 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-18 12:40:27 +0100
commit8147ff76a49206a08999f420206d971de10db12e (patch)
treedea3412c8e30cfab464557bcbe4c5c3fb08bc33e /tpl
parent9eba6ff469bdea8f341af06ef23c8bb4bd3a6869 (diff)
parente3ffc8fdee30be41046b985fe6e7034fb580b0c8 (diff)
downloadShaarli-8147ff76a49206a08999f420206d971de10db12e.tar.gz
Shaarli-8147ff76a49206a08999f420206d971de10db12e.tar.zst
Shaarli-8147ff76a49206a08999f420206d971de10db12e.zip
merge
Diffstat (limited to 'tpl')
-rw-r--r--tpl/daily.html4
-rw-r--r--tpl/editlink.html35
-rw-r--r--tpl/feed.atom.html4
-rw-r--r--tpl/includes.html3
-rw-r--r--tpl/linklist.html15
-rw-r--r--tpl/linklist.paging.html6
-rw-r--r--tpl/loginform.html4
-rw-r--r--tpl/page.header.html6
-rw-r--r--tpl/pluginsadmin.html4
-rw-r--r--tpl/tools.html6
10 files changed, 45 insertions, 42 deletions
diff --git a/tpl/daily.html b/tpl/daily.html
index b82ad483..eba0af3b 100644
--- a/tpl/daily.html
+++ b/tpl/daily.html
@@ -49,13 +49,13 @@
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="!$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"}
diff --git a/tpl/editlink.html b/tpl/editlink.html
index 441b5302..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,20 +30,20 @@
25 {$value} 30 {$value}
26 {/loop} 31 {/loop}
27 32
28 {if="($link_is_new && $default_private_links) || $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 &nbsp;<label for="lf_private"><i>Private</i></label><br> 35 &nbsp;<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 &nbsp;<label for="lf_private"><i>Private</i></label><br> 38 &nbsp;<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"}
diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html
index 40fd421a..aead0459 100644
--- a/tpl/feed.atom.html
+++ b/tpl/feed.atom.html
@@ -30,9 +30,7 @@
30 <published>{$value.pub_iso_date}</published> 30 <published>{$value.pub_iso_date}</published>
31 <updated>{$value.up_iso_date}</updated> 31 <updated>{$value.up_iso_date}</updated>
32 {/if} 32 {/if}
33 <content type="html" xml:lang="{$language}"> 33 <content type="html" xml:lang="{$language}"><![CDATA[{$value.description}]]></content>
34 <![CDATA[{$value.description}]]>
35 </content>
36 {loop="$value.taglist"} 34 {loop="$value.taglist"}
37 <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" /> 35 <category scheme="{$index_url}?searchtags=" term="{$value|strtolower}" label="{$value}" />
38 {/loop} 36 {/loop}
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 70c9cf79..0f1a5e8c 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -29,10 +29,8 @@
29 </form> 29 </form>
30 {loop="$plugins_header.fields_toolbar"} 30 {loop="$plugins_header.fields_toolbar"}
31 <form 31 <form
32 {loop="$value"} 32 {loop="$value.attr"}
33 {if="$key!='inputs'"} 33 {$key}="{$value}"
34 {$key}="{$value}"
35 {/if}
36 {/loop}> 34 {/loop}>
37 {loop="$value.inputs"} 35 {loop="$value.inputs"}
38 <input 36 <input
@@ -83,12 +81,13 @@
83 {if="isLoggedIn()"} 81 {if="isLoggedIn()"}
84 <div class="linkeditbuttons"> 82 <div class="linkeditbuttons">
85 <form method="GET" class="buttoneditform"> 83 <form method="GET" class="buttoneditform">
86 <input type="hidden" name="edit_link" value="{$value.linkdate}"> 84 <input type="hidden" name="edit_link" value="{$value.id}">
87 <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">
88 </form><br> 86 </form><br>
89 <form method="GET" class="buttoneditform"> 87 <form method="POST" class="buttoneditform">
88 <input type="hidden" name="lf_linkdate" value="{$value.id}">
90 <input type="hidden" name="token" value="{$token}"> 89 <input type="hidden" name="token" value="{$token}">
91 <input type="hidden" name="delete_link" value="{$value.linkdate}"> 90 <input type="hidden" name="delete_link">
92 <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"
93 class="button_delete" onClick="return confirmDeleteLink();"> 92 class="button_delete" onClick="return confirmDeleteLink();">
94 </form> 93 </form>
@@ -102,7 +101,7 @@
102 {if="!$hide_timestamps || isLoggedIn()"} 101 {if="!$hide_timestamps || isLoggedIn()"}
103 {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} 102 {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'}
104 <span class="linkdate" title="Permalink"> 103 <span class="linkdate" title="Permalink">
105 <a href="?{$value.linkdate|smallHash}"> 104 <a href="?{$value.shorturl}">
106 <span title="{$updated}"> 105 <span title="{$updated}">
107 {function="strftime('%c', $value.timestamp)"} 106 {function="strftime('%c', $value.timestamp)"}
108 {if="$value.updated_timestamp"}*{/if} 107 {if="$value.updated_timestamp"}*{/if}
diff --git a/tpl/linklist.paging.html b/tpl/linklist.paging.html
index 42f58d0d..86019c01 100644
--- a/tpl/linklist.paging.html
+++ b/tpl/linklist.paging.html
@@ -15,10 +15,8 @@
15 {loop="$action_plugin"} 15 {loop="$action_plugin"}
16 <div class="paging_privatelinks"> 16 <div class="paging_privatelinks">
17 <a 17 <a
18 {loop="$value"} 18 {loop="$value.attr"}
19 {if="$key!='html'"} 19 {$key}="{$value}"
20 {$key}="{$value}"
21 {/if}
22 {/loop}> 20 {/loop}>
23 {$value.html} 21 {$value.html}
24 </a> 22 </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 89879678..cce61ec4 100644
--- a/tpl/page.header.html
+++ b/tpl/page.header.html
@@ -36,10 +36,8 @@
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 <li><a 38 <li><a
39 {loop="$value"} 39 {loop="$value.attr"}
40 {if="$key!='html'"} 40 {$key}="{$value}"
41 {$key}="{$value}"
42 {/if}
43 {/loop}> 41 {/loop}>
44 {$value.html} 42 {$value.html}
45 </a></li> 43 </a></li>
diff --git a/tpl/pluginsadmin.html b/tpl/pluginsadmin.html
index 672f4993..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>
diff --git a/tpl/tools.html b/tpl/tools.html
index 8e285f44..e06d239d 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -50,12 +50,15 @@
50 &nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli. 50 &nbsp;&nbsp;&nbsp;&nbsp;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>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span> 59 <span>&#x21D0; 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("/"));
@@ -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;