X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fview_attendee.sh;h=c9adf7f9c8169b96ca487125826f183bd59c951a;hp=fa9241ecd9465b33f266f734517cfa248f8d1c8d;hb=71195981a9ea7cc2a050c52f4247609e67d1dbf5;hpb=28a2c1efac4c9bb93a57f09a387f5991e0c7573c

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index fa9241e..c9adf7f 100755
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -20,9 +20,9 @@ item_name[ADR]="Anschrift"
 item_name[URL]="Webseite"
 item_name[LANG]="Sprache"
 item_name[NOTE]="Notiz"
-item_name
+
 item_name[RELATED]="Kontakte"
-item_name
+
 item_name[BEGIN]=""
 item_name[CALADRURI]=""
 item_name[CALURI]=""
@@ -44,33 +44,31 @@ item_name[VERSION]=""
 item_name[XML]=""
 
 l10n() {
-  [ -n "$item_name[$1]" ] && echo "$item_name[$1]" || echo "$1"
+  [ -n "$item_name[$1]" ] && echo -n "$item_name[$1]" || echo -n "$1"
 }
 
 view_card_item() {
-  debug "Item: $key"
   case "$key" in
     BEGIN|VERSION|END);;
     PHOTO)
-      debug "Type: $tag[TYPE]"
       echo "<img class=\"PHOTO\" src=\"data:image/$tag[TYPE];base64,$value\"/>"
       ;;
     FN)
       echo "<h2 CLASS=\"FN\">$value</h2>"
       ;;
     *)
-      echo "<span class=\"KEY $key\">$(l10n "$key")"
-      [ -n "$tag[TYPE]" ] && echo "($tag[TYPE])"
+      echo -n "<span class=\"item\"><span class=\"KEY $key\">$(l10n "$key")"
+      [ -n "$tag[TYPE]" ] && echo -n "($tag[TYPE])"
       echo ":</span>"
       ;|
     EMAIL)
-      echo "<a href=\"mailto:$value\" class=\"VALUE $key\">$value</a><br/>"
+      echo "<a href=\"mailto:$value\" class=\"VALUE $key\">$value</a></item>"
       ;;
     IMPP)
-      echo "<a href=\"$value\" class=\"VALUE $key\">"$(echo "$value" |cut -d: -f2-)"</a><br/>"
+      echo "<a href=\"$value\" class=\"VALUE $key\">"$(echo "$value" |cut -d: -f2-)"</a></item>"
       ;;
     *)
-      echo "<span class=\"VALUE $key\">$value</span><br/>"
+      echo "<span class=\"VALUE $key\">$value</span></item>"
       ;;
   esac
 }
@@ -88,6 +86,8 @@ view_attendee() {  #Parameter: Cardfile
         else
           view_card_item
           eval "$line"
+	  unset value
+	  unset tag
         fi
       ;;
     esac