3 files changed, 31 insertions, 5 deletions
diff --git a/tpl/404.html b/tpl/404.html
new file mode 100644
index 00000000..53e98e2e
--- /dev/null
+++ b/tpl/404.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    {include="includes"}
+</head>
+<body>
+<div id="pageheader">
+    {include="page.header"}
+</div>
+<div class="error-container">
+    <h1>404 Not found <small>Oh crap!</small></h1>
+    <p>{$error_message}</p>
+    <p>Would you mind <a href="?">clicking here</a>?</p>
+</div>
+{include="page.footer"}
+</body>
+</html>
diff --git a/tpl/linklist.html b/tpl/linklist.html
index 666748a7..ca91699e 100644
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -7,15 +7,24 @@
 <body>
 <div id="pageheader">
    {include="page.header"}
    <div id="headerform" class="search">
        <form method="GET" class="searchform" name="searchform">
-            <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text" value="">
+            <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
+               {if="!empty($search_crits) && $search_type=='fulltext'"}
+                    value="{$search_crits}"
+               {/if}
+            >
            <input type="submit" value="Search" class="bigbutton">
        </form>
        <form method="GET" class="tagfilter" name="tagfilter">
-            <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" value=""
+            <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
-                   autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
+                {if="!empty($search_crits) && $search_type=='tags'"}
-                   data-list="{loop="$tags"}{$key}, {/loop}">
+                    value="{function="implode(' ', $search_crits)"}"
+                {/if}
+                autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
+                data-list="{loop="$tags"}{$key}, {/loop}"
+            >
            <input type="submit" value="Search" class="bigbutton">
        </form>
        {loop="$plugins_header.fields_toolbar"}
@@ -44,7 +53,7 @@
            <div id="searchcriteria">{$result_count} results for tags <i>
            {loop="search_crits"}
                <span class="linktag" title="Remove tag">
-                    <a href="?removetag={$value}">{$value} <span class="remove">x</span></a>
+                    <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
                </span>
            {/loop}</i></div>
        {/if}
diff --git a/tpl/tools.html b/tpl/tools.html
index c13f4f16..c13f4f16 100755..100644
--- a/tpl/tools.html
+++ b/tpl/tools.html

diff --git a/tpl/404.html b/tpl/404.html new file mode 100644 index 00000000..53e98e2e --- /dev/null +++ b/tpl/404.html
@@ -0,0 +1,17 @@
		1	<!DOCTYPE html>
		2	<html>
		3	<head>
		4	{include="includes"}
		5	</head>
		6	<body>
		7	<div id="pageheader">
		8	{include="page.header"}
		9	</div>
		10	<div class="error-container">
		11	<h1>404 Not found <small>Oh crap!</small></h1>
		12	<p>{$error_message}</p>
		13	<p>Would you mind <a href="?">clicking here</a>?</p>
		14	</div>
		15	{include="page.footer"}
		16	</body>
		17	</html>


diff --git a/tpl/linklist.html b/tpl/linklist.html index 666748a7..ca91699e 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html
@@ -7,15 +7,24 @@
7	<body>	7	<body>
8	<div id="pageheader">	8	<div id="pageheader">
9	{include="page.header"}	9	{include="page.header"}
		10
10	<div id="headerform" class="search">	11	<div id="headerform" class="search">
11	<form method="GET" class="searchform" name="searchform">	12	<form method="GET" class="searchform" name="searchform">
12	<input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text" value="">	13	<input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
		14	{if="!empty($search_crits) && $search_type=='fulltext'"}
		15	value="{$search_crits}"
		16	{/if}
		17	>
13	<input type="submit" value="Search" class="bigbutton">	18	<input type="submit" value="Search" class="bigbutton">
14	</form>	19	</form>
15	<form method="GET" class="tagfilter" name="tagfilter">	20	<form method="GET" class="tagfilter" name="tagfilter">
16	<input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" value=""	21	<input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
17	autocomplete="off" class="awesomplete" data-multiple data-minChars="1"	22	{if="!empty($search_crits) && $search_type=='tags'"}
18	data-list="{loop="$tags"}{$key}, {/loop}">	23	value="{function="implode(' ', $search_crits)"}"
		24	{/if}
		25	autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
		26	data-list="{loop="$tags"}{$key}, {/loop}"
		27	>
19	<input type="submit" value="Search" class="bigbutton">	28	<input type="submit" value="Search" class="bigbutton">
20	</form>	29	</form>
21	{loop="$plugins_header.fields_toolbar"}	30	{loop="$plugins_header.fields_toolbar"}
@@ -44,7 +53,7 @@
44	<div id="searchcriteria">{$result_count} results for tags <i>	53	<div id="searchcriteria">{$result_count} results for tags <i>
45	{loop="search_crits"}	54	{loop="search_crits"}
46	<span class="linktag" title="Remove tag">	55	<span class="linktag" title="Remove tag">
47	<a href="?removetag={$value}">{$value} <span class="remove">x</span></a>	56	<a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
48	</span>	57	</span>
49	{/loop}</i></div>	58	{/loop}</i></div>
50	{/if}	59	{/if}


diff --git a/tpl/tools.html b/tpl/tools.html index c13f4f16..c13f4f16 100755..100644 --- a/tpl/tools.html +++ b/tpl/tools.html