From 856d7b3c7823e768e4ad468ff2203fde3838e861 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Fri, 16 Jul 2021 22:09:25 +0200 Subject: [PATCH] put calendar widget into separate file --- index.cgi | 61 ++---------------------------------------------------- widgets.sh | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 59 deletions(-) create mode 100755 widgets.sh diff --git a/index.cgi b/index.cgi index 48c9a79..363e969 100755 --- a/index.cgi +++ b/index.cgi @@ -7,20 +7,10 @@ _DATA="${_DATA:-.}" #. "$_EXEC"/cgilite/session.sh . "$_EXEC"/cgilite/file.sh #. "$_EXEC"/session_lock.sh +. "$_EXEC"/widgets.sh #git init "$_DATA" >/dev/null & -checked(){ - if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then - printf 'checked="checked"' - fi 2>/dev/null -} -selected(){ - if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then - printf 'selected="selected"' - fi 2>/dev/null -} - yield_page(){ title="${1:-Webpoll}" page="$2" printf '%s\r\n' 'Content-Type: text/html; charset=utf-8' \ @@ -38,57 +28,10 @@ yield_page(){ } |"$_EXEC/cgilite/html-sh.sed" -u } -w_month() { - local month="$1" selected="$2" - local dow dom days n=1 Y m d V w B - if [ $month ]; then - read Y m d V w B<<-EOF - $(date -d "${month}-01" +"%Y %m %d %V %w %B") - EOF - else - read Y m d V w <<-EOF - $(date +"%Y %m %d %V %w") - EOF - month="$Y-$m" - V="$((V - d / 7))" - [ $V -lt 1 ] && V=$((V + 53)) - fi - - case $m in - 0[13578]|10|12) - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31";; - 0[469]|11) - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30";; - 02) if [ $(( Y / 400 )) = 0 ]; then - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29"; - elif [ $(( Y / 100 )) = 0 ]; then - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"; - elif [ $(( Y / 4 )) = 0 ]; then - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29"; - else - days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"; - fi;; - esac - - printf '[table .calendar month=%s [thead - [tr .monthname [th colspan=8 . %s]] - [tr .weekday [th][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s]] - ][tbody - ' "$month" "$B $Y" Mo Di Mi Do Fr Sa So - for dom in $days; do - dow=$(( (w - d + 35 + dom ) % 7)) - [ $dow = 1 -o $dom = 1 ] && printf '[tr [th .weekno . %i]' $V - [ $dom = 1 ] && while [ $n -lt $(( ($dow + 6) % 7 + 1)) ]; do printf '[td ]'; n=$((n + 1)); done - printf '[td [label [input type=radio name=date value="%04i-%02i-%02i" %s] %i]]' $Y $m $dom "$(checked $dom $selected)" $dom - [ $dow = 0 ] && printf ']\n' - [ $dow = 0 ] && V=$(( V % 53 + 1)) - done - printf ']]' -} - case ${PATH_INFO##*/} in favicon.ico) printf '%s\r\n' 'Content-Length: 0' '';; common.css) FILE "$_EXEC/cgilite/common.css";; + widgets.css) FILE "$_EXEC/widgets.css";; '') yield_page <<-EOF $(w_month 2019-12 24) $(w_month 2020-01) diff --git a/widgets.sh b/widgets.sh new file mode 100755 index 0000000..02f7cb2 --- /dev/null +++ b/widgets.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +checked(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'checked="checked"' + fi 2>/dev/null +} +selected(){ + if [ "$1" = "$2" ] || [ "$1" -eq "$2" ]; then + printf 'selected="selected"' + fi 2>/dev/null +} + +w_month() { + local month="$1" selected="$2" + local dow dom days n=1 Y m d V w B + if [ $month ]; then + read Y m d V w B<<-EOF + $(date -d "${month}-01" +"%Y %m %d %V %w %B") + EOF + else + read Y m d V w <<-EOF + $(date +"%Y %m %d %V %w") + EOF + month="$Y-$m" + V="$((V - d / 7))" + [ $V -lt 1 ] && V=$((V + 53)) + fi + + case $m in + 0[13578]|10|12) + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31";; + 0[469]|11) + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30";; + 02) if [ $(( Y / 400 )) = 0 ]; then + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29"; + elif [ $(( Y / 100 )) = 0 ]; then + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"; + elif [ $(( Y / 4 )) = 0 ]; then + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29"; + else + days="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"; + fi;; + esac + + printf '[table .calendar month=%s [thead + [tr .monthname [th colspan=8 . %s]] + [tr .weekday [th][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s][th . %s]] + ][tbody + ' "$month" "$B $Y" Mo Di Mi Do Fr Sa So + for dom in $days; do + dow=$(( (w - d + 35 + dom ) % 7)) + [ $dow = 1 -o $dom = 1 ] && printf '[tr [th .weekno . %i]' $V + [ $dom = 1 ] && while [ $n -lt $(( ($dow + 6) % 7 + 1)) ]; do printf '[td ]'; n=$((n + 1)); done + printf '[td [label [input type=radio name=date value="%04i-%02i-%02i" %s] %i]]' $Y $m $dom "$(checked $dom $selected)" $dom + [ $dow = 0 ] && printf ']\n' + [ $dow = 0 ] && V=$(( V % 53 + 1)) + done + printf ']]' +} -- 2.39.2