X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=0ef5eba0a9df9e1367be3e3b716ae000706c2c5d;hp=ab2be506a8c9b9c25fdc9089f497ac8e3c1b6aea;hb=56ff6e8a97ae261fca8e293a6c82fad7a69c89b6;hpb=ed7c5fd1f5d1232649fe3e206a8d88b89ee406dd

diff --git a/cards/list.sh b/cards/list.sh
index ab2be50..0ef5eba 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -29,53 +29,46 @@ card_item(){
                  "$(pdi_value "$card" "$item" |HTML)"
         fi
         ;;
-      BDAY) if [ $cnt -gt 0 ]; then
-          printf '[span .item .BDAY [b *:] %s]' \
-                 "$(pdi_value "$card" BDAY |grep -xE '[0-9-]+')"
-        fi
+      BDAY)
+       [ $cnt -gt 0 ] && printf '[span .item .BDAY [b *:] %s]' \
+                                "$(pdi_value "$card" BDAY |grep -xE '[0-9-]+')"
         ;;
-      SOUND) if [ $cnt -gt 0 ]; then
-          printf '[audio .item .SOUND controls="controls"
-                    [source type="audio/ogg" src="data:audio/ogg;base64,%s"]
-                  ]' \
-                 "$(pdi_value "$card" SOUND |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
+      SOUND)
+        [ $cnt -gt 0 ] && printf '[audio .item .SOUND controls="controls"
+                                    [source type="audio/ogg" src="data:audio/ogg;base64,%s"]
+                                  ]' \
+                                  "$(pdi_value "$card" SOUND |grep -xE '[a-zA-Z0-9/+=]+')"
         ;;
-      PHOTO|LOGO) if [ $cnt -gt 0 ]; then 
-          printf '[img .item .%s src="data:image/%s;base64,%s"]' "$item" \
-                 "$(pdi_attrib "$card" "$item" |sed -E 's;^(.*;)?TYPE="?(.+)"?(;.*)?$;\2;')" \
-                 "$(pdi_value "$card" "$item" |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
+      PHOTO|LOGO)
+        [ $cnt -gt 0 ] && printf '[img .item .%s src="data:image/%s;base64,%s"]' "$item" \
+                                 "$(pdi_attrib "$card" "$item" |sed -E 's;^(.*;)?TYPE="?(.+)"?(;.*)?$;\2;')" \
+                                 "$(pdi_value "$card" "$item" |grep -xE '[a-zA-Z0-9/+=]+')"
         ;;
-      EMAIL) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n EMAIL)"
-          seq 1 $cnt |while read c; do
-            printf '[a .item .EMAIL href="mailto:%s" ­%s]' \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)" \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)"
-          done
-        fi
+      EMAIL) 
+        [ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n EMAIL)"
+        seq 1 $cnt |while read c; do
+          printf '[a .item .EMAIL href="mailto:%s" ­%s]' \
+                 "$(pdi_value "$card" EMAIL $c |unescape |HTML)" \
+                 "$(pdi_value "$card" EMAIL $c |unescape |HTML)"
+        done
         ;;
-      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
+      TEL)
+        [ $cnt -gt 0 ] && 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
         ;;
-      *) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n "$item")"
-          seq 1 $cnt |while read c; do
-            printf '[span .item .%s ­%s]' "$item" \
-                   "$(pdi_value "$card" "$item" $c |unescape |HTML)"
-          done
-        fi
+      *)[ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n "$item")"
+        seq 1 $cnt |while read c; do
+          printf '[span .item .%s ­%s]' "$item" \
+                 "$(pdi_value "$card" "$item" $c |unescape |HTML)"
+        done
         ;;
     esac
   done
@@ -132,19 +125,22 @@ edit_item(){
         ;;
       BDAY|X-ZACK-JOINDATE|X-ZACK-LEAVEDATE)
         printf '[h3 %s]
-        [input .item .%s name="%s" value="%s" placeholder="YYYY-MM-DD"]
-        ' \
+        [input .item .%s name="%s" value="%s" placeholder="YYYY-MM-DD"]' \
         "$(l10n "$item")" "$item" "$item" "$(pdi_value "$card" "$item" |grep -xE '[0-9-]+')"
         ;;
       ADR|NOTE)
         printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
+          printf '[checkbox "%s_delete" "%i" .delete #%s_delete_%i][label for="%s_delete_%i" %s]' \
+            "$item" $c "$item" $c "$item" $c "$(l10n delete)"
           printf '<textarea class="item %s" name="%s">%s</textarea>' \
-          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)"
+            "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)"
         done
         ;;
       TEL) printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
+          printf '[checkbox "%s_delete" "%i" .delete #%s_delete_%i][label for="%s_delete_%i" %s]' \
+            "$item" $c "$item" $c "$item" $c "$(l10n delete)"
           teltype="$(pdi_attrib "$card" TEL $c TYPE)"
           printf '[select .item .teltype name="teltype"
                     [option value="" disabled="disabled" %s %s]
@@ -160,13 +156,15 @@ edit_item(){
                   "$([ "$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")"
+            "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
         done
         ;;
-      *) printf '[h3 %s]' "$(l10n "$item")"
+      *)printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
+          printf '[checkbox "%s_delete" "%i" .delete #%s_delete_%i][label for="%s_delete_%i" %s]' \
+            "$item" $c "$item" $c "$item" $c "$(l10n delete)"
           printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \
-          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
+            "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
         done
         ;;
     esac
@@ -277,8 +275,9 @@ print_cards(){
 
   while read cardfile; do
     cachefile="${_DATA}/cache/${cardfile##*/}.cache"
-    if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \
-                         -a "$cachefile" -nt "${_EXEC}/cards" ]; then
+    # if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \
+    #                      -a "$cachefile" -nt "${_EXEC}/cards" ]; then
+    if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" ]; then
       cat "$cachefile"
     else
       print_card "$cardfile" |tee "$cachefile"