X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Fwidgets.sh;h=09956a70559ac8f788b6da14e6f5cea2901addbb;hb=028ca40e8f741f3bf7acbba15d61e4479ab570d2;hp=c0c05946b1c594272d034a33081e351444873df9;hpb=5b8d1b752ede7a6dc4250620ca58971447570a76;p=confetti

diff --git a/cards/widgets.sh b/cards/widgets.sh
index c0c0594..09956a7 100755
--- a/cards/widgets.sh
+++ b/cards/widgets.sh
@@ -25,10 +25,10 @@ list_courses() {
     cat "$cachefile"
   else
     for file in "$_DATA/ical"/*.ics; do
-      name="$(pdi_value "$(pdi_load "$file")" SUMMARY |HTML)"
-      printf '%s	%s\n' "$file" "$name"
+      name="$(pdi_value "$(pdi_load "$file")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
+      printf '%s/%s\n' "${file##*/}" "$name"
     done \
-    | sort -k2 |tee "$cachefile"
+    | sort -t/ -k2 |tee "$cachefile"
   fi
 }
 
@@ -39,12 +39,12 @@ cat <<EOF
     [legend $(l10n filter_item):]
 
     $(for field in any name street zip TEL BDAY CATEGORIES course; do
-      printf '[input id="%s%i" type="radio" name="filter_type%i" value="%s" %s][label for="%s%i" %s ]' \
+      printf '[input .tab id="%s%i" type="radio" name="filter_type%i" value="%s" %s][label for="%s%i" %s ]' \
               "$field" "$n" "$n" "$field" "$([ "$1" = "$field" ] && printf checked )" \
               "$field" "$n" "$(l10n filter_$field)"
     done)
-    [input type="text" name="filter_text$n" value="$([ "$1" = CATEGORIES -o "$1" = course ] || HTML "$2")" placeholder="$(l10n filter_placeholder)"]
-    [fieldset .categories
+    [input .tab type="text" name="filter_text$n" value="$([ "$1" = CATEGORIES -o "$1" = course ] || HTML "$2")" placeholder="$(l10n filter_placeholder)"]
+    [fieldset .tab .categories
       $(list_categories | while read cat; do
           printf '[label [checkbox "filter_cat%i" "|%s" %s] %s ] ' \
                  "$n" "$(HTML "$cat")" \
@@ -53,8 +53,8 @@ cat <<EOF
       done)
       [a href="/categories/" $(l10n edit_categories)]
     ]
-    [fieldset .courses
-      $(list_courses | while read course coursename; do
+    [fieldset .tab .courses
+      $(list_courses | while IFS=/ read course coursename; do
         printf '[label [checkbox "filter_course%i" "|%s" %s] %s ] ' \
                "$n" "$(HTML "${course##*/}")" \
                "$(printf %s "${course##*/}" |grep -qxEe "$2" && printf checked )" \
@@ -167,6 +167,13 @@ card_item(){
                     "$(pdi_value "$card" TEL $c |unescape |HTML)"
         done
         ;;
+      ADR)[ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n "$item")"
+        shy="$(printf '\302\255')"
+        seq 1 $cnt |while read c; do
+          printf '[span .item .%s . %s]' "$item" \
+                 "$(pdi_value "$card" "$item" $c |sed -r "s;(straße|weg|damm|allee|ufer);${shy}\1;g" |unescape |HTML)"
+        done
+        ;;
       *)[ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
           printf '[span .item .%s . %s]' "$item" \