X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fedit_attendee.sh;h=e27592c6d9b32da57a39e7ec266cf6e74f521bec;hp=e5050128db36e54f40301eb46e1a16d4e409c15d;hb=70c5786a6b3dd9c6561e2f19f2827ce92191c13f;hpb=fd8bfb7fa37228c2c75d896124c99a4518e93b1e

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index e505012..e27592c 100755
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 Paul Hänsch
+# Copyright 2014 - 2016 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -22,121 +22,111 @@ check_a() {
   egrep -q "^${1}.${id}$" "$_DATA/mappings/attendance" && echo 'checked="checked"'
 }
 
-n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
-n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
-n_middle="$(echo "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')"
-n_pre="$(echo "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
-n_post="$(echo "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
-
 SUP_FIELDS=(N NICKNAME GENDER BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE EMAIL TEL IMPP ADR URL NOTE)
 
 [ -z "$values[UID]" ] && values[UID]="$(uuidgenerator)"
 
-echo '<div id="'${id}'" class="card">'
-echo '<form action="?action=update_attendee" method="POST">'
-echo '<input type="hidden" name="card" value="'${id}'"/>'
-echo '  <div class="section basic">'
-echo '    <span class="sectitle">'$(l10n N)'</span>'
-echo '    <input class="item N" name="3N" placeholder="'$(l10n n_pre)'" value="'$n_pre'" />'
-echo '    <input class="item N" name="1N" placeholder="'$(l10n n_first)'" value="'$n_first'" />'
-echo '    <input class="item N" name="2N" placeholder="'$(l10n n_middle)'" value="'$n_middle'" />'
-echo '    <input class="item N" name="0N" placeholder="'$(l10n n_last)'" value="'$n_last'" />'
-echo '    <input class="item N" name="4N" placeholder="'$(l10n n_post)'" value="'$n_post'" />'
+cat <<END_HTML
+<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>
+    <input class="item N" name="3N" placeholder="$(l10n n_pre)" value="$values[N+3]" />
+    <input class="item N" name="1N" placeholder="$(l10n n_first)" value="$values[N+1]" />
+    <input class="item N" name="2N" placeholder="$(l10n n_middle)" value="$values[N+2]" />
+    <input class="item N" name="0N" placeholder="$(l10n n_last)" value="$values[N+0]" />
+    <input class="item N" name="4N" placeholder="$(l10n n_post)" value="$values[N+4]" />
+
+    <select class="item GENDER" name="GENDER">
+      <option value="" disabled="disabled">$(l10n GENDER)</option>
+      <option value="female" $(check_gen female)>$(l10n gender_female)</option>
+      <option value="male" $(check_gen male)>$(l10n gender_male)</option>
+      <option value="other" $(check_gen other)>$(l10n gender_other)</option>
+      <option value="none" $(check_gen none)>$(l10n gender_none)</option>
+    </select>
+
+    $(for n in NICKNAME NICKNAME{0..10}; do
+      echo "${values[$n]+<input class="item NICKNAME" name="NICKNAME" placeholder="$(l10n NICKNAME)" value="$values[$n]" />}"
+    done)
+
+    <h3>$(l10n BDAY)</h3>
+    <input class="item BDAY" name="BDAY" value="$values[BDAY]" />
+
+    <h3>$(l10n X-ZACK-JOINDATE)</h3>
+    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-JOINDATE" value="$values[X-ZACK-JOINDATE]" />
+    $(if [ -n "$values[X-ZACK-LEAVEDATE]" ]; then
+      echo '    <h3>'$(l10n X-ZACK-LEAVEDATE)'</h3>'
+      echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-LEAVEDATE" value="'$values[X-ZACK-LEAVEDATE]'" />'
+    fi)
+
+    $(if [ -n "$values[SOUND]" ]; then
+      echo '    <audio controls="controls" class="item SOUND">'
+      echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'
+      echo '    </audio>'
+    fi)
+    ${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>
 
-echo '    <select class="item GENDER" name="GENDER">'
-echo '      <option value="" disabled="disabled">'$(l10n GENDER)'</option>'
-echo '      <option value="female" '$(check_gen female)'>'$(l10n gender_female)'</option>'
-echo '      <option value="male" '$(check_gen male)'>'$(l10n gender_male)'</option>'
-echo '      <option value="other" '$(check_gen other)'>'$(l10n gender_other)'</option>'
-echo '      <option value="none" '$(check_gen none)'>'$(l10n gender_none)'</option>'
-echo '    </select>'
+  <div class="section phone">
+    <h3>$(l10n TEL)</h3>
+    <input class="item TEL" name="TEL" value="$values[TEL]" />
+    $(for n in TEL{0..10}; do
+      echo "${values[$n]+<input class="item TEL" name="TEL" value="'$values[$n]'" />}"
+    done)
+  </div>
 
-for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <input class="item NICKNAME" name="NICKNAME" placeholder="'$(l10n NICKNAME)'" value="'$values[$n]'" />'
-done
+  <div class="section message">
+    <h3>$(l10n EMAIL)</h3>
+    <input class="item EMAIL" name="EMAIL" value="$values[EMAIL]" />
+    $(for n in EMAIL{0..10}; do
+      echo "${values[$n]+<input class="item EMAIL" name="EMAIL" value="$values[$n]" />}"
+    done)
+    ${values[IMPP]+<h3>$(l10n IMPP)</h3>}
+    $(for n in IMPP IMPP{0..10}; do
+      echo "${values[$n]+<input class="item IMPP" name="IMPP" value="$values[$n]" />}"
+    done)
+  </div>
 
-echo '    <span class="sectitle">'$(l10n BDAY)'</span>'
-echo '    <input class="item BDAY" name="BDAY" value="'$values[BDAY]'" />'
+  <div class="section address">
+    <h3>$(l10n ADR)</h3>
+    <textarea class="item ADR" name="ADR">$values[ADR]</textarea>
+    $(for n in ADR{0..10}; do
+      echo "${values[$n]+<textarea class="item ADR" name="ADR">$values[$n]</textarea>}"
+    done)
+    ${values[URL]+<h3>$(l10n URL)</h3>}
+    $(for n in URL URL{0..10}; do
+      echo "${values[$n]+<input class="item URL" name="URL" value="$values[$n]" />}"
+    done)
+  </div>
 
-echo '    <span class="sectitle">'$(l10n X-ZACK-JOINDATE)'</span>'
-echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-JOINDATE" value="'$values[X-ZACK-JOINDATE]'" />'
-if [ -n "$values[X-ZACK-LEAVEDATE]" ]; then
-  echo '    <span class="sectitle">'$(l10n X-ZACK-LEAVEDATE)'</span>'
-  echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-LEAVEDATE" value="'$values[X-ZACK-LEAVEDATE]'" />'
-fi
+  <div class="section note">
+    <h3>$(l10n NOTE)</h3>
+    <textarea class="item NOTE" name="NOTE">$values[NOTE]</textarea>
+    $(for n in NOTE{0..10}; do
+      echo "${values[$n]+<textarea class="item NOTE" name="NOTE">$values[$n]</textarea>}"
+    done)
+  </div>
 
-if [ -n "$values[SOUND]" ]; then
-  echo '    <audio controls="controls" class="item SOUND">'
-  echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'
-  echo '    </audio>'
-fi
-[ -n "$values[PHOTO]" ] &&\
-  echo '    <img class="item PHOTO" src="data:image/'$tags[PHOTO_TYPE]';base64,'$values[PHOTO]'" />'
-[ -n "$values[LOGO]" ] &&\
-  echo '    <img class="item LOGO" src="data:image/'$tags[LOGO_TYPE]';base64,'$values[LOGO]'" />'
-echo '  </div>'
-echo ''
-echo '  <div class="section phone">'
-echo '    <span class="sectitle">'$(l10n TEL)'</span>'
-  echo '    <input class="item TEL" name="TEL" value="'$values[TEL]'" />'
-for n in TEL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <input class="item TEL" name="TEL" value="'$values[$n]'" />'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section message">'
-echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
-  echo '    <input class="item EMAIL" name="EMAIL" value="'$values[EMAIL]'" />'
-for n in EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <input class="item EMAIL" name="EMAIL" value="'$values[$n]'" />'
-done
-[ -n "$values[IMPP]" ] && \
-  echo '    <span class="sectitle">'$(l10n IMPP)'</span>'
-for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <input class="item IMPP" name="IMPP" value="'$values[$n]'" />'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section address">'
-echo '    <span class="sectitle">'$(l10n ADR)'</span>'
-echo '    <textarea class="item ADR" name="ADR">'$values[ADR]'</textarea>'
-for n in ADR{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <textarea class="item ADR" name="ADR">'$values[$n]'</textarea>'
-done
-[ -n "$values[URL]" ] && \
-  echo '    <span class="sectitle">'$(l10n URL)'</span>'
-for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <input class="item URL" name="URL" value="'$values[$n]'" />'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section note">'
-echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
-echo '    <textarea class="item NOTE" name="NOTE">'$values[NOTE]'</textarea>'
-for n in NOTE{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <textarea class="item NOTE" name="NOTE">'$values[$n]'</textarea>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section attendance">'
-echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
-listcourses |while read each; do
-  cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
-  echo '    <span class="check attendance"><input type="checkbox" name="attendance" value="'$each'" '$(check_a "$each")'/>'$cname'</span>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section control">'
-echo '    <button class="item control" type="submit" name="action" value="addfield">'$(l10n edit_addfield)'</button>'
-echo '    <select class="item control" name="newfield">'
-echo '      <option value="" disabled="disabled" selected="selected">'$(l10n edit_addfieldtext)'</option>'
-            for f in $SUP_FIELDS; do echo "<option value=\"$f\">$(l10n $f)</option>"; done
-echo '    </select>'
-echo '    <button class="item control" type="submit" name="action" value="update">'$(l10n edit_update)'</button>'
-echo '    <button class="item control" type="submit" name="action" value="delete">'$(l10n edit_delete)'</button>'
-echo '    <button class="item control" type="submit" name="action" value="cancel">'$(l10n edit_cancel)'</button>'
-echo '  </div>'
-echo '<input type="hidden" name="UID" value="'$values[UID]'"/>'
-echo '</form>'
-echo '</div>'
+  <div class="section attendance">
+    <h3>$(l10n course_attendance)</h3>
+    $(listcourses |while read each; do
+      cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
+      echo '<label><input type="checkbox" name="attendance" value="'$each'" '$(check_a "$each")'/>'$cname'</label>'
+    done)
+  </div>
 
+  <div class="control">
+    <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
+    ><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>
+    <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]"/>
+</form>
+END_HTML