12 files changed, 30 insertions, 29 deletions
diff --git a/tpl/vintage/changepassword.html b/tpl/vintage/changepassword.html
index c40daf9d..7e37b9a3 100644
--- a/tpl/vintage/changepassword.html
+++ b/tpl/vintage/changepassword.html
@@ -4,7 +4,7 @@
 <body onload="document.changepasswordform.oldpassword.focus();">
 <div id="pageheader">
        {include="page.header"}
-        <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
+        <form method="POST" action="{$base_path}/admin/password" name="changepasswordform" id="changepasswordform">
        Old password: <input type="password" name="oldpassword">&nbsp; &nbsp;
        New password: <input type="password" name="setpassword">
        <input type="hidden" name="token" value="{$token}">
@@ -12,4 +12,4 @@
 </div>
 {include="page.footer"}
 </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/tpl/vintage/changetag.html b/tpl/vintage/changetag.html
index 670a8dd7..6ef60252 100644
--- a/tpl/vintage/changetag.html
+++ b/tpl/vintage/changetag.html
@@ -5,7 +5,7 @@
 <body onload="document.changetag.fromtag.focus();">
 <div id="pageheader">
        {include="page.header"}
-        <form method="POST" action="" name="changetag" id="changetag">
+        <form method="POST" action="{$base_path}/admin/tags" name="changetag" id="changetag">
        <input type="hidden" name="token" value="{$token}">
        <div>
            <label for="fromtag">Tag:</label>
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html
index c5861aae..ba4f3f71 100644
--- a/tpl/vintage/configure.html
+++ b/tpl/vintage/configure.html
@@ -4,7 +4,7 @@
 <body onload="document.configform.title.focus();">
 <div id="pageheader">
  {include="page.header"}
-  <form method="POST" action="#" name="configform" id="configform">
+  <form method="POST" action="{$base_path}/admin/configure" name="configform" id="configform">
    <input type="hidden" name="token" value="{$token}">
    <table id="configuration_table">
diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html
index ccf8c677..c3671b1f 100644
--- a/tpl/vintage/editlink.html
+++ b/tpl/vintage/editlink.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>{include="includes"}
-    <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" />
 </head>
 <body
 {if="$link.title==''"}onload="document.linkform.lf_title.focus();"
@@ -10,9 +9,8 @@
 <div id="pageheader">
    {include="page.header"}
    <div id="shaarli_title"><a href="{$titleLink}">{$shaarlititle}</a></div>
-    {/if}
    <div id="editlinkform">
-        <form method="post" name="linkform">
+        <form method="post" name="linkform" action="{$base_path}/admin/shaare">
            <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
          {if="isset($link.id)"}
                  <input type="hidden" name="lf_id" value="{$link.id}">
diff --git a/tpl/vintage/export.html b/tpl/vintage/export.html
index feee307c..c30e3b0a 100644
--- a/tpl/vintage/export.html
+++ b/tpl/vintage/export.html
@@ -10,6 +10,8 @@
        <input type="radio" name="selection" value="all" checked="true"> All<br>
        <input type="radio" name="selection" value="private"> Private<br>
        <input type="radio" name="selection" value="public"> Public<br>
+        <input type="hidden" name="token" value="{$token}">
        <br>
        <input type="checkbox" name="prepend_note_url" id="prepend_note_url">
        <label for="prepend_note_url">
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html
index aa2381c6..eac05701 100644
--- a/tpl/vintage/includes.html
+++ b/tpl/vintage/includes.html
@@ -6,14 +6,14 @@
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}feed/rss?{$searchcrits}#" title="RSS Feed" />
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}feed/atom?{$searchcrits}#" title="ATOM Feed" />
 <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-<link type="text/css" rel="stylesheet" href="css/shaarli.min.css" />
+<link type="text/css" rel="stylesheet" href="{$asset_path}/css/shaarli.min.css#" />
 {if="$formatter==='markdown'"}
  <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" />
 {/if}
 {loop="$plugins_includes.css_files"}
-<link type="text/css" rel="stylesheet" href="{$value}#"/>
+<link type="text/css" rel="stylesheet" href="{$base_path}/{$value}#"/>
 {/loop}
