X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=courses%2Fwidgets.sh;h=fee7690aae41850154d1422216ba5b18e919da0e;hp=ec0acc2207370449ede9e04c8ed9b84c39b73a9b;hb=HEAD;hpb=b5ffb9d90da32513277d4c65a4a0e37854d4dee2

diff --git a/courses/widgets.sh b/courses/widgets.sh
index ec0acc2..fee7690 100755
--- a/courses/widgets.sh
+++ b/courses/widgets.sh
@@ -25,16 +25,17 @@ order="$(GET o |grep -m1 -xE 'DOW|TOD')"
 w_sort_courses(){
   cat <<-EOF
 	[form .sort .search action="?" method="GET"
-	  [span .label $(l10n sort_order):]
-	  [radio "order" "DOW" $(check $order DOW) $(l10n order_DOW)]
-	  [radio "order" "TOD" $(check $order TOD) $(l10n order_TOD)]
+          [fieldset .order [legend $(l10n sort_order):]
+	    [radio "order" "DOW" $(check $order DOW) $(l10n order_DOW)]
+	    [radio "order" "TOD" $(check $order TOD) $(l10n order_TOD)]
+          ]
 	  [submit "" "" $(l10n order_apply)]
 	]
 	EOF
 }
 
 cal_date(){
-  { [ $# -eq 0 ] && cat || printf %s "$*"; } |sed -rnE '
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } |sed -nE '
     2q
     s/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/\1-\2-\3 \4:\5:\6 UTC/p;t
     s/^TZID=(.+)\:([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})$/TZ="\1" \2-\3-\4 \5:\6:\7/p;t
@@ -52,11 +53,11 @@ cal_item(){
 
     case $item in
       SUMMARY)
-        printf '[h2 &shy%s]' "$(pdi_value "$course" SUMMARY)"
+        printf '[h2 . %s]' "$(pdi_value "$course" SUMMARY)"
         ;;
       DTSTART)
         printf '[span .text .DTSTART %s %s ]' \
-               "$(date -d "$(pdi_value "$course" DTSTART |cal_date)" '+%A %B %d, %Y - %H:%M')" \
+               "$(LANG=de_DE.UTF-8 date -d "$(pdi_value "$course" DTSTART |cal_date)" '+%A, %d. %B %Y - %H:%M')" \
                "$(l10n t_oclock)"
         ;;
       RRULE)
@@ -148,7 +149,7 @@ edit_item(){
 	done 2>/dev/null
 	)]
 	]
-	[span .DTSTIME $(l10n time):]
+	[label .DTSTIME $(l10n time):]
 	[input type="number" name="DTS_HOUR" value="$hhstart" min="0" max="23"]:[input type="number" name="DTS_MINUTE" value="$mmstart" min="0" max="59"]
 	EOF
         ;;
