5 files changed, 10 insertions, 6 deletions

diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html
index b4b4a0ec..999d2f4d 100644
--- a/tpl/default/addlink.html
+++ b/tpl/default/addlink.html
@@ -9,7 +9,7 @@
   <div class="pure-u-lg-1-3 pure-u-1-24"></div>
   <div id="addlink-form" class="page-form  page-form-light pure-u-lg-1-3 pure-u-22-24">
     <h2 class="window-title">{"Shaare a new link"|t}</h2>
-    <form method="GET" action="#" name="addform" class="addform">
+    <form method="GET" action="./shaare" name="addform" class="addform">
       <div>
         <label for="shaare">{'URL or leave empty to post a note'|t}</label>
         <input type="text" name="post" id="shaare" class="autofocus">
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html
index d16059a3..9f6d6b74 100644
--- a/tpl/default/editlink.html
+++ b/tpl/default/editlink.html
@@ -7,7 +7,11 @@
   {include="page.header"}
   <div id="editlinkform" class="edit-link-container" class="pure-g">
     <div class="pure-u-lg-1-5 pure-u-1-24"></div>
-    <form method="post" name="linkform" class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light">
+    <form method="post"
+          name="linkform"
+          action="./shaare"
+          class="page-form pure-u-lg-3-5 pure-u-22-24 page-form page-form-light"
+    >
       <h2 class="window-title">
         {if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if}
       </h2>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index bde5036d..cf59e89d 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -21,7 +21,7 @@
         </li>
         {if="$is_logged_in || $openshaarli"}
           <li class="pure-menu-item">
-            <a href="./?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare">
+            <a href="./add-shaare" class="pure-menu-link" id="shaarli-menu-shaare">
               <i class="fa fa-plus" aria-hidden="true"></i> {'Shaare'|t}
             </a>
           </li>
diff --git a/tpl/vintage/addlink.html b/tpl/vintage/addlink.html
index da50f45e..13dbb36e 100644
--- a/tpl/vintage/addlink.html
+++ b/tpl/vintage/addlink.html
@@ -5,7 +5,7 @@
 <div id="pageheader">
         {include="page.header"}
         <div id="headerform">
-                <form method="GET" action="" name="addform" class="addform">
+                <form method="GET" action="./shaare" name="addform" class="addform">
                         <input type="text" name="post" class="linkurl">
                         <input type="submit" value="Add link" class="bigbutton">
                 </form>
diff --git a/tpl/vintage/page.header.html b/tpl/vintage/page.header.html
index c265d6d0..8f9b6cc5 100644
--- a/tpl/vintage/page.header.html
+++ b/tpl/vintage/page.header.html
@@ -20,10 +20,10 @@
     {if="$is_logged_in"}
     <li><a href="./logout">Logout</a></li>
     <li><a href="./tools">Tools</a></li>
-    <li><a href="?do=addlink">Add link</a></li>
+    <li><a href="./add-shaare">Add link</a></li>
     {elseif="$openshaarli"}
     <li><a href="./tools">Tools</a></li>
-    <li><a href="./?do=addlink">Add link</a></li>
+    <li><a href="./add-shaare">Add link</a></li>
     {else}
     <li><a href="./login">Login</a></li>
     {/if}