bugfixes, styling

[confetti] / cards / list.sh

diff --git a/cards/list.sh b/cards/list.sh
index 834803f336756b7419de663eec5a8b3585f44e0e..ab2be506a8c9b9c25fdc9089f497ac8e3c1b6aea 100755 (executable)
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -62,7 +62,7 @@ card_item(){
             teltype="$(pdi_attrib "$card" TEL $c TYPE)"
             [ "$teltype" ] \
             && printf '[span .item .TEL [span .type ­%s:] %s]' \
-                      "$(l10n "$teltype" |HTML)" \
+                      "$(l10n "TYPE=$teltype" |HTML)" \
                       "$(pdi_value "$card" TEL $c |unescape |HTML)" \
             || printf '[span .item .TEL ­%s]' \
                       "$(pdi_value "$card" TEL $c |unescape |HTML)"
@@ -91,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)"
@@ -153,10 +154,10 @@ edit_item(){
                     [option value="FAX"  %s %s]
                   ]\n' \
                   "$([ "$teltype" = ''     ] && printf 'selected="selected"')" "$(l10n teltype)" \
-                  "$([ "$teltype" = 'HOME' ] && printf 'selected="selected"')" "$(l10n HOME)" \
-                  "$([ "$teltype" = 'WORK' ] && printf 'selected="selected"')" "$(l10n WORK)" \
-                  "$([ "$teltype" = 'CELL' ] && printf 'selected="selected"')" "$(l10n CELL)" \
-                  "$([ "$teltype" = 'FAX'  ] && printf 'selected="selected"')" "$(l10n FAX)"
+                  "$([ "$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")"
@@ -227,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"]