X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tpl%2Fvintage%2Ftools.html;h=1125bba92082ba8ef3622c208ffb22df35387998;hb=06f05c923ae59e5daa1aaa8d1ad4c50bd9064bb2;hp=c36aa5b5ef0fa1afc127e342bcbde104fc2d5010;hpb=009ce9358168cc06c76fc2f4162829e552e633a3;p=github%2Fshaarli%2FShaarli.git

diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html
index c36aa5b5..1125bba9 100644
--- a/tpl/vintage/tools.html
+++ b/tpl/vintage/tools.html
@@ -5,17 +5,17 @@
 <div id="pageheader">
 	{include="page.header"}
 	<div id="toolsdiv">
-		<a href="?do=configure"><b>Configure your Shaarli</b><span>: Change Title, timezone...</span></a>
+		<a href="{$base_path}/admin/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>
+		<a href="{$base_path}/admin/plugins"><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="{$base_path}/admin/password"><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>
+		<a href="{$base_path}/admin/tags"><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>
+		<a href="{$base_path}/admin/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>
+		<a href="{$base_path}/admin/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();"
@@ -24,7 +24,7 @@
 				var%20url%20=%20location.href;
 				var%20title%20=%20document.title%20||%20url;
 				window.open(
-					'{$pageabsaddr}?post='%20+%20encodeURIComponent(url)+
+					'{$pageabsaddr}admin/shaare?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'
@@ -39,7 +39,15 @@
 		</a><br><br>
 		<a class="smallbutton"
 		   	onclick="return alertBookmarklet();"
-		   	href="?private=1&amp;post="><b>✚Add Note</b></a>
+        href="javascript:(
+          function(){
+            window.open(
+              '{$pageabsaddr}?private=1&amp;post='+
+              '&amp;description='%20+%20encodeURIComponent(document.getSelection())+
+              '&amp;source=bookmarklet','_blank','menubar=no,height=800,width=600,toolbar=no,scrollbars=yes,status=no,dialog=1'
+            );
+          }
+        )();"><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>
@@ -47,13 +55,6 @@
 			</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}
         {/loop}
@@ -61,31 +62,6 @@
 		<div class="clear"></div>
 
 		<script>
-			{if="$sslenabled"}
-			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=%{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...');
 				return false;