Apply v0.8.2 changes, add opensearch tpl, add favicon

1 files changed, 36 insertions, 32 deletions

diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index ae794ce9..3f2cf0f1 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -76,7 +76,7 @@
               '{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+
               '&title='%20+%20encodeURIComponent(title)+
               '&description='%20+%20encodeURIComponent(document.getSelection())+
-              '&source=bookmarklet','_blank','menubar=no,height=390,width=600,toolbar=no,scrollbars=no,status=no,dialog=1'
+              '&source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1'
             );
           }
         )();">
@@ -94,20 +94,22 @@
   </div>
 </div>
 
-<div class="pure-g">
-  <div class="pure-u-lg-1-3 pure-u-1-8"></div>
-  <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light">
-    <h2 class="window-title">Firefox Social API</h2>
-    <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p>
+{if="$sslenabled"}
+  <div class="pure-g">
+    <div class="pure-u-lg-1-3 pure-u-1-8"></div>
+    <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light">
+      <h2 class="window-title">Firefox Social API</h2>
+      <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p>
 
-    <div class="tools-item">
-      <a title="{'Click on this button to add Shaarli to the 'Share this page' button in Firefox"
-         onclick="activateFirefoxSocial(this)">
-      <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add to'|t} Firefox Social</span>
-      </a>
+      <div class="tools-item">
+        <a title="{'Click on this button to add Shaarli to the 'Share this page' button in Firefox"
+           onclick="activateFirefoxSocial(this)">
+        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add to'|t} Firefox Social</span>
+        </a>
+      </div>
     </div>
   </div>
-</div>
+{/if}
 
 <div class="pure-g">
   <div class="pure-u-lg-1-3 pure-u-1-8"></div>
@@ -128,31 +130,33 @@
 </div>
 
 {include="page.footer"}
-<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, database free, bookmarking service by the Shaarli community.",
-      author: "Shaarli",
-      version: "1.0.0",
+<script>
+  {if="$sslenabled"}
+    function activateFirefoxSocial(node) {
+      var loc = location.href;
+      var baseURL = loc.substring(0, loc.lastIndexOf("/"));
 
-      iconURL: baseURL + "/images/favicon.ico",
-      icon32URL: baseURL + "/images/favicon.ico",
-      icon64URL: baseURL + "/images/favicon.ico",
+      // 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, database free, bookmarking service by the Shaarli community.",
+        author: "Shaarli",
+        version: "1.0.0",
 
-      shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
-      homepageURL: baseURL
-    };
-    node.setAttribute("data-service", JSON.stringify(data));
+        iconURL: baseURL + "/images/favicon.ico",
+        icon32URL: baseURL + "/images/favicon.ico",
+        icon64URL: baseURL + "/images/favicon.ico",
 
-    var activate = new CustomEvent("ActivateSocialFeature");
-    node.dispatchEvent(activate);
-  }
+        shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
+        homepageURL: baseURL
+      };
+      node.setAttribute("data-service", JSON.stringify(data));
 
+      var activate = new CustomEvent("ActivateSocialFeature");
+      node.dispatchEvent(activate);
+    }
+  {/if}
   function alertBookmarklet() {
     alert({"'Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link'"|t});
     return false;