maintain different top lists for tag selection and setting

[serve0] / templates / view.html.sh

diff --git a/templates/view.html.sh b/templates/view.html.sh
index 3c0e3a5f6b8525a7b12292265796c9a422f49d39..8df1b5695061f02e9956dc00f6748bb8393ef7de 100755 (executable)
--- a/templates/view.html.sh
+++ b/templates/view.html.sh
@@ -28,7 +28,7 @@ cat <<EOF
   <input type="submit" name="submit" value="Find">
 
   <a class="panel clearsearch" href="?">Clear All</a>
-  <a class="panel" href="${info:+?p=list&amp;${page_this}}${info:-?p=tree&amp;d=${directory}&amp;${page_this}}">Dismiss</a>
+  <a class="panel" href="${info:+?p=list&amp;${page_this}#$(urlsave $info)}${info:-?p=tree&amp;d=${directory}&amp;${page_this}}">Dismiss</a>
 
   <div class="pagination_nav">
     <label>Page:</label>
@@ -50,8 +50,7 @@ cat <<EOF
   <span class="info width" >Width: $width</span>
   <span class="info height">Height: $height</span><br>
   
-  <label class="tags">Tags:</label>
-  $(printf %s\\n "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
+  $(printf %s\\n "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span> :g')
   ${description:+<span class="info description">$(printf %s "$description" |_wiki)</span>}
 
   <form class="panel" id="tagger" action="?action=meta&${page_this}" method="post" accept-charset="UTF-8">
@@ -65,7 +64,7 @@ cat <<EOF
       catt="${cat}:"
       [ "$catt" = "none:" ] && catt=''
       
-      printf %s "$taglist" |egrep '^'"$catt"'[^:]+$' |while read line; do
+      printf %s "$taglist_set" |egrep '^'"$catt"'[^:]+$' |while read line; do
         printf '<option %s value="%s">%s</option>' \
                "$(egrep -q "(^|.*\|)$line(\|.*|$)" "$meta" && printf selected)" \
                "$line" "${line#*:}"
@@ -91,7 +90,7 @@ cat <<EOF
 </div>
 
 <div class="panel footer" id="foot">
-  <a class="panel toggle" href="#tagger">Add Tags</a>
+  <a class="panel toggle" href="#tagger">Edit Tags</a>
 
   <div class="pagination_nav">
     <label>Page:</label>