multiple logical fixes in vcard updater

[confetti] / templates / attendees.html.sh

diff --git a/templates/attendees.html.sh b/templates/attendees.html.sh
index 92e4d91ab4d053fbc94c9368f5db3a7d6e69bce8..a237d3eea8ea85da6896762878eb6734025402f6 100644 (file)
--- a/templates/attendees.html.sh
+++ b/templates/attendees.html.sh
@@ -37,27 +37,18 @@ cat <<EOF
 
 <div class="cardlist">
 $(listcards |while read card; do
-  id="vcf_$card"
+  id="$(basename "$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>
+      $(edit_attendee "$id")
     </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")
+    $(view_attendee "$id")
   </div>
 x_EOF
   fi