X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fcards.html.sh;h=377ccf8ebe478e39e3083e699cfed30dcc6014a8;hp=df630c0e0d8ffd89460b0fc9f1c84182585a9be6;hb=16a2240ce347132c7000ca22989e83801cf3ebf0;hpb=bdf05fd0cb8f4c79152adbba9070213bc3087193

diff --git a/templates/cards.html.sh b/templates/cards.html.sh
index df630c0..377ccf8 100755
--- a/templates/cards.html.sh
+++ b/templates/cards.html.sh
@@ -16,7 +16,8 @@
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
 check_type(){
-  [ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"'
+  #[ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"'
+  [ "${_GET[filter]%%:*}" = "$1" ] && echo 'checked="checked"'
 }
 check_order(){
   [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"'
@@ -26,21 +27,37 @@ cat <<EOF
 <form class="filter" action="?action=filter_card" method="POST">
   <h1>$(l10n filter_label)</h1>
   <input type="hidden" name="page" value="cards"/>
-  <input type="text" name="filter" value="${_GET[filter]}" placeholder="$(l10n filter_placeholder)"/>
-  <br />
-  <fieldset>
-  <legend>$(l10n filter_type):</legend>
-    <label><input type="radio" name="filtertype" value="any"       $(check_type any)      >$(l10n filter_all)</label>
-    <label><input type="radio" name="filtertype" value="name"      $(check_type name)     >$(l10n filter_name)</label>
-    <label><input type="radio" name="filtertype" value="street"    $(check_type street)   >$(l10n filter_street)</label>
-    <label><input type="radio" name="filtertype" value="zip"       $(check_type zip)      >$(l10n filter_zip)</label>
-    <label><input type="radio" name="filtertype" value="telephone" $(check_type telephone)>$(l10n filter_phone)</label>
-    <label><input type="radio" name="filtertype" value="birth"     $(check_type birth)    >$(l10n filter_birthyear)</label>
+  <fieldset class="item">
+  <legend>$(l10n filter_item):</legend>
+    <input  id="any" type="radio" name="filtertype" value="any" $(check_type any)>
+    <label for="any" >$(l10n filter_all)</label>
+
+    <input  id="name" type="radio" name="filtertype" value="name" $(check_type name)>
+    <label for="name">$(l10n filter_name)</label>
+
+    <input  id="street" type="radio" name="filtertype" value="street" $(check_type street)>
+    <label for="street">$(l10n filter_street)</label>
+
+    <input  id="zip" type="radio" name="filtertype" value="zip" $(check_type zip)>
+    <label for="zip">$(l10n filter_zip)</label>
+
+    <input  id="telephone" type="radio" name="filtertype" value="TEL" $(check_type TEL)>
+    <label for="telephone">$(l10n filter_phone)</label>
+
+    <input  id="birth" type="radio" name="filtertype" value="BDAY" $(check_type BDAY)>
+    <label for="birth">$(l10n filter_birthyear)</label>
+
+<!--
     ${profile_circus:+
-    <label><input type="radio" name="filtertype" value="course"    $(check_type course)   >$(l10n filter_course)</label>
+    <input  id="course" type="radio" name="filtertype" value="course" $(check_type course)>
+    <label for="course">$(l10n filter_course)</label>
     }
+-->
+
+    <input type="text" name="filter" value="${_GET[filter]#*:}" placeholder="$(l10n filter_placeholder)"/>
   </fieldset>
-  <fieldset>
+
+  <fieldset class="order">
     <legend>$(l10n filter_order):</legend>
     <label><input type="radio" name="order" value="firstname" $(check_order firstname)>$(l10n filter_firstname)</label>
     <label><input type="radio" name="order" value="lastname"  $(check_order lastname) >$(l10n filter_lastname)</label>