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
old mode 100644 (file)
new mode 100755 (executable)
index 92b169c..fbc5fe5
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -1,44 +1,71 @@
+# Copyright 2014 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
+
+check_type(){
+  [ "${_GET[filtertype]}" = "$1" ] && echo 'checked="checked"'
+}
+check_order(){
+  [ "${_GET[order]}" = "$1" ] && echo 'checked="checked"'
+}
+
+edit="${_GET[edit]}"
+[ -z "${_GET[filtertype]}" ] && _GET[filtertype]="any"
+[ -z "${_GET[order]}" ] && _GET[order]="firstname"
+
 cat <<EOF
-<div class="filter">
-<form action="/" method="GET">
-  <div class="search">
-    <span class="label">Filter:</span>
-    <input type="hidden" name="page" value="attendees"/>
-    <input type="text" name="filter"/>
-    <input type="radio" name="filtertype" value="any" checked="checked">Alles</input>
-    <input type="radio" name="filtertype" value="name">Name</input>
-    <input type="radio" name="filtertype" value="street">Straße</input>
-    <input type="radio" name="filtertype" value="zip">PLZ.</input>
-    <input type="radio" name="filtertype" value="telephone">Telefon</input>
-    <input type="radio" name="filtertype" value="birth">Geburtsjahr</input>
-    <input type="radio" name="filtertype" value="course">Kurs</input>
-    <button type="submit" name="action" value="new_filter">Filtern</button>
-    <button type="submit" name="action" value="del_filter">Filter löschen</button>
-  </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>
+    <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>
+    <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>
 </form>
-</div>
 
-<div class="newcard">
-<h2>Neuer Eintrag</h2>
-<form action="actions/newcard.cgi" method="POST">
-  <span class="label">Name:</span>
-  <input type="text" name="name"/>
-  <button type="submit">Anlegen</button>
+<form class="newcard" action="?action=new_attendee" method="POST">
+  <button type="submit">$(l10n newcard)</button>
 </form>
-</div>
-
-<div class="cardlist">
-  $(listcards |while read card; do
-    echo '<div class="card">'
-    vcf_parse "$card" |sed -r '
-      s:^key=(.+)$:  <span class="label">\1</span>:g
-      s:^value=(.*)$:<span class="value">\1</span>:g
-      s:^tag=(.*)$:  <span class="tag"  >\1</span><br />:g
-    '
-    echo '</div>'
-  done)
-</div>
 
+$(
+[ -f "vcard/$edit" -o -f "temp/$edit" ] &&  edit_attendee "$edit"
+if [ "$?" = 0 ]; then
+  listcards |grep -v "$edit"
+else
+  listcards
+fi |while read card; do
+  view_attendee "$card"
+done
+)
 EOF
 
 # vi:set filetype=html: