Merge remote-tracking branch 'Marsup/firefox-social' into next

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 @@
 {elseif="$link.description==''"}onload="document.linkform.lf_description.focus();"
 {else}onload="document.linkform.lf_tags.focus();"{/if} >
 <div id="pageheader">
+        {if="$source !== 'firefoxsocialapi'"}
         {include="page.header"}
+        {/if}
         <div id="editlinkform">
             <form method="post" name="linkform">
                 <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
@@ -34,7 +36,9 @@
             </form>
         </div>
 </div>
+{if="$source !== 'firefoxsocialapi'"}
 {include="page.footer"}
+{/if}
 {if="($GLOBALS['config']['OPEN_SHAARLI'] || isLoggedIn())"}
 <script>
     $ = 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 @@
                 <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>
                 <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>
                 <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>
+                <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>
                 <div class="clear"></div>
+
+                <script>
+                        function activateFirefoxSocial(node) {
+                                var loc = location.href;
+                                var baseURL = loc.substring(0, loc.lastIndexOf("/"));
+
+                                // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable.
+                                var data = {
+                                        name: "{$shaarlititle}",
+                                        description: "The personal, minimalist, super-fast, no-database delicious clone.",
+                                        author: "Shaarli",
+                                        version: "1.0.0",
+
+                                        iconURL: baseURL + "/images/favicon.ico",
+                                        icon32URL: baseURL + "/images/favicon.ico",
+                                        icon64URL: baseURL + "/images/favicon.ico",
+
+                                        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}",
+                                        homepageURL: baseURL
+                                };
+                                node.setAttribute("data-service", JSON.stringify(data));
+
+                                var activate = new CustomEvent("ActivateSocialFeature");
+                                node.dispatchEvent(activate);
+                        }
+                </script>
         </div>
 </div>
 {include="page.footer"}