. "${_EXEC}"/pdiread.sh
+SUP_FIELDS="COMMENT"
+MAILTO="${MAILTO:-confetti@confetti}"
+
edit_course(){
local coursefile="$_DATA/ical/$1"
local tempfile 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 . $(
[div .section .recur . $(
edit_item "$course" RRULE
)]
- [div .section .select_attendance . $(
+ [div .section .attendance . $(
edit_item "$course" attendance
)]
[div .control
- [select .item name=newfield
+ [!-- select .item name=newfield
[option disabled="disabled" selected . $(l10n edit_addfieldtext)]
$(for f in $SUP_FIELDS; do printf '[option value="%s" . %s]\n' "$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)]
- [button .item type="submit" name="action" value="delete" . $(l10n edit_delete)]
[button .item type="submit" name="action" value="cancel" . $(l10n edit_cancel)]
- ]'
+ [div .item .delete label="$(l10n edit_delete)"
+ [input type="checkbox" #delete]
+ [label for="delete" $(l10n edit_delete)]
+ [button type="submit" name="action" value="delete" $(l10n edit_delete)]
+ ]
+ ]
]
EOF
fi
print_course(){
local coursefile="$1"
local course="$(pdi_load "$coursefile")"
+
cat <<-EOF
[div .course #${coursefile##*/}
[div .section .basic . $(
[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
cat "${_DATA}/vcard/${card}"
done \
| pdi_load - \
- | sed -rn 's;^EMAIL(\;[^:]*)*:(.+)\r?$;\2,;p' \
+ | sed -nE 's;^EMAIL(\;[^:]*)*:(.+)\r?$;\2,;p' \
| tr -d \\n \
| unescape
}
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