X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fview_attendee.sh;h=5966729e01611df62bb78485d186cf8ecefd1b0d;hp=d54c11f28b6af16c5627e42f8d71859b658dace5;hb=70c5786a6b3dd9c6561e2f19f2827ce92191c13f;hpb=793cb4fe08df6131b64ddbbf6cc6cb89201f1bd4

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index d54c11f..5966729 100755
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2015 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -15,82 +15,71 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-echo '<div id="'${id}'" class="card">'
-echo '  <div class="section basic">'
-echo '    <h2 class="item FN">'$values[FN]'</h2>'
-[ -n "$values[GENDER]" ] && \
-  echo '    <span class="item GENDER">'$(l10n $values[GENDER])'</span>'
-for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item NICKNAME">aka. '$values[$n]'</span>'
-done
-[ -n "$values[BDAY]" ] &&\
-  echo '    <span class="item BDAY"><b>*:</b> '$values[BDAY]'</span>'
+n=$(printf %s "$values[N+3] $values[N+1] $values[N+2] $values[N+0] $values[N+4]" \
+    | sed -r ':X;$!{N;bX}; s;^[\n ]+;;; s;[\n ]+$;;; s;[\r\t\n ]+; ;g;'
+   )
+fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
 
-[ -n "$values[X-ZACK-JOINDATE]" ] &&\
-  echo '    <span class="item X-ZACK-JOINDATE"><b>'$(l10n label_join)':</b> '$values[X-ZACK-JOINDATE]'</span>'
-[ -n "$values[X-ZACK-LEAVEDATE]" ] &&\
-  echo '    <span class="item X-ZACK-LEAVEDATE"><b>'$(l10n label_leave)':</b> '$values[X-ZACK-LEAVEDATE]'</span>'
+cat <<END_HTML
+  <div class="section basic">
+    <h2 class="item FN">$fullname</h2>
+    ${values[GENDER]:+<span class="item GENDER">$(l10n $values[GENDER])</span>}
 
-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 '    <h3>'$(l10n TEL)'</h3>'
-for n in TEL TEL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item TEL">'$tags[${n}_TYPE]' '$values[$n]'</span>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section message">'
-[ -n "$values[EMAIL]" ] && \
-  echo '    <h3>'$(l10n EMAIL)'</h3>'
-for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item EMAIL"><a href="mailto:'$values[$n]'">'$values[$n]'</a></span>'
-done
-[ -n "$values[IMPP]" ] && \
-  echo '    <h3>'$(l10n IMPP)'</h3>'
-for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item IMPP">'$tags[${n}_TYPE]' <a href="'$values[$n]'">'$values[$n]'</a></span>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section address">'
-echo '    <h3>'$(l10n ADR)'</h3>'
-for n in ADR ADR{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item ADR">'$values[$n]'</span>'
-done
-[ -n "$values[URL]" ] && \
-  echo '    <h3>'$(l10n URL)'</h3>'
-for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item URL"><a href="'$values[$n]'">'$values[$n]'</a></span>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section note">'
-echo '    <h3>'$(l10n NOTE)'</h3>'
-for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
-  echo '    <span class="item NOTE">'$values[$n]'</span>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section">'
-echo '    <h3>'$(l10n course_attendance)'</h3>'
-sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
-  cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
-  echo '    <a class="item attendance" href="?p=courses#'$each'">'$cname'</a>'
-done
-echo '  </div>'
-echo ''
-echo '  <div class="section control">'
-echo '    <a class="item control" href="?action=edit_attendee&card='${id}'">'$(l10n edit)'</a>'
-echo '    <a class="item control" href="?action=export_vcard&card='${id}'">'$(l10n vcf_export)'</a>'
-echo '  </div>'
-echo '</div>'
+    $(for n in NICKNAME NICKNAME{0..10}; do
+      echo "${values[$n]:+<span class="item NICKNAME">aka. $values[$n]</span>}"
+    done)
+
+    ${values[BDAY]:+<span class="item BDAY"><b>*:</b> $values[BDAY]</span>}
+    ${values[X-ZACK-JOINDATE]:+<span class="item X-ZACK-JOINDATE"><b>$(l10n label_join):</b> $values[X-ZACK-JOINDATE]</span>}
+    ${values[X-ZACK-LEAVEDATE]:+<span class="item X-ZACK-LEAVEDATE"><b>$(l10n label_leave):</b> $values[X-ZACK-LEAVEDATE]</span>}
+    ${values[SOUND]:+<audio controls="controls" class="item SOUND"><source type="audio/ogg" src="data:audio/ogg;base64,$values[SOUND]" /></audio>}
+    ${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">
+    <h3>$(l10n TEL)</h3>
+    $(for n in TEL TEL{0..10}; do
+      echo "${values[$n]:+<span class="item TEL">$values[${n}_TYPE] $values[$n]</span>}"
+    done)
+  </div><!--
+
+  --><div class="section message">
+    ${values[EMAIL]:+<h3>$(l10n EMAIL)</h3>}
+    $(for n in EMAIL EMAIL{0..10}; do
+      echo "${values[$n]:+<span class="item EMAIL"><a href="mailto:$values[$n]">$values[$n]</a></span>}"
+    done)
+    ${values[IMPP]:+<h3>$(l10n IMPP)</h3>}
+    $(for n in IMPP IMPP{0..10}; do
+      echo "${values[$n]:+<span class="item IMPP">$values[${n}_TYPE] <a href="$values[$n]">$values[$n]</a></span>}"
+    done)
+  </div><!--
+
+  --><div class="section address">
+    <h3>$(l10n ADR)</h3>
+    $(for n in ADR ADR{0..10}; do
+      echo "${values[$n]:+<span class="item ADR">$values[$n]</span>}"
+    done)
+    ${values[URL]:+<h3>$(l10n URL)</h3>}
+    $(for n in URL URL{0..10}; do
+      echo "${values[$n]:+<span class="item URL"><a href="$values[$n]">$values[$n]</a></span>}"
+    done)
+  </div><!--
+
+  --><div class="section note">
+    <h3>$(l10n NOTE)</h3>
+    $(for n in NOTE NOTE{0..10}; do
+      echo "${values[$n]:+<span class="item NOTE">$values[$n]</span>}"
+    done)
+  </div><!--
+
+  --><div class="section attendance">
+    <h3>$(l10n course_attendance)</h3>
+    <ul>
+    $(sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
+      cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
+      echo '   <li><a class="item attendance" href="?p=courses#'$each'">'$cname'</a></li>'
+    done)
+    </ul>
+  </div>
+END_HTML