1 files changed, 17 insertions, 3 deletions
diff --git a/tpl/linklist.html b/tpl/linklist.html
index c7de5b87..70b9ff3a 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -1,9 +1,10 @@
+<!DOCTYPE html>
 <html>
 <head>{include="includes"}</head>
 <body>
 <div id="pageheader">
        {include="page.header"}
-        <div id="headerform" style="width:100%; white-space:nowrap;";>
+        <div id="headerform" style="width:100%; white-space:nowrap;">
            <form method="GET" class="searchform" name="searchform" style="display:inline;"><input type="text" name="searchterm" style="width:30%" value=""> <input type="submit" value="Search" class="bigbutton"></form>
            <form method="GET" class="tagfilter" name="tagfilter" style="display:inline;margin-left:24px;"><input type="text" name="searchtags" id="searchtags" style="width:10%" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
        </div>
@@ -28,7 +29,7 @@
        <li{if="$value.class"} class="{$value.class}"{/if}>
            <div class="thumbnail">{$value.url|thumbnail}</div>
            <div class="linkcontainer">
-                <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
+                <span class="linktitle"><a href="{$redirector}{$value.url|urlencode}">{$value.title|htmlspecialchars}</a></span>
                {if="isLoggedIn()"}
                    <form method="GET" class="buttoneditform"><input type="hidden" name="edit_link" value="{$value.linkdate}"><input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"></form>
                    <form method="POST" class="buttoneditform"><input type="hidden" name="lf_linkdate" value="{$value.linkdate}">
@@ -41,10 +42,11 @@
                {else}
                    <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                {/if}
+                <div style="position:relative;display:inline;"><a href="http://invx.com/code/qrcode/?code={$scripturl|urlencode}%2F{$value.linkdate|smallHash}&width=200&height=200" onclick="return false;" class="qrcode"><img src="images/qrcode.png#" width="13" height="13" title="QR-Code"></a></div> - 
                <span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span><br>
                {if="$value.tags"}
                    <div class="linktaglist">
-                    {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|htmlspecialchars}">{$value|htmlspecialchars}</a></span> {/loop}
+                    {loop="value.taglist"}<span class="linktag" title="Add tag"><a href="?addtag={$value|urlencode}">{$value|htmlspecialchars}</a></span> {/loop}
                    </div>
                {/if}
            </div>
@@ -57,5 +59,17 @@
 </div>
    {include="page.footer"}
+<script>
+$('a.qrcode').click(function(){
+  hide_qrcode();
+  var link = $(this).attr('href');
+  $(this).after('<div class="qrcode" onclick="hide_qrcode();return false;"><img src="'+link+'#" width="200" height="200"><br>click to close</div>');
+});
+function hide_qrcode()
+{
+    $('div.qrcode').remove();
+}
+</script>
 </body>
 </html>
 \ No newline at end of file