diff options
| -rw-r--r-- | charset.rb | 4 | ||||
| -rwxr-xr-x | config_poll.rb | 8 | ||||
| -rw-r--r-- | datepoll.rb | 2 | ||||
| -rw-r--r-- | dudle.css | 10 | ||||
| -rw-r--r-- | poll.rb | 25 | ||||
| -rw-r--r-- | timepoll.rb | 10 |
6 files changed, 38 insertions, 21 deletions
@@ -22,9 +22,10 @@ if ($cgi.include?("utf") || $cgi.cookies["utf"][0]) && !$cgi.include?("ascii") YEARFORWARD = CGI.escapeHTML("↠") EDIT = CGI.escapeHTML("✍") + DELETE = CGI.escapeHTML("⌧") else $utfcookie.expires = Time.now-1*60*60*24*36 - UTFASCII = "<a href='?utf' style='text-decoration:none'>#{CGI.escapeHTML('↩✔✘?–↞←→↠✍')}</a>" + UTFASCII = "<a href='?utf' style='text-decoration:none'>#{CGI.escapeHTML('↩✔✘?–↞←→↠✍⌧')}</a>" BACK = CGI.escapeHTML("back") YES = CGI.escapeHTML('OK') @@ -38,5 +39,6 @@ else YEARFORWARD = CGI.escapeHTML(">>") EDIT = CGI.escapeHTML("edit") + DELETE = CGI.escapeHTML("delete") end diff --git a/config_poll.rb b/config_poll.rb index 201893b..65aebb3 100755 --- a/config_poll.rb +++ b/config_poll.rb @@ -58,7 +58,8 @@ else } table.invite_delete($cgi["invite_delete"]) if $cgi.include?("invite_delete") and $cgi["invite_delete"] != "" - table.edit_column($cgi["edit_column"],$cgi["columndescription"],$cgi["editcolumn"]) if $cgi.include?("edit_column") + table.edit_column($cgi["new_columnname"],$cgi["columndescription"],$cgi["old_columnname"]) if $cgi.include?("new_columnname") + table.delete_column($cgi["delete_column"]) if $cgi.include?("delete_column") table.toggle_hidden if $cgi.include?("toggle_hidden") def writehtaccess(acusers) @@ -132,10 +133,9 @@ $htmlout += <<HTMLHEAD </div> HTMLHEAD -activecolumn = $cgi.include?("edit_column") ? $cgi["edit_column"] : $cgi["editcolumn"] $htmlout += <<TABLE <h1>#{table.name}</h1> -#{table.to_html(config = true,activecolumn = activecolumn)} +#{table.to_html(config = true,activecolumn = $cgi["editcolumn"])} TABLE $htmlout += <<INVITEDELETE @@ -155,7 +155,7 @@ INVITEDELETE # ADD/REMOVE COLUMN $htmlout +=<<ADD_EDIT <div id='edit_column'> -#{table.edit_column_htmlform(activecolumn)} +#{table.edit_column_htmlform($cgi["editcolumn"])} </div> ADD_EDIT diff --git a/datepoll.rb b/datepoll.rb index e323c30..4768353 100644 --- a/datepoll.rb +++ b/datepoll.rb @@ -83,7 +83,7 @@ END klasse = "notchoosen" klasse = "disabled" if d < Date.today klasse = "choosen" if @head.include?(d) - ret += "<td class='calendarday'><input class='#{klasse}' type='submit' name='edit_column' value='#{d.day}' /></td>\n" + ret += "<td class='calendarday'><input class='#{klasse}' type='submit' name='new_columnname' value='#{d.day}' /></td>\n" ret += "</tr><tr>\n" if d.wday == 0 d = d.next end @@ -12,16 +12,16 @@ td.undecided { background-color:#DDD;color:#666 } td.name { text-align:right; } -#active{ +#active, #activedeletebutton{ background-color:#A00; } -input.historynavi{ +input.deletebutton{ border-width: 0px; - border-style: none; + border-style: solid; padding: 0px; cursor: pointer; - background-color: white; - color: blue; + background-color: black; + color: white; } th.weekday{ width: 2.5em; @@ -41,7 +41,22 @@ class Poll ret += "<th" ret += " id='active' " if activecolumn == columntitle ret += "><a title=\"#{columndescription}\" href=\"?sort=#{CGI.escapeHTML(CGI.escape(columntitle))}\">#{CGI.escapeHTML(columntitle)}</a>" - ret += "<br/>\n<small><a href=\"?editcolumn=#{CGI.escapeHTML(CGI.escape(columntitle))}#edit_column\">#{EDIT}</a></small>" if config + if config + ret += <<EDITDELETE +<form method='post' action=''> + <div> + <small> + <a href="?editcolumn=#{CGI.escapeHTML(CGI.escape(columntitle))}" title="edit"> + #{EDIT} + </a> + #{CGI.escapeHTML("|")} + <input type='hidden' name='delete_column' value="#{CGI.escapeHTML(columntitle)}" /> + <input type="submit" value="#{DELETE}" title="delete" class="deletebutton" #{activecolumn == columntitle ? 'id="activedeletebutton"' : ''} /> + </small> + </div> +</form> +EDITDELETE + end ret += "</th>" } ret += "<th><a href='.'>Last Edit</a></th>\n" @@ -297,20 +312,20 @@ ADDCOMMENT true end def edit_column_htmlform(activecolumn) - if activecolumn + if activecolumn title = activecolumn description = @head[title] title = CGI.escapeHTML(title) end return <<END <fieldset><legend>add/edit column</legend> -<form method='post' action='?'> +<form method='post' action='config.cgi'> <div> <label for='columntitle'>Columntitle: </label> - <input id='columntitle' size='16' type='text' value="#{title}" name='edit_column' /> + <input id='columntitle' size='16' type='text' value="#{title}" name='new_columnname' /> <label for='columndescription'>Description: </label> <input id='columndescription' size='30' type='text' value="#{description}" name='columndescription' /> - <input type='hidden' name='editcolumn' value="#{title}" /> + <input type='hidden' name='old_columnname' value="#{title}" /> <input type='submit' value='add/edit column' /> </div> </form> diff --git a/timepoll.rb b/timepoll.rb index fc69097..a59ea45 100644 --- a/timepoll.rb +++ b/timepoll.rb @@ -97,7 +97,7 @@ END klasse = "notchoosen" klasse = "disabled" if d < Date.today klasse = "choosen" if @head.keys.collect{|t|t.strftime("%Y-%m-%d")}.include?(d.strftime("%Y-%m-%d")) - ret += "<td class='calendarday'><input class='#{klasse}' type='submit' name='edit_column' value='#{d.day}' /></td>\n" + ret += "<td class='calendarday'><input class='#{klasse}' type='submit' name='new_columnname' value='#{d.day}' /></td>\n" ret += "</tr><tr>\n" if d.wday == 0 d = d.next end @@ -139,10 +139,10 @@ END klasse = "choosen" if @head.include?(timestamp) ret += <<END <td class='calendarday'> - <form method='post' action="config.cgi"> + <form method='post' action=""> <div> <!--Timestamp: #{timestamp} --> - <input title='#{timestamp}' class='#{klasse}' type='submit' name='edit_column' value='#{time}' /> + <input title='#{timestamp}' class='#{klasse}' type='submit' name='new_columnname' value='#{time}' /> <input type='hidden' name='add_remove_column_day' value='#{timestamp.day}' /> <input type='hidden' name='add_remove_column_month' value='#{timestamp.strftime("%Y-%m")}' /> </div> @@ -157,11 +157,11 @@ END days.each{|d| ret += <<END <td> - <form method='post' action='config.cgi'> + <form method='post' action=''> <div> <input type='hidden' name='add_remove_column_day' value='#{d.day}' /> <input type='hidden' name='add_remove_column_month' value='#{d.strftime("%Y-%m")}' /> - <input name='edit_column' type="text" maxlength="7" style="width: 7ex" /><br /> + <input name='new_columnname' type="text" maxlength="7" style="width: 7ex" /><br /> <input type="submit" value="Add" style="width: 100%" /> </div> </form> |