From ce11c3fc933090ab1eb17290ee223cb441a53cc5 Mon Sep 17 00:00:00 2001 From: Benjamin Kellermann Date: Tue, 28 Oct 2008 09:14:57 +0100 Subject: validated output --- overview.rb | 2 +- participate.rb | 100 ++++++++++++++++++++++++++++++--------------------------- poll.rb | 28 +++++++++------- 3 files changed, 71 insertions(+), 59 deletions(-) diff --git a/overview.rb b/overview.rb index e786d69..e8e7f0c 100644 --- a/overview.rb +++ b/overview.rb @@ -89,7 +89,7 @@ puts < - + diff --git a/participate.rb b/participate.rb index 58ae386..ad70651 100644 --- a/participate.rb +++ b/participate.rb @@ -13,19 +13,19 @@ end puts < - - -dudle - #{table.name} - - - - + + + dudle - #{table.name} + + + + - -

#{table.name}

+ +

#{table.name}

HEAD if $cgi.include?("add_participant") @@ -50,26 +50,22 @@ table.delete_comment($cgi["delete_comment"].to_i) if $cgi.include?("delete_comme puts table.to_html -puts "
" -puts "
Hint" -puts "To change a line, add a new person with the same name!" -puts "
" -puts "
" - MAXREV=`bzr revno`.to_i REVISION=MAXREV unless defined?(REVISION) log = `export LC_ALL=de_DE.UTF-8; bzr log --forward`.split("-"*60) log.collect!{|s| s.scan(/\nrevno:.*\ncommitter.*\n.*\ntimestamp: (.*)\nmessage:\n (.*)/).flatten} log.shift log.collect!{|t,c| [DateTime.parse(t),c]} -puts "
" -puts "
browse history" -puts "" -puts "" -puts "" -puts "" -puts "" -puts "" +puts < +
browse history +
revtimedescription of change
+ + + + + +HISTORY ((REVISION-2)..(REVISION+2)).each do |i| if i >0 && i<=MAXREV @@ -77,7 +73,7 @@ puts "" puts "" puts "" @@ -89,28 +85,38 @@ puts "
revtimedescription of change
#{i}" else puts "
" - puts "#{i}" + puts "#{i}" end puts "#{log[i-1][0].strftime('%d.%m, %H:%M')}
" puts "
" puts "
" -puts "
" -puts "
invite/delete participant" -puts "
\n" -puts "
" -puts "" -puts "" -puts "
" -puts "
" -puts "
" -puts "
" +puts < +
+ invite/delete participant +
+
+ + +
+
+
+ +INVITEDELETE puts table.add_remove_column_htmlform -puts "
" -puts "
Comment" -puts "
\n" -puts "
" -puts "
" -puts "
" -puts "" -puts "
" -puts "
" -puts "
" -puts "
" +puts < +
+ Comment +
+
+ + +
+ +
+ +
+
+
+ +ADDCOMMENT +puts "" diff --git a/poll.rb b/poll.rb index 6f90c8e..e60ff23 100755 --- a/poll.rb +++ b/poll.rb @@ -67,8 +67,9 @@ END ret += "\n" } + # PARTICIPATE ret += "\n" - ret += "\n" + ret += "\n" @head.sort.each{|columntitle,columndescription| ret += " @@ -87,6 +88,7 @@ END ret += "\n" + # SUMMARY ret += "\n" @head.sort.each{|columntitle,columndescription| yes = 0 @@ -132,16 +134,20 @@ END ret += "
Comments" @comment.each_with_index{|c,i| time,name,comment = c - ret += "
\n" - ret += "
" - ret += "
#{name} said on #{time.strftime("%d.%m, %H:%M")} " - ret += "" - ret += "" - ret += "" - ret += comment - ret += "
" - ret += "
" - ret += "" + ret += < +
+
+ #{name} said on #{time.strftime("%d.%m, %H:%M")} + +   + + + #{comment} +
+
+ +COMMENT } ret += "
" end -- cgit v1.2.3
total