little more "semantic markup"

[confetti] / templates / attendees.html.sh

diff --git a/templates/attendees.html.sh b/templates/attendees.html.sh
index 7613a0b3c4906c178035afc893d63d4e8e574ac2..1b57df1c86411a85989ebeb510fc6fec230be161 100755 (executable)
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -27,38 +27,45 @@ edit="$_GET[\"edit\"]"
 [ -z "$_GET[\"order\"]" ] && _GET["order"]="firstname"
 
 cat <<EOF
-<div class="filter">
-  <span class="label">$(l10n filter_label)</span>
-  <form class="search" action="?action=filter_attendee" method="POST">
-    <input type="hidden" name="page" value="attendees"/>
-    <input type="text" name="filter" value="$_GET["filter"]" placeholder="$(l10n filter_placeholder)"/>
-    <br />
-    <span class="label">$(l10n filter_type):</span>
-    <input type="radio" name="filtertype" value="any" $(check_type any)>$(l10n filter_all)</input>
-    <input type="radio" name="filtertype" value="name" $(check_type name)>$(l10n filter_name)</input>
-    <input type="radio" name="filtertype" value="street" $(check_type street)>$(l10n filter_street)</input>
-    <input type="radio" name="filtertype" value="zip" $(check_type zip)>$(l10n filter_zip)</input>
-    <input type="radio" name="filtertype" value="telephone" $(check_type telephone)>$(l10n filter_phone)</input>
-    <input type="radio" name="filtertype" value="birth" $(check_type birth)>$(l10n filter_birthyear)</input>
-    <input type="radio" name="filtertype" value="course" $(check_type course)>$(l10n filter_course)</input>
-    <br />
-    <span class="label">$(l10n filter_order):</span>
-    <input type="radio" name="order" value="firstname" $(check_order firstname)>$(l10n filter_firstname)</input>
-    <input type="radio" name="order" value="lastname" $(check_order lastname)>$(l10n filter_lastname)</input>
-    <input type="radio" name="order" value="bdate" $(check_order bdate)>$(l10n filter_bdate)</input>
-    <br>
-    <button type="submit" name="choice" value="new_filter">$(l10n filter_apply)</button>
-    <button type="submit" name="choice" value="del_filter">$(l10n filter_cancel)</button>
-  </form>
-</div>
+<form class="filter" action="?action=filter_attendee" method="POST">
+  <h1>$(l10n filter_label)</h1>
+  <input type="hidden" name="page" value="attendees"/>
+  <input type="text" name="filter" value="$_GET["filter"]" placeholder="$(l10n filter_placeholder)"/>
+  <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>
+  </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>
+  </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>
+</form>
 
-<div class="newcard">
-<form action="?action=new_attendee" method="POST">
+<form class="newcard" action="?action=new_attendee" method="POST">
   <button type="submit">$(l10n newcard)</button>
 </form>
-</div>
 
-<div class="cardlist">
 $(
 [ -f "vcard/$edit" -o -f "temp/$edit" ] &&  edit_attendee "$edit"
 if [ "$?" = 0 ]; then
@@ -69,7 +76,6 @@ fi |while read card; do
   view_attendee "$card"
 done
 )
-</div>
 EOF
 
 # vi:set filetype=html: