use external comment script

diff --git a/.gitignore b/.gitignore
index d89107876d6976c13611a6044c7cc4dceb47e234..5f749301ddbd53914aba0b158a74d543320085f0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 serverkey
 [0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=][0-9a-zA-Z:=]
+comments/

diff --git a/poll.sh b/poll.sh
index bb5bc8db1d213dc0b46d3bdebacfe5a24d257c3f..7ab0e9d58dea7414449584d78dc0046e9fcb48b9 100644 (file)
--- a/poll.sh
+++ b/poll.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. "${_EXEC}/comments.sh"
+
 id="$(checkid "${PATH_INFO#/}")"
 file="${_DATA}/${id}"
 
@@ -223,19 +225,24 @@ else
   pagename="$(pagename "$id")"
 
   yield_page "$pagename" poll <<-EOF
-       [form method=POST
+       [main
          [section .description
            [h1 .title $(HTML "$pagename")]
            $(DBM "$file" get description |markdown)
          ]
-         $(table_poll || printf '[p Poll parameters are invalid]')
-          $(if [ "$admin" ]; then
-            printf '[section .bookmark You have bookmarked the admin page of this poll: [a href="./%s" modify poll]]' "$(URL ${id}/${admin})"
-          elif [ "$bookmarks" ]; then
-            printf '[section .bookmark This poll has been bookmarked and is accessible via a link on the front page.]'
-          else
-            printf '[section .bookmark Polls are accessible only via their URL. You can set a Cookie to bookmark all polls you visit. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]'
-          fi)
+         [form method=POST
+           $(table_poll || printf '[p Poll parameters are invalid]')
+
+            $(if [ "$admin" ]; then
+              printf '[section .bookmark You have bookmarked the admin page of this poll: [a href="./%s" modify poll]]' "$(URL ${id}/${admin})"
+            elif [ "$bookmarks" ]; then
+              printf '[section .bookmark This poll has been bookmarked and is accessible via a link on the front page.]'
+            else
+              printf '[section .bookmark Polls are accessible only via their URL. You can set a Cookie to bookmark all polls you visit. Bookmarked polls will be listed on the frontpage.<br/> [submit "bookmark" "add" Set Cookie]]'
+            fi)
+         ]
+
+          $(w_comments)
        ]
        EOF
 fi