aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-05-22 21:04:36 +0200
committernodiscc <nodiscc@gmail.com>2015-05-22 21:04:36 +0200
commit8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048 (patch)
tree939f6c91da5b4f9c87ec7b8b84586519fb40aa00 /tpl
parentf5b059254f1bc0311a4a2912502353e77dbad1dc (diff)
parentd33c5d4c3b9c70441391a08e8bcb2a8c639a4635 (diff)
downloadShaarli-8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048.tar.gz
Shaarli-8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048.tar.zst
Shaarli-8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048.zip
Merge remote-tracking branch 'Marsup/firefox-social' into next
Diffstat (limited to 'tpl')
-rw-r--r--tpl/editlink.html4
-rw-r--r--tpl/tools.html27
2 files changed, 31 insertions, 0 deletions
diff --git a/tpl/editlink.html b/tpl/editlink.html
index b737b990..0276f088 100644
--- a/tpl/editlink.html
+++ b/tpl/editlink.html
@@ -9,7 +9,9 @@
9{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();" 9{elseif="$link.description==''"}onload="document.linkform.lf_description.focus();"
10{else}onload="document.linkform.lf_tags.focus();"{/if} > 10{else}onload="document.linkform.lf_tags.focus();"{/if} >
11<div id="pageheader"> 11<div id="pageheader">
12 {if="$source !== 'firefoxsocialapi'"}
12 {include="page.header"} 13 {include="page.header"}
14 {/if}
13 <div id="editlinkform"> 15 <div id="editlinkform">
14 <form method="post" name="linkform"> 16 <form method="post" name="linkform">
15 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}"> 17 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
@@ -34,7 +36,9 @@
34 </form> 36 </form>
35 </div> 37 </div>
36</div> 38</div>
39{if="$source !== 'firefoxsocialapi'"}
37{include="page.footer"} 40{include="page.footer"}
41{/if}
38{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"} 42{if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"}
39<script> 43<script>
40 $ = Awesomplete.$; 44 $ = Awesomplete.$;
diff --git a/tpl/tools.html b/tpl/tools.html
index e912f615..a3b469de 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -12,7 +12,34 @@
12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br> 12 <a href="?do=export"><b>Export</b> <span>: Export Netscape html bookmarks (which can be imported in Firefox, Chrome, Opera, delicious...)</span></a><br><br>
13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br> 13 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="javascript:javascript:(function(){var%20url%20=%20location.href;var%20title%20=%20document.title%20||%20url;window.open('{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+'&amp;title='%20+%20encodeURIComponent(title)+'&amp;description='%20+%20encodeURIComponent(document.getSelection())+'&amp;source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1');})();"><b>✚Shaare link</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Shaare link" button in any page you want to share.</span></a><br><br>
14 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="?private=1&post="><b>✚Add Note</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a (default private) Note (text post) to your Shaarli.</span></a><br><br> 14 <a class="smallbutton" onclick="alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');return false;" href="?private=1&post="><b>✚Add Note</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Drag this link to your bookmarks toolbar (or right-click it and choose Bookmark This Link....).<br>&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a (default private) Note (text post) to your Shaarli.</span></a><br><br>
15 <a class="smallbutton" onclick="activateFirefoxSocial(this)"><b>✚Add to Firefox social</b></a> <a href="#" style="clear:none;"><span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span></a><br><br>
15 <div class="clear"></div> 16 <div class="clear"></div>
17
18 <script>
19 function activateFirefoxSocial(node) {
20 var loc = location.href;
21 var baseURL = loc.substring(0, loc.lastIndexOf("/"));
22
23 // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable.
24 var data = {
25 name: "{$shaarlititle}",
26 description: "The personal, minimalist, super-fast, no-database delicious clone.",
27 author: "Shaarli",
28 version: "1.0.0",
29
30 iconURL: baseURL + "/images/favicon.ico",
31 icon32URL: baseURL + "/images/favicon.ico",
32 icon64URL: baseURL + "/images/favicon.ico",
33
34 shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}",
35 homepageURL: baseURL
36 };
37 node.setAttribute("data-service", JSON.stringify(data));
38
39 var activate = new CustomEvent("ActivateSocialFeature");
40 node.dispatchEvent(activate);
41 }
42 </script>
16 </div> 43 </div>
17</div> 44</div>
18{include="page.footer"} 45{include="page.footer"}