3 files changed, 26 insertions, 2 deletions

diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html
index 160286a5..53b0cad2 100644
--- a/tpl/vintage/configure.html
+++ b/tpl/vintage/configure.html
@@ -33,6 +33,19 @@
       </tr>
 
       <tr>
+        <td><b>Description formatter:</b></td>
+        <td>
+          <select name="formatter" id="formatter">
+            {loop="$formatter_available"}
+              <option value="{$value}" {if="$value===$formatter"}selected{/if}>
+                {$value|ucfirst}
+              </option>
+            {/loop}
+          </select>
+        </td>
+      </tr>
+
+      <tr>
         <td><b>Timezone:</b></td>
         <td>
           <select id="continent" name="continent">
diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html
index 5fa7d194..6f7a330f 100644
--- a/tpl/vintage/editlink.html
+++ b/tpl/vintage/editlink.html
@@ -26,7 +26,16 @@
             <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input"
                 data-list="{loop="$tags"}{$key}, {/loop}" data-multiple autocomplete="off" ><br>
 
-            {loop="$edit_link_plugin"}
+          {if="$formatter==='markdown'"}
+            <div class="md_help">
+              {'Description will be rendered with'|t}
+              <a href="http://daringfireball.net/projects/markdown/syntax" title="{'Markdown syntax documentation'|t}">
+                {'Markdown syntax'|t}
+              </a>.
+            </div>
+          {/if}
+
+          {loop="$edit_link_plugin"}
                 {$value}
             {/loop}
 
@@ -38,7 +47,6 @@
             &nbsp;<label for="lf_private"><i>Private</i></label><br><br>
             {/if}
             <input type="submit" value="Save" name="save_edit" class="bigbutton">
-            <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton">
             {if="!$link_is_new && isset($link.id)"}
               <a href="?delete_link&amp;lf_linkdate={$link.id}&amp;token={$token}"
                  name="delete_link" class="bigbutton"
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html
index 1c4ff79c..8d273c44 100644
--- a/tpl/vintage/includes.html
+++ b/tpl/vintage/includes.html
@@ -7,6 +7,9 @@
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=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" />
+{if="$formatter==='markdown'"}
+  <link type="text/css" rel="stylesheet" href="css/markdown.min.css?v={$version_hash}" />
+{/if}
 {loop="$plugins_includes.css_files"}
 <link type="text/css" rel="stylesheet" href="{$value}#"/>
 {/loop}