unify vcf parsers

[confetti] / templates / edit_attendee.sh

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 4513a3d40256fc01894f69af80a437d258739bdc..047879ad84f5d994f247c1d5431a8cf60b2ac8f8 100755 (executable)
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -33,7 +33,7 @@ SUP_FIELDS=(N NICKNAME GENDER BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE EMAIL TEL IM
 [ -z "$values[UID]" ] && values[UID]="$(uuidgenerator)"
 
 cat <<END_HTML
-<form id="$id" class="card" action="?action=update_attendee" method="POST">
+<form id="$id" class="card" action="?action=update_card" method="POST">
   <input type="hidden" name="card" value="${id}"/>
   <div class="section basic">
     <h3>$(l10n N)</h3>
@@ -70,8 +70,8 @@ cat <<END_HTML
       echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'
       echo '    </audio>'
     fi)
-    ${values[PHOTO]:+<img class="item PHOTO" src="data:image/$tags[PHOTO_TYPE];base64,$values[PHOTO]" />}
-    ${values[LOGO]:+<img class="item LOGO" src="data:image/$tags[LOGO_TYPE];base64,$values[LOGO]" />}
+    ${values[PHOTO]:+<img class="item PHOTO" src="data:image/$values[PHOTO_TYPE];base64,$values[PHOTO]" />}
+    ${values[LOGO]:+<img class="item LOGO" src="data:image/$values[LOGO_TYPE];base64,$values[LOGO]" />}
   </div>
 
   <div class="section phone">
@@ -118,19 +118,19 @@ cat <<END_HTML
     <h3>$(l10n course_attendance)</h3>
     $(listcourses |while read each; do
       cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
-      echo '<input type="checkbox" name="attendance" value="'$each'" id="cbatt_'$each'" '$(check_a "$each")'/
-            ><label for="cbatt_'$each'">'$cname'</label>'
+      echo '<label><input type="checkbox" name="attendance" value="'$each'" '$(check_a "$each")'/>'$cname'</label>'
     done)
   </div>
 
   <div class="control">
-    <button class="item" type="submit" name="action" value="addfield">$(l10n edit_addfield)</button>
     <select class="item" name="newfield">
       <option value="" disabled="disabled" selected="selected">$(l10n edit_addfieldtext)</option>
       $(for f in $SUP_FIELDS; do echo "<option value=\"$f\">$(l10n $f)</option>"; done)
-    </select>
+    </select
+    ><button class="item" type="submit" name="action" value="addfield">$(l10n edit_addfield)</button>
     <button class="item" type="submit" name="action" value="update">$(l10n edit_update)</button>
-    <button class="item" type="submit" name="action" value="delete">$(l10n edit_delete)</button>
+    <input type="checkbox" id="delete"><label class="item" for="delete">$(l10n edit_delete)</label>
+      <button class="item" type="submit" name="action" value="delete">$(l10n edit_delete)</button>
     <button class="item" type="submit" name="action" value="cancel">$(l10n edit_cancel)</button>
   </div>
   <input type="hidden" name="UID" value="$values[UID]"/>