X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=ab2be506a8c9b9c25fdc9089f497ac8e3c1b6aea;hp=4a57bd2314f300585b6ef50eb6f9162536898945;hb=ed7c5fd1f5d1232649fe3e206a8d88b89ee406dd;hpb=444462594b41e81946546c1376ef1c06e0c414f8

diff --git a/cards/list.sh b/cards/list.sh
index 4a57bd2..ab2be50 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -56,6 +56,19 @@ card_item(){
           done
         fi
         ;;
+      TEL) if [ $cnt -gt 0 ]; then
+          printf '[h3 %s]' "$(l10n TEL)"
+          seq 1 $cnt |while read c; do
+            teltype="$(pdi_attrib "$card" TEL $c TYPE)"
+            [ "$teltype" ] \
+            && printf '[span .item .TEL [span .type ­%s:] %s]' \
+                      "$(l10n "TYPE=$teltype" |HTML)" \
+                      "$(pdi_value "$card" TEL $c |unescape |HTML)" \
+            || printf '[span .item .TEL ­%s]' \
+                      "$(pdi_value "$card" TEL $c |unescape |HTML)"
+          done
+        fi
+        ;;
       *) if [ $cnt -gt 0 ]; then
           printf '[h3 %s]' "$(l10n "$item")"
           seq 1 $cnt |while read c; do
@@ -78,9 +91,10 @@ edit_item(){
     [ $cnt -lt 1 ] && cnt=1
 
     case $item in
-      N)if N="$(pdi_value "$card" N)"; then
+      N)N="$(pdi_value "$card" N)"
+        if [ "$N" ]; then
           IFS=\; read n1 n2 n3 n4 n5 <<-EOF
-		$(pdi_value "$card" N)
+		$N
 		EOF
         else
 	  N="$(pdi_value "$card" FN |unescape)"
@@ -101,6 +115,7 @@ edit_item(){
         "$(l10n n_post)"  "$(HTML "$n5")"
         ;;
       GENDER)
+        gender="$(pdi_value "$card" GENDER)"
         printf '
         [select .item .GENDER name="GENDER"
           [option value="" disabled="disabled" %s %s]
@@ -108,18 +123,12 @@ edit_item(){
           [option value="male"   %s %s]
           [option value="other"  %s %s]
           [option value="none"   %s %s]
-        ]
-        ' \
-        "$([ "$(pdi_value "$card" GENDER)" = '' ] && printf 'selected="selected"')" \
-        "$(l10n GENDER)" \
-        "$([ "$(pdi_value "$card" GENDER)" = 'female' ] && printf 'selected="selected"')" \
-        "$(l10n gender_female)" \
-        "$([ "$(pdi_value "$card" GENDER)" = 'male' ] && printf 'selected="selected"')" \
-        "$(l10n gender_male)" \
-        "$([ "$(pdi_value "$card" GENDER)" = 'other' ] && printf 'selected="selected"')" \
-        "$(l10n gender_other)" \
-        "$([ "$(pdi_value "$card" GENDER)" = 'none' ] && printf 'selected="selected"')" \
-        "$(l10n gender_none)"
+        ]\n' \
+        "$([ "$gender" = ''       ] && printf 'selected="selected"')" "$(l10n GENDER)" \
+        "$([ "$gender" = 'female' ] && printf 'selected="selected"')" "$(l10n gender_female)" \
+        "$([ "$gender" = 'male'   ] && printf 'selected="selected"')" "$(l10n gender_male)" \
+        "$([ "$gender" = 'other'  ] && printf 'selected="selected"')" "$(l10n gender_other)" \
+        "$([ "$gender" = 'none'   ] && printf 'selected="selected"')" "$(l10n gender_none)"
         ;;
       BDAY|X-ZACK-JOINDATE|X-ZACK-LEAVEDATE)
         printf '[h3 %s]
@@ -134,6 +143,26 @@ edit_item(){
           "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)"
         done
         ;;
+      TEL) printf '[h3 %s]' "$(l10n "$item")"
+        seq 1 $cnt |while read c; do
+          teltype="$(pdi_attrib "$card" TEL $c TYPE)"
+          printf '[select .item .teltype name="teltype"
+                    [option value="" disabled="disabled" %s %s]
+                    [option value="HOME" %s %s]
+                    [option value="WORK" %s %s]
+                    [option value="CELL" %s %s]
+                    [option value="FAX"  %s %s]
+                  ]\n' \
+                  "$([ "$teltype" = ''     ] && printf 'selected="selected"')" "$(l10n teltype)" \
+                  "$([ "$teltype" = 'HOME' ] && printf 'selected="selected"')" "$(l10n TYPE=HOME)" \
+                  "$([ "$teltype" = 'WORK' ] && printf 'selected="selected"')" "$(l10n TYPE=WORK)" \
+                  "$([ "$teltype" = 'CELL' ] && printf 'selected="selected"')" "$(l10n TYPE=CELL)" \
+                  "$([ "$teltype" = 'FAX'  ] && printf 'selected="selected"')" "$(l10n TYPE=FAX)"
+
+          printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \
+          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
+        done
+        ;;
       *) printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
           printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \
@@ -199,11 +228,10 @@ edit_card(){
 	  [div .control
 	    [select .item name="newfield"
 	      [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
-	      $(for f in ; do
+	      $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
 	        printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
 	      done)
-	    ]
-	    [button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+	   ][button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
 	    [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
 	    [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)]
 	      [button .item type="submit" name="action" value="delete"]