reset table padding from updated cgilite style

[webpoll] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 472318d01a8f02d0af4d09ac94f2f8560db210d5..8410a0cb92eaa61ab3a469fe6fd3859adc8f1d6f 100755 (executable)
--- a/widgets.sh
+++ b/widgets.sh
@@ -1,5 +1,23 @@
 #!/bin/sh
 
+[ -n "$include_widgets" ] && return 0
+include_widgets="$0"
+
+export MD_HTML="false"
+if [ "$(which awk)" ]; then
+  markdown() { awk -f "$_EXEC/cgilite/markdown.awk"; }
+else
+  markdown() { busybox awk -f "$_EXEC/cgilite/markdown.awk"; }
+fi
+
+dec(){
+  local n
+  for n in "$@"; do
+    while [ "${n}" != "${n#0}" ]; do n="${n#0}"; done
+    printf %i\\n "$n"
+  done
+}
+
 checked(){
   local check="$1"; shift 1;
   for comp in "$@"; do
@@ -21,7 +39,7 @@ selected(){
 
 w_month() {
   # Arguments:
-  # 1. (optional) select, multiple, none - default: select
+  # 1. (optional) select, multiple, submit, none - default: select
   # 2. (optional) Name of form field - default: "date"
   # 3. (optional) Month to display in format: YYYY-MM - default: current month
   # 4. (optional, multiple) Days to preselect in format: DD - default: none
@@ -31,7 +49,7 @@ w_month() {
   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")
+       $(date -d "${month}-01" +"%_Y %_m %_d %_V %w %B")
        EOF
   else
     read Y m d V w <<-EOF
@@ -43,11 +61,11 @@ w_month() {
   fi
 
   case $m in
-    0[13578]|10|12)
+    [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)
+    [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
+    2) 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";
@@ -77,17 +95,34 @@ w_month() {
         printf '[td [input type=checkbox id="%s_%s" name="%s" value="%s" %s][label for="%s_%s" . %i]]' \
                "$input" "$date" "$input" "$date" "$(checked $dom $selected)" "$input" "$date" "$dom"
         ;;
+      submit)
+        [ "$(checked $dom $selected)" ] \
+        && printf '[td [submit "%s_remove" "%s" . %i][hidden "%s" "%s"]]' "$input" "$date" "$dom" "$input" "$date" \
+        || printf '[td [submit "%s_add"    "%s" . %i]]' "$input" "$date" "$dom"
+        ;;
       select|*)
         printf '[td [input type=radio id="%s_%s" name="%s" value="%s" %s][label for="%s_%s" . %i]]' \
                "$input" "$date" "$input" "$date" "$(checked $dom $selected)" "$input" "$date" "$dom"
         ;;
     esac
-    [ $dow = 0 ] && printf ']\n'
-    [ $dow = 0 ] && V=$(( V % 53 + 1))
+    if [ $dow = 0 ]; then
+      printf ']\n'
+      V=$((V + 1))
+      [ $m = 1 -a $V -ge 53 ] && V=1
+    fi
   done
-  if [ $dow -le 6 ]; then
+  if [ $dow -gt 0 ]; then
     while [ $dow -le 6 ]; do printf '[td ]'; dow=$((dow + 1)) ; done
     printf ']\n'
   fi
   printf ']]'
 }
+
+dlist_timeofday() {
+  local step="${1:-15}" id="${2:-dlist_timeofday}"
+  printf '[datalist id="%s"\n' $id
+    for h in $(seq 0 23); do for m in $(seq 0 "$step" 59); do
+      printf '[option value="%i:%02i"]\n' $h $m
+    done; done
+  printf ']\n'
+}