X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Flist.sh;h=519005c08f780bc5e09dc64717fa72bd46425482;hb=6e7496f7d5f9d5804ff071a53da789ca5ef9d4ba;hp=0ed8af46297cc72abe6ae1202869e21db1501c3c;hpb=028ca40e8f741f3bf7acbba15d61e4479ab570d2;p=confetti

diff --git a/cards/list.sh b/cards/list.sh
index 0ed8af4..519005c 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -13,7 +13,7 @@ edit_card(){
   else
     card="$(pdi_load "$tempfile")"
     cat <<-EOF
-	[form .card #${cardfile##*/} action="/cards/update_card.sh" method="POST"
+	[form .card #${cardfile##*/} action="${_BASE}/cards/update_card.sh" method="POST"
 	  [input type="hidden" name="tid" value="$(transid ${tempfile})"]
 	  [div .section .basic $(
 	    edit_item "$card" N GENDER
@@ -65,7 +65,7 @@ edit_card(){
             [div .item .newfield
               [select name="newfield"
 	        [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
-	        $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
+	        $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE X-ZACK-LEAVEDATE; do
 	          printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
 	        done)
 	      ][button type="submit" name="action" value="addfield" $(l10n edit_addfield)]
@@ -94,15 +94,15 @@ print_card(){
       [div .section .note    . $(card_item "$card" NOTE)]
       [div .section .attendance [h3 $(l10n course_attendance) ] [ul
         $(grep -F "	${cardfile##*/}" "$_DATA/mappings/attendance" |while read each discard; do
-          printf '[li [a .item .attendance href="/courses#%s" . %s]]' \
-                 "$each" \
+          printf '[li [a .item .attendance href="%s/courses#%s" . %s]]' \
+                 "${_BASE}" "$each" \
                  "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
         done |sort -k7)]
         $(card_item "$card" CATEGORIES)
       ]
       [div .control
-        [a .button .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
-        [a .button .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
+        [a .button .item href="${_BASE}/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
+        [a .button .item href="${_BASE}/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
 	EOF
@@ -113,11 +113,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" ]; then
       cat "$cachefile"
-    else
+    elif [ -s "$cardfile" ]; then
       print_card "$cardfile" |tee "$cachefile"
     fi
   done
@@ -150,6 +148,7 @@ filter_attendance(){
 
 filter_cards(){
   local filter f fex='x;p;'
+  local upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; '
 
   filter="$(printf %s "${filter}" \
             | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\&;g;