use native radio and check buttons, do not break line between input and label

[confetti] / templates / attendees.html.sh

diff --git a/templates/attendees.html.sh b/templates/attendees.html.sh
index 1b57df1c86411a85989ebeb510fc6fec230be161..fbc5fe50fbe582f0d4c7553164bf23d6f960ecb7 100755 (executable)
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -16,15 +16,15 @@
 # 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"'
 }
 check_order(){
-  [ "$_GET[\"order\"]" = "$1" ] && echo 'checked="checked"'
+  [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"'
 }
 
-edit="$_GET[\"edit\"]"
-[ -z "$_GET[\"filtertype\"]" ] && _GET["filtertype"]="any"
-[ -z "$_GET[\"order\"]" ] && _GET["order"]="firstname"
+edit="${_GET[edit]}"
+[ -z "${_GET[filtertype]}" ] && _GET[filtertype]="any"
+[ -z "${_GET[order]}" ] && _GET[order]="firstname"
 
 cat <<EOF
 <form class="filter" action="?action=filter_attendee" method="POST">
@@ -34,29 +34,19 @@ cat <<EOF
   <br />
   <fieldset>
   <legend>$(l10n filter_type):</legend>
-    <input type="radio" name="filtertype" value="any"       id="ft_any"    $(check_type any)
-     ><label for="ft_any"   >$(l10n filter_all)</label>
-    <input type="radio" name="filtertype" value="name"      id="ft_name"   $(check_type name)
-     ><label for="ft_name"  >$(l10n filter_name)</label>
-    <input type="radio" name="filtertype" value="street"    id="ft_street" $(check_type street)
-     ><label for="ft_street">$(l10n filter_street)</label>
-    <input type="radio" name="filtertype" value="zip"       id="ft_zip"    $(check_type zip)
-     ><label for="ft_zip"   >$(l10n filter_zip)</label>
-    <input type="radio" name="filtertype" value="telephone" id="ft_phone"  $(check_type telephone)
-     ><label for="ft_phone" >$(l10n filter_phone)</label>
-    <input type="radio" name="filtertype" value="birth"     id="ft_birth"  $(check_type birth)
-     ><label for="ft_birth" >$(l10n filter_birthyear)</label>
-    <input type="radio" name="filtertype" value="course"    id="ft_course" $(check_type course)
-     ><label for="ft_course">$(l10n filter_course)</label>
+    <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>
+    <label><input type="radio" name="filtertype" value="course"    $(check_type course)   >$(l10n filter_course)</label>
   </fieldset>
   <fieldset>
     <legend>$(l10n filter_order):</legend>
-    <input type="radio" name="order" value="firstname" id="od_fname" $(check_order firstname)
-     ><label for="od_fname">$(l10n filter_firstname)</label>
-    <input type="radio" name="order" value="lastname"  id="od_lname" $(check_order lastname)
-     ><label for="od_lname">$(l10n filter_lastname)</label>
-    <input type="radio" name="order" value="bdate"     id="od_bdate" $(check_order bdate)
-     ><label for="od_bdate">$(l10n filter_bdate)</label>
+    <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>
+    <label><input type="radio" name="order" value="bdate"     $(check_order bdate)    >$(l10n filter_bdate)</label>
   </fieldset>
   <button type="submit" name="choice" value="new_filter">$(l10n filter_apply)</button>
   <button type="submit" name="choice" value="del_filter">$(l10n filter_cancel)</button>