diff options
| author | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2008-10-28 09:14:57 +0100 |
|---|---|---|
| committer | Benjamin Kellermann <Benjamin.Kellermann@gmx.de> | 2008-10-28 09:14:57 +0100 |
| commit | ce11c3fc933090ab1eb17290ee223cb441a53cc5 (patch) | |
| tree | 42bbe90276a71310f75b7e8e73fb043acabeb58f | |
| parent | fa7ae7f353d15f90d7a5faaf758a0f0c9267bbc0 (diff) | |
validated output
| -rw-r--r-- | overview.rb | 2 | ||||
| -rw-r--r-- | participate.rb | 100 | ||||
| -rwxr-xr-x | 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 <<CREATE </tr> <tr> <td><label title="#{hidden_tip = "do not list the poll here (you have to remember the link)"}" for="hidden">Hidden?:</label></td> - <td><input id="hidden" type="checkbox" name="hidden" value="true" title="#{hidden_tip}"></td> + <td><input id="hidden" type="checkbox" name="hidden" value="true" title="#{hidden_tip}" /></td> </tr> <tr> <td colspan='2'><input type='submit' value='create' /></td> diff --git a/participate.rb b/participate.rb index 58ae386..ad70651 100644 --- a/participate.rb +++ b/participate.rb @@ -13,19 +13,19 @@ end puts <<HEAD <head> -<meta http-equiv="Content-Type" content="#{CONTENTTYPE}" /> -<meta http-equiv="Content-Style-Type" content="text/css" /> -<title>dudle - #{table.name}</title> -<link rel="stylesheet" type="text/css" href="../dudle.css" title="default"/> -<link rel="stylesheet" type="text/css" href="../print.css" title="print" media="print" /> -<link rel="stylesheet" type="text/css" href="../print.css" title="print" /> -<link rel="alternate" type="application/atom+xml" href="atom.cgi" /> + <meta http-equiv="Content-Type" content="#{CONTENTTYPE}" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <title>dudle - #{table.name}</title> + <link rel="stylesheet" type="text/css" href="../dudle.css" title="default"/> + <link rel="stylesheet" type="text/css" href="../print.css" title="print" media="print" /> + <link rel="stylesheet" type="text/css" href="../print.css" title="print" /> + <link rel="alternate" type="application/atom+xml" href="atom.cgi" /> </head> <body> -<div id='backlink'> -<a href='..' style='text-decoration:none'>#{BACK}</a> -</div> -<h1>#{table.name}</h1> + <div id='backlink'> + <a href='..' style='text-decoration:none'>#{BACK}</a> + </div> + <h1>#{table.name}</h1> 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 "<div id='hint'>" -puts "<fieldset><legend>Hint</legend>" -puts "To change a line, add a new person with the same name!" -puts "</fieldset>" -puts "</div>" - 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 "<div id='history'>" -puts "<fieldset><legend>browse history</legend>" -puts "<table>" -puts "<tr>" -puts "<th>rev</th>" -puts "<th>time</th>" -puts "<th>description of change</th>" -puts "</tr>" +puts <<HISTORY +<div id='history'> + <fieldset><legend>browse history</legend> + <table> + <tr> + <th>rev</th> + <th>time</th> + <th>description of change</th> + </tr> +HISTORY ((REVISION-2)..(REVISION+2)).each do |i| if i >0 && i<=MAXREV @@ -77,7 +73,7 @@ puts "</tr>" puts "<tr id='displayed_revision'><td>#{i}" else puts "<tr><td>" - puts "<a href='?revision=#{i}' />#{i}</a>" + puts "<a href='?revision=#{i}'>#{i}</a>" end puts "</td>" puts "<td>#{log[i-1][0].strftime('%d.%m, %H:%M')}</td>" @@ -89,28 +85,38 @@ puts "</table>" puts "</fieldset>" puts "</div>" -puts "<div id='invite_delete'>" -puts "<fieldset><legend>invite/delete participant</legend>" -puts "<form method='post' action='.'>\n" -puts "<div>" -puts "<input size='16' value='#{$cgi["invite_delete"]}' type='text' name='invite_delete' />" -puts "<input type='submit' value='invite/delete' />" -puts "</div>" -puts "</form>" -puts "</fieldset>" -puts "</div>" +puts <<INVITEDELETE +<div id='invite_delete'> + <fieldset> + <legend>invite/delete participant</legend> + <form method='post' action='.'> + <div> + <input size='16' value='#{$cgi["invite_delete"]}' type='text' name='invite_delete' /> + <input type='submit' value='invite/delete' /> + </div> + </form> + </fieldset> +</div> +INVITEDELETE puts table.add_remove_column_htmlform -puts "<div id='add_comment'>" -puts "<fieldset><legend>Comment</legend>" -puts "<form method='post' action='.'>\n" -puts "<div>" -puts "<label for='Commentname'>Name: </label><input id='Commentname' value='anonymous' type='text' name='commentname' /><br />" -puts "<textarea cols='50' rows='10' name='comment' ></textarea><br />" -puts "<input type='submit' value='Submit' />" -puts "</div>" -puts "</form>" -puts "</fieldset>" -puts "</div>" +puts <<ADDCOMMENT +<div id='add_comment'> + <fieldset> + <legend>Comment</legend> + <form method='post' action='.'> + <div> + <label for='Commentname'>Name: </label> + <input id='Commentname' value='anonymous' type='text' name='commentname' /> + <br /> + <textarea cols='50' rows='10' name='comment' ></textarea> + <br /> + <input type='submit' value='Submit' /> + </div> + </form> + </fieldset> +</div> +ADDCOMMENT +puts "</body></html>" @@ -67,8 +67,9 @@ END ret += "</tr>\n" } + # PARTICIPATE ret += "<tr id='add_participant'>\n" - ret += "<td class='name'><input size='16' type='text' name='add_participant' /></td>\n" + ret += "<td class='name'><input size='16' type='text' name='add_participant' title='To change a line, add a new person with the same name!' /></td>\n" @head.sort.each{|columntitle,columndescription| ret += "<td class='checkboxes'> <table><tr> @@ -87,6 +88,7 @@ END ret += "</tr>\n" + # SUMMARY ret += "<tr><td class='name'>total</td>\n" @head.sort.each{|columntitle,columndescription| yes = 0 @@ -132,16 +134,20 @@ END ret += "<fieldset><legend>Comments</legend>" @comment.each_with_index{|c,i| time,name,comment = c - ret += "<form method='post' action='.'>\n" - ret += "<div>" - ret += "<fieldset><legend>#{name} said on #{time.strftime("%d.%m, %H:%M")} " - ret += "<input type='hidden' name='delete_comment' value='#{i}' />" - ret += "<input class='delete_comment_button' type='submit' value='delete' style='position: absolute; margin-left: 20px;' />" - ret += "</legend>" - ret += comment - ret += "</fieldset>" - ret += "</div>" - ret += "</form>" + ret += <<COMMENT +<form method='post' action='.'> +<div> + <fieldset> + <legend>#{name} said on #{time.strftime("%d.%m, %H:%M")} + <input type='hidden' name='delete_comment' value='#{i}' /> + + <input class='delete_comment_button' type='submit' value='delete' /> + </legend> + #{comment} + </fieldset> +</div> +</form> +COMMENT } ret += "</fieldset>" end |