+ + #{BACK} + history:#{table.history_to_html} +

#{table.name}

HTMLHEAD -table.invite_delete($cgi["invite_delete"]) if $cgi.include?("invite_delete") and $cgi["invite_delete"] != "" - -if $cgi.include?("add_remove_column") - $htmlout += "Could not add/remove column #{$cgi["add_remove_column"]}" unless table.add_remove_column($cgi["add_remove_column"],$cgi["columndescription"]) -end -table.toggle_hidden if $cgi.include?("toggle_hidden") - -$htmlout += table.to_html(config = true) +$htmlout += <#{table.name} +#{table.to_html(config = true)} +TABLE $htmlout += < diff --git a/participate.rb b/participate.rb index 6cb0a3c..feca58f 100644 --- a/participate.rb +++ b/participate.rb @@ -15,6 +15,20 @@ if $cgi.include?("revision") table = YAML::load(VCS.cat(REVISION, "data.yaml")) else table = YAML::load_file("data.yaml") + + if $cgi.include?("add_participant") + agreed = {} + $cgi.params.each{|k,v| + if k =~ /^add_participant_checked_/ + agreed[k.gsub(/^add_participant_checked_/,"")] = v[0] + end + } + + table.add_participant($cgi["add_participant"],agreed) + end + + table.add_comment($cgi["commentname"],$cgi["comment"]) if $cgi["comment"] != "" + table.delete_comment($cgi["delete_comment"].to_i) if $cgi.include?("delete_comment") end $htmlout += < -

- - #{BACK} - config +

+ + #{BACK} + config + history:#{table.history_to_html} + +

HEAD - -# HISTORY -MAXREV=VCS.revno -REVISION=MAXREV unless defined?(REVISION) -log = VCS.history -log.shift -log.collect!{|s| s.scan(/\nrevno:.*\ncommitter.*\n.*\ntimestamp: (.*)\nmessage:\n (.*)/).flatten} -log.collect!{|t,c| [DateTime.parse(t),c]} - -$htmlout +=" history:" - -((REVISION-2)..(REVISION+2)).each do |i| - if i >0 && i<=MAXREV - $htmlout += " " - $htmlout += "" if REVISION != i - $htmlout += "#{i}" - $htmlout += "" if REVISION != i - end -end -$htmlout += "

" - # TABLE -$htmlout += "

#{table.name}

" -if $cgi.include?("add_participant") - agreed = {} - $cgi.params.each{|k,v| - if k =~ /^add_participant_checked_/ - agreed[k.gsub(/^add_participant_checked_/,"")] = v[0] - end - } - - table.add_participant($cgi["add_participant"],agreed) -end - -table.add_comment($cgi["commentname"],$cgi["comment"]) if $cgi["comment"] != "" -table.delete_comment($cgi["delete_comment"].to_i) if $cgi.include?("delete_comment") - -# POLL -$htmlout += <#{table.name}

- -#{table.to_html} - + + #{table.to_html} +

-POLLTABLE +TABLE $htmlout += table.comment_to_html - $htmlout += "" diff --git a/poll.rb b/poll.rb index 7c98356..3e634e1 100644 --- a/poll.rb +++ b/poll.rb @@ -201,6 +201,25 @@ ADDCOMMENT ret += "\n" ret end + def history_to_html + ret = "" + maxrev=VCS.revno + revision= defined?(REVISION) ? REVISION : maxrev + log = VCS.history + log.shift + log.collect!{|s| s.scan(/\nrevno:.*\ncommitter.*\n.*\ntimestamp: (.*)\nmessage:\n (.*)/).flatten} + log.collect!{|t,c| [DateTime.parse(t),c]} + + ((revision-2)..(revision+2)).each do |i| + if i >0 && i<=maxrev + ret += " " + ret += "" if revision != i + ret += "#{i}" + ret += "" if revision != i + end + end + ret + end def add_remove_column_htmlform if $cgi.include?("editcolumn") title = $cgi["editcolumn"] -- cgit v1.2.3