reset table padding from updated cgilite style

[webpoll] / newdate.sh

diff --git a/newdate.sh b/newdate.sh
index 4b220c14c49fa8908b5ea80ee38dfaf2dd4cbb4d..83e27b64cb8c21cd0022db779463d2fb4363d2ba 100755 (executable)
--- a/newdate.sh
+++ b/newdate.sh
@@ -59,8 +59,8 @@ fs_splittimes() {
                       pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
                <input name="todend_%s"   value="%s" placeholder="HH:MM"   list="dlist_timeofday"
                       pattern="^(0?\[0-9\]|1\[0-9\]|2\[0-3\]):(\[0-5\]\[0-9\])$"/>
-               [submit "todremove" "%i" -]
-             ' "$day" "${time%-*}" "$day" "${time#*-}" "${c}"
+               [submit "todremove_%s" "%i" -]
+             ' "$day" "${time%-*}" "$day" "${time#*-}" "$day" "${c}"
            done
            printf '[submit "addtime" "%s" + Add Time Option]' "$day"
          done)
@@ -111,7 +111,7 @@ if [ "$REQUEST_METHOD" = POST ]; then
         [ "${todstart%:??}" -lt "${todend%:??}" -o "${todstart%:??}" -eq "${todend%:??}" -a "${todstart#*:}" -lt "${todend#*:}" ] \
         2>&- \
         && { printf '%02i:%02i-%02i:%02i\n' "${todstart%:??}" "${todstart#*:}" "${todend%:??}" "${todend#*:}"; }\
-        || { [ "${todstart%:??}" -ge 0 -a  "${todstart#*:}" -ge 0 ] 2>&- && printf '%02i:%02i-\n' "${todstart%:??}" "${todstart#*:}"; }
+        || { [ "${todstart%:??}" -ge 0 -a  "${todstart#*:}" -ge 0 ] 2>&- && printf '%02i:%02i-\n' $(dec ${todstart%:??} ${todstart#*:}); }
       done |grep -xE '^([01][0-9]|2[0-3]):([0-5][0-9])-(([01][0-9]|2[0-3]):([0-5][0-9]))?$' |sort -u
     )"
     [ "$addtime" = "$date" ] && DBM "$file" append "tod_${date}" "${BR}-"
@@ -156,9 +156,18 @@ else
 
   yield_page "$(pagename "$id")" "newdate" <<-EOF
        $(dlist_timeofday)
-       [form method=post
-         [input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title"]
+       [main [form method=post
+         [input name=title value="$(DBM "$file" get title |HTML)" placeholder="Title" autocomplete=off]
          [textarea name=description placeholder="Description" . $(DBM "$file" get description |HTML)]
+         $(if [ "$bookmarks" ]; then
+           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! The poll has also been bookmarked and will be listed on the front page.]' \
+           "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
+           "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
+          else
+           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! You can also set a Cookie to bookmark all polls you visit, including this admin page. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]' \
+           "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
+           "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
+         fi)
          [fieldset .date
            $(printf '[hidden "date" "%s"]' $additional)
            [submit "month" "$prev" Previous Month]
@@ -173,15 +182,6 @@ else
          else
            printf '[submit "delete" "delete" Cancel] [submit "post" "post" Post Event]'
          fi)
-         $(if [ "$bookmarks" ]; then
-           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! The poll has also been bookmarked and will be listed on the front page.' \
-           "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
-           "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
-          else
-           printf '[section .bookmark This admin page is accessible via the link [a href="%s" . %s]. You must copy this link and keep it safe, so you can modify this poll later! You can also set a Cookie to bookmark all polls you visit, including this admin page. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]' \
-           "$(URL "//$(HEADER Host)/${_BASE}/${id}/${admin}")" \
-           "$(HTML "${HTTPS:+https:}${HTTPS:-http:}//$(HEADER Host)$(PATH "/${_BASE}/${id}/${admin}")")"
-         fi)
-       ]
+       ]]
        EOF
 fi