X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=courses%2Flist.sh;h=cc0deae382f77cd2a22c016c1a5af10c28e40a45;hp=e9ae7bca263506c1a71f4f3b9c0a72cc0d526ee2;hb=HEAD;hpb=76c1e7bff1a8604ef2ef7da5d274d0db0e639139 diff --git a/courses/list.sh b/courses/list.sh index e9ae7bc..95857ec 100755 --- a/courses/list.sh +++ b/courses/list.sh @@ -3,6 +3,7 @@ . "${_EXEC}"/pdiread.sh SUP_FIELDS="COMMENT" +MAILTO="${MAILTO:-confetti@confetti}" edit_course(){ local coursefile="$_DATA/ical/$1" @@ -15,7 +16,7 @@ edit_course(){ else course="$(pdi_load "$tempfile")" cat <<-EOF - [form .course #${coursefile##*/} action="/courses/update_course.sh" method="POST" + [form .course #${coursefile##*/} action="${_BASE}/courses/update_course.sh" method="POST" [input type="hidden" name="course" value="${coursefile##*/}"] [input type="hidden" name="tid" value="$(transid ${tempfile})"] [div .section .basic . $( @@ -52,6 +53,7 @@ edit_course(){ print_course(){ local coursefile="$1" local course="$(pdi_load "$coursefile")" + cat <<-EOF [div .course #${coursefile##*/} [div .section .basic . $( @@ -60,16 +62,16 @@ print_course(){ [div .section .COMMENT . $(cal_item "$course" COMMENT)] [div .section .attendance [h3 $(l10n course_attendance) ] [ul . $(grep -F "${coursefile##*/} " "$_DATA/mappings/attendance" |while read discard each; do - printf '[li [a .item .attendance href="/cards/#%s" . %s]]\n' \ - "$each" \ + printf '[li [a .item .attendance href="%s/cards/#%s" . %s]]\n' \ + "${_BASE}" "$each" \ "$(pdi_value "$(pdi_load "$_DATA/vcard/$each")" FN |unescape |HTML)" done |sort -k7)] ] [div .control - [a .item href="/courses/edit_course.sh?course=${coursefile##*/}" $(l10n edit)] - [a .item href="/courses/export_pdf.sh?course=${coursefile##*/}" target="blank" $(l10n courselist)] - [a .item href="/courses/export_ical.sh?course=${coursefile##*/}" $(l10n ics_export)] - [a .item href="mailto:zack@vuesch.org?bcc=$(course_mail "${coursefile##*/}" |HTML)" $(l10n course_mail)] + [a .button .item href="${_BASE}/courses/edit_course.sh?course=${coursefile##*/}" $(l10n edit)] + [a .button .item href="${_BASE}/courses/export_pdf.sh?course=${coursefile##*/}" target="blank" $(l10n courselist)] + [a .button .item href="${_BASE}/courses/export_ical.sh?course=${coursefile##*/}" $(l10n ics_export)] + [a .button .item href="mailto:${MAILTO}?bcc=$(course_mail "${coursefile##*/}" |HTML)" $(l10n course_mail)] ] ] EOF @@ -93,7 +95,7 @@ print_courses(){ cachefile="${_DATA}/cache/${calfile##*/}.cache" if [ -s "$cachefile" -a "$cachefile" -nt "$calfile" ]; then cat "$cachefile" - else + elif [ -s "$calfile" ]; then print_course "$calfile" |tee "$cachefile" fi done