From 8a7d0cfbbb4b9f8ade386bbb032a9a3636d3acca Mon Sep 17 00:00:00 2001
From: Benjamin Kellermann <Benjamin.Kellermann@gmx.de>
Date: Wed, 7 Oct 2009 14:13:31 +0200
Subject: new feature: delete columns in config interface

---
 poll.rb | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'poll.rb')

diff --git a/poll.rb b/poll.rb
index f02835a..b8feca3 100644
--- a/poll.rb
+++ b/poll.rb
@@ -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>
-- 
cgit v1.2.3