simplify progress api

[serve0] / templates / browse.html.sh

diff --git a/templates/browse.html.sh b/templates/browse.html.sh
index a061ed12b54c85890681d9f198abb5639c113f25..7f28f83c64ac0ee5c5b8a104538ba383d4b908a5 100755 (executable)
--- a/templates/browse.html.sh
+++ b/templates/browse.html.sh
@@ -19,7 +19,8 @@ cat <<EOF
 
   <input type=radio name=topmenu id=btn_search checked><label for=btn_search>Search</label>
   <form class="panel" id="search" action="?" method="get" accept-charset="UTF-8">
-    <input type="text" name="s" value="$search" placeholder="Search">
+    <input type="hidden" name="d" value="$(attribsafe "$directory")">
+    <input type="text" name="s" value="$(attribsafe "$search")" placeholder="Search">
 
     <select class="order" size="1" name="o" id="o1">
       <option class="label" selected disabled>Order by</option>
@@ -46,10 +47,7 @@ cat <<EOF
   </div>
 
   <form action="?action=multitag" method="post" accept-charset="UTF-8">
-    <input type="hidden" name="o" value="${order}">
-    <input type="hidden" name="s" value="${search}">
-    <input type="hidden" name="f" value="${filter}">
-    <input type="hidden" name="pn" value="${page}">
+    <input type="hidden" name="page" value="?$(attribsafe "${page_this}")">
 
     <ul id="thumblist">
 EOF