-{if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if}
+{if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="{$base_path}/data/user.css#" />{/if}
 <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
      title="Shaarli search - {$shaarlititle|htmlspecialchars}" />
 {if="! empty($links) && count($links) === 1"}
diff --git a/tpl/vintage/install.html b/tpl/vintage/install.html
index aca890d6..8c10b2cb 100644
--- a/tpl/vintage/install.html
+++ b/tpl/vintage/install.html
@@ -5,7 +5,7 @@
 <div id="install">
    <h1>Shaarli</h1>
    It looks like it's the first time you run Shaarli. Please configure it:<br>
-    <form method="POST" action="#" name="installform" id="installform">
+    <form method="POST" action="{$base_path}/install" name="installform" id="installform">
        <table>
            <tr><td><b>Login:</b></td><td><input type="text" name="setlogin" size="30"></td></tr>
            <tr><td><b>Password:</b></td><td><input type="password" name="setpassword" size="30"></td></tr>
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html
index 8db8f70b..00896eb5 100644
--- a/tpl/vintage/linklist.html
+++ b/tpl/vintage/linklist.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" />
    {include="includes"}
 </head>
 <body>
@@ -84,7 +83,7 @@
                <div class="thumbnail">
                    <a href="{$value.real_url}">
                        {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
-                        <img data-src="{$value.thumbnail}#" class="b-lazy"
+                        <img data-src="{$base_path}/{$value.thumbnail}#" class="b-lazy"
                             src=""
                             alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
                    </a>
@@ -93,17 +92,16 @@
            <div class="linkcontainer">
                {if="$is_logged_in"}
                    <div class="linkeditbuttons">
-                        <form method="GET" class="buttoneditform">
+                        <a href="{$base_path}/admin/shaare/{$value.id}" title="Edit" class="button_edit">
-                            <input type="hidden" name="edit_link" value="{$value.id}">
+                            <img src="{$asset_path}/img/edit_icon.png#">
-                            <input type="image" alt="Edit" src="{$asset_path}/img/edit_icon.png#" title="Edit" class="button_edit">
+                        </a>
-                        </form><br>
+                        <br>
-                        <form method="GET" class="buttoneditform">
+                        <a href="{$base_path}/admin/shaare/delete?id={$value.id}&amp;token={$token}" label="Delete"
-                            <input type="hidden" name="lf_linkdate" value="{$value.id}">
+                           onClick="return confirmDeleteLink();"
-                            <input type="hidden" name="token" value="{$token}">
+                           class="button_delete"
-                            <input type="hidden" name="delete_link">
+                        >
-                            <input type="image" alt="Delete" src="{$asset_path}/img/delete_icon.png#" title="Delete"
+                            <img src="{$asset_path}/img/delete_icon.png#">
-                                   class="button_delete" onClick="return confirmDeleteLink();">
+                        </a>
-                        </form>
                    </div>
                {/if}
                <span class="linktitle">
@@ -114,7 +112,7 @@
                {if="!$hide_timestamps || $is_logged_in"}
                    {$updated=$value.updated_timestamp ? 'Edited: '. format_date($value.updated) : 'Permalink'}
                    <span class="linkdate" title="Permalink">
-                        <a href="{$base_path}/?{$value.shorturl}">
+                        <a href="{$base_path}/shaare/{$value.shorturl}">
                            <span title="{$updated}">
                                {$value.created|format_date}
                                {if="$value.updated_timestamp"}*{/if}
@@ -123,7 +121,7 @@
                        </a> -
                    </span>
                {else}
-                    <span class="linkdate" title="Short link here"><a href="{$base_path}/?{$value.shorturl}">permalink</a> - </span>
+                    <span class="linkdate" title="Short link here"><a href="{$base_path}/shaare/{$value.shorturl}">permalink</a> - </span>
                {/if}
                {loop="$value.link_plugin"}
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index a3792066..6aa20ab1 100644
--- a/tpl/vintage/loginform.html
+++ b/tpl/vintage/loginform.html
@@ -11,7 +11,7 @@
  {include="page.header"}
  <div id="headerform">
-    <form method="post" name="loginform">
+    <form method="post" name="loginform" action="{$base_path}/login">
      <label for="login">Login: <input type="text" id="login" name="login" tabindex="1"
         {if="!empty($username)"}value="{$username}"{/if}>
      </label>
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html
index 6d9021e3..0fe4c736 100644
--- a/tpl/vintage/page.footer.html
+++ b/tpl/vintage/page.footer.html
@@ -30,5 +30,7 @@
 {/if}
 {loop="$plugins_footer.js_files"}
-        <script src="{$value}#"></script>
+        <script src="{$base_path}/{$value}#"></script>
 {/loop}
+<input type="hidden" name="js_base_path" value="{$base_path}" />
diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html
index a04c77c2..d0972cd1 100644
--- a/tpl/vintage/pluginsadmin.html
+++ b/tpl/vintage/pluginsadmin.html
@@ -86,6 +86,7 @@
        <input type="submit" value="Save"/>
      </div>
    </section>
+    <input type="hidden" name="token" value="{$token}">
  </form>
  <form action="{$base_path}/admin/plugins" method="POST">
@@ -124,6 +125,7 @@
        </div>
      </div>
    </section>
+    <input type="hidden" name="token" value="{$token}">
  </form>
 </div>
diff --git a/tpl/vintage/thumbnails.html b/tpl/vintage/thumbnails.html
index a1537f9c..18f296f7 100644
--- a/tpl/vintage/thumbnails.html
+++ b/tpl/vintage/thumbnails.html
@@ -23,7 +23,6 @@
 <input type="hidden" name="ids" value="{function="implode(',', $ids)"}" />
 {include="page.footer"}
-<input type="hidden" name="js_base_path" value="{$base_path}" />
 <script src="{$asset_path}/js/thumbnails_update.min.js?v={$version_hash}#"></script>
 </body>
 </html>