@@ -159,10 +160,10 @@ edit_item(){
         local dstart="${dtstart##*-}"; dstart="${dstart%% *}"
 
         local rrule="$(pdi_value "$course" RRULE)"
-        local   rr_int="$(printf %s "$rrule" |sed -rn 's;^(.*\;[	 ]*)?INTERVAL=([0-9]+)(\;.*)?$;\2;p')"
-        local rr_count="$(printf %s "$rrule" |sed -rn 's;^(.*\;[	 ]*)?COUNT=([0-9]+)(\;.*)?$;\2;p')"
-        local  rr_freq="$(printf %s "$rrule" |sed -rn 's;^(.*\;[	 ]*)?FREQ=(DAILY|WEEKLY|MONTHLY|YEARLY)(\;.*)?$;\2;p')"
-        local rr_until="$(printf %s "$rrule" |sed -rn 's;^(.*\;[	 ]*)?UNTIL=([0-9]{8}T[0-9]{6}Z)(\;.*)?$;\2;p')"
+        local   rr_int="$(printf %s "$rrule" |sed -nE 's;^(.*\;[	 ]*)?INTERVAL=([0-9]+)(\;.*)?$;\2;p')"
+        local rr_count="$(printf %s "$rrule" |sed -nE 's;^(.*\;[	 ]*)?COUNT=([0-9]+)(\;.*)?$;\2;p')"
+        local  rr_freq="$(printf %s "$rrule" |sed -nE 's;^(.*\;[	 ]*)?FREQ=(DAILY|WEEKLY|MONTHLY|YEARLY)(\;.*)?$;\2;p')"
+        local rr_until="$(printf %s "$rrule" |sed -nE 's;^(.*\;[	 ]*)?UNTIL=([0-9]{8}T[0-9]{6}Z)(\;.*)?$;\2;p')"
         local rr_uyear="${rr_until%????T??????Z}"
         local rr_umonth=${rr_until#????}; rr_umonth="${rr_umonth%??T??????Z}"
         local   rr_uday=${rr_until#??????}; rr_uday="${rr_uday%T??????Z}"
@@ -179,16 +180,16 @@ edit_item(){
           printf '  [option value="%s" %s . %s]\n' "$f" "$(selected $f "$rr_freq")" "$(l10n $f)"
         done)
 	]]
-	[span .item [input type="radio" name="RRULE_LIMIT" value="ETERN" $(checked "$rr_limit" ETERN) . $(l10n t_eternal)][br]]
-	[span .item
-	[input type="radio" name="RRULE_LIMIT" value="COUNT" $(checked "$rr_limit" COUNT)]
-	[input type="number" .RRULE .COUNT name="RRULE_COUNT" placeholder="#N" value="${rr_count:-1}" min="1"] $(l10n t_times)
+	[label .item [input type="radio" name="RRULE_LIMIT" value="ETERN" $(checked "$rr_limit" ETERN)] $(l10n t_eternal)]
+	[label .item
+	  [input type="radio" name="RRULE_LIMIT" value="COUNT" $(checked "$rr_limit" COUNT)]
+	  [input type="number" .RRULE .COUNT name="RRULE_COUNT" placeholder="#N" value="${rr_count:-1}" min="1"] $(l10n t_times)
 	]
-	[span .item
-	[input type="radio" name="RRULE_LIMIT" value="UNTIL" $(checked "$rr_limit" UNTIL) . $(l10n t_until)]
-	[input type="number" .RRULE .UYEAR name="RRULE_UYEAR" placeholder="$(l10n YYYY)" value="${rr_uyear:-$ystart}" min="$ystart"]
-	[input type="number" .RRULE .UMONTH name="RRULE_UMONTH" placeholder="$(l10n MM)" value="${rr_umonth:-$mstart}" min="1" max="12"]
-	[input type="number" .RRULE .UDAY name="RRULE_UDAY" placeholder="$(l10n DD)" value="${rr_uday:-$dstart}" min="1" max="31"]
+	[label .item
+	  [input type="radio" name="RRULE_LIMIT" value="UNTIL" $(checked "$rr_limit" UNTIL)] $(l10n t_until)
+	  [input type="number" .RRULE .UYEAR name="RRULE_UYEAR" placeholder="$(l10n YYYY)" value="${rr_uyear:-$ystart}" min="$ystart"]
+	  [input type="number" .RRULE .UMONTH name="RRULE_UMONTH" placeholder="$(l10n MM)" value="${rr_umonth:-$mstart}" min="1" max="12"]
+	  [input type="number" .RRULE .UDAY name="RRULE_UDAY" placeholder="$(l10n DD)" value="${rr_uday:-$dstart}" min="1" max="31"]
 	]
 	EOF
         ;;
@@ -204,15 +205,17 @@ edit_item(){
         ;;
       attendance)
         printf '[h3 %s]' "$(l10n course_attendance)"
+        printf '[div .attendance\n'
         for vcf in "$_DATA"/vcard/*.vcf; do
           fn="$(pdi_value "$(pdi_load "$vcf")" FN)"
           printf '%s/%s\n' "${vcf##*/}" "$fn"
         done \
         | sort -t/ -k2 \
         | while IFS=/ read -r vcf fn; do
-          printf '[label [input type="checkbox" .item name="attendance" value="%s" %s] %s]' \
-                 "$vcf" "$(grep -qxF "${coursefile##*/}	$vcf" "$_DATA/mappings/attendance" && printf 'checked="checked"')" "$fn"
+          printf '[span .item [input type="checkbox" id="att%s" name="attendance" value="%s" %s][label for="att%s" . %s]]' \
+                 "$vcf" "$vcf" "$(grep -qxF "${coursefile##*/}	$vcf" "$_DATA/mappings/attendance" && printf 'checked="checked"')" "$vcf" "$fn"
         done
+        printf ']'
         ;;
       SUMMARY)
         printf '[h3 %s]' "$(l10n "$item")"