From b74b96bfbd0b778ac50fd17f5e107c51435b1678 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 29 May 2016 12:32:14 +0200
Subject: Adds ConfigJson which handle the configuration in JSON format.

Also use the Updater to make the transition
---
 tpl/tools.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/tools.html')

diff --git a/tpl/tools.html b/tpl/tools.html
index 78b81663..29ade725 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -9,7 +9,7 @@
 		<br><br>
 		<a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>
     <br><br>
-		{if="!$GLOBALS['config']['OPEN_SHAARLI']"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
+		{if="$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
     <br><br>{/if}
 		<a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>
     <br><br>
-- 
cgit v1.2.3


From c3599302aaf9f7bf25601f21beff1946aa1737d1 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Fri, 15 Apr 2016 01:55:52 +0200
Subject: Firefox Share: Use selected text as description

https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Share
---
 tpl/tools.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/tools.html')

diff --git a/tpl/tools.html b/tpl/tools.html
index 78b81663..7b4eba09 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -79,7 +79,7 @@
 					icon32URL: baseURL + "/images/favicon.ico",
 					icon64URL: baseURL + "/images/favicon.ico",
 
-					shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{description}&source=firefoxsocialapi{/noparse}",
+					shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}",
 					homepageURL: baseURL
 				};
 				node.setAttribute("data-service", JSON.stringify(data));
-- 
cgit v1.2.3


From 15ff4745ff362ba84936e73bf02f998297582265 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 6 Aug 2016 14:38:47 +0200
Subject: Bugfix: enable change password if open shaarli is disabled

---
 tpl/tools.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tpl/tools.html')

diff --git a/tpl/tools.html b/tpl/tools.html
index 9e45caad..8e285f44 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -9,7 +9,7 @@
 		<br><br>
 		<a href="?do=pluginadmin"><b>Plugin administration</b><span>: Enable, disable and configure plugins.</span></a>
     <br><br>
-		{if="$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
+		{if="!$openshaarli"}<a href="?do=changepasswd"><b>Change password</b><span>: Change your password.</span></a>
     <br><br>{/if}
 		<a href="?do=changetag"><b>Rename/delete tags</b><span>: Rename or delete a tag in all links</span></a>
     <br><br>
-- 
cgit v1.2.3


From caa382dd55c285306a3f48bb54678cf787d842e1 Mon Sep 17 00:00:00 2001
From: Teromene <teromene@teromene.fr>
Date: Tue, 29 Nov 2016 11:06:31 +0000
Subject: Disable Firefox Social in the tools section if the page is not loaded
 using HTTPS, as Firefox will deny the request.

---
 tpl/tools.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tpl/tools.html')

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 @@
 				&nbsp;&nbsp;&nbsp;&nbsp;Then click "✚Add Note" button anytime to start composing a private Note (text post) to your Shaarli.
 			</span>
 		</a><br><br>
+
+		{if="$sslenabled"}
 		<a class="smallbutton" onclick="activateFirefoxSocial(this)">
 			<b>✚Add to Firefox social</b>
 		</a>
 		<a href="#">
 			<span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span>
 		</a><br><br>
+		{/if}
 
 		{loop="$tools_plugin"}
             {$value}
@@ -64,6 +67,7 @@
 		<div class="clear"></div>
 
 		<script>
+			{if="$sslenabled"}
 			function activateFirefoxSocial(node) {
 				var loc = location.href;
 				var baseURL = loc.substring(0, loc.lastIndexOf("/"));
@@ -87,7 +91,7 @@
 				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...');
 				return false;
-- 
cgit v1.2.3