X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Ftools.html;h=8e285f445733cf5c28ded6387e1bc541521243e4;hb=83dbc41a77d36c57dfc4abdfcac98e27e8d49edd;hp=c9ada4ac3d018a7763c526274280f08c94b85ad5;hpb=fd006c630b64146edc402b68d8503c716f8a55d6;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/tools.html b/tpl/tools.html
index c9ada4ac..8e285f44 100644
--- a/tpl/tools.html
+++ b/tpl/tools.html
@@ -5,17 +5,62 @@
 <div id="pageheader">
 	{include="page.header"}
 	<div id="toolsdiv">
-		{if="!$GLOBALS['config']['OPEN_SHAARLI']"}<a href="?do=changepasswd"><b>Change password</b>  <span>: Change your password.</span></a><br><br>{/if}
-		<a href="?do=configure"><b>Configure your Shaarli</b> <span>:  Change Title, timezone...</span></a><br><br>
-		<a href="?do=changetag"><b>Rename/delete tags</b> <span>:  Rename or delete a tag in all links</span></a><br><br>
-		<a href="?do=import"><b>Import</b> <span>:  Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a> <br><br>
-		<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>
-        {loop="$tools_plugin"}
+		<a href="?do=configure"><b>Configure your Shaarli</b><span>: Change Title, timezone...</span></a>
+		<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>
+    <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>
+		<a href="?do=import"><b>Import</b><span>: Import Netscape html bookmarks (as exported from Firefox, Chrome, Opera, delicious...)</span></a>
+    <br><br>
+		<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="return alertBookmarklet();"
+		   href="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="#" onclick="return alertBookmarklet();">
+			<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="return alertBookmarklet();"
+		   	href="?private=1&amp;post=">
+			<b>✚Add Note</b>
+		</a>
+		<a href="#" onclick="return alertBookmarklet();">
+			<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 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="#">
+			<span>&#x21D0; Click on this button to add Shaarli to the "Share this page" button in Firefox.</span>
+		</a><br><br>
+
+		{loop="$tools_plugin"}
             {$value}
         {/loop}
+
 		<div class="clear"></div>
 
 		<script>
@@ -34,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));
@@ -42,6 +87,11 @@
 				var activate = new CustomEvent("ActivateSocialFeature");
 				node.dispatchEvent(activate);
 			}
+
+			function alertBookmarklet() {
+				alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...');
+				return false;
+			}
 		</script>
 	</div>
 </div>