X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fattendees.html.sh;h=b4ca0b8e9455dd3da93f7d80390507245848da5a;hp=92e4d91ab4d053fbc94c9368f5db3a7d6e69bce8;hb=3badbe5f34b9a481f43f83d07d4cd28a3aa7798b;hpb=737e7f91162ec98b99dd2796ca26dd95e8c21f49

diff --git a/templates/attendees.html.sh b/templates/attendees.html.sh
index 92e4d91..b4ca0b8 100644
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -1,69 +1,58 @@
-. ${_EXEC}/templates/text_attendee.sh
-. ${_EXEC}/templates/view_attendee.sh
-. ${_EXEC}/templates/edit_attendee.sh
-
-check(){
+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>
+  <span class="label">$(l10n filter_label)</span>
+  <form class="search" action="/" method="GET">
     <input type="hidden" name="page" value="attendees"/>
-    <input type="text" name="filter" value="$_GET["filter"]"/><br/>
-    <input type="radio" name="filtertype" value="any" $(check any)>$(l10n filter_all)</input>
-    <input type="radio" name="filtertype" value="name" $(check name)>$(l10n filter_name)</input>
-    <input type="radio" name="filtertype" value="street" $(check street)>$(l10n filter_street)</input>
-    <input type="radio" name="filtertype" value="zip" $(check zip)>$(l10n filter_zip)</input>
-    <input type="radio" name="filtertype" value="telephone" $(check telephone)>$(l10n filter_phone)</input>
-    <input type="radio" name="filtertype" value="birth" $(check birth)>$(l10n filter_birthyear)</input>
-    <input type="radio" name="filtertype" value="course" $(check course)>$(l10n filter_course)</input><br/>
-    <button type="submit" name="action" value="new_filter">$(l10n filter_apply)</button>
-    <button type="submit" name="action" value="del_filter">$(l10n filter_cancel)</button>
-  </div>
-</form>
+    <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>
 
 <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 action="?action=new_attendee" method="POST">
+  <button type="submit">$(l10n newcard)</button>
 </form>
 </div>
 
 <div class="cardlist">
-$(listcards |while read card; do
-  id="vcf_$card"
-  if [ "$_GET[\"edit\"]" = "$id" ]; then cat <<x_EOF
-  <div id="${id}" class="card">
-    <form action="/?action=update_attendee" method="POST">
-      <input type="hidden" name="card" value="${id}"/>
-      $(edit_attendee "$card")
-      <br /><select name="newfield">
-	<option value="" disabled="disabled" selected="selected">$(l10n edit_addfieldtext)</option>
-	$(echo $FIELDLIST |while read f; do echo "<option value=\"$f\">$(l10n $f)</option>"; done)
-      </select>
-      <button type="submit" name="action" value="addfield">$(l10n edit_addfield)</button>
-      <br /><button type="submit" name="action" value="update">$(l10n edit_update)</button>
-      <br /><button type="submit" name="action" value="cancel">$(l10n edit_cancel)</button>
-    </form>
-  </div>
-x_EOF
-  debug "Edit: $card"
-  else cat <<x_EOF
-  <div id="${id}" class="card">
-    <p class="control"><a href="?page=attendees&edit=${id}#${id}">$(l10n edit)</a></p>
-    $(view_attendee "$card")
-  </div>
-x_EOF
-  fi
-done)
+$(
+[ -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
+)
 </div>
-
 EOF
 
 # vi:set filetype=html: