Add intial take on an AJAX based web user interface.

2008-04-03 19:15:00 +00:00 · 2008-04-03 19:15:00 +00:00 · 96d41e1e85
commit 96d41e1e85
parent 7cba494444
26 changed files with 9305 additions and 57 deletions
--- a/26
+++ b/26
@ -28,10 +28,33 @@ SRCS += cwc.c krypt.c
 VPATH += ffdecsa
 SRCS += FFdecsa.c

+#
+# Embedded AJAX user interface
+#
+
+VPATH  += ajaxui
+SRCS   += ajaxui.c ajaxui_channels.c ajaxui_config.c
+
+JSSRCS += tvheadend.js
+
+CSSSRCS += ajaxui.css
+
+VPATH  += ajaxui/images
+GIFSRCS+= sbbody_l.gif sbbody_r.gif sbhead_l.gif sbhead_r.gif
+
+
+VPATH  += ajaxui/prototype
+JSSRCS += prototype.js
+
+
+VPATH  += ajaxui/scriptaculous
+JSSRCS += builder.js controls.js dragdrop.js effects.js scriptaculous.js \
+	  slider.js
+
 PROG = tvheadend
 MAN  = tvheadend.1
 CFLAGS += -g -Wall -Werror -O2 -mmmx
-CFLAGS += -I$(INCLUDES_INSTALL_BASE) $(HTS_CFLAGS)
+CFLAGS += -I$(INCLUDES_INSTALL_BASE) $(HTS_CFLAGS) -I$(CURDIR)
 CFLAGS += -Wno-deprecated-declarations
 CFLAGS += -D_LARGEFILE64_SOURCE
 CFLAGS += -DENABLE_INPUT_IPTV -DENABLE_INPUT_DVB -DENABLE_INPUT_V4L
@ -58,3 +81,4 @@ DLIBS += -lpthread

 include ../build/prog.mk

+
--- a/ajaxui/ajaxui.c
+++ b/ajaxui/ajaxui.c
@ -0,0 +1,419 @@
+/*
+ *  tvheadend, AJAX / HTML user interface
+ *  Copyright (C) 2008 Andreas Öman
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <pthread.h>
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "tvhead.h"
+#include "http.h"
+#include "ajaxui.h"
+
+#include "obj/ajaxui.cssh"
+
+#include "obj/prototype.jsh"
+#include "obj/builder.jsh"
+#include "obj/controls.jsh"
+#include "obj/dragdrop.jsh"
+#include "obj/effects.jsh"
+#include "obj/scriptaculous.jsh"
+#include "obj/slider.jsh"
+
+#include "obj/tvheadend.jsh"
+
+#include "obj/sbbody_l.gifh"
+#include "obj/sbbody_r.gifh"
+#include "obj/sbhead_l.gifh"
+#include "obj/sbhead_r.gifh"
+
+
+
+const char *ajax_tabnames[] = {
+  [AJAX_TAB_CHANNELS]      = "Channels",
+  [AJAX_TAB_RECORDER]      = "Recorder",
+  [AJAX_TAB_CONFIGURATION] = "Configuration",
+};
+
+/**
+ * AJAX box start
+ */
+void
+ajax_box_begin(tcp_queue_t *tq, ajax_box_t type,
+	       const char *id, const char *style, const char *title)
+{
+  char id0[100], style0[100];
+  
+  if(id != NULL)
+    snprintf(id0, sizeof(id0), "id=\"%s\" ", id);
+  else
+    id0[0] = 0;
+
+  if(style != NULL)
+    snprintf(style0, sizeof(style0), "style=\"%s\" ", style);
+  else
+    style0[0] = 0;
+
+
+  switch(type) {
+  case AJAX_BOX_SIDEBOX:
+    tcp_qprintf(tq,
+		"<div class=\"sidebox\">"
+		"<div class=\"boxhead\"><h2>%s</h2></div>\r\n"
+		"  <div class=\"boxbody\" %s%s>",
+		title, id0, style0);
+    break;
+
+  case AJAX_BOX_FILLED:
+    tcp_qprintf(tq, 
+		"<div style=\"margin: 3px\">"
+		"<b class=\"filledbox\">"
+		"<b class=\"filledbox1\"><b></b></b>"
+		"<b class=\"filledbox2\"><b></b></b>"
+		"<b class=\"filledbox3\"></b>"
+		"<b class=\"filledbox4\"></b>"
+		"<b class=\"filledbox5\"></b></b>"
+		"<div class=\"filledboxfg\" %s%s>\r\n",
+		id0, style0);
+    break;
+
+  case AJAX_BOX_BORDER:
+   tcp_qprintf(tq, 
+		"<div style=\"margin: 3px\">"
+		"<b class=\"borderbox\">"
+		"<b class=\"borderbox1\"><b></b></b>"
+		"<b class=\"borderbox2\"><b></b></b>"
+		"<b class=\"borderbox3\"></b>"
+		"<b class=\"borderbox4\"></b>"
+		"<b class=\"borderbox5\"></b></b>"
+		"<div class=\"borderboxfg\" %s%s>\r\n",
+		id0, style0);
+
+    break;
+  }
+}
+
+/**
+ * AJAX box end
+ */
+void
+ajax_box_end(tcp_queue_t *tq, ajax_box_t type)
+{
+  switch(type) {
+  case AJAX_BOX_SIDEBOX:
+    tcp_qprintf(tq,"</div></div>");
+    break;
+    
+  case AJAX_BOX_FILLED:
+    tcp_qprintf(tq,
+		"</div>"
+		"<b class=\"filledbox\">"
+		"<b class=\"filledbox5\"></b>"
+		"<b class=\"filledbox4\"></b>"
+		"<b class=\"filledbox3\"></b>"
+		"<b class=\"filledbox2\"><b></b></b>"
+		"<b class=\"filledbox1\"><b></b></b></b>"
+		"</div>\r\n");
+    break;
+
+ case AJAX_BOX_BORDER:
+    tcp_qprintf(tq,
+		"</div>"
+		"<b class=\"borderbox\">"
+		"<b class=\"borderbox5\"></b>"
+		"<b class=\"borderbox4\"></b>"
+		"<b class=\"borderbox3\"></b>"
+		"<b class=\"borderbox2\"><b></b></b>"
+		"<b class=\"borderbox1\"><b></b></b></b>"
+		"</div>\r\n");
+    break;
+ 
+  }
+}
+
+/**
+ *
+ */
+void
+ajax_js(tcp_queue_t *tq, const char *fmt, ...)
+{
+  va_list ap;
+
+  tcp_qprintf(tq, 
+	      "<script type=\"text/javascript\">\r\n"
+	      "//<![CDATA[\r\n");
+
+  va_start(ap, fmt);
+  tcp_qvprintf(tq, fmt, ap);
+  va_end(ap);
+
+  tcp_qprintf(tq, 
+	      "\r\n//]]>\r\n"
+	      "</script>\r\n");
+}
+
+
+
+/**
+ * Based on the given char[] array, generate a menu bar
+ */
+void
+ajax_menu_bar_from_array(tcp_queue_t *tq, const char *name, 
+			 const char **vec, int num, int cur)
+{
+  int i;
+ 
+  tcp_qprintf(tq, "<ul class=\"menubar\">");
+
+  for(i = 0; i < num; i++) {
+    tcp_qprintf(tq,
+		"<li%s>"
+		"<a href=\"javascript:switchtab('%s', '%d')\">%s</a>"
+		"</li>",
+		cur == i ? " style=\"font-weight:bold;\"" : "", name,
+		i, vec[i]);
+  }
+  tcp_qprintf(tq, "</ul>");
+}
+
+
+/*
+ * Titlebar AJAX page
+ */
+static int
+ajax_page_titlebar(http_connection_t *hc, const char *remain, void *opaque)
+{
+  tcp_queue_t tq;
+  
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tcp_init_queue(&tq, -1);
+  ajax_menu_bar_from_array(&tq, "top", ajax_tabnames, AJAX_TABS, atoi(remain));
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+/*
+ * Tab AJAX page
+ *
+ * Find the 'tab' id and continue with tab specific code
+ */
+static int
+ajax_page_tab(http_connection_t *hc, const char *remain, void *opaque)
+{
+  int tab;
+
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tab = atoi(remain);
+
+  switch(tab) {
+  case AJAX_TAB_CHANNELS:
+    return ajax_channelgroup_tab(hc);
+
+  case AJAX_TAB_CONFIGURATION:
+    return ajax_config_tab(hc);
+
+  default:
+    return HTTP_STATUS_NOT_FOUND;
+  }
+  return 0;
+}
+
+
+
+/*
+ * Root page
+ */
+static int
+ajax_page_root(http_connection_t *hc, const char *remain, void *opaque)
+{
+  tcp_queue_t tq;
+
+  tcp_init_queue(&tq, -1);
+
+  tcp_qprintf(&tq, 
+	      "<!DOCTYPE html "
+	      "PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\r\n"
+	      "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
+	      "\r\n"
+	      "<html xmlns=\"http://www.w3.org/1999/xhtml\" "
+	      "xml:lang=\"en\" lang=\"en\">"
+	      "<head>"
+	      "<title>HTS/Tvheadend</title>"
+	      "<meta http-equiv=\"Content-Type\" "
+	      "content=\"text/html; charset=utf-8\">\r\n");
+
+
+  tcp_qprintf(&tq, 
+	      "<link href=\"/ajax/ajaxui.css\" rel=\"stylesheet\" "
+	      "type=\"text/css\">\r\n");
+
+  tcp_qprintf(&tq,
+	      "<script src=\"/ajax/prototype.js\" type=\"text/javascript\">"
+	      "</script>\r\n");
+
+  tcp_qprintf(&tq,
+	      "<script src=\"/ajax/effects.js\" type=\"text/javascript\">"
+	      "</script>\r\n");
+
+  tcp_qprintf(&tq,
+	      "<script src=\"/ajax/dragdrop.js\" type=\"text/javascript\">"
+	      "</script>\r\n");
+
+  tcp_qprintf(&tq,
+	      "<script src=\"/ajax/controls.js\" type=\"text/javascript\">"
+	      "</script>\r\n");
+
+ tcp_qprintf(&tq,
+	      "<script src=\"/ajax/tvheadend.js\" type=\"text/javascript\">"
+	      "</script>\r\n");
+
+  tcp_qprintf(&tq,
+	      "</head>");
+
+  tcp_qprintf(&tq,
+	      "<body>");
+
+
+  ajax_box_begin(&tq, AJAX_BOX_FILLED, "topmenu", NULL, NULL);
+  ajax_box_end(&tq, AJAX_BOX_FILLED);
+
+  tcp_qprintf(&tq, "<div id=\"topdeck\"></div>");
+  
+  ajax_js(&tq, "switchtab('top', '0')");
+
+  tcp_qprintf(&tq, "</body></html>");
+
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+#if 0
+void blah(void) {
+  tcp_qprintf(&tq,
+	      "<ul id=\"list\">"
+	      "<li id=\"item_1\">I'm number 1 <a href=\"/\">a link</a></li>"
+	      "<li id=\"item_2\">");
+  ajax_box_top(&tq, NULL, NULL);
+  tcp_qprintf(&tq,
+	      "I'm number 2");
+
+  ajax_box_bottom(&tq);
+
+  tcp_qprintf(&tq,
+	      "</li>"
+	      "<li id=\"item_3\">I'm number 3</li>"
+	      "<li id=\"item_4\">I'm number 4</li>"
+	      "</ul>"
+	      "\r\n"
+	      "<p id=\"list-info\"></p>\r\n");
+
+
+  tcp_qprintf(&tq,
+	      "<script type=\"text/javascript\">\r\n"
+	      "//<![CDATA[\r\n"
+	      "Sortable.create(\"list\", {onUpdate:function(){new Ajax.Updater('list-info', '/ajax/order', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight(\"list\",{});}, parameters:Sortable.serialize(\"list\")})}})\r\n"
+	      "//]]>\r\n"
+	      "</script>\r\n");
+
+
+ tcp_qprintf(&tq,
+	     "<div id=\"updateDiv\"></div>\r\n"
+	     "<form id=\"testform\">\n"
+	     "<input name=\"name\" type=\"text\"><br>\r\n"
+	     "<textarea name=\"comment\" cols=\"20\" rows=\"3\">"
+	     "</textarea><br>\r\n"
+	     "<input name=\"sendbutton\" type=\"button\" value=\"Send\""
+	     " onClick=\"new Ajax.Updater('updateDiv', '/ajax/formupdate', "
+	     "{asynchronous:true, "
+	     " parameters:Form.serialize($('testform'))})\">\r\n"
+	     "</form>\r\n");
+
+
+ for(i = 0; i < 40; i++) {
+   tcp_qprintf(&tq,
+	       "<div style=\"float: left\" class=\"sidebox\">\r\n"
+	       " <div class=\"boxhead\"><h2>Discovery</h2></div>\r\n"
+	       "  <div class=\"boxbody\">"
+	       "   <p>Idag e det bra saker pa TV</p>"
+	       "   <p>Imorgon vet vi inte</p>"
+	       "</div></div>");
+ }
+
+  tcp_qprintf(&tq,
+	      "</body></html>");
+
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+#endif
+
+
+/**
+ * AJAX user interface
+ */
+void
+ajaxui_start(void)
+{
+  http_path_add("/ajax/index.html",           NULL, ajax_page_root);
+
+  http_path_add("/ajax/topmenu",              NULL, ajax_page_titlebar);
+  http_path_add("/ajax/toptab",               NULL, ajax_page_tab);
+
+
+  /* Stylesheet */
+  http_resource_add("/ajax/ajaxui.css", embedded_ajaxui,
+		    sizeof(embedded_ajaxui), "text/css", "gzip");
+
+#define ADD_JS_RESOURCE(path, name) \
+  http_resource_add(path, name, sizeof(name), "text/javascript", "gzip")
+
+  /* Prototype */
+  ADD_JS_RESOURCE("/ajax/prototype.js",          embedded_prototype);
+
+  /* Scriptaculous */
+  ADD_JS_RESOURCE("/ajax/builder.js",            embedded_builder);
+  ADD_JS_RESOURCE("/ajax/controls.js",           embedded_controls);
+  ADD_JS_RESOURCE("/ajax/dragdrop.js",           embedded_dragdrop);
+  ADD_JS_RESOURCE("/ajax/effects.js",            embedded_effects);
+  ADD_JS_RESOURCE("/ajax/scriptaculous.js",      embedded_scriptaculous);
+  ADD_JS_RESOURCE("/ajax/slider.js",             embedded_slider);
+
+  /* Tvheadend */
+  ADD_JS_RESOURCE("/ajax/tvheadend.js",          embedded_tvheadend);
+
+  /* Embedded images */
+  http_resource_add("/sidebox/sbbody-l.gif", embedded_sbbody_l,
+		    sizeof(embedded_sbbody_l), "image/gif", NULL);
+  http_resource_add("/sidebox/sbbody-r.gif", embedded_sbbody_r,
+		    sizeof(embedded_sbbody_r), "image/gif", NULL);
+  http_resource_add("/sidebox/sbhead-l.gif", embedded_sbhead_l,
+		    sizeof(embedded_sbhead_l), "image/gif", NULL);
+  http_resource_add("/sidebox/sbhead-r.gif", embedded_sbhead_r,
+		    sizeof(embedded_sbhead_r), "image/gif", NULL);
+
+  ajax_channels_init();
+  ajax_config_init();
+
+}
--- a/ajaxui/ajaxui.css
+++ b/ajaxui/ajaxui.css
@ -0,0 +1,222 @@
+body {
+  font:       11px Lucida Grande, Verdana, Arial, Helvetica, sans serif;
+}
+
+a, a:hover, a:visited, a:active { 
+  color: #aa6600;
+}
+
+img { border: 0; }
+
+.draglist {
+   margin:0;
+   margin-top:10px;
+   padding:0;
+   list-style-type: none;
+ }
+.draglist li {
+   margin:0;
+   padding:0px;
+   cursor:move;
+ }
+ 
+/**
+ * Input classes
+ */
+
+.textinput {
+  border: 1px dotted #000000;
+  background: #fff
+}
+
+/**
+ * Misc classes
+ */
+
+.chgroupaction {
+  text-align: right;
+}
+
+/**
+ *  Box with round edges
+ */
+.filledbox {
+  display:block;
+}
+
+.filledbox * {
+  display:block;
+  height:1px;
+  overflow:hidden;
+  font-size:.01em;
+  background:#dddddd;
+}
+
+.filledbox1 {
+  margin-left:3px;
+  margin-right:3px;
+  padding-left:1px;
+  padding-right:1px;
+  border-left:1px solid #f0f0f0;
+  border-right:1px solid #f0f0f0;
+  background:#e5e5e5;
+}
+
+.filledbox2 {
+  margin-left:1px;
+  margin-right:1px;
+  padding-right:1px;
+  padding-left:1px;
+  border-left:1px solid #fbfbfb;
+  border-right:1px solid #fbfbfb;
+  background:#e3e3e3;
+}
+
+.filledbox3 {
+  margin-left:1px;
+  margin-right:1px;
+  border-left:1px solid #e3e3e3;
+  border-right:1px solid #e3e3e3;
+}
+
+.filledbox4 {
+  border-left:1px solid #f0f0f0;
+  border-right:1px solid #f0f0f0;
+}
+
+.filledbox5 {
+  border-left:1px solid #e5e5e5;
+  border-right:1px solid #e5e5e5;
+}
+
+.filledboxfg {
+  padding-left:5px;
+  padding-right:5px;
+  background:#dddddd;
+}
+
+
+
+
+
+/**
+ * Box with rounded edges
+ */
+.borderbox {
+  display:block;
+}
+
+.borderbox * {
+  display:block;
+  height:1px;
+  overflow:hidden;
+  font-size:.01em;
+}
+
+.borderbox1 {
+  margin-left:4px;
+  margin-right:4px;
+  padding-left:1px;
+  padding-right:1px;
+  background: #000000;
+  border-left:1px  solid #000;
+  border-right:1px solid #000;
+}
+
+.borderbox2 {
+  margin-left:2px;
+  margin-right:2px;
+  padding-right:1px;
+  padding-left:1px;
+  border-left:2px  solid #000;
+  border-right:2px solid #000;
+}
+
+.borderbox3 {
+  margin-left:1px;
+  margin-right:1px;
+  border-left:1px  solid #000;
+  border-right:1px solid #000;
+}
+
+.borderbox4 {
+  border-left:1px solid  #000;
+  border-right:1px solid #000;
+}
+
+.borderbox5 {
+  border-left:1px solid  #000;
+  border-right:1px solid #000;
+}
+
+.borderboxfg {
+  border-left:1px solid  #000;
+  border-right:1px solid #000;
+  padding-left:5px;
+  padding-right:5px;
+}
+
+
+
+/**
+ * Menubar
+ */
+
+.menubar {
+  margin: 0px;
+  padding: 0px;
+  text-align: center;
+  height: 15px;
+}
+
+.menubar li {
+ margin-left: 5px;
+ margin-right: 5px;
+ display: inline;
+ list-style-type: none;
+}
+
+.menubar a {
+ color: #000000;
+ text-decoration: none;
+}
+
+
+
+
+
+/**
+ * Sidebox
+ *
+ * from http://www.vertexwerks.com/tests/sidebox/
+ */
+
+/* Show only to IE PC \*/
+* html .boxhead h2 {height: 1%;} /* For IE 5 PC */
+
+.sidebox {
+	margin: 0 auto; /* center for now */
+	background: url(/sidebox/sbbody-r.gif) no-repeat bottom right;
+	font-size: 100%;
+}
+.boxhead {
+	background: url(/sidebox/sbhead-r.gif) no-repeat top right;
+	margin: 0;
+	padding: 0;
+	text-align: center;
+}
+.boxhead h2 {
+	background: url(/sidebox/sbhead-l.gif) no-repeat top left;
+	margin: 0;
+	padding: 22px 30px 5px;
+	color: white; 
+	font-weight: bold; 
+	font-size: 1.4em; 
+	line-height: 1em;
+	text-shadow: rgba(0,0,0,.4) 0px 2px 5px; /* Safari-only, but cool */
+}
+.boxbody {
+	background: url(/sidebox/sbbody-l.gif) no-repeat bottom left;
+	margin: 0;
+	padding: 5px 30px 31px;
+}
--- a/ajaxui/ajaxui.h
+++ b/ajaxui/ajaxui.h
@ -0,0 +1,56 @@
+/*
+ *  tvheadend, AJAX user interface
+ *  Copyright (C) 2007 Andreas Öman
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <htmlui://www.gnu.org/licenses/>.
+ */
+
+#ifndef AJAXUI_H_
+#define AJAXUI_H_
+
+
+typedef enum {
+  AJAX_BOX_FILLED,
+  AJAX_BOX_SIDEBOX,
+  AJAX_BOX_BORDER,
+} ajax_box_t;
+
+void ajax_box_begin(tcp_queue_t *tq, ajax_box_t type,
+		    const char *id, const char *style, const char *title);
+
+void ajax_box_end(tcp_queue_t *tq, ajax_box_t type);
+
+void ajax_js(tcp_queue_t *tq, const char *fmt, ...);
+
+
+TAILQ_HEAD(ajax_menu_entry_queue, ajax_menu_entry);
+
+#define AJAX_TAB_CHANNELS      0
+#define AJAX_TAB_RECORDER      1
+#define AJAX_TAB_CONFIGURATION 2
+#define AJAX_TABS 3
+
+
+void ajaxui_start(void);
+void ajax_channels_init(void);
+void ajax_config_init(void);
+
+
+void ajax_menu_bar_from_array(tcp_queue_t *tq, const char *name, 
+			      const char **vec, int num, int cur);
+
+int ajax_channelgroup_tab(http_connection_t *hc);
+int ajax_config_tab(http_connection_t *hc);
+
+#endif /* AJAXUI_H_ */
--- a/ajaxui/ajaxui_channels.c
+++ b/ajaxui/ajaxui_channels.c
@ -0,0 +1,154 @@
+/*
+ *  tvheadend, AJAX / HTML user interface
+ *  Copyright (C) 2008 Andreas Öman
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <pthread.h>
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "tvhead.h"
+#include "http.h"
+#include "ajaxui.h"
+#include "channels.h"
+
+
+static void
+ajax_channelgroupmenu_content(tcp_queue_t *tq, int current)
+{
+  th_channel_group_t *tcg;
+
+  tcp_qprintf(tq, "<ul class=\"menubar\">");
+
+  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
+    if(tcg->tcg_hidden)
+      continue;
+
+    if(current < 1)
+      current = tcg->tcg_tag;
+
+    tcp_qprintf(tq,
+		"<li%s>"
+		"<a href=\"javascript:switchtab('channelgroup', '%d')\">%s</a>"
+		"</li>",
+		current == tcg->tcg_tag ? " style=\"font-weight:bold;\"" : "",
+		tcg->tcg_tag, tcg->tcg_name);
+  }
+  tcp_qprintf(tq, "</ul>");  
+}
+
+
+/*
+ * Channelgroup menu bar
+ */
+static int
+ajax_channelgroup_menu(http_connection_t *hc, const char *remain, void *opaque)
+{
+  tcp_queue_t tq;
+  
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tcp_init_queue(&tq, -1);
+
+  ajax_channelgroupmenu_content(&tq, atoi(remain));
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+
+
+/*
+ * Display a list of all channels within the given group
+ *
+ * Group is given by 'tag' as an ASCII string in remain
+ */
+int
+ajax_channel_tab(http_connection_t *hc, const char *remain, void *opaque)
+{
+  tcp_queue_t tq;
+  th_channel_t *ch;
+  th_channel_group_t *tcg;
+
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+  
+  if((tcg = channel_group_by_tag(atoi(remain))) == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tcp_init_queue(&tq, -1);
+
+  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
+    if(LIST_FIRST(&ch->ch_transports) == NULL)
+      continue;
+
+#if 0
+    ajax_box_begin(&tq, "x", ch->ch_name);
+
+    tcp_qprintf(&tq, "<div style=\"height: 100px\"></div>");
+    ajax_sidebox_end(&tq);
+#endif
+  }
+
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+
+/*
+ * Channel (group)s AJAX page
+ *
+ * This is the top level menu for this c-file
+ */
+int
+ajax_channelgroup_tab(http_connection_t *hc)
+{
+  tcp_queue_t tq;
+
+  tcp_init_queue(&tq, -1);
+
+  ajax_box_begin(&tq, AJAX_BOX_FILLED, "channelgroupmenu", NULL, NULL);
+  ajax_box_end(&tq, AJAX_BOX_FILLED);
+
+  tcp_qprintf(&tq, "<div id=\"channelgroupdeck\"></div>");
+
+  tcp_qprintf(&tq,
+	      "<script type=\"text/javascript\">"
+	      "switchtab('channelgroup', '0')"
+	      "</script>");
+
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+/**
+ *
+ */
+void
+ajax_channels_init(void)
+{
+  http_path_add("/ajax/channelgroupmenu",    NULL, ajax_channelgroup_menu);
+  http_path_add("/ajax/channelgrouptab",     NULL, ajax_channel_tab);
+}
--- a/ajaxui/ajaxui_config.c
+++ b/ajaxui/ajaxui_config.c
@ -0,0 +1,318 @@
+/*
+ *  tvheadend, AJAX / HTML user interface
+ *  Copyright (C) 2008 Andreas Öman
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <pthread.h>
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "tvhead.h"
+#include "http.h"
+#include "ajaxui.h"
+#include "channels.h"
+
+
+#define AJAX_CONFIG_TAB_CHANNELS 0
+#define AJAX_CONFIG_TAB_ADAPTERS 1
+#define AJAX_CONFIG_TABS         2
+
+const char *ajax_config_tabnames[] = {
+  [AJAX_CONFIG_TAB_CHANNELS]      = "Channels & Groups",
+  [AJAX_CONFIG_TAB_ADAPTERS]      = "DVB adapters",
+};
+
+
+/*
+ * Titlebar AJAX page
+ */
+static int
+ajax_config_menu(http_connection_t *hc, const char *remain, void *opaque)
+{
+  tcp_queue_t tq;
+  
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tcp_init_queue(&tq, -1);
+  ajax_menu_bar_from_array(&tq, "config", 
+			   ajax_config_tabnames, AJAX_CONFIG_TABS,
+			   atoi(remain));
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+/**
+ * Render a channel group widget
+ */
+static void
+ajax_chgroup_build(tcp_queue_t *tq, th_channel_group_t *tcg)
+{
+  tcp_qprintf(tq, "<li id=\"chgrp_%d\">", tcg->tcg_tag);
+  
+  ajax_box_begin(tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
+  
+  tcp_qprintf(tq,
+	      "<div %s>%s</div>",
+	      tcg == defgroup ? "" : "style=\"float: left\" ",
+	      tcg->tcg_name);
+
+  if(tcg != defgroup) {
+    tcp_qprintf(tq,
+		"<div class=\"chgroupaction\">"
+		"<a href=\"javascript:void(0)\" "
+		"onClick=\"dellistentry('/ajax/chgroup_del','%d', '%s');\""
+		">Delete</a></div>",
+		tcg->tcg_tag, tcg->tcg_name);
+  }
+  
+
+  ajax_box_end(tq, AJAX_BOX_BORDER);
+  tcp_qprintf(tq, "</li>");
+}
+
+/**
+ * Update order of channel groups
+ */
+static int
+ajax_chgroup_updateorder(http_connection_t *hc, const char *remain,
+			 void *opaque)
+{
+  th_channel_group_t *tcg;
+  tcp_queue_t tq;
+  http_arg_t *ra;
+
+  tcp_init_queue(&tq, -1);
+
+  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
+    if(strcmp(ra->key, "channelgrouplist[]") ||
+       (tcg = channel_group_by_tag(atoi(ra->val))) == NULL)
+      continue;
+    
+    TAILQ_REMOVE(&all_channel_groups, tcg, tcg_global_link);
+    TAILQ_INSERT_TAIL(&all_channel_groups, tcg, tcg_global_link);
+  }
+
+  tcp_qprintf(&tq, "<span id=\"updatedok\">Updated on server</span>");
+  ajax_js(&tq, "Effect.Fade('updatedok')");
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+/**
+ * Add a new channel group
+ */
+static int
+ajax_chgroup_add(http_connection_t *hc, const char *remain, void *opaque)
+{
+  th_channel_group_t *tcg;
+  tcp_queue_t tq;
+  const char *name;
+  
+  tcp_init_queue(&tq, -1);
+
+  if((name = http_arg_get(&hc->hc_req_args, "name")) != NULL) {
+
+    TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link)
+      if(!strcmp(name, tcg->tcg_name))
+	break;
+
+    if(tcg == NULL) {
+      tcg = channel_group_find(name, 1);
+
+      ajax_chgroup_build(&tq, tcg);
+
+      /* We must recreate the Sortable object */
+
+      ajax_js(&tq, "Sortable.destroy(\"channelgrouplist\")");
+
+      ajax_js(&tq, "Sortable.create(\"channelgrouplist\", "
+	      "{onUpdate:function(){updatelistonserver("
+	      "'channelgrouplist', "
+	      "'/ajax/chgroup_updateorder', "
+	      "'list-info'"
+	      ")}});");
+    }
+  }
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+/**
+ * Delete a channel group
+ */
+static int
+ajax_chgroup_del(http_connection_t *hc, const char *remain, void *opaque)
+{
+  th_channel_group_t *tcg;
+  tcp_queue_t tq;
+  const char *id;
+  
+  if((id = http_arg_get(&hc->hc_req_args, "id")) == NULL)
+    return HTTP_STATUS_BAD_REQUEST;
+
+  if((tcg = channel_group_by_tag(atoi(id))) == NULL)
+    return HTTP_STATUS_BAD_REQUEST;
+
+  tcp_init_queue(&tq, -1);
+  tcp_qprintf(&tq, "$('chgrp_%d').remove();", tcg->tcg_tag);
+  http_output_queue(hc, &tq, "text/javascript; charset=UTF-8", 0);
+
+  channel_group_destroy(tcg);
+
+  return 0;
+}
+
+
+
+/**
+ * Channel group & channel configuration
+ */
+static int
+ajax_channel_config_tab(http_connection_t *hc)
+{
+  tcp_queue_t tq;
+  th_channel_group_t *tcg;
+
+  tcp_init_queue(&tq, -1);
+  
+  tcp_qprintf(&tq, "<div style=\"float: left; width: 400px\">");
+
+  ajax_box_begin(&tq, AJAX_BOX_SIDEBOX, "channelgroups",
+		 NULL, "Channel groups");
+
+  tcp_qprintf(&tq, "<div style=\"height:15px; text-align:center\" "
+	      "id=\"list-info\"></div>");
+   
+  tcp_qprintf(&tq, "<ul id=\"channelgrouplist\" class=\"draglist\">");
+
+  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
+    if(tcg->tcg_hidden)
+      continue;
+    ajax_chgroup_build(&tq, tcg);
+  }
+
+  tcp_qprintf(&tq, "</ul>");
+ 
+  ajax_js(&tq, "Sortable.create(\"channelgrouplist\", "
+	  "{onUpdate:function(){updatelistonserver("
+	  "'channelgrouplist', "
+	  "'/ajax/chgroup_updateorder', "
+	  "'list-info'"
+	  ")}});");
+
+  /**
+   * Add new group
+   */
+  ajax_box_begin(&tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
+
+  tcp_qprintf(&tq,
+	      "<div style=\"height: 20px\">"
+	      "<div style=\"float: left\">"
+	      "<input class=\"textinput\" type=\"text\" id=\"newchgrp\">"
+	      "</div>"
+	      "<div style=\"padding-top:2px\" class=\"chgroupaction\">"
+	      "<a href=\"javascript:void(0)\" "
+	      "onClick=\"javascript:addlistentry_by_widget("
+	      "'channelgrouplist', 'chgroup_add', 'newchgrp');\">"
+	      "Add</a></div>"
+	      "</div>");
+    
+  ajax_box_end(&tq, AJAX_BOX_BORDER);
+    
+  ajax_box_end(&tq, AJAX_BOX_SIDEBOX);
+  tcp_qprintf(&tq, "</div>");
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+/*
+ * Tab AJAX page
+ *
+ * Switch to different tabs
+ */
+static int
+ajax_config_dispatch(http_connection_t *hc, const char *remain, void *opaque)
+{
+  int tab;
+
+  if(remain == NULL)
+    return HTTP_STATUS_NOT_FOUND;
+
+  tab = atoi(remain);
+
+  switch(tab) {
+  case AJAX_CONFIG_TAB_CHANNELS:
+    return ajax_channel_config_tab(hc);
+
+  default:
+    return HTTP_STATUS_NOT_FOUND;
+  }
+  return 0;
+}
+
+
+
+
+/*
+ * Config root menu AJAX page
+ *
+ * This is the top level menu for this c-file
+ */
+int
+ajax_config_tab(http_connection_t *hc)
+{
+  tcp_queue_t tq;
+
+  tcp_init_queue(&tq, -1);
+
+  ajax_box_begin(&tq, AJAX_BOX_FILLED, "configmenu", NULL, NULL);
+  ajax_box_end(&tq, AJAX_BOX_FILLED);
+
+  tcp_qprintf(&tq, "<div id=\"configdeck\"></div>");
+
+  tcp_qprintf(&tq,
+	      "<script type=\"text/javascript\">"
+	      "switchtab('config', '0')"
+	      "</script>");
+
+  http_output_queue(hc, &tq, "text/html; charset=UTF-8", 0);
+  return 0;
+}
+
+
+
+/**
+ *
+ */
+void
+ajax_config_init(void)
+{
+  http_path_add("/ajax/chgroup_add"        , NULL, ajax_chgroup_add);
+  http_path_add("/ajax/chgroup_del"        , NULL, ajax_chgroup_del);
+  http_path_add("/ajax/chgroup_updateorder", NULL, ajax_chgroup_updateorder);
+  http_path_add("/ajax/configmenu",          NULL, ajax_config_menu);
+  http_path_add("/ajax/configtab",           NULL, ajax_config_dispatch);
+}
--- a/ajaxui/images/sbbody_l.gif
+++ b/ajaxui/images/sbbody_l.gif
--- a/ajaxui/images/sbbody_r.gif
+++ b/ajaxui/images/sbbody_r.gif
--- a/ajaxui/images/sbhead_l.gif
+++ b/ajaxui/images/sbhead_l.gif
--- a/ajaxui/images/sbhead_r.gif
+++ b/ajaxui/images/sbhead_r.gif
--- a/ajaxui/prototype/prototype.js
+++ b/ajaxui/prototype/prototype.js
--- a/ajaxui/scriptaculous/builder.js
+++ b/ajaxui/scriptaculous/builder.js
@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+    
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+      
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+    
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+    
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1]) 
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        } 
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return element;
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e)
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) { 
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
+  
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+  
+    tags.each( function(tag){ 
+      scope[tag] = function() { 
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
+      } 
+    });
+  }
+}
--- a/ajaxui/scriptaculous/controls.js
+++ b/ajaxui/scriptaculous/controls.js
@ -0,0 +1,965 @@
+// script.aculo.us controls.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+//  Richard Livsey
+//  Rahul Bhargava
+//  Rob Wills
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// Autocompleter.Base handles all the autocompletion functionality 
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least, 
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method 
+// should get the text for which to provide autocompletion by
+// invoking this.getToken(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: [',', '\n'] } which
+// enables autocompletion on multiple tokens. This is most 
+// useful when one of the tokens is \n (a newline), as it 
+// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
+
+var Autocompleter = { }
+Autocompleter.Base = Class.create({
+  baseInitialize: function(element, update, options) {
+    element          = $(element)
+    this.element     = element; 
+    this.update      = $(update);  
+    this.hasFocus    = false; 
+    this.changed     = false; 
+    this.active      = false; 
+    this.index       = 0;     
+    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
+
+    if(this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = options || { };
+
+    this.options.paramName    = this.options.paramName || this.element.name;
+    this.options.tokens       = this.options.tokens || [];
+    this.options.frequency    = this.options.frequency || 0.4;
+    this.options.minChars     = this.options.minChars || 1;
+    this.options.onShow       = this.options.onShow || 
+      function(element, update){ 
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false, 
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
+    this.options.onHide = this.options.onHide || 
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+
+    if(typeof(this.options.tokens) == 'string') 
+      this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
+
+    this.observer = null;
+    
+    this.element.setAttribute('autocomplete','off');
+
+    Element.hide(this.update);
+
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
+  },
+
+  show: function() {
+    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
+    if(!this.iefix && 
+      (Prototype.Browser.IE) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
+      new Insertion.After(this.update, 
+       '<iframe id="' + this.update.id + '_iefix" '+
+       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+      this.iefix = $(this.update.id+'_iefix');
+    }
+    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
+  },
+  
+  fixIEOverlapping: function() {
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
+    this.iefix.style.zIndex = 1;
+    this.update.style.zIndex = 2;
+    Element.show(this.iefix);
+  },
+
+  hide: function() {
+    this.stopIndicator();
+    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
+    if(this.iefix) Element.hide(this.iefix);
+  },
+
+  startIndicator: function() {
+    if(this.options.indicator) Element.show(this.options.indicator);
+  },
+
+  stopIndicator: function() {
+    if(this.options.indicator) Element.hide(this.options.indicator);
+  },
+
+  onKeyPress: function(event) {
+    if(this.active)
+      switch(event.keyCode) {
+       case Event.KEY_TAB:
+       case Event.KEY_RETURN:
+         this.selectEntry();
+         Event.stop(event);
+       case Event.KEY_ESC:
+         this.hide();
+         this.active = false;
+         Event.stop(event);
+         return;
+       case Event.KEY_LEFT:
+       case Event.KEY_RIGHT:
+         return;
+       case Event.KEY_UP:
+         this.markPrevious();
+         this.render();
+         Event.stop(event);
+         return;
+       case Event.KEY_DOWN:
+         this.markNext();
+         this.render();
+         Event.stop(event);
+         return;
+      }
+     else 
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
+
+    this.changed = true;
+    this.hasFocus = true;
+
+    if(this.observer) clearTimeout(this.observer);
+      this.observer = 
+        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
+  },
+
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
+  onHover: function(event) {
+    var element = Event.findElement(event, 'LI');
+    if(this.index != element.autocompleteIndex) 
+    {
+        this.index = element.autocompleteIndex;
+        this.render();
+    }
+    Event.stop(event);
+  },
+  
+  onClick: function(event) {
+    var element = Event.findElement(event, 'LI');
+    this.index = element.autocompleteIndex;
+    this.selectEntry();
+    this.hide();
+  },
+  
+  onBlur: function(event) {
+    // needed to make click events working
+    setTimeout(this.hide.bind(this), 250);
+    this.hasFocus = false;
+    this.active = false;     
+  }, 
+  
+  render: function() {
+    if(this.entryCount > 0) {
+      for (var i = 0; i < this.entryCount; i++)
+        this.index==i ? 
+          Element.addClassName(this.getEntry(i),"selected") : 
+          Element.removeClassName(this.getEntry(i),"selected");
+      if(this.hasFocus) { 
+        this.show();
+        this.active = true;
+      }
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+  
+  markPrevious: function() {
+    if(this.index > 0) this.index--
+      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
+  },
+  
+  markNext: function() {
+    if(this.index < this.entryCount-1) this.index++
+      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
+  },
+  
+  getEntry: function(index) {
+    return this.update.firstChild.childNodes[index];
+  },
+  
+  getCurrentEntry: function() {
+    return this.getEntry(this.index);
+  },
+  
+  selectEntry: function() {
+    this.active = false;
+    this.updateElement(this.getCurrentEntry());
+  },
+
+  updateElement: function(selectedElement) {
+    if (this.options.updateElement) {
+      this.options.updateElement(selectedElement);
+      return;
+    }
+    var value = '';
+    if (this.options.select) {
+      var nodes = $(selectedElement).select('.' + this.options.select) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+    
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
+      if (whitespace)
+        newValue += whitespace[0];
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
+    } else {
+      this.element.value = value;
+    }
+    this.oldElementValue = this.element.value;
+    this.element.focus();
+    
+    if (this.options.afterUpdateElement)
+      this.options.afterUpdateElement(this.element, selectedElement);
+  },
+
+  updateChoices: function(choices) {
+    if(!this.changed && this.hasFocus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.down());
+
+      if(this.update.firstChild && this.update.down().childNodes) {
+        this.entryCount = 
+          this.update.down().childNodes.length;
+        for (var i = 0; i < this.entryCount; i++) {
+          var entry = this.getEntry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else { 
+        this.entryCount = 0;
+      }
+
+      this.stopIndicator();
+      this.index = 0;
+      
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;   
+    this.tokenBounds = null;
+    if(this.getToken().length>=this.options.minChars) {
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+    this.oldElementValue = this.element.value;
+  },
+
+  getToken: function() {
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
+  },
+
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
+    }
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
+  }
+});
+
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, url, options) {
+    this.baseInitialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this);
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+
+  getUpdatedChoices: function() {
+    this.startIndicator();
+    
+    var entry = encodeURIComponent(this.options.paramName) + '=' + 
+      encodeURIComponent(this.getToken());
+
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+
+    if(this.options.defaultParams) 
+      this.options.parameters += '&' + this.options.defaultParams;
+    
+    new Ajax.Request(this.url, this.options);
+  },
+
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+});
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partialSearch - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the 
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option fullSearch to true (default: off).
+//
+// - fullSsearch - Search anywhere in autocomplete array strings.
+//
+// - partialChars - How many characters to enter before triggering
+//                   a partial match (unlike minChars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignoreCase - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector' 
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, array, options) {
+    this.baseInitialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partialSearch: true,
+      partialChars: 2,
+      ignoreCase: true,
+      fullSearch: false,
+      selector: function(instance) {
+        var ret       = []; // Beginning matches
+        var partial   = []; // Inside matches
+        var entry     = instance.getToken();
+        var count     = 0;
+
+        for (var i = 0; i < instance.options.array.length &&  
+          ret.length < instance.options.choices ; i++) { 
+
+          var elem = instance.options.array[i];
+          var foundPos = instance.options.ignoreCase ? 
+            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+            elem.indexOf(entry);
+
+          while (foundPos != -1) {
+            if (foundPos == 0 && elem.length != entry.length) { 
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partialChars && 
+              instance.options.partialSearch && foundPos != -1) {
+              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
+                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
+                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
+                  foundPos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            foundPos = instance.options.ignoreCase ? 
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
+              elem.indexOf(entry, foundPos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || { });
+  }
+});
+
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
+
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+}
+
+Ajax.InPlaceEditor = Class.create({
+  initialize: function(element, url, options) {
+    this.url = url;
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
+    }
+    if (this.options.externalControl)
+      this.options.externalControl = $(this.options.externalControl);
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
+    this.element.title = this.options.clickToEditText;
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
+  },
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
+  },
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
+    }
+  },
+  createEditField: function() {
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
+      var size = this.options.size || this.options.cols || 0;
+      if (0 < size) fld.size = size;
+    } else {
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
+    }
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
+  },
+  getText: function() {
+    return this.element.innerHTML;
+  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
+  loadExternalText: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
+  },
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
+  },
+  prepareSubmission: function() {
+    this._saving = true;
+    this.removeForm();
+    this.leaveHover();
+    this.showSaving();
+  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
+    }
+  },
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
+  },
+  wrapUp: function(transport) {
+    this.leaveEditMode();
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
+  }
+});
+
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw 'Server returned an invalid collection representation.';
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+
+// Delayed observer, like Form.Element.Observer, 
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create({
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element); 
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
+});
--- a/ajaxui/scriptaculous/dragdrop.js
+++ b/ajaxui/scriptaculous/dragdrop.js
@ -0,0 +1,974 @@
+// script.aculo.us dragdrop.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if(Object.isUndefined(Effect))
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || { });
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if(Object.isArray(containment)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+    
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+  
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+      
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+    
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode; 
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+  
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect( 
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var drop, affected = [];
+    
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+        
+    if(affected.length>0)
+      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+      
+      if (drop != this.last_active) Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event); 
+        return true; 
+      }
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+}
+
+var Draggables = {
+  drags: [],
+  observers: [],
+  
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+      
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+  
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+  
+  activate: function(draggable) {
+    if(draggable.options.delay) { 
+      this._timeout = setTimeout(function() { 
+        Draggables._timeout = null; 
+        window.focus(); 
+        Draggables.activeDraggable = draggable; 
+      }.bind(this), draggable.options.delay); 
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
+  },
+  
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+  
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+    
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+  
+  endDrag: function(event) {
+    if(this._timeout) { 
+      clearTimeout(this._timeout); 
+      this._timeout = null; 
+    }
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+  
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+  
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+  
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+  
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
+  },
+  
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create({
+  initialize: function(element) {
+    var defaults = {
+      handle: false,
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
+      },
+      endeffect: function(element) {
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){ 
+            Draggable._dragging[element] = false 
+          }
+        }); 
+      },
+      zindex: 1000,
+      revert: false,
+      quiet: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+    
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+        }
+      });
+    
+    var options = Object.extend(defaults, arguments[1] || { });
+
+    this.element = $(element);
+    
+    if(options.handle && Object.isString(options.handle))
+      this.handle = this.element.down('.'+options.handle, 0);
+    
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+    
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
+
+    Element.makePositioned(this.element); // fix IE    
+
+    this.options  = options;
+    this.dragging = false;   
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+    
+    Draggables.register(this);
+  },
+  
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+  
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+  
+  initDrag: function(event) {
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
+      Draggable._dragging[this.element]) return;
+    if(Event.isLeftClick(event)) {    
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+        
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+      
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+  
+  startDrag: function(event) {
+    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
+    
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+    
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this.element._originallyAbsolute)
+        Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+    
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+    
+    Draggables.notify('onStart', this, event);
+        
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+  
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+    
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+    
+    Draggables.notify('onDrag', this, event);
+    
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+    
+    if(this.options.scroll) {
+      this.stopScrolling();
+      
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+    
+    // fix AppleWebKit rendering
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+    
+    Event.stop(event);
+  },
+  
+  finishDrag: function(event, success) {
+    this.dragging = false;
+    
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
+
+    if(this.options.ghosting) {
+      if (!this.element._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this.element._originallyAbsolute;
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    var dropped = false; 
+    if(success) { 
+      dropped = Droppables.fire(event, this.element); 
+      if (!dropped) dropped = false; 
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
+    
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect) 
+      this.options.endeffect(this.element);
+      
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+  
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+  
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+  
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+    
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+    
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+    
+    var p = [0,1].map(function(i){ 
+      return (point[i]-pos[i]-this.offset[i]) 
+    }.bind(this));
+    
+    if(this.options.snap) {
+      if(Object.isFunction(this.options.snap)) {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(Object.isArray(this.options.snap)) {
+        p = p.map( function(v, i) {
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+      } else {
+        p = p.map( function(v) {
+          return (v/this.options.snap).round()*this.options.snap }.bind(this))
+      }
+    }}
+    
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+    
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+  
+  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+  
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+    
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
+    
+    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+});
+
+Draggable._dragging = { };
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create({
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+});
+
+var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+  
+  sortables: { },
+  
+  _findRootElement: function(element) {
+    while (element.tagName.toUpperCase() != "BODY") {  
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+  
+  destroy: function(element){
+    var s = Sortable.options(element);
+    
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+      
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({ 
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      delay:       0,
+      hoverclass:  null,
+      ghosting:    false,
+      quiet:       false, 
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      this.SERIALIZE_RULE,
+      
+      // these take arrays of elements or ids and can be 
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+      
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || { });
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      quiet:       options.quiet,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables  
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+    }
+    
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    }
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element); 
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);      
+    });
+    
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+  
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+  
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+        
+    if(!Element.isParent(dropon, element)) {
+      var index;
+      
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
+      var child = null;
+            
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+        
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+      
+      dropon.insertBefore(element, child);
+      
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Sortable._marker.hide();
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return; 
+
+    if(!Sortable._marker) {
+      Sortable._marker = 
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }    
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+    
+    if(position=='after')
+      if(sortable.overlap == 'horizontal') 
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
+      else
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+    
+    Sortable._marker.show();
+  },
+  
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+  
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+      
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: [],
+        position: parent.children.length,
+        container: $(children[i]).down(options.treeTag)
+      }
+      
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child)
+      
+      parent.children.push (child);
+    }
+
+    return parent; 
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || { });
+    
+    var root = {
+      id: null,
+      parent: null,
+      children: [],
+      container: element,
+      position: 0
+    }
+    
+    return Sortable._tree(element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || { });
+    
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || { });
+    
+    var nodeMap = { };
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+  
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+    
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "[id]=" + 
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+}
+
+// Returns true if child is contained within element
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+  if (child.parentNode == element) return true;
+  return Element.isParent(child.parentNode, element);
+}
+
+Element.findChildren = function(element, only, recursive, tagName) {   
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+}
+
+Element.offsetSize = function (element, type) {
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+}
--- a/ajaxui/scriptaculous/effects.js
+++ b/ajaxui/scriptaculous/effects.js
--- a/ajaxui/scriptaculous/scriptaculous.js
+++ b/ajaxui/scriptaculous/scriptaculous.js
@ -0,0 +1,58 @@
+// script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Scriptaculous = {
+  Version: '1.8.1',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
+  },
+  REQUIRED_PROTOTYPE: '1.6.0',
+  load: function() {
+    function convertVersionString(versionString){
+      var r = versionString.split('.');
+      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
+    }
+ 
+    if((typeof Prototype=='undefined') || 
+       (typeof Element == 'undefined') || 
+       (typeof Element.Methods=='undefined') ||
+       (convertVersionString(Prototype.Version) < 
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
+    
+    $A(document.getElementsByTagName("script")).findAll( function(s) {
+      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
+    }).each( function(s) {
+      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
+      var includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+}
+
+Scriptaculous.load();
--- a/ajaxui/scriptaculous/slider.js
+++ b/ajaxui/scriptaculous/slider.js
@ -0,0 +1,275 @@
+// script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
+
+// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if (!Control) var Control = { };
+
+// options:
+//  axis: 'vertical', or 'horizontal' (default)
+//
+// callbacks:
+//  onChange(value)
+//  onSlide(value)
+Control.Slider = Class.create({
+  initialize: function(handle, track, options) {
+    var slider = this;
+    
+    if (Object.isArray(handle)) {
+      this.handles = handle.collect( function(e) { return $(e) });
+    } else {
+      this.handles = [$(handle)];
+    }
+    
+    this.track   = $(track);
+    this.options = options || { };
+
+    this.axis      = this.options.axis || 'horizontal';
+    this.increment = this.options.increment || 1;
+    this.step      = parseInt(this.options.step || '1');
+    this.range     = this.options.range || $R(0,1);
+    
+    this.value     = 0; // assure backwards compat
+    this.values    = this.handles.map( function() { return 0 });
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.endSpan   = $(this.options.endSpan || null);
+
+    this.restricted = this.options.restricted || false;
+
+    this.maximum   = this.options.maximum || this.range.end;
+    this.minimum   = this.options.minimum || this.range.start;
+
+    // Will be used to align the handle onto the track, if necessary
+    this.alignX = parseInt(this.options.alignX || '0');
+    this.alignY = parseInt(this.options.alignY || '0');
+    
+    this.trackLength = this.maximumOffset() - this.minimumOffset();
+
+    this.handleLength = this.isVertical() ? 
+      (this.handles[0].offsetHeight != 0 ? 
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
+        this.handles[0].style.width.replace(/px$/,""));
+
+    this.active   = false;
+    this.dragging = false;
+    this.disabled = false;
+
+    if (this.options.disabled) this.setDisabled();
+
+    // Allowed values array
+    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+    if (this.allowedValues) {
+      this.minimum = this.allowedValues.min();
+      this.maximum = this.allowedValues.max();
+    }
+
+    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+
+    // Initialize handles in reverse (make sure first handle is active)
+    this.handles.each( function(h,i) {
+      i = slider.handles.length-1-i;
+      slider.setValue(parseFloat(
+        (Object.isArray(slider.options.sliderValue) ? 
+          slider.options.sliderValue[i] : slider.options.sliderValue) || 
+         slider.range.start), i);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
+    });
+    
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
+    
+    this.initialized = true;
+  },
+  dispose: function() {
+    var slider = this;    
+    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+    Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    this.handles.each( function(h) {
+      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+    });
+  },
+  setDisabled: function(){
+    this.disabled = true;
+  },
+  setEnabled: function(){
+    this.disabled = false;
+  },  
+  getNearestValue: function(value){
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+      
+      var offset = Math.abs(this.allowedValues[0] - value);
+      var newValue = this.allowedValues[0];
+      this.allowedValues.each( function(v) {
+        var currentOffset = Math.abs(v - value);
+        if (currentOffset <= offset){
+          newValue = v;
+          offset = currentOffset;
+        } 
+      });
+      return newValue;
+    }
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
+    return value;
+  },
+  setValue: function(sliderValue, handleIdx){
+    if (!this.active) {
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
+      this.updateStyles();
+    }
+    handleIdx = handleIdx || this.activeHandleIdx || 0;
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+        sliderValue = this.values[handleIdx-1];
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+        sliderValue = this.values[handleIdx+1];
+    }
+    sliderValue = this.getNearestValue(sliderValue);
+    this.values[handleIdx] = sliderValue;
+    this.value = this.values[0]; // assure backwards compat
+    
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
+      this.translateToPx(sliderValue);
+    
+    this.drawSpans();
+    if (!this.dragging || !this.event) this.updateFinished();
+  },
+  setValueBy: function(delta, handleIdx) {
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
+      handleIdx || this.activeHandleIdx || 0);
+  },
+  translateToPx: function(value) {
+    return Math.round(
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
+      (value - this.range.start)) + "px";
+  },
+  translateToValue: function(offset) {
+    return ((offset/(this.trackLength-this.handleLength) * 
+      (this.range.end-this.range.start)) + this.range.start);
+  },
+  getRange: function(range) {
+    var v = this.values.sortBy(Prototype.K); 
+    range = range || 0;
+    return $R(v[range],v[range+1]);
+  },
+  minimumOffset: function(){
+    return(this.isVertical() ? this.alignY : this.alignX);
+  },
+  maximumOffset: function(){
+    return(this.isVertical() ? 
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY : 
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
+        this.track.style.width.replace(/px$/,"")) - this.alignX);
+  },  
+  isVertical:  function(){
+    return (this.axis == 'vertical');
+  },
+  drawSpans: function() {
+    var slider = this;
+    if (this.spans)
+      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
+    if (this.options.startSpan)
+      this.setSpan(this.options.startSpan,
+        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
+    if (this.options.endSpan)
+      this.setSpan(this.options.endSpan, 
+        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
+  },
+  setSpan: function(span, range) {
+    if (this.isVertical()) {
+      span.style.top = this.translateToPx(range.start);
+      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+    } else {
+      span.style.left = this.translateToPx(range.start);
+      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+    }
+  },
+  updateStyles: function() {
+    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
+    Element.addClassName(this.activeHandle, 'selected');
+  },
+  startDrag: function(event) {
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
+        this.active = true;
+        
+        var handle = Event.element(event);
+        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        var track = handle;
+        if (track==this.track) {
+          var offsets  = Position.cumulativeOffset(this.track); 
+          this.event = event;
+          this.setValue(this.translateToValue( 
+           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
+          ));
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+        } else {
+          // find the handle (prevents issues with Safari)
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
+            handle = handle.parentNode;
+            
+          if (this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+            
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }
+      Event.stop(event);
+    }
+  },
+  update: function(event) {
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
+      this.draw(event);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+      Event.stop(event);
+   }
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.track);
+    pointer[0] -= this.offsetX + offsets[0];
+    pointer[1] -= this.offsetY + offsets[1];
+    this.event = event;
+    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
+    if (this.initialized && this.options.onSlide)
+      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
+  },
+  endDrag: function(event) {
+    if (this.active && this.dragging) {
+      this.finishDrag(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.dragging = false;
+  },  
+  finishDrag: function(event, success) {
+    this.active = false;
+    this.dragging = false;
+    this.updateFinished();
+  },
+  updateFinished: function() {
+    if (this.initialized && this.options.onChange) 
+      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
+    this.event = null;
+  }
+});
--- a/ajaxui/tvheadend.js
+++ b/ajaxui/tvheadend.js
@ -0,0 +1,51 @@
+function switchtab(name, index)
+{
+    a = new Ajax.Updater(name + 'deck', '/ajax/' + name + 'tab/'  + index, 
+			 { asynchronous: true, 
+			   method: 'get', 
+			   evalScripts: true});
+
+    a = new Ajax.Updater(name + 'menu', '/ajax/' + name + 'menu/' + index,
+			 { asynchronous: true, 
+			   method: 'get', 
+			   evalScripts: true});
+};
+
+function updatelistonserver(listid, url, resultid)
+{
+    //    document.getElementById(resultid).innerHTML = "Updating...";
+
+    a = new Ajax.Updater(resultid, url, 
+			 { asynchronous: true, 
+			   evalScripts: true,
+			   parameters:Sortable.serialize(listid)});
+};
+
+function addlistentry(listid, url, name)
+{
+    if(name == null || name == "") {
+	alert("Emtpy name is not allowed");
+    } else {
+	a = new Ajax.Updater(listid, url,
+			     { asynchronous: true, 
+			       evalScripts: true,
+			       parameters: { name: name },
+			       insertion: Insertion.Bottom
+			     });
+    }
+}
+
+
+function dellistentry(url, id, name)
+{
+    if(confirm("Are you sure you want to delete '" + name + "'") == true) {
+	a = new Ajax.Request(url, { parameters: { id: id }});
+    }
+}
+
+function addlistentry_by_widget(listid, url, widget)
+{
+    name = $F(widget);
+    $(widget).clear();
+    addlistentry(listid, url, name);
+}
--- a/channels.c
+++ b/channels.c
@ -372,9 +372,12 @@ channel_group_by_tag(uint32_t tag)
 {
  th_channel_group_t *tcg;

-  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link)
+  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
    if(tcg->tcg_tag == tag)
      return tcg;
+    if(tag == 0 && tcg->tcg_hidden == 0)
+      return tcg;
+  }

  return NULL;
 }
--- a/htmlui.c
+++ b/htmlui.c
@ -702,7 +702,7 @@ page_event(http_connection_t *hc, const char *remain, void *opaque)

  pvrr = pvr_get_by_entry(e);

-  if(http_arg_get(&hc->hc_url_args, "rec")) {
+  if(http_arg_get(&hc->hc_req_args, "rec")) {
    if(!html_verify_access(hc, "record-events")) {
      epg_unlock();
      return HTTP_STATUS_UNAUTHORIZED;
@ -710,7 +710,7 @@ page_event(http_connection_t *hc, const char *remain, void *opaque)
    pvrr = pvr_schedule_by_event(e, hc->hc_username);
  }

-  if(pvrr != NULL && http_arg_get(&hc->hc_url_args, "cancel")) {
+  if(pvrr != NULL && http_arg_get(&hc->hc_req_args, "cancel")) {
    if(!html_verify_access(hc, "record-events")) {
      epg_unlock();
      return HTTP_STATUS_UNAUTHORIZED;
@ -718,7 +718,7 @@ page_event(http_connection_t *hc, const char *remain, void *opaque)
    pvr_abort(pvrr);
  }

-  if(pvrr != NULL && http_arg_get(&hc->hc_url_args, "clear")) {
+  if(pvrr != NULL && http_arg_get(&hc->hc_req_args, "clear")) {
    if(!html_verify_access(hc, "record-events")) {
      epg_unlock();
      return HTTP_STATUS_UNAUTHORIZED;
@ -850,12 +850,12 @@ page_pvr(http_connection_t *hc, const char *remain, void *opaque)
  if(!html_verify_access(hc, "record-events"))
    return HTTP_STATUS_UNAUTHORIZED;

-  if(http_arg_get(&hc->hc_url_args, "clearall")) {
+  if(http_arg_get(&hc->hc_req_args, "clearall")) {
    pvr_clear_all_completed();
  }

  pvrr_tgt = NULL;
-  LIST_FOREACH(ra, &hc->hc_url_args, link) {
+  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
    c = 0;

    if(!strncmp(ra->key, "ardel_", 6)) {
@ -1539,10 +1539,10 @@ page_chgroups(http_connection_t *hc, const char *remain, void *opaque)
  if(!html_verify_access(hc, "admin"))
    return HTTP_STATUS_UNAUTHORIZED;

-  if((grp = http_arg_get(&hc->hc_url_args, "newgrpname")) != NULL)
+  if((grp = http_arg_get(&hc->hc_req_args, "newgrpname")) != NULL)
    channel_group_find(grp, 1);

-  LIST_FOREACH(ra, &hc->hc_url_args, link) {
+  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
    if(!strncmp(ra->key, "delgroup", 8)) {
      tcg = channel_group_by_tag(atoi(ra->key + 8));
      if(tcg != NULL)
@ -1848,7 +1848,7 @@ page_updatechannel(http_connection_t *hc, const char *remain, void *opaque)
  if(remain == NULL || (ch = channel_by_tag(atoi(remain))) == NULL)
    return 404;

-  if((s = http_arg_get(&hc->hc_url_args, "merge")) != NULL) {
+  if((s = http_arg_get(&hc->hc_req_args, "merge")) != NULL) {
    ch2 = channel_find(s, 0, NULL);
    if(ch2 != NULL) {

@ -1865,10 +1865,10 @@ page_updatechannel(http_connection_t *hc, const char *remain, void *opaque)
    }
  }

-  if((s = http_arg_get(&hc->hc_url_args, "ttrp")) != NULL)
+  if((s = http_arg_get(&hc->hc_req_args, "ttrp")) != NULL)
    channel_set_teletext_rundown(ch, atoi(s));

-  if((grp = http_arg_get(&hc->hc_url_args, "grp")) != NULL) {
+  if((grp = http_arg_get(&hc->hc_req_args, "grp")) != NULL) {
    tcg = channel_group_find(grp, 1);
    channel_set_group(ch, tcg);
  }
@ -1887,7 +1887,7 @@ page_updatechannel(http_connection_t *hc, const char *remain, void *opaque)
  
  for(i = 0; i < n; i++) {
    t = tv[i];
-    s = http_arg_get(&hc->hc_url_args, t->tht_uniquename);
+    s = http_arg_get(&hc->hc_req_args, t->tht_uniquename);
    if(s != NULL) {
      pri = atoi(s);
      if(pri >= 0 && pri <= 9999) {
@ -1919,14 +1919,14 @@ page_search(http_connection_t *hc, const char *remain, void *opaque)
  event_t *e, **ev;
  struct tm a, day;
  
-  const char *search  = http_arg_get(&hc->hc_url_args, "s");
-  const char *autorec = http_arg_get(&hc->hc_url_args, "ar");
-  const char *title   = http_arg_get(&hc->hc_url_args, "n");
-  const char *content = http_arg_get(&hc->hc_url_args, "c");
-  const char *chgroup = http_arg_get(&hc->hc_url_args, "g");
-  const char *channel = http_arg_get(&hc->hc_url_args, "ch");
-  const char *ar_name = http_arg_get(&hc->hc_url_args, "ar_name");
-  const char *ar_prio = http_arg_get(&hc->hc_url_args, "ar_prio");
+  const char *search  = http_arg_get(&hc->hc_req_args, "s");
+  const char *autorec = http_arg_get(&hc->hc_req_args, "ar");
+  const char *title   = http_arg_get(&hc->hc_req_args, "n");
+  const char *content = http_arg_get(&hc->hc_req_args, "c");
+  const char *chgroup = http_arg_get(&hc->hc_req_args, "g");
+  const char *channel = http_arg_get(&hc->hc_req_args, "ch");
+  const char *ar_name = http_arg_get(&hc->hc_req_args, "ar_name");
+  const char *ar_prio = http_arg_get(&hc->hc_req_args, "ar_prio");

  if(title   != NULL && *title == 0)               title   = NULL;
  if(content != NULL && !strcmp(content, "-All-")) content = NULL;
@ -1940,7 +1940,7 @@ page_search(http_connection_t *hc, const char *remain, void *opaque)
  s_tcg = chgroup ? channel_group_find(chgroup, 0)          : NULL;
  s_ch  = channel ? channel_find(channel, 0, NULL)          : NULL;

-  if(http_arg_get(&hc->hc_url_args, "ar_create")) {
+  if(http_arg_get(&hc->hc_req_args, "ar_create")) {
    /* Create autorecording */

    
--- a/http.c
+++ b/http.c
@ -50,6 +50,7 @@ static LIST_HEAD(, http_path) http_paths;

 static struct strtab HTTP_cmdtab[] = {
  { "GET",        HTTP_CMD_GET },
+  { "POST",       HTTP_CMD_POST },
  { "DESCRIBE",   RTSP_CMD_DESCRIBE },
  { "OPTIONS",    RTSP_CMD_OPTIONS },
  { "SETUP",      RTSP_CMD_SETUP },
@ -170,7 +171,7 @@ http_output_reply_header(http_connection_t *hc, int rc, int maxage)

    tm = gmtime_r(&t, &tm0);
    http_printf(hc, 
-		"Last-Modified: %s, %d %s %d %d:%d:%d GMT\r\n",
+		"Last-Modified: %s, %02d %s %d %02d:%02d:%02d GMT\r\n",
 		cachedays[tm->tm_wday],	tm->tm_year + 1900,
 		cachemonths[tm->tm_mon], tm->tm_mday,
 		tm->tm_hour, tm->tm_min, tm->tm_sec);
@ -179,7 +180,7 @@ http_output_reply_header(http_connection_t *hc, int rc, int maxage)

    tm = gmtime_r(&t, &tm0);
    http_printf(hc, 
-		"Expires: %s, %d %s %d %d:%d:%d GMT\r\n",
+		"Expires: %s, %02d %s %d %02d:%02d:%02d GMT\r\n",
 		cachedays[tm->tm_wday],	tm->tm_year + 1900,
 		cachemonths[tm->tm_mon], tm->tm_mday,
 		tm->tm_hour, tm->tm_min, tm->tm_sec);
@ -245,6 +246,29 @@ http_output_queue(http_connection_t *hc, tcp_queue_t *tq, const char *content,
  tcp_output_queue(&hc->hc_tcp_session, NULL, tq);
 }

+/**
+ * Send an HTTP OK and post data from a tcp queue
+ */
+static void
+http_output_queue_encoding(http_connection_t *hc, tcp_queue_t *tq,
+			   const char *content, int maxage,
+			   const char *encoding)
+{
+  http_output_reply_header(hc, 200, maxage);
+
+  if(hc->hc_version >= HTTP_VERSION_1_0) {
+    http_printf(hc, 
+		"Content-Encoding: %s\r\n"
+		"Content-Type: %s\r\n"
+		"Content-Length: %d\r\n"
+		"\r\n",
+		encoding, content, tq->tq_depth);
+  }
+
+  tcp_output_queue(&hc->hc_tcp_session, NULL, tq);
+}
+
+
 /**
 * Send an HTTP REDIRECT
 */
@ -298,6 +322,114 @@ http_cmd_get(http_connection_t *hc)
 }


+/**
+ * Check if a HTTP POST is fully received, and if so, continue processing
+ */
+static void
+http_post_check(http_connection_t *hc)
+{
+  http_path_t *hp;
+  char *remain, *args, *v, *argv[2];
+  int err, n;
+
+  if(hc->hc_post_ptr != hc->hc_post_len)
+    return;
+
+  hc->hc_state = HTTP_CON_WAIT_REQUEST;
+
+  /* Parse content-type */
+  v = http_arg_get(&hc->hc_args, "Content-Type");
+  if(v == NULL) {
+    http_error(hc, HTTP_STATUS_BAD_REQUEST);
+    return;
+  }
+
+  n = http_tokenize(v, argv, 2, ';');
+  if(n == 0) {
+    http_error(hc, HTTP_STATUS_BAD_REQUEST);
+    return;
+  }
+
+  if(!strcmp(argv[0], "application/x-www-form-urlencoded"))
+    http_parse_get_args(hc, hc->hc_post_data);
+
+  hp = http_resolve(hc, &remain, &args);
+  if(hp == NULL) {
+    http_error(hc, HTTP_STATUS_NOT_FOUND);
+    return;
+  }
+
+  err = hp->hp_callback(hc, remain, hp->hp_opaque);
+  if(err)
+    http_error(hc, err);
+}
+
+
+
+
+
+/**
+ * HTTP POST
+ */
+static void
+http_cmd_post(http_connection_t *hc)
+{
+  char *v;
+
+  /* Set keep-alive status */
+  v = http_arg_get(&hc->hc_args, "Content-Length");
+  if(v == NULL) {
+    /* No content length in POST, make us disconnect */
+    hc->hc_keep_alive = 0;
+    return;
+  }
+  
+  hc->hc_post_len = atoi(v);
+  if(hc->hc_post_len > 16 * 1024 * 1024) {
+    /* Bail out if POST data > 16 Mb */
+    hc->hc_keep_alive = 0;
+    return;
+  }
+
+  hc->hc_state = HTTP_CON_POST_DATA;
+
+  /* Allocate space for data, we add a terminating null char to ease
+     string processing on the content */
+
+  hc->hc_post_data = malloc(hc->hc_post_len + 1);
+  hc->hc_post_data[hc->hc_post_len] = 0;
+
+  hc->hc_post_ptr  = 0;
+
+  /* We need to drain the line parser of any excess data */
+
+  hc->hc_post_ptr = tcp_line_drain(&hc->hc_tcp_session, hc->hc_post_data,
+				   hc->hc_post_len);
+
+  http_post_check(hc);
+}
+
+
+/**
+ * Read POST data directly from socket
+ */
+static void
+http_consume_post_data(http_connection_t *hc)
+{
+  tcp_session_t *tcp = &hc->hc_tcp_session;
+  int togo = hc->hc_post_len - hc->hc_post_ptr;
+  int r;
+
+  r = read(tcp->tcp_fd, hc->hc_post_data + hc->hc_post_ptr, togo);
+  if(r < 1) {
+     tcp_disconnect(tcp, r == 0 ? ECONNRESET : errno);
+     return;
+  }
+
+  hc->hc_post_ptr += r;
+  http_post_check(hc);
+}
+
 /**
 * Process a HTTP request
 */
@ -311,6 +443,9 @@ http_process_request(http_connection_t *hc)
  case HTTP_CMD_GET:
    http_cmd_get(hc); 
    break;
+  case HTTP_CMD_POST:
+    http_cmd_post(hc); 
+    break;
  }
 }

@ -360,6 +495,12 @@ process_request(http_connection_t *hc)
    break;
  }

+  free(hc->hc_username);
+  hc->hc_username = NULL;
+
+  free(hc->hc_password);
+  hc->hc_password = NULL;
+
  /* Extract authorization */
  if((v = http_arg_get(&hc->hc_args, "Authorization")) != NULL) {
    if((n = http_tokenize(v, argv, 2, -1)) == 2) {
@ -387,18 +528,7 @@ process_request(http_connection_t *hc)
    break;
  }

-
-  /* Clean up */
-
-  free(hc->hc_username);
-  hc->hc_username = NULL;
-
-  free(hc->hc_password);
-  hc->hc_password = NULL;
-
-  if(hc->hc_keep_alive == 0)
-    return -1;
-  return 0;
+  return hc->hc_keep_alive == 0 ? -1 : 0;
 }


@ -413,12 +543,17 @@ http_con_parse(void *aux, char *buf)
  int n, v;
  char *argv[3], *c;

-  //  printf("HTTP INPUT: %s\n", buf);
+  // printf("HTTP INPUT: %s\n", buf);

  switch(hc->hc_state) {
  case HTTP_CON_WAIT_REQUEST:
+    if(hc->hc_post_data != NULL) {
+      free(hc->hc_post_data);
+      hc->hc_post_data = NULL;
+    }
+
    http_arg_flush(&hc->hc_args);
-    http_arg_flush(&hc->hc_url_args);
+    http_arg_flush(&hc->hc_req_args);
    if(hc->hc_url != NULL) {
      free(hc->hc_url);
      hc->hc_url = NULL;
@ -465,6 +600,9 @@ http_con_parse(void *aux, char *buf)
    http_arg_set(&hc->hc_args, argv[0], argv[1]);
    break;

+  case HTTP_CON_POST_DATA:
+    abort();
+
  case HTTP_CON_END:
    break;
  }
@ -478,9 +616,13 @@ http_con_parse(void *aux, char *buf)
 static void
 http_disconnect(http_connection_t *hc)
 {
+  free(hc->hc_post_data);
+  free(hc->hc_username);
+  free(hc->hc_password);
+
  rtsp_disconncet(hc);
  http_arg_flush(&hc->hc_args);
-  http_arg_flush(&hc->hc_url_args);
+  http_arg_flush(&hc->hc_req_args);
  free(hc->hc_url);
 }

@ -495,6 +637,8 @@ http_tcp_callback(tcpevent_t event, void *tcpsession)

  switch(event) {
  case TCP_CONNECT:
+    TAILQ_INIT(&hc->hc_args);
+    TAILQ_INIT(&hc->hc_req_args);
    break;

  case TCP_DISCONNECT:
@ -502,7 +646,11 @@ http_tcp_callback(tcpevent_t event, void *tcpsession)
    break;

  case TCP_INPUT:
-    tcp_line_read(&hc->hc_tcp_session, http_con_parse);
+
+    if(hc->hc_state == HTTP_CON_POST_DATA)
+      http_consume_post_data(hc);
+    else
+      tcp_line_read(&hc->hc_tcp_session, http_con_parse);
    break;
  }
 }
@ -537,8 +685,8 @@ void
 http_arg_flush(struct http_arg_list *list)
 {
  http_arg_t *ra;
-  while((ra = LIST_FIRST(list)) != NULL) {
-    LIST_REMOVE(ra, link);
+  while((ra = TAILQ_FIRST(list)) != NULL) {
+    TAILQ_REMOVE(list, ra, link);
    free(ra->key);
    free(ra->val);
    free(ra);
@ -553,7 +701,7 @@ char *
 http_arg_get(struct http_arg_list *list, const char *name)
 {
  http_arg_t *ra;
-  LIST_FOREACH(ra, list, link)
+  TAILQ_FOREACH(ra, list, link)
    if(!strcasecmp(ra->key, name))
      return ra->val;
  return NULL;
@ -568,13 +716,13 @@ http_arg_set(struct http_arg_list *list, char *key, char *val)
 {
  http_arg_t *ra;

-  LIST_FOREACH(ra, list, link)
+  TAILQ_FOREACH(ra, list, link)
    if(!strcasecmp(ra->key, key))
      break;

  if(ra == NULL) {
    ra = malloc(sizeof(http_arg_t));
-    LIST_INSERT_HEAD(list, ra, link);
+    TAILQ_INSERT_TAIL(list, ra, link);
    ra->key = strdup(key);
  } else {
    free(ra->val);
@ -702,6 +850,43 @@ http_parse_get_args(http_connection_t *hc, char *args)

    http_deescape(k);
    http_deescape(v);
-    http_arg_set(&hc->hc_url_args, k, v);
+    printf("%s = %s\n", k, v);
+    http_arg_set(&hc->hc_req_args, k, v);
  }
 }
+
+/**
+ * HTTP embedded resource
+ */
+typedef struct http_resource {
+  const void *data;
+  size_t len;
+  const char *content;
+  const char *encoding;
+} http_resource_t;
+
+static int
+deliver_resource(http_connection_t *hc, const char *remain, void *opaque)
+{
+  http_resource_t *hres = opaque;
+  tcp_queue_t tq;
+
+  tcp_init_queue(&tq, -1);
+  tcp_qput(&tq, hres->data, hres->len);
+  http_output_queue_encoding(hc, &tq, hres->content, 15, hres->encoding);
+  return 0;
+}
+
+void
+http_resource_add(const char *path, const void *ptr, size_t len, 
+		  const char *content, const char *encoding)
+{
+  http_resource_t *hres = malloc(sizeof(http_resource_t));
+
+  hres->data     = ptr;
+  hres->len      = len;
+  hres->content  = content;
+  hres->encoding = encoding;
+
+  http_path_add(path, hres, deliver_resource);
+}
--- a/http.h
+++ b/http.h
@ -33,10 +33,10 @@ LIST_HEAD(rtsp_session_head, rtsp_session);

 #define http_printf(x, fmt...) tcp_printf(&(x)->hc_tcp_session, fmt)

-LIST_HEAD(http_arg_list, http_arg);
+TAILQ_HEAD(http_arg_list, http_arg);

 typedef struct http_arg {
-  LIST_ENTRY(http_arg) link;
+  TAILQ_ENTRY(http_arg) link;
  char *key;
  char *val;
 } http_arg_t;
@ -49,16 +49,18 @@ typedef struct http_connection {

  struct http_arg_list hc_args;

-  struct http_arg_list hc_url_args;
+  struct http_arg_list hc_req_args; /* Argumets from GET or POST request */

  enum {
    HTTP_CON_WAIT_REQUEST,
    HTTP_CON_READ_HEADER,
    HTTP_CON_END,
+    HTTP_CON_POST_DATA,
  } hc_state;

  enum {
    HTTP_CMD_GET,
+    HTTP_CMD_POST,
    RTSP_CMD_DESCRIBE,
    RTSP_CMD_OPTIONS,
    RTSP_CMD_SETUP,
@ -81,6 +83,12 @@ typedef struct http_connection {

  struct config_head *hc_user_config;

+  /* Support for HTTP POST */
+  
+  char *hc_post_data;
+  unsigned int hc_post_len;
+  unsigned int hc_post_ptr;
+
 } http_connection_t;


@ -116,4 +124,7 @@ typedef struct http_path {
 http_path_t *http_path_add(const char *path, void *opaque,
 			   http_callback_t *callback);

+void http_resource_add(const char *path, const void *ptr, size_t len, 
+		       const char *content, const char *encoding);
+
 #endif /* HTTP_H_ */
--- a/main.c
+++ b/main.c
@ -59,6 +59,7 @@
 #include "spawn.h"
 #include "ffmuxer.h"
 #include "xbmsp.h"
+#include "ajaxui/ajaxui.h"

 #include <libhts/htsparachute.h>

@ -121,12 +122,16 @@ main(int argc, char **argv)
  int logfacility = LOG_DAEMON;
  int disable_dvb = 0;
  int p;
+  int doajax = 0;
  char buf[400];

  signal(SIGPIPE, handle_sigpipe);

-  while((c = getopt(argc, argv, "c:fu:g:d")) != -1) {
+  while((c = getopt(argc, argv, "c:fu:g:dA")) != -1) {
    switch(c) {
+    case 'A':
+      doajax = 1;
+      break;
    case 'd':
      disable_dvb = 1;
      break;
@ -229,6 +234,8 @@ main(int argc, char **argv)
  subscriptions_init();

  htmlui_start();
+  if(doajax)
+    ajaxui_start();

  avgen_init();

--- a/tcp.c
+++ b/tcp.c
@ -37,12 +37,11 @@ static void tcp_client_reconnect_timeout(void *aux, int64_t now);


 /*
- *  printf data on a TCP queue
+ *  vprintf data on a TCP queue
 */
 void
-tcp_qprintf(tcp_queue_t *tq, const char *fmt, ...)
+tcp_qvprintf(tcp_queue_t *tq, const char *fmt, va_list ap)
 {
-  va_list ap;
  char buf[5000];
  void *out;
  tcp_data_t *td;
@ -50,10 +49,7 @@ tcp_qprintf(tcp_queue_t *tq, const char *fmt, ...)
  td = malloc(sizeof(tcp_data_t));
  td->td_offset = 0;

-  va_start(ap, fmt);
  td->td_datalen = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-
  out = malloc(td->td_datalen);
  memcpy(out, buf, td->td_datalen);
  td->td_data = out;
@ -61,6 +57,19 @@ tcp_qprintf(tcp_queue_t *tq, const char *fmt, ...)
  tq->tq_depth += td->td_datalen;
 }

+
+/*
+ *  printf data on a TCP queue
+ */
+void
+tcp_qprintf(tcp_queue_t *tq, const char *fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  tcp_qvprintf(tq, fmt, ap);
+  va_end(ap);
+}
+
 /*
 *  Put data on a TCP queue
 */
@ -102,6 +111,26 @@ tcp_printf(tcp_session_t *ses, const char *fmt, ...)
  tcp_send_msg(ses, &ses->tcp_q_hi, out, l);
 }

+/**
+ * Read max 'n' bytes of data from line parser. Used to consume binary data
+ * for mixed line / binary protocols (HTTP)
+ *
+ * Returns bytes read
+ */
+int
+tcp_line_drain(tcp_session_t *ses, void *buf, int n)
+{
+  if(n > ses->tcp_input_buf_ptr)
+    n = ses->tcp_input_buf_ptr;
+
+  memcpy(buf, ses->tcp_input_buf, n);
+
+  memmove(ses->tcp_input_buf, ses->tcp_input_buf + n, 
+	  sizeof(ses->tcp_input_buf) - n);
+  ses->tcp_input_buf_ptr -= n;
+  return n;
+}
+
 /**
 * Line parser for TCP based connections. Note that callback cannot
 * destroy the session on its own. It must return an error to perform
--- a/tcp.h
+++ b/tcp.h
@ -95,6 +95,8 @@ void tcp_create_server(int port, size_t session_size, const char *name,

 void tcp_line_read(tcp_session_t *ses, tcp_line_input_t *callback);

+int tcp_line_drain(tcp_session_t *ses, void *buf, int n);
+
 #define tcp_logname(ses) ((ses)->tcp_peer_txt)

 int tcp_send_msg(tcp_session_t *ses, tcp_queue_t *tq, const void *data,
@ -104,6 +106,8 @@ void tcp_printf(tcp_session_t *ses, const char *fmt, ...);

 void tcp_qprintf(tcp_queue_t *tq, const char *fmt, ...);

+void tcp_qvprintf(tcp_queue_t *tq, const char *fmt, va_list ap);
+
 void tcp_qput(tcp_queue_t *tq, const uint8_t *buf, size_t len);

 void tcp_output_queue(tcp_session_t *ses, tcp_queue_t *dst, tcp_queue_t *src);
--- a/tvhead.h
+++ b/tvhead.h
@ -98,7 +98,6 @@ extern struct th_channel_group_queue all_channel_groups;
 extern struct pvr_rec_list pvrr_global_list;
 extern struct th_subscription_list subscriptions;

-
 struct th_transport;
 struct th_stream;

@ -864,6 +863,7 @@ extern const char *settings_dir;
 FILE *settings_open_for_write(const char *name);
 FILE *settings_open_for_read(const char *name);
 extern const char *sys_warning;
+extern th_channel_group_t *defgroup;

 struct config_head *user_resolve_to_config(const char *username, 
 					   const char *password);