added subnets of CHILD_SAs to xml interface
authorMartin Willi <martin@strongswan.org>
Fri, 14 Sep 2007 14:07:30 +0000 (14:07 -0000)
committerMartin Willi <martin@strongswan.org>
Fri, 14 Sep 2007 14:07:30 +0000 (14:07 -0000)
a first design of Managers IKE_SA list page

36 files changed:
src/charon/control/interfaces/xml_interface.c
src/manager/Makefile.am
src/manager/controller/auth_controller.c
src/manager/controller/gateway_controller.c
src/manager/controller/static_controller.c [deleted file]
src/manager/controller/static_controller.h [deleted file]
src/manager/controller/status_controller.c
src/manager/lib/controller.h
src/manager/lib/dispatcher.c
src/manager/lib/dispatcher.h
src/manager/lib/response.c
src/manager/lib/response.h
src/manager/lib/session.c
src/manager/lib/session.h
src/manager/lib/template.c
src/manager/lib/template.h
src/manager/main.c
src/manager/templates/auth/login.cs
src/manager/templates/auth/logout.cs [deleted file]
src/manager/templates/footer.cs
src/manager/templates/gateway/list.cs
src/manager/templates/header.cs
src/manager/templates/static/client-left.png [new file with mode: 0644]
src/manager/templates/static/client-right.png [new file with mode: 0644]
src/manager/templates/static/gateway-left.png [new file with mode: 0644]
src/manager/templates/static/gateway-right.png [new file with mode: 0644]
src/manager/templates/static/jquery.js [new file with mode: 0644]
src/manager/templates/static/nat.png [new file with mode: 0644]
src/manager/templates/static/pipe-bad.png [new file with mode: 0644]
src/manager/templates/static/pipe-good.png [new file with mode: 0644]
src/manager/templates/static/pipe.png [new file with mode: 0644]
src/manager/templates/static/router.png [new file with mode: 0644]
src/manager/templates/static/script.js [new file with mode: 0644]
src/manager/templates/static/strongswan.png [new file with mode: 0644]
src/manager/templates/static/style.css
src/manager/templates/status/ikesalist.cs

index 7710ae1..3946611 100644 (file)
@@ -146,6 +146,41 @@ static void write_address(xmlTextWriterPtr writer, char *element, host_t *host)
 }
 
 /**
+ * write a list of traffic_selector_t
+ */
+static void write_ts(xmlTextWriterPtr writer, linked_list_t *list)
+{
+       iterator_t *iterator;
+       traffic_selector_t *ts;
+       
+       iterator = list->create_iterator(list, TRUE);
+       while (iterator->iterate(iterator, (void**)&ts))
+       {
+               xmlTextWriterStartElement(writer, "net");
+               xmlTextWriterWriteAttribute(writer, "type",
+                                               ts->get_type(ts) == TS_IPV4_ADDR_RANGE ? "ipv4" : "ipv6");
+               xmlTextWriterWriteFormatString(writer, "%R", ts);
+               xmlTextWriterEndElement(writer);
+       }
+       iterator->destroy(iterator);
+}
+
+/**
+ * write a child_sa_t 
+ */
+static void write_child(xmlTextWriterPtr writer, child_sa_t *child)
+{
+       xmlTextWriterStartElement(writer, "childsa");
+       xmlTextWriterStartElement(writer, "local");
+       write_ts(writer, child->get_traffic_selectors(child, TRUE));
+       xmlTextWriterEndElement(writer);
+       xmlTextWriterStartElement(writer, "remote");
+       write_ts(writer, child->get_traffic_selectors(child, FALSE));
+       xmlTextWriterEndElement(writer);
+       xmlTextWriterEndElement(writer);
+}
+
+/**
  * process a ikesalist query request message
  */
 static void request_query_ikesa(xmlTextReaderPtr reader, xmlTextWriterPtr writer)
@@ -214,7 +249,7 @@ static void request_query_ikesa(xmlTextReaderPtr reader, xmlTextWriterPtr writer
                children = ike_sa->create_child_sa_iterator(ike_sa);
                while (children->iterate(children, (void**)&child_sa))
                {
-                       /* TODO: Children */
+                       write_child(writer, child_sa);
                }
                children->destroy(children);
                /* </childsalist> */
index 686c312..7a8ffe0 100644 (file)
@@ -3,7 +3,6 @@ ipsec_PROGRAMS = manager.fcgi
 manager_fcgi_SOURCES = \
 main.c manager.c manager.h gateway.h gateway.c database.h database.c \
 controller/auth_controller.c controller/auth_controller.h \
-controller/static_controller.c controller/static_controller.h \
 controller/status_controller.c controller/status_controller.h \
 controller/gateway_controller.c controller/gateway_controller.h
 
@@ -21,6 +20,7 @@ lib/template.h lib/template.c lib/dict.h lib/dict.c lib/xml.h lib/xml.c lib/enum
 libappserv_la_LDFLAGS = -lstrongswan -lfcgi -lpthread -lneo_cs -lneo_utl ${xml_LIBS}
 
 INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/manager/lib -I/usr/include/ClearSilver ${xml_CFLAGS}
+AM_CFLAGS = -rdynamic -DIPSECDIR=\"${ipsecdir}\" -DIPSEC_PIDDIR=\"${piddir}\"
 
 ipsec_DATA = sqlite.db
 
@@ -29,7 +29,7 @@ ipsec_templatesdir = ${ipsecdir}/templates
 ipsec_templates_DATA = templates/header.cs templates/footer.cs
 
 ipsec_templates_authdir = ${ipsec_templatesdir}/auth
-ipsec_templates_auth_DATA = templates/auth/login.cs templates/auth/logout.cs
+ipsec_templates_auth_DATA = templates/auth/login.cs
 
 ipsec_templates_gatewaydir = ${ipsec_templatesdir}/gateway
 ipsec_templates_gateway_DATA = templates/gateway/list.cs
@@ -37,6 +37,9 @@ ipsec_templates_gateway_DATA = templates/gateway/list.cs
 ipsec_templates_statusdir = ${ipsec_templatesdir}/status
 ipsec_templates_status_DATA = templates/status/ikesalist.cs
 
+ipsec_templates_staticdir = ${ipsec_templatesdir}/static
+ipsec_templates_static_DATA = templates/static/style.css templates/static/script.js
+
 EXTRA_DIST = sqlite.db templates/header.cs templates/footer.cs \
 templates/auth/login.cs templates/auth/logout.cs \
 templates/gateway/list.cs templates/status/ikesalist.cs
index 1026b5e..68332da 100644 (file)
@@ -51,6 +51,7 @@ static void login(private_auth_controller_t *this,
 {
        template_t *t = template_create("templates/auth/login.cs");
        t->set(t, "action", "check");
+       t->set(t, "title", "Login");
        t->render(t, response);
        t->destroy(t);
 }
@@ -65,7 +66,7 @@ static void check(private_auth_controller_t *this,
        if (username && password &&
                this->manager->login(this->manager, username, password))
        {
-               response->redirect(response, "status/test");
+               response->redirect(response, "status/ikesalist");
        }
        else
        {
@@ -89,14 +90,27 @@ static char* get_name(private_auth_controller_t *this)
 }
 
 /**
- * Implementation of controller_t.get_handler
+ * Implementation of controller_t.handle
  */
-static controller_handler_t get_handler(private_auth_controller_t *this, char *name)
+static void handle(private_auth_controller_t *this,
+                                  request_t *request, response_t *response, char *action)
 {
-       if (streq(name, "login")) return (controller_handler_t)login;
-       if (streq(name, "check")) return (controller_handler_t)check;
-       if (streq(name, "logout")) return (controller_handler_t)logout;
-       return NULL;
+       if (action)
+       {
+               if (streq(action, "login"))
+               {
+                       return login(this, request, response);
+               }
+               else if (streq(action, "check")) 
+               {
+                       return check(this, request, response);
+               }
+               else if (streq(action, "logout")) 
+               {
+                       return logout(this, request, response);
+               }
+       }
+       response->redirect(response, "auth/login");
 }
 
 /**
@@ -115,7 +129,7 @@ controller_t *auth_controller_create(context_t *context, void *param)
        private_auth_controller_t *this = malloc_thing(private_auth_controller_t);
 
        this->public.controller.get_name = (char*(*)(controller_t*))get_name;
-       this->public.controller.get_handler = (controller_handler_t(*)(controller_t*,char*))get_handler;
+       this->public.controller.handle = (void(*)(controller_t*,request_t*,response_t*,char*,char*,char*,char*,char*))handle;
        this->public.controller.destroy = (void(*)(controller_t*))destroy;
        
        this->manager = (manager_t*)context;
index 3257621..1ebb511 100644 (file)
@@ -72,6 +72,7 @@ static void list(private_gateway_controller_t *this,
        }
        enumerator->destroy(enumerator);
        t->set(t, "action", "select");
+       t->set(t, "title", "Choose gateway");
        t->render(t, response);
        t->destroy(t);
 }
@@ -90,16 +91,7 @@ static void _select(private_gateway_controller_t *this,
                        return;
                }
        }
-       response->printf(response, "selecting dings failed: %s", id);
-}
-
-/**
- * redirect to authentication login
- */
-static void login(private_gateway_controller_t *this,
-                                 request_t *request, response_t *response)
-{
-       response->redirect(response, "auth/login");
+       response->printf(response, "selecting gateway failed: %s", id);
 }
 
 /**
@@ -111,16 +103,30 @@ static char* get_name(private_gateway_controller_t *this)
 }
 
 /**
- * Implementation of controller_t.get_handler
+ * Implementation of controller_t.handle
  */
-static controller_handler_t get_handler(private_gateway_controller_t *this, char *name)
+static void handle(private_gateway_controller_t *this,
+                                  request_t *request, response_t *response, char *action)
 {
-       if (!this->manager->logged_in(this->manager)) return (controller_handler_t)login;
-       if (streq(name, "list")) return (controller_handler_t)list;
-       if (streq(name, "select")) return (controller_handler_t)_select;
-       return NULL;
+       if (!this->manager->logged_in(this->manager))
+       {
+               return response->redirect(response, "auth/login");
+       }
+       if (action)
+       {
+               if (streq(action, "list"))
+               {
+                       return list(this, request, response);
+               }
+               else if (streq(action, "select")) 
+               {
+                       return _select(this, request, response);
+               }
+       }
+       response->redirect(response, "gateway/list");
 }
 
+
 /**
  * Implementation of controller_t.destroy
  */
@@ -137,7 +143,7 @@ controller_t *gateway_controller_create(context_t *context, void *param)
        private_gateway_controller_t *this = malloc_thing(private_gateway_controller_t);
 
        this->public.controller.get_name = (char*(*)(controller_t*))get_name;
-       this->public.controller.get_handler = (controller_handler_t(*)(controller_t*,char*))get_handler;
+       this->public.controller.handle = (void(*)(controller_t*,request_t*,response_t*,char*,char*,char*,char*,char*))handle;
        this->public.controller.destroy = (void(*)(controller_t*))destroy;
        
        this->manager = (manager_t*)context;
diff --git a/src/manager/controller/static_controller.c b/src/manager/controller/static_controller.c
deleted file mode 100644 (file)
index 8968c87..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file static_controller.c
- *
- * @brief Implementation of static_controller_t.
- *
- */
-
-/*
- * Copyright (C) 2007 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * 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 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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.
- */
-
-#include "static_controller.h"
-#include "../manager.h"
-#include "../gateway.h"
-
-#include <template.h>
-
-#include <library.h>
-
-
-typedef struct private_static_controller_t private_static_controller_t;
-
-/**
- * private data of the task manager
- */
-struct private_static_controller_t {
-
-       /**
-        * public functions
-        */
-       static_controller_t public;
-       
-       /**
-        * manager instance
-        */
-       manager_t *manager;
-       
-};
-
-/**
- * serve style.css
- */
-static void style(private_static_controller_t *this,
-                                 request_t *request, response_t *response)
-{
-       template_t *t = template_create("templates/static/style.css");
-       response->set_content_type(response, "text/css");
-       t->render(t, response);
-       t->destroy(t);
-}
-
-/**
- * Implementation of controller_t.get_name
- */
-static char* get_name(private_static_controller_t *this)
-{
-       return "static";
-}
-
-/**
- * Implementation of controller_t.get_handler
- */
-static controller_handler_t get_handler(private_static_controller_t *this, char *name)
-{
-       if (streq(name, "style.css")) return (controller_handler_t)style;
-       return NULL;
-}
-
-/**
- * Implementation of controller_t.destroy
- */
-static void destroy(private_static_controller_t *this)
-{
-       free(this);
-}
-
-/*
- * see header file
- */
-controller_t *static_controller_create(context_t *context, void *param)
-{
-       private_static_controller_t *this = malloc_thing(private_static_controller_t);
-
-       this->public.controller.get_name = (char*(*)(controller_t*))get_name;
-       this->public.controller.get_handler = (controller_handler_t(*)(controller_t*,char*))get_handler;
-       this->public.controller.destroy = (void(*)(controller_t*))destroy;
-       
-       this->manager = (manager_t*)context;
-       
-       return &this->public.controller;
-}
-
diff --git a/src/manager/controller/static_controller.h b/src/manager/controller/static_controller.h
deleted file mode 100644 (file)
index 8181a7a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file static_controller.h
- * 
- * @brief Interface of static_controller_t.
- * 
- */
-
-/*
- * Copyright (C) 2007 Martin Willi
- * Hochschule fuer Technik Rapperswil
- *
- * 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 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * 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.
- */
-
-#ifndef STATIC_CONTROLLER_H_
-#define STATIC_CONTROLLER_H_
-
-
-#include <controller.h>
-
-typedef struct static_controller_t static_controller_t;
-
-/**
- * @brief Static controller, serves static files.
- */
-struct static_controller_t {
-
-       /**
-        * Implements controller_t interface.
-        */
-       controller_t controller;
-};
-
-/**
- * @brief Create a static_controller controller instance.
- */
-controller_t *static_controller_create(context_t *context, void *param);
-
-#endif /* STATIC_CONTROLLER_H_ */
index e3abda0..7071176 100644 (file)
@@ -53,9 +53,9 @@ static void ikesalist(private_status_controller_t *this,
 {
        char *str;
        gateway_t *gateway;
-       xml_t *doc, *node;
-       enumerator_t *e1, *e2, *e3, *e4, *e5, *e6;
-       char *name, *value, *id, *section;
+       xml_t *node;
+       enumerator_t *e1, *e2, *e3, *e4, *e5, *e6, *e7, *e8;
+       char *name, *value, *id = "", *section;
 
        gateway = this->manager->select_gateway(this->manager, 0);
        str = gateway->request(gateway, "<message type=\"request\" id=\"1\">"
@@ -69,8 +69,8 @@ static void ikesalist(private_status_controller_t *this,
                return;
        }
        
-       doc = xml_create(str);
-       if (doc == NULL)
+       node = xml_create(str);
+       if (node == NULL)
        {
                response->printf(response, "parsing XML failed");
                return;
@@ -78,7 +78,7 @@ static void ikesalist(private_status_controller_t *this,
        
        template_t *t = template_create("templates/status/ikesalist.cs");
 
-       e1 = doc->children(doc);
+       e1 = node->children(node);
        while (e1->enumerate(e1, &node, &name, &value))
        {
                if (streq(name, "message"))
@@ -116,6 +116,33 @@ static void ikesalist(private_status_controller_t *this,
                                                                                        }
                                                                                        e6->destroy(e6);
                                                                                }
+                                                                               else if (streq(name, "childsalist"))
+                                                                               {
+                                                                                       e6 = node->children(node);
+                                                                                       while (e6->enumerate(e6, &node, &name, &value))
+                                                                                       {
+                                                                                               if (streq(name, "childsa"))
+                                                                                               {
+                                                                                                       e7 = node->children(node);
+                                                                                                       while (e7->enumerate(e7, &node, &name, &value))
+                                                                                                       {
+                                                                                                               if (streq(name, "local") ||
+                                                                                                                       streq(name, "remote"))
+                                                                                                               {
+                                                                                                                       section = name;
+                                                                                                                       e8 = node->children(node);
+                                                                                                                       while (e8->enumerate(e8, &node, &name, &value))
+                                                                                                                       {
+                                                                                                                               t->setf(t, "ikesas.%s.childsas.%s.%s=%s", id, section, name, value);
+                                                                                                                       }
+                                                                                                                       e8->destroy(e8);
+                                                                                                               }
+                                                                                                       }
+                                                                                                       e7->destroy(e7);
+                                                                                               }
+                                                                                       }
+                                                                                       e6->destroy(e6);
+                                                                               }
                                                                                else
                                                                                {
                                                                                        t->setf(t, "ikesas.%s.%s=%s", id, name, value);
@@ -135,30 +162,13 @@ static void ikesalist(private_status_controller_t *this,
        }
        e1->destroy(e1);
 
+       t->set(t, "title", "IKE SA overview");
        t->render(t, response);
        t->destroy(t); 
        free(str);
 }
 
 /**
- * redirect to authentication login
- */
-static void login(private_status_controller_t *this,
-                                 request_t *request, response_t *response)
-{
-       response->redirect(response, "auth/login");
-}
-
-/**
- * redirect to gateway selection
- */
-static void selection(private_status_controller_t *this,
-                                         request_t *request, response_t *response)
-{
-       response->redirect(response, "gateway/list");
-}
-
-/**
  * Implementation of controller_t.get_name
  */
 static char* get_name(private_status_controller_t *this)
@@ -167,14 +177,27 @@ static char* get_name(private_status_controller_t *this)
 }
 
 /**
- * Implementation of controller_t.get_handler
+ * Implementation of controller_t.handle
  */
-static controller_handler_t get_handler(private_status_controller_t *this, char *name)
+static void handle(private_status_controller_t *this,
+                                  request_t *request, response_t *response, char *action)
 {
-       if (!this->manager->logged_in(this->manager)) return (controller_handler_t)login;
-       if (this->manager->select_gateway(this->manager, 0) == NULL) return (controller_handler_t)selection;
-       if (streq(name, "ikesalist")) return (controller_handler_t)ikesalist;
-       return NULL;
+       if (!this->manager->logged_in(this->manager))
+       {
+               return response->redirect(response, "auth/login");
+       }
+       if (this->manager->select_gateway(this->manager, 0) == NULL)
+       {
+               return response->redirect(response, "gateway/list");
+       }
+       if (action)
+       {
+               if (streq(action, "ikesalist"))
+               {
+                       return ikesalist(this, request, response);
+               }
+       }
+       return response->redirect(response, "status/ikesalist");
 }
 
 /**
@@ -193,7 +216,7 @@ controller_t *status_controller_create(context_t *context, void *param)
        private_status_controller_t *this = malloc_thing(private_status_controller_t);
 
        this->public.controller.get_name = (char*(*)(controller_t*))get_name;
-       this->public.controller.get_handler = (controller_handler_t(*)(controller_t*,char*))get_handler;
+       this->public.controller.handle = (void(*)(controller_t*,request_t*,response_t*,char*,char*,char*,char*,char*))handle;
        this->public.controller.destroy = (void(*)(controller_t*))destroy;
        
        this->manager = (manager_t*)context;
index 92968d8..fe61775 100644 (file)
@@ -59,13 +59,24 @@ struct controller_t {
        char* (*get_name)(controller_t *this);
        
        /**
-        * @brief Get the controllers handler function for an action name.
+        * @brief Handle a HTTP request for that controller.
         *
-        * @param name                  name of the action 
-        * @return                              controllers handler
+        * Request URLs are parsed in the form
+        * controller_name/p1/p2/p3/p4/p5 with a maximum of 5 parameters. Each
+        * parameter not found in the request URL is set to NULL.
+        *
+        * @param request               HTTP request
+        * @param response              HTTP response
+        * @param p1                    first parameter
+        * @param p2                    second parameter
+        * @param p3                    third parameter
+        * @param p4                    forth parameter
+        * @param p5                    fifth parameter
+        * @return
         */
-       controller_handler_t (*get_handler)(controller_t *this, char *name);
-       
+       void (*handle)(controller_t *this, request_t *request, response_t *response,
+                                  char *a1, char *a2, char *a3, char *a4, char *a5);
+               
        /**
         * @brief Destroy the controller instance.
         */
index 018122e..db99110 100644 (file)
@@ -146,6 +146,7 @@ static session_entry_t *session_entry_create(private_dispatcher_t *this)
        entry->waiting = 1;
        pthread_cond_init(&entry->cond, NULL);
        entry->session = load_session(this);
+       entry->used = time(NULL);
        
        return entry;
 }
@@ -208,16 +209,19 @@ static void dispatch(private_dispatcher_t *this)
                        iterator = this->sessions->create_iterator_locked(this->sessions, &this->mutex);
                        while (iterator->iterate(iterator, (void**)&current))
                        {
-                               if (sid && streq(current->session->get_sid(current->session), sid))
-                               {
-                                       found = current;
-                                       found->waiting++;
-                               }
-                               else if (current->waiting == 0 &&
-                                                current->used + this->timeout > now)
+                               /* check all sessions for timeout */
+                               if (current->waiting == 0 &&
+                                       current->used < now - this->timeout)
                                {
                                        iterator->remove(iterator);
                                        session_entry_destroy(current);
+                                       continue;
+                               }
+                               if (!found && sid &&
+                                       streq(current->session->get_sid(current->session), sid))
+                               {
+                                       found = current;
+                                       found->waiting++;
                                }
                        }
                        iterator->destroy(iterator);
@@ -319,7 +323,8 @@ static void destroy(private_dispatcher_t *this)
 /*
  * see header file
  */
-dispatcher_t *dispatcher_create(context_constructor_t constructor, void *param)
+dispatcher_t *dispatcher_create(int timeout, context_constructor_t constructor,
+                                                               void *param)
 {
        private_dispatcher_t *this = malloc_thing(private_dispatcher_t);
 
@@ -334,7 +339,7 @@ dispatcher_t *dispatcher_create(context_constructor_t constructor, void *param)
        pthread_mutex_init(&this->mutex, NULL);
        this->param = param;
     this->fd = 0;
-    this->timeout = 180;
+    this->timeout = timeout;
        
     FCGX_Init();
     
index 5119a1e..f46e5f3 100644 (file)
@@ -40,6 +40,9 @@ struct dispatcher_t {
        /**
         * @brief Register a controller to the dispatcher.
         *
+        * The first controller added serves as default controller. Client's
+        * get redirected to it if no other controller matches.
+        *
         * @param constructor   constructor function to the conntroller
         * @param param                 param to pass to constructor
         */
@@ -70,9 +73,11 @@ struct dispatcher_t {
  * The context constructor is invoked to create a session context for
  * each session.
  *
+ * @param timeout              session timeout
  * @param constructor  construction function for session context
  * @param param                        parameter to supply to context constructor
  */
-dispatcher_t *dispatcher_create(context_constructor_t constructor, void *param);
+dispatcher_t *dispatcher_create(int timeout,
+                                                               context_constructor_t constructor, void *param);
 
 #endif /* DISPATCHER_H_ */
index ae74ab6..be93379 100644 (file)
@@ -186,6 +186,15 @@ static void redirect(private_response_t *this, char *location)
                                 *location == '/' ? "" : "/", location);
 }
 
+
+/**
+ * Implementation of response_t.get_base.
+ */
+static char* get_base(private_response_t *this)
+{
+       return FCGX_GetParam("SCRIPT_NAME", this->req->envp);
+}
+
 /**
  * Implementation of response_t.destroy
  */
@@ -210,6 +219,7 @@ response_t *response_create(FCGX_Request *request)
        this->public.set_content_type = (void(*)(response_t*, char *type))set_content_type;
        this->public.add_cookie = (void(*)(response_t*, char *name, char *value))add_cookie;
        this->public.redirect = (void(*)(response_t*, char *location))redirect;
+       this->public.get_base = (char*(*)(response_t*))get_base;
        this->public.destroy = (void(*)(response_t*))destroy;
        
        this->req = request;
index e3be2cf..50d0eac 100644 (file)
@@ -78,6 +78,13 @@ struct response_t {
         * @param location              location to redirect to
         */
        void (*redirect)(response_t *this, char *location);
+       
+       /**
+        * @brief Get the base path of the application.
+        *
+        * @return                      base path
+        */
+       char* (*get_base)(response_t *this);
                
        /**
         * @brief Destroy a response_t.
index be25f27..7520c32 100644 (file)
@@ -91,7 +91,6 @@ static void process(private_session_t *this,
        char *pos, *path, *controller, *action;
        iterator_t *iterator;
        bool handled = FALSE;
-       controller_handler_t handler;
        controller_t *current;
        
        if (this->sid == NULL)
@@ -126,12 +125,8 @@ static void process(private_session_t *this,
        {
                if (streq(current->get_name(current), controller))
                {       
-                       handler = current->get_handler(current, action);
-                       if (handler)
-                       {
-                               handler(current, request, response);
-                               handled = TRUE;
-                       }
+                       current->handle(current, request, response, action, NULL, NULL, NULL, NULL);
+                       handled = TRUE;
                        break;
                }
        }
@@ -140,8 +135,15 @@ static void process(private_session_t *this,
        free(action);
        if (!handled)
        {
-               response->add_header(response, "Status", "400 Not Found");
-               response->printf(response, "<html><body><h1>Not Found</h1></body></html>\n");
+               if (this->controllers->get_first(this->controllers,
+                                                                                (void**)&current) == SUCCESS)
+               {
+                       response->redirect(response, current->get_name(current));
+               }
+               else
+               {
+                       response->printf(response, "No controllers loaded!\n");
+               }
        }
 }
 
index baaacd0..a66b1a8 100644 (file)
@@ -68,7 +68,7 @@ struct session_t {
 /**
  * @brief Create a session.
  *
- * @param context                      user defined session context instance
+ * @param context                              user defined session context instance
  */
 session_t *session_create(context_t *context);
 
index 3ae7c87..36a4d29 100644 (file)
@@ -66,6 +66,8 @@ static void render(private_template_t *this, response_t *response)
        NEOERR* err;
        CSPARSE *parse;
        
+       hdf_set_value(this->hdf, "base", response->get_base(response));
+       
        err = cs_init(&parse, this->hdf);
        if (!err)
        {
index 1a8c2f7..6e17177 100644 (file)
@@ -55,6 +55,10 @@ struct template_t {
        /**
         * @brief Render a template to a response object.
         *
+        * The render() function additionally sets a clearsilver variable "base"
+        * which points to the root of the web application and allows to point to
+        * other targets without to worry about path location.
+        *
         * @param response      response to render to
         * @return                      rendered template string
         */
index 5aec021..abfc529 100644 (file)
 
 #include "manager.h"
 #include "database.h"
-#include "controller/static_controller.h"
 #include "controller/auth_controller.h"
 #include "controller/status_controller.h"
 #include "controller/gateway_controller.h"
 
-#define DBFILE "/usr/local/libexec/ipsec/sqlite.db"
+#define DBFILE IPSECDIR "/sqlite.db"
+#define SESSION_TIMEOUT 180
+#define THREADS 10
 
 int main (int arc, char *argv[])
 {
@@ -44,14 +45,13 @@ int main (int arc, char *argv[])
                return 1;
        }
        
-       dispatcher = dispatcher_create((context_constructor_t)manager_create, database);
-       
-       dispatcher->add_controller(dispatcher, static_controller_create, NULL);
-       dispatcher->add_controller(dispatcher, auth_controller_create, NULL);
+       dispatcher = dispatcher_create(SESSION_TIMEOUT,
+                                                       (context_constructor_t)manager_create, database);
        dispatcher->add_controller(dispatcher, status_controller_create, NULL);
        dispatcher->add_controller(dispatcher, gateway_controller_create, NULL);
+       dispatcher->add_controller(dispatcher, auth_controller_create, NULL);
        
-       dispatcher->run(dispatcher, 10);
+       dispatcher->run(dispatcher, THREADS);
        
        dispatcher->waitsignal(dispatcher);
        
@@ -60,3 +60,4 @@ int main (int arc, char *argv[])
 
     return 0;
 }
+
index f84c630..49a8ec6 100644 (file)
@@ -1,15 +1,17 @@
 <?cs include:"templates/header.cs" ?>
+<div align="center">
 <form method="post" action="<?cs var:action ?>">
-  <table width="100%">
+  <table>
     <tr>
-      <td>Username</td><td><input type="text" name="username" value="" size="25" /></td>
+      <td>Username</td><td><input type="text" name="username" size="25" /></td>
     </tr>
     <tr>
-      <td>Password</td><td><input type="password" name="password" value="" size="25" /></td>
+      <td>Password</td><td><input type="password" name="password" size="25" /></td>
     </tr>
     <tr>
       <td/><td><input type="submit" value="Login"/></td>
     </tr>
 </table>
 </form>
+</div>
 <?cs include:"templates/footer.cs" ?>
diff --git a/src/manager/templates/auth/logout.cs b/src/manager/templates/auth/logout.cs
deleted file mode 100644 (file)
index e69de29..0000000
index b605728..db36019 100644 (file)
@@ -1,2 +1,4 @@
+      </div>    
+    </div>
   </body>
 </html>
index 5cc8603..b93364d 100644 (file)
@@ -1,4 +1,5 @@
 <?cs include:"templates/header.cs" ?>
+<div class="dialog">
 <form method="post" action="<?cs var:action ?>">
   <p>
     <select name="gateway" size="1">
@@ -10,4 +11,5 @@
     <input type="submit" value="Select"/>
   <p>
 </form>
+</div>
 <?cs include:"templates/footer.cs" ?>
index b417ef9..64a859a 100644 (file)
@@ -2,7 +2,23 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <link rel="stylesheet" type="text/css" href="static/stlye.css" />
-    <title>strongSwan management</title>
+    <title><?cs var:title ?> - strongSwan Manager</title>
+    <link rel="stylesheet" type="text/css" href="<?cs var:base ?>/static/style.css" />
+    <script type="text/javascript" src="<?cs var:base ?>/static/jquery.js" />
+    <script type="text/javascript" src="<?cs var:base ?>/static/script.js" />
   </head>
   <body>
+       <div class="fleft">
+      <a href="<?cs var:base ?>/status/ikesalist">
+        <img class="fleft" src="<?cs var:base ?>/static/strongswan.png"/>
+      </a>
+      <h1>strongSwan Manager</h1>
+         <h2><?cs var:title ?></h2>
+    </div>
+    <div class="menu">
+      | <a href="<?cs var:base ?>/gateway/list">Select Gateway</a>
+      | <a href="<?cs var:base ?>/auth/logout">Logout</a>
+    </div>
+    <hr class="cleft"/>
+    <div class="center">
+      <div class="content">
diff --git a/src/manager/templates/static/client-left.png b/src/manager/templates/static/client-left.png
new file mode 100644 (file)
index 0000000..ee4247d
Binary files /dev/null and b/src/manager/templates/static/client-left.png differ
diff --git a/src/manager/templates/static/client-right.png b/src/manager/templates/static/client-right.png
new file mode 100644 (file)
index 0000000..792aef6
Binary files /dev/null and b/src/manager/templates/static/client-right.png differ
diff --git a/src/manager/templates/static/gateway-left.png b/src/manager/templates/static/gateway-left.png
new file mode 100644 (file)
index 0000000..b584364
Binary files /dev/null and b/src/manager/templates/static/gateway-left.png differ
diff --git a/src/manager/templates/static/gateway-right.png b/src/manager/templates/static/gateway-right.png
new file mode 100644 (file)
index 0000000..4b370cb
Binary files /dev/null and b/src/manager/templates/static/gateway-right.png differ
diff --git a/src/manager/templates/static/jquery.js b/src/manager/templates/static/jquery.js
new file mode 100644 (file)
index 0000000..0728760
--- /dev/null
@@ -0,0 +1,2965 @@
+(function(){
+/*
+ * jQuery 1.2 - New Wave Javascript
+ *
+ * Copyright (c) 2007 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2007-09-10 15:45:49 -0400 (Mon, 10 Sep 2007) $
+ * $Rev: 3219 $
+ */
+
+// Map over jQuery in case of overwrite
+if ( typeof jQuery != "undefined" )
+       var _jQuery = jQuery;
+
+var jQuery = window.jQuery = function(a,c) {
+       // If the context is global, return a new object
+       if ( window == this || !this.init )
+               return new jQuery(a,c);
+       
+       return this.init(a,c);
+};
+
+// Map over the $ in case of overwrite
+if ( typeof $ != "undefined" )
+       var _$ = $;
+       
+// Map the jQuery namespace to the '$' one
+window.$ = jQuery;
+
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;
+
+jQuery.fn = jQuery.prototype = {
+       init: function(a,c) {
+               // Make sure that a selection was provided
+               a = a || document;
+
+               // Handle HTML strings
+               if ( typeof a  == "string" ) {
+                       var m = quickExpr.exec(a);
+                       if ( m && (m[1] || !c) ) {
+                               // HANDLE: $(html) -> $(array)
+                               if ( m[1] )
+                                       a = jQuery.clean( [ m[1] ], c );
+
+                               // HANDLE: $("#id")
+                               else {
+                                       var tmp = document.getElementById( m[3] );
+                                       if ( tmp )
+                                               // Handle the case where IE and Opera return items
+                                               // by name instead of ID
+                                               if ( tmp.id != m[3] )
+                                                       return jQuery().find( a );
+                                               else {
+                                                       this[0] = tmp;
+                                                       this.length = 1;
+                                                       return this;
+                                               }
+                                       else
+                                               a = [];
+                               }
+
+                       // HANDLE: $(expr)
+                       } else
+                               return new jQuery( c ).find( a );
+
+               // HANDLE: $(function)
+               // Shortcut for document ready
+               } else if ( jQuery.isFunction(a) )
+                       return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
+
+               return this.setArray(
+                       // HANDLE: $(array)
+                       a.constructor == Array && a ||
+
+                       // HANDLE: $(arraylike)
+                       // Watch for when an array-like object is passed as the selector
+                       (a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+
+                       // HANDLE: $(*)
+                       [ a ] );
+       },
+       
+       jquery: "1.2",
+
+       size: function() {
+               return this.length;
+       },
+       
+       length: 0,
+
+       get: function( num ) {
+               return num == undefined ?
+
+                       // Return a 'clean' array
+                       jQuery.makeArray( this ) :
+
+                       // Return just the object
+                       this[num];
+       },
+       
+       pushStack: function( a ) {
+               var ret = jQuery(a);
+               ret.prevObject = this;
+               return ret;
+       },
+       
+       setArray: function( a ) {
+               this.length = 0;
+               Array.prototype.push.apply( this, a );
+               return this;
+       },
+
+       each: function( fn, args ) {
+               return jQuery.each( this, fn, args );
+       },
+
+       index: function( obj ) {
+               var pos = -1;
+               this.each(function(i){
+                       if ( this == obj ) pos = i;
+               });
+               return pos;
+       },
+
+       attr: function( key, value, type ) {
+               var obj = key;
+               
+               // Look for the case where we're accessing a style value
+               if ( key.constructor == String )
+                       if ( value == undefined )
+                               return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
+                       else {
+                               obj = {};
+                               obj[ key ] = value;
+                       }
+               
+               // Check to see if we're setting style values
+               return this.each(function(index){
+                       // Set all the styles
+                       for ( var prop in obj )
+                               jQuery.attr(
+                                       type ? this.style : this,
+                                       prop, jQuery.prop(this, obj[prop], type, index, prop)
+                               );
+               });
+       },
+
+       css: function( key, value ) {
+               return this.attr( key, value, "curCSS" );
+       },
+
+       text: function(e) {
+               if ( typeof e != "object" && e != null )
+                       return this.empty().append( document.createTextNode( e ) );
+
+               var t = "";
+               jQuery.each( e || this, function(){
+                       jQuery.each( this.childNodes, function(){
+                               if ( this.nodeType != 8 )
+                                       t += this.nodeType != 1 ?
+                                               this.nodeValue : jQuery.fn.text([ this ]);
+                       });
+               });
+               return t;
+       },
+
+       wrapAll: function(html) {
+               if ( this[0] )
+                       // The elements to wrap the target around
+                       jQuery(html, this[0].ownerDocument)
+                               .clone()
+                               .insertBefore(this[0])
+                               .map(function(){
+                                       var elem = this;
+                                       while ( elem.firstChild )
+                                               elem = elem.firstChild;
+                                       return elem;
+                               })
+                               .append(this);
+
+               return this;
+       },
+
+       wrapInner: function(html) {
+               return this.each(function(){
+                       jQuery(this).contents().wrapAll(html);
+               });
+       },
+
+       wrap: function(html) {
+               return this.each(function(){
+                       jQuery(this).wrapAll(html);
+               });
+       },
+
+       append: function() {
+               return this.domManip(arguments, true, 1, function(a){
+                       this.appendChild( a );
+               });
+       },
+
+       prepend: function() {
+               return this.domManip(arguments, true, -1, function(a){
+                       this.insertBefore( a, this.firstChild );
+               });
+       },
+       
+       before: function() {
+               return this.domManip(arguments, false, 1, function(a){
+                       this.parentNode.insertBefore( a, this );
+               });
+       },
+
+       after: function() {
+               return this.domManip(arguments, false, -1, function(a){
+                       this.parentNode.insertBefore( a, this.nextSibling );
+               });
+       },
+
+       end: function() {
+               return this.prevObject || jQuery([]);
+       },
+
+       find: function(t) {
+               var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
+               return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
+                       jQuery.unique( data ) : data );
+       },
+
+       clone: function(events) {
+               // Do the clone
+               var ret = this.map(function(){
+                       return this.outerHTML ? jQuery(this.outerHTML)[0] : this.cloneNode(true);
+               });
+               
+               if (events === true) {
+                       var clone = ret.find("*").andSelf();
+
+                       this.find("*").andSelf().each(function(i) {
+                               var events = jQuery.data(this, "events");
+                               for ( var type in events )
+                                       for ( var handler in events[type] )
+                                               jQuery.event.add(clone[i], type, events[type][handler], events[type][handler].data);
+                       });
+               }
+
+               // Return the cloned set
+               return ret;
+       },
+
+       filter: function(t) {
+               return this.pushStack(
+                       jQuery.isFunction( t ) &&
+                       jQuery.grep(this, function(el, index){
+                               return t.apply(el, [index]);
+                       }) ||
+
+                       jQuery.multiFilter(t,this) );
+       },
+
+       not: function(t) {
+               return this.pushStack(
+                       t.constructor == String &&
+                       jQuery.multiFilter(t, this, true) ||
+
+                       jQuery.grep(this, function(a) {
+                               return ( t.constructor == Array || t.jquery )
+                                       ? jQuery.inArray( a, t ) < 0
+                                       : a != t;
+                       })
+               );
+       },
+
+       add: function(t) {
+               return this.pushStack( jQuery.merge(
+                       this.get(),
+                       t.constructor == String ?
+                               jQuery(t).get() :
+                               t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+                                       t : [t] )
+               );
+       },
+
+       is: function(expr) {
+               return expr ? jQuery.multiFilter(expr,this).length > 0 : false;
+       },
+
+       hasClass: function(expr) {
+               return this.is("." + expr);
+       },
+       
+       val: function( val ) {
+               if ( val == undefined ) {
+                       if ( this.length ) {
+                               var elem = this[0];
+                       
+                               // We need to handle select boxes special
+                               if ( jQuery.nodeName(elem, "select") ) {
+                                       var index = elem.selectedIndex,
+                                               a = [],
+                                               options = elem.options,
+                                               one = elem.type == "select-one";
+                                       
+                                       // Nothing was selected
+                                       if ( index < 0 )
+                                               return null;
+
+                                       // Loop through all the selected options
+                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+                                               var option = options[i];
+                                               if ( option.selected ) {
+                                                       // Get the specifc value for the option
+                                                       var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+                                                       
+                                                       // We don't need an array for one selects
+                                                       if ( one )
+                                                               return val;
+                                                       
+                                                       // Multi-Selects return an array
+                                                       a.push(val);
+                                               }
+                                       }
+                                       
+                                       return a;
+                                       
+                               // Everything else, we just grab the value
+                               } else
+                                       return this[0].value.replace(/\r/g, "");
+                       }
+               } else
+                       return this.each(function(){
+                               if ( val.constructor == Array && /radio|checkbox/.test(this.type) )
+                                       this.checked = (jQuery.inArray(this.value, val) >= 0 ||
+                                               jQuery.inArray(this.name, val) >= 0);
+                               else if ( jQuery.nodeName(this, "select") ) {
+                                       var tmp = val.constructor == Array ? val : [val];
+
+                                       jQuery("option", this).each(function(){
+                                               this.selected = (jQuery.inArray(this.value, tmp) >= 0 ||
+                                               jQuery.inArray(this.text, tmp) >= 0);
+                                       });
+
+                                       if ( !tmp.length )
+                                               this.selectedIndex = -1;
+                               } else
+                                       this.value = val;
+                       });
+       },
+       
+       html: function( val ) {
+               return val == undefined ?
+                       ( this.length ? this[0].innerHTML : null ) :
+                       this.empty().append( val );
+       },
+
+       replaceWith: function( val ) {
+               return this.after( val ).remove();
+       },
+
+       slice: function() {
+               return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
+       },
+
+       map: function(fn) {
+               return this.pushStack(jQuery.map( this, function(elem,i){
+                       return fn.call( elem, i, elem );
+               }));
+       },
+
+       andSelf: function() {
+               return this.add( this.prevObject );
+       },
+       
+       domManip: function(args, table, dir, fn) {
+               var clone = this.length > 1, a; 
+
+               return this.each(function(){
+                       if ( !a ) {
+                               a = jQuery.clean(args, this.ownerDocument);
+                               if ( dir < 0 )
+                                       a.reverse();
+                       }
+
+                       var obj = this;
+
+                       if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
+                               obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
+
+                       jQuery.each( a, function(){
+                               if ( jQuery.nodeName(this, "script") ) {
+                                       if ( this.src )
+                                               jQuery.ajax({ url: this.src, async: false, dataType: "script" });
+                                       else
+                                               jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
+                               } else
+                                       fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                       });
+               });
+       }
+};
+
+jQuery.extend = jQuery.fn.extend = function() {
+       // copy reference to target object
+       var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+       // Handle a deep copy situation
+       if ( target.constructor == Boolean ) {
+               deep = target;
+               target = arguments[1] || {};
+       }
+
+       // extend jQuery itself if only one argument is passed
+       if ( al == 1 ) {
+               target = this;
+               a = 0;
+       }
+
+       var prop;
+
+       for ( ; a < al; a++ )
+               // Only deal with non-null/undefined values
+               if ( (prop = arguments[a]) != null )
+                       // Extend the base object
+                       for ( var i in prop ) {
+                               // Prevent never-ending loop
+                               if ( target == prop[i] )
+                                       continue;
+
+                               // Recurse if we're merging object values
+                               if ( deep && typeof prop[i] == 'object' && target[i] )
+                                       jQuery.extend( target[i], prop[i] );
+
+                               // Don't bring in undefined values
+                               else if ( prop[i] != undefined )
+                                       target[i] = prop[i];
+                       }
+
+       // Return the modified object
+       return target;
+};
+
+var expando = "jQuery" + (new Date()).getTime(), uuid = 0, win = {};
+
+jQuery.extend({
+       noConflict: function(deep) {
+               window.$ = _$;
+               if ( deep )
+                       window.jQuery = _jQuery;
+               return jQuery;
+       },
+
+       // This may seem like some crazy code, but trust me when I say that this
+       // is the only cross-browser way to do this. --John
+       isFunction: function( fn ) {
+               return !!fn && typeof fn != "string" && !fn.nodeName && 
+                       fn.constructor != Array && /function/i.test( fn + "" );
+       },
+       
+       // check if an element is in a XML document
+       isXMLDoc: function(elem) {
+               return elem.documentElement && !elem.body ||
+                       elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+       },
+
+       // Evalulates a script in a global context
+       // Evaluates Async. in Safari 2 :-(
+       globalEval: function( data ) {
+               data = jQuery.trim( data );
+               if ( data ) {
+                       if ( window.execScript )
+                               window.execScript( data );
+                       else if ( jQuery.browser.safari )
+                               // safari doesn't provide a synchronous global eval
+                               window.setTimeout( data, 0 );
+                       else
+                               eval.call( window, data );
+               }
+       },
+
+       nodeName: function( elem, name ) {
+               return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
+       },
+       
+       cache: {},
+       
+       data: function( elem, name, data ) {
+               elem = elem == window ? win : elem;
+
+               var id = elem[ expando ];
+
+               // Compute a unique ID for the element
+               if ( !id ) 
+                       id = elem[ expando ] = ++uuid;
+
+               // Only generate the data cache if we're
+               // trying to access or manipulate it
+               if ( name && !jQuery.cache[ id ] )
+                       jQuery.cache[ id ] = {};
+               
+               // Prevent overriding the named cache with undefined values
+               if ( data != undefined )
+                       jQuery.cache[ id ][ name ] = data;
+               
+               // Return the named cache data, or the ID for the element       
+               return name ? jQuery.cache[ id ][ name ] : id;
+       },
+       
+       removeData: function( elem, name ) {
+               elem = elem == window ? win : elem;
+
+               var id = elem[ expando ];
+
+               // If we want to remove a specific section of the element's data
+               if ( name ) {
+                       if ( jQuery.cache[ id ] ) {
+                               // Remove the section of cache data
+                               delete jQuery.cache[ id ][ name ];
+
+                               // If we've removed all the data, remove the element's cache
+                               name = "";
+                               for ( name in jQuery.cache[ id ] ) break;
+                               if ( !name )
+                                       jQuery.removeData( elem );
+                       }
+
+               // Otherwise, we want to remove all of the element's data
+               } else {
+                       // Clean up the element expando
+                       try {
+                               delete elem[ expando ];
+                       } catch(e){
+                               // IE has trouble directly removing the expando
+                               // but it's ok with using removeAttribute
+                               if ( elem.removeAttribute )
+                                       elem.removeAttribute( expando );
+                       }
+
+                       // Completely remove the data cache
+                       delete jQuery.cache[ id ];
+               }
+       },
+
+       // args is for internal usage only
+       each: function( obj, fn, args ) {
+               if ( args ) {
+                       if ( obj.length == undefined )
+                               for ( var i in obj )
+                                       fn.apply( obj[i], args );
+                       else
+                               for ( var i = 0, ol = obj.length; i < ol; i++ )
+                                       if ( fn.apply( obj[i], args ) === false ) break;
+
+               // A special, fast, case for the most common use of each
+               } else {
+                       if ( obj.length == undefined )
+                               for ( var i in obj )
+                                       fn.call( obj[i], i, obj[i] );
+                       else
+                               for ( var i = 0, ol = obj.length, val = obj[0]; 
+                                       i < ol && fn.call(val,i,val) !== false; val = obj[++i] ){}
+               }
+
+               return obj;
+       },
+       
+       prop: function(elem, value, type, index, prop){
+                       // Handle executable functions
+                       if ( jQuery.isFunction( value ) )
+                               value = value.call( elem, [index] );
+                               
+                       // exclude the following css properties to add px
+                       var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+
+                       // Handle passing in a number to a CSS property
+                       return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+                               value + "px" :
+                               value;
+       },
+
+       className: {
+               // internal only, use addClass("class")
+               add: function( elem, c ){
+                       jQuery.each( (c || "").split(/\s+/), function(i, cur){
+                               if ( !jQuery.className.has( elem.className, cur ) )
+                                       elem.className += ( elem.className ? " " : "" ) + cur;
+                       });
+               },
+
+               // internal only, use removeClass("class")
+               remove: function( elem, c ){
+                       elem.className = c != undefined ?
+                               jQuery.grep( elem.className.split(/\s+/), function(cur){
+                                       return !jQuery.className.has( c, cur ); 
+                               }).join(" ") : "";
+               },
+
+               // internal only, use is(".class")
+               has: function( t, c ) {
+                       return jQuery.inArray( c, (t.className || t).toString().split(/\s+/) ) > -1;
+               }
+       },
+
+       swap: function(e,o,f) {
+               for ( var i in o ) {
+                       e.style["old"+i] = e.style[i];
+                       e.style[i] = o[i];
+               }
+               f.apply( e, [] );
+               for ( var i in o )
+                       e.style[i] = e.style["old"+i];
+       },
+
+       css: function(e,p) {
+               if ( p == "height" || p == "width" ) {
+                       var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
+
+                       jQuery.each( d, function(){
+                               old["padding" + this] = 0;
+                               old["border" + this + "Width"] = 0;
+                       });
+
+                       jQuery.swap( e, old, function() {
+                               if ( jQuery(e).is(':visible') ) {
+                                       oHeight = e.offsetHeight;
+                                       oWidth = e.offsetWidth;
+                               } else {
+                                       e = jQuery(e.cloneNode(true))
+                                               .find(":radio").removeAttr("checked").end()
+                                               .css({
+                                                       visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
+                                               }).appendTo(e.parentNode)[0];
+
+                                       var parPos = jQuery.css(e.parentNode,"position") || "static";
+                                       if ( parPos == "static" )
+                                               e.parentNode.style.position = "relative";
+
+                                       oHeight = e.clientHeight;
+                                       oWidth = e.clientWidth;
+
+                                       if ( parPos == "static" )
+                                               e.parentNode.style.position = "static";
+
+                                       e.parentNode.removeChild(e);
+                               }
+                       });
+
+                       return p == "height" ? oHeight : oWidth;
+               }
+
+               return jQuery.curCSS( e, p );
+       },
+
+       curCSS: function(elem, prop, force) {
+               var ret, stack = [], swap = [];
+
+               // A helper method for determining if an element's values are broken
+               function color(a){
+                       if ( !jQuery.browser.safari )
+                               return false;
+
+                       var ret = document.defaultView.getComputedStyle(a,null);
+                       return !ret || ret.getPropertyValue("color") == "";
+               }
+
+               if (prop == "opacity" && jQuery.browser.msie) {
+                       ret = jQuery.attr(elem.style, "opacity");
+                       return ret == "" ? "1" : ret;
+               }
+               
+               if (prop.match(/float/i))
+                       prop = styleFloat;
+
+               if (!force && elem.style[prop])
+                       ret = elem.style[prop];
+
+               else if (document.defaultView && document.defaultView.getComputedStyle) {
+
+                       if (prop.match(/float/i))
+                               prop = "float";
+
+                       prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
+                       var cur = document.defaultView.getComputedStyle(elem, null);
+
+                       if ( cur && !color(elem) )
+                               ret = cur.getPropertyValue(prop);
+
+                       // If the element isn't reporting its values properly in Safari
+                       // then some display: none elements are involved
+                       else {
+                               // Locate all of the parent display: none elements
+                               for ( var a = elem; a && color(a); a = a.parentNode )
+                                       stack.unshift(a);
+
+                               // Go through and make them visible, but in reverse
+                               // (It would be better if we knew the exact display type that they had)
+                               for ( a = 0; a < stack.length; a++ )
+                                       if ( color(stack[a]) ) {
+                                               swap[a] = stack[a].style.display;
+                                               stack[a].style.display = "block";
+                                       }
+
+                               // Since we flip the display style, we have to handle that
+                               // one special, otherwise get the value
+                               ret = prop == "display" && swap[stack.length-1] != null ?
+                                       "none" :
+                                       document.defaultView.getComputedStyle(elem,null).getPropertyValue(prop) || "";
+
+                               // Finally, revert the display styles back
+                               for ( a = 0; a < swap.length; a++ )
+                                       if ( swap[a] != null )
+                                               stack[a].style.display = swap[a];
+                       }
+
+                       if ( prop == "opacity" && ret == "" )
+                               ret = "1";
+
+               } else if (elem.currentStyle) {
+                       var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
+                       ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
+
+                       // From the awesome hack by Dean Edwards
+                       // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+                       // If we're not dealing with a regular pixel number
+                       // but a number that has a weird ending, we need to convert it to pixels
+                       if ( !/^\d+(px)?$/i.test(ret) && /^\d/.test(ret) ) {
+                               var style = elem.style.left;
+                               var runtimeStyle = elem.runtimeStyle.left;
+                               elem.runtimeStyle.left = elem.currentStyle.left;
+                               elem.style.left = ret || 0;
+                               ret = elem.style.pixelLeft + "px";
+                               elem.style.left = style;
+                               elem.runtimeStyle.left = runtimeStyle;
+                       }
+               }
+
+               return ret;
+       },
+       
+       clean: function(a, doc) {
+               var r = [];
+               doc = doc || document;
+
+               jQuery.each( a, function(i,arg){
+                       if ( !arg ) return;
+
+                       if ( arg.constructor == Number )
+                               arg = arg.toString();
+                       
+                       // Convert html string into DOM nodes
+                       if ( typeof arg == "string" ) {
+                               // Fix "XHTML"-style tags in all browsers
+                               arg = arg.replace(/(<(\w+)[^>]*?)\/>/g, function(m, all, tag){
+                                       return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i)? m : all+"></"+tag+">";
+                               });
+
+                               // Trim whitespace, otherwise indexOf won't work as expected
+                               var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
+
+                               var wrap =
+                                       // option or optgroup
+                                       !s.indexOf("<opt") &&
+                                       [1, "<select>", "</select>"] ||
+                                       
+                                       !s.indexOf("<leg") &&
+                                       [1, "<fieldset>", "</fieldset>"] ||
+                                       
+                                       s.match(/^<(thead|tbody|tfoot|colg|cap)/) &&
+                                       [1, "<table>", "</table>"] ||
+                                       
+                                       !s.indexOf("<tr") &&
+                                       [2, "<table><tbody>", "</tbody></table>"] ||
+                                       
+                                       // <thead> matched above
+                                       (!s.indexOf("<td") || !s.indexOf("<th")) &&
+                                       [3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
+                                       
+                                       !s.indexOf("<col") &&
+                                       [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
+
+                                       // IE can't serialize <link> and <script> tags normally
+                                       jQuery.browser.msie &&
+                                       [1, "div<div>", "</div>"] ||
+                                       
+                                       [0,"",""];
+
+                               // Go to html and back, then peel off extra wrappers
+                               div.innerHTML = wrap[1] + arg + wrap[2];
+                               
+                               // Move to the right depth
+                               while ( wrap[0]-- )
+                                       div = div.lastChild;
+                               
+                               // Remove IE's autoinserted <tbody> from table fragments
+                               if ( jQuery.browser.msie ) {
+                                       
+                                       // String was a <table>, *may* have spurious <tbody>
+                                       if ( !s.indexOf("<table") && s.indexOf("<tbody") < 0 ) 
+                                               tb = div.firstChild && div.firstChild.childNodes;
+                                               
+                                       // String was a bare <thead> or <tfoot>
+                                       else if ( wrap[1] == "<table>" && s.indexOf("<tbody") < 0 )
+                                               tb = div.childNodes;
+
+                                       for ( var n = tb.length-1; n >= 0 ; --n )
+                                               if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
+                                                       tb[n].parentNode.removeChild(tb[n]);
+       
+                                       // IE completely kills leading whitespace when innerHTML is used        
+                                       if ( /^\s/.test(arg) )  
+                                               div.insertBefore( doc.createTextNode( arg.match(/^\s*/)[0] ), div.firstChild );
+
+                               }
+                               
+                               arg = jQuery.makeArray( div.childNodes );
+                       }
+
+                       if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
+                               return;
+
+                       if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
+                               r.push( arg );
+                       else
+                               r = jQuery.merge( r, arg );
+
+               });
+
+               return r;
+       },
+       
+       attr: function(elem, name, value){
+               var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
+
+               // Safari mis-reports the default selected property of a hidden option
+               // Accessing the parent's selectedIndex property fixes it
+               if ( name == "selected" && jQuery.browser.safari )
+                       elem.parentNode.selectedIndex;
+               
+               // Certain attributes only work when accessed via the old DOM 0 way
+               if ( fix[name] ) {
+                       if ( value != undefined ) elem[fix[name]] = value;
+                       return elem[fix[name]];
+               } else if ( jQuery.browser.msie && name == "style" )
+                       return jQuery.attr( elem.style, "cssText", value );
+
+               else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
+                       return elem.getAttributeNode(name).nodeValue;
+
+               // IE elem.getAttribute passes even for style
+               else if ( elem.tagName ) {
+
+                       if ( value != undefined ) {
+                               if ( name == "type" && jQuery.nodeName(elem,"input") && elem.parentNode )
+                                       throw "type property can't be changed";
+                               elem.setAttribute( name, value );
+                       }
+
+                       if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
+                               return elem.getAttribute( name, 2 );
+
+                       return elem.getAttribute( name );
+
+               // elem is actually elem.style ... set the style
+               } else {
+                       // IE actually uses filters for opacity
+                       if ( name == "opacity" && jQuery.browser.msie ) {
+                               if ( value != undefined ) {
+                                       // IE has trouble with opacity if it does not have layout
+                                       // Force it by setting the zoom level
+                                       elem.zoom = 1; 
+       
+                                       // Set the alpha filter to set the opacity
+                                       elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
+                                               (parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+                               }
+       
+                               return elem.filter ? 
+                                       (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
+                       }
+                       name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
+                       if ( value != undefined ) elem[name] = value;
+                       return elem[name];
+               }
+       },
+       
+       trim: function(t){
+               return (t||"").replace(/^\s+|\s+$/g, "");
+       },
+
+       makeArray: function( a ) {
+               var r = [];
+
+               // Need to use typeof to fight Safari childNodes crashes
+               if ( typeof a != "array" )
+                       for ( var i = 0, al = a.length; i < al; i++ )
+                               r.push( a[i] );
+               else
+                       r = a.slice( 0 );
+
+               return r;
+       },
+
+       inArray: function( b, a ) {
+               for ( var i = 0, al = a.length; i < al; i++ )
+                       if ( a[i] == b )
+                               return i;
+               return -1;
+       },
+
+       merge: function(first, second) {
+               // We have to loop this way because IE & Opera overwrite the length
+               // expando of getElementsByTagName
+
+               // Also, we need to make sure that the correct elements are being returned
+               // (IE returns comment nodes in a '*' query)
+               if ( jQuery.browser.msie ) {
+                       for ( var i = 0; second[i]; i++ )
+                               if ( second[i].nodeType != 8 )
+                                       first.push(second[i]);
+               } else
+                       for ( var i = 0; second[i]; i++ )
+                               first.push(second[i]);
+
+               return first;
+       },
+
+       unique: function(first) {
+               var r = [], done = {};
+
+               try {
+                       for ( var i = 0, fl = first.length; i < fl; i++ ) {
+                               var id = jQuery.data(first[i]);
+                               if ( !done[id] ) {
+                                       done[id] = true;
+                                       r.push(first[i]);
+                               }
+                       }
+               } catch(e) {
+                       r = first;
+               }
+
+               return r;
+       },
+
+       grep: function(elems, fn, inv) {
+               // If a string is passed in for the function, make a function
+               // for it (a handy shortcut)
+               if ( typeof fn == "string" )
+                       fn = eval("false||function(a,i){return " + fn + "}");
+
+               var result = [];
+
+               // Go through the array, only saving the items
+               // that pass the validator function
+               for ( var i = 0, el = elems.length; i < el; i++ )
+                       if ( !inv && fn(elems[i],i) || inv && !fn(elems[i],i) )
+                               result.push( elems[i] );
+
+               return result;
+       },
+
+       map: function(elems, fn) {
+               // If a string is passed in for the function, make a function
+               // for it (a handy shortcut)
+               if ( typeof fn == "string" )
+                       fn = eval("false||function(a){return " + fn + "}");
+
+               var result = [];
+
+               // Go through the array, translating each of the items to their
+               // new value (or values).
+               for ( var i = 0, el = elems.length; i < el; i++ ) {
+                       var val = fn(elems[i],i);
+
+                       if ( val !== null && val != undefined ) {
+                               if ( val.constructor != Array ) val = [val];
+                               result = result.concat( val );
+                       }
+               }
+
+               return result;
+       }
+});
+
+var userAgent = navigator.userAgent.toLowerCase();
+
+// Figure out what browser is being used
+jQuery.browser = {
+       version: (userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
+       safari: /webkit/.test(userAgent),
+       opera: /opera/.test(userAgent),
+       msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
+       mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
+};
+
+var styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+       
+jQuery.extend({
+       // Check to see if the W3C box model is being used
+       boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
+       
+       styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+       
+       props: {
+               "for": "htmlFor",
+               "class": "className",
+               "float": styleFloat,
+               cssFloat: styleFloat,
+               styleFloat: styleFloat,
+               innerHTML: "innerHTML",
+               className: "className",
+               value: "value",
+               disabled: "disabled",
+               checked: "checked",
+               readonly: "readOnly",
+               selected: "selected",
+               maxlength: "maxLength"
+       }
+});
+
+jQuery.each({
+       parent: "a.parentNode",
+       parents: "jQuery.dir(a,'parentNode')",
+       next: "jQuery.nth(a,2,'nextSibling')",
+       prev: "jQuery.nth(a,2,'previousSibling')",
+       nextAll: "jQuery.dir(a,'nextSibling')",
+       prevAll: "jQuery.dir(a,'previousSibling')",
+       siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
+       children: "jQuery.sibling(a.firstChild)",
+       contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
+}, function(i,n){
+       jQuery.fn[ i ] = function(a) {
+               var ret = jQuery.map(this,n);
+               if ( a && typeof a == "string" )
+                       ret = jQuery.multiFilter(a,ret);
+               return this.pushStack( jQuery.unique(ret) );
+       };
+});
+
+jQuery.each({
+       appendTo: "append",
+       prependTo: "prepend",
+       insertBefore: "before",
+       insertAfter: "after",
+       replaceAll: "replaceWith"
+}, function(i,n){
+       jQuery.fn[ i ] = function(){
+               var a = arguments;
+               return this.each(function(){
+                       for ( var j = 0, al = a.length; j < al; j++ )
+                               jQuery(a[j])[n]( this );
+               });
+       };
+});
+
+jQuery.each( {
+       removeAttr: function( key ) {
+               jQuery.attr( this, key, "" );
+               this.removeAttribute( key );
+       },
+       addClass: function(c){
+               jQuery.className.add(this,c);
+       },
+       removeClass: function(c){
+               jQuery.className.remove(this,c);
+       },
+       toggleClass: function( c ){
+               jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this, c);
+       },
+       remove: function(a){
+               if ( !a || jQuery.filter( a, [this] ).r.length ) {
+                       jQuery.removeData( this );
+                       this.parentNode.removeChild( this );
+               }
+       },
+       empty: function() {
+               // Clean up the cache
+               jQuery("*", this).each(function(){ jQuery.removeData(this); });
+
+               while ( this.firstChild )
+                       this.removeChild( this.firstChild );
+       }
+}, function(i,n){
+       jQuery.fn[ i ] = function() {
+               return this.each( n, arguments );
+       };
+});
+
+jQuery.each( [ "Height", "Width" ], function(i,name){
+       var n = name.toLowerCase();
+       
+       jQuery.fn[ n ] = function(h) {
+               return this[0] == window ?
+                       jQuery.browser.safari && self["inner" + name] ||
+                       jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
+                       document.body["client" + name] :
+               
+                       this[0] == document ?
+                               Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
+        
+                               h == undefined ?
+                                       ( this.length ? jQuery.css( this[0], n ) : null ) :
+                                       this.css( n, h.constructor == String ? h : h + "px" );
+       };
+});
+
+var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+               "(?:[\\w*_-]|\\\\.)" :
+               "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
+       quickChild = new RegExp("^>\\s*(" + chars + "+)"),
+       quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
+       quickClass = new RegExp("^([#.]?)(" + chars + "*)");
+
+jQuery.extend({
+       expr: {
+               "": "m[2]=='*'||jQuery.nodeName(a,m[2])",
+               "#": "a.getAttribute('id')==m[2]",
+               ":": {
+                       // Position Checks
+                       lt: "i<m[3]-0",
+                       gt: "i>m[3]-0",
+                       nth: "m[3]-0==i",
+                       eq: "m[3]-0==i",
+                       first: "i==0",
+                       last: "i==r.length-1",
+                       even: "i%2==0",
+                       odd: "i%2",
+
+                       // Child Checks
+                       "first-child": "a.parentNode.getElementsByTagName('*')[0]==a",
+                       "last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
+                       "only-child": "!jQuery.nth(a.parentNode.lastChild,2,'previousSibling')",
+
+                       // Parent Checks
+                       parent: "a.firstChild",
+                       empty: "!a.firstChild",
+
+                       // Text Check
+                       contains: "(a.textContent||a.innerText||'').indexOf(m[3])>=0",
+
+                       // Visibility
+                       visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
+                       hidden: '"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
+
+                       // Form attributes
+                       enabled: "!a.disabled",
+                       disabled: "a.disabled",
+                       checked: "a.checked",
+                       selected: "a.selected||jQuery.attr(a,'selected')",
+
+                       // Form elements
+                       text: "'text'==a.type",
+                       radio: "'radio'==a.type",
+                       checkbox: "'checkbox'==a.type",
+                       file: "'file'==a.type",
+                       password: "'password'==a.type",
+                       submit: "'submit'==a.type",
+                       image: "'image'==a.type",
+                       reset: "'reset'==a.type",
+                       button: '"button"==a.type||jQuery.nodeName(a,"button")',
+                       input: "/input|select|textarea|button/i.test(a.nodeName)",
+
+                       // :has()
+                       has: "jQuery.find(m[3],a).length",
+
+                       // :header
+                       header: "/h\\d/i.test(a.nodeName)",
+
+                       // :animated
+                       animated: "jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length"
+               }
+       },
+       
+       // The regular expressions that power the parsing engine
+       parse: [
+               // Match: [@value='test'], [@foo]
+               /^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
+
+               // Match: :contains('foo')
+               /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
+
+               // Match: :even, :last-chlid, #id, .class
+               new RegExp("^([:.#]*)(" + chars + "+)")
+       ],
+
+       multiFilter: function( expr, elems, not ) {
+               var old, cur = [];
+
+               while ( expr && expr != old ) {
+                       old = expr;
+                       var f = jQuery.filter( expr, elems, not );
+                       expr = f.t.replace(/^\s*,\s*/, "" );
+                       cur = not ? elems = f.r : jQuery.merge( cur, f.r );
+               }
+
+               return cur;
+       },
+
+       find: function( t, context ) {
+               // Quickly handle non-string expressions
+               if ( typeof t != "string" )
+                       return [ t ];
+
+               // Make sure that the context is a DOM Element
+               if ( context && !context.nodeType )
+                       context = null;
+
+               // Set the correct context (if none is provided)
+               context = context || document;
+
+               // Initialize the search
+               var ret = [context], done = [], last;
+
+               // Continue while a selector expression exists, and while
+               // we're no longer looping upon ourselves
+               while ( t && last != t ) {
+                       var r = [];
+                       last = t;
+
+                       t = jQuery.trim(t);
+
+                       var foundToken = false;
+
+                       // An attempt at speeding up child selectors that
+                       // point to a specific element tag
+                       var re = quickChild;
+                       var m = re.exec(t);
+
+                       if ( m ) {
+                               var nodeName = m[1].toUpperCase();
+
+                               // Perform our own iteration and filter
+                               for ( var i = 0; ret[i]; i++ )
+                                       for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+                                               if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()) )
+                                                       r.push( c );
+
+                               ret = r;
+                               t = t.replace( re, "" );
+                               if ( t.indexOf(" ") == 0 ) continue;
+                               foundToken = true;
+                       } else {
+                               re = /^([>+~])\s*(\w*)/i;
+
+                               if ( (m = re.exec(t)) != null ) {
+                                       r = [];
+
+                                       var nodeName = m[2], merge = {};
+                                       m = m[1];
+
+                                       for ( var j = 0, rl = ret.length; j < rl; j++ ) {
+                                               var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
+                                               for ( ; n; n = n.nextSibling )
+                                                       if ( n.nodeType == 1 ) {
+                                                               var id = jQuery.data(n);
+
+                                                               if ( m == "~" && merge[id] ) break;
+                                                               
+                                                               if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
+                                                                       if ( m == "~" ) merge[id] = true;
+                                                                       r.push( n );
+                                                               }
+                                                               
+                                                               if ( m == "+" ) break;
+                                                       }
+                                       }
+
+                                       ret = r;
+
+                                       // And remove the token
+                                       t = jQuery.trim( t.replace( re, "" ) );
+                                       foundToken = true;
+                               }
+                       }
+
+                       // See if there's still an expression, and that we haven't already
+                       // matched a token
+                       if ( t && !foundToken ) {
+                               // Handle multiple expressions
+                               if ( !t.indexOf(",") ) {
+                                       // Clean the result set
+                                       if ( context == ret[0] ) ret.shift();
+
+                                       // Merge the result sets
+                                       done = jQuery.merge( done, ret );
+
+                                       // Reset the context
+                                       r = ret = [context];
+
+                                       // Touch up the selector string
+                                       t = " " + t.substr(1,t.length);
+
+                               } else {
+                                       // Optimize for the case nodeName#idName
+                                       var re2 = quickID;
+                                       var m = re2.exec(t);
+                                       
+                                       // Re-organize the results, so that they're consistent
+                                       if ( m ) {
+                                          m = [ 0, m[2], m[3], m[1] ];
+
+                                       } else {
+                                               // Otherwise, do a traditional filter check for
+                                               // ID, class, and element selectors
+                                               re2 = quickClass;
+                                               m = re2.exec(t);
+                                       }
+
+                                       m[2] = m[2].replace(/\\/g, "");
+
+                                       var elem = ret[ret.length-1];
+
+                                       // Try to do a global search by ID, where we can
+                                       if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
+                                               // Optimization for HTML document case
+                                               var oid = elem.getElementById(m[2]);
+                                               
+                                               // Do a quick check for the existence of the actual ID attribute
+                                               // to avoid selecting by the name attribute in IE
+                                               // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
+                                               if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
+                                                       oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
+
+                                               // Do a quick check for node name (where applicable) so
+                                               // that div#foo searches will be really fast
+                                               ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
+                                       } else {
+                                               // We need to find all descendant elements
+                                               for ( var i = 0; ret[i]; i++ ) {
+                                                       // Grab the tag name being searched for
+                                                       var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
+
+                                                       // Handle IE7 being really dumb about <object>s
+                                                       if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
+                                                               tag = "param";
+
+                                                       r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
+                                               }
+
+                                               // It's faster to filter by class and be done with it
+                                               if ( m[1] == "." )
+                                                       r = jQuery.classFilter( r, m[2] );
+
+                                               // Same with ID filtering
+                                               if ( m[1] == "#" ) {
+                                                       var tmp = [];
+
+                                                       // Try to find the element with the ID
+                                                       for ( var i = 0; r[i]; i++ )
+                                                               if ( r[i].getAttribute("id") == m[2] ) {
+                                                                       tmp = [ r[i] ];
+                                                                       break;
+                                                               }
+
+                                                       r = tmp;
+                                               }
+
+                                               ret = r;
+                                       }
+
+                                       t = t.replace( re2, "" );
+                               }
+
+                       }
+
+                       // If a selector string still exists
+                       if ( t ) {
+                               // Attempt to filter it
+                               var val = jQuery.filter(t,r);
+                               ret = r = val.r;
+                               t = jQuery.trim(val.t);
+                       }
+               }
+
+               // An error occurred with the selector;
+               // just return an empty set instead
+               if ( t )
+                       ret = [];
+
+               // Remove the root context
+               if ( ret && context == ret[0] )
+                       ret.shift();
+
+               // And combine the results
+               done = jQuery.merge( done, ret );
+
+               return done;
+       },
+
+       classFilter: function(r,m,not){
+               m = " " + m + " ";
+               var tmp = [];
+               for ( var i = 0; r[i]; i++ ) {
+                       var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+                       if ( !not && pass || not && !pass )
+                               tmp.push( r[i] );
+               }
+               return tmp;
+       },
+
+       filter: function(t,r,not) {
+               var last;
+
+               // Look for common filter expressions
+               while ( t  && t != last ) {
+                       last = t;
+
+                       var p = jQuery.parse, m;
+
+                       for ( var i = 0; p[i]; i++ ) {
+                               m = p[i].exec( t );
+
+                               if ( m ) {
+                                       // Remove what we just matched
+                                       t = t.substring( m[0].length );
+
+                                       m[2] = m[2].replace(/\\/g, "");
+                                       break;
+                               }
+                       }
+
+                       if ( !m )
+                               break;
+
+                       // :not() is a special case that can be optimized by
+                       // keeping it out of the expression list
+                       if ( m[1] == ":" && m[2] == "not" )
+                               r = jQuery.filter(m[3], r, true).r;
+
+                       // We can get a big speed boost by filtering by class here
+                       else if ( m[1] == "." )
+                               r = jQuery.classFilter(r, m[2], not);
+
+                       else if ( m[1] == "[" ) {
+                               var tmp = [], type = m[3];
+                               
+                               for ( var i = 0, rl = r.length; i < rl; i++ ) {
+                                       var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
+                                       
+                                       if ( z == null || /href|src|selected/.test(m[2]) )
+                                               z = jQuery.attr(a,m[2]) || '';
+
+                                       if ( (type == "" && !!z ||
+                                                type == "=" && z == m[5] ||
+                                                type == "!=" && z != m[5] ||
+                                                type == "^=" && z && !z.indexOf(m[5]) ||
+                                                type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
+                                                (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
+                                                       tmp.push( a );
+                               }
+                               
+                               r = tmp;
+
+                       // We can get a speed boost by handling nth-child here
+                       } else if ( m[1] == ":" && m[2] == "nth-child" ) {
+                               var merge = {}, tmp = [],
+                                       test = /(\d*)n\+?(\d*)/.exec(
+                                               m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
+                                               !/\D/.test(m[3]) && "n+" + m[3] || m[3]),
+                                       first = (test[1] || 1) - 0, last = test[2] - 0;
+
+                               for ( var i = 0, rl = r.length; i < rl; i++ ) {
+                                       var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
+
+                                       if ( !merge[id] ) {
+                                               var c = 1;
+
+                                               for ( var n = parentNode.firstChild; n; n = n.nextSibling )
+                                                       if ( n.nodeType == 1 )
+                                                               n.nodeIndex = c++;
+
+                                               merge[id] = true;
+                                       }
+
+                                       var add = false;
+
+                                       if ( first == 1 ) {
+                                               if ( last == 0 || node.nodeIndex == last )
+                                                       add = true;
+                                       } else if ( (node.nodeIndex + last) % first == 0 )
+                                               add = true;
+
+                                       if ( add ^ not )
+                                               tmp.push( node );
+                               }
+
+                               r = tmp;
+
+                       // Otherwise, find the expression to execute
+                       } else {
+                               var f = jQuery.expr[m[1]];
+                               if ( typeof f != "string" )
+                                       f = jQuery.expr[m[1]][m[2]];
+
+                               // Build a custom macro to enclose it
+                               f = eval("false||function(a,i){return " + f + "}");
+
+                               // Execute it against the current filter
+                               r = jQuery.grep( r, f, not );
+                       }
+               }
+
+               // Return an array of filtered elements (r)
+               // and the modified expression string (t)
+               return { r: r, t: t };
+       },
+
+       dir: function( elem, dir ){
+               var matched = [];
+               var cur = elem[dir];
+               while ( cur && cur != document ) {
+                       if ( cur.nodeType == 1 )
+                               matched.push( cur );
+                       cur = cur[dir];
+               }
+               return matched;
+       },
+       
+       nth: function(cur,result,dir,elem){
+               result = result || 1;
+               var num = 0;
+
+               for ( ; cur; cur = cur[dir] )
+                       if ( cur.nodeType == 1 && ++num == result )
+                               break;
+
+               return cur;
+       },
+       
+       sibling: function( n, elem ) {
+               var r = [];
+
+               for ( ; n; n = n.nextSibling ) {
+                       if ( n.nodeType == 1 && (!elem || n != elem) )
+                               r.push( n );
+               }
+
+               return r;
+       }
+});
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code orignated from 
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+       // Bind an event to an element
+       // Original by Dean Edwards
+       add: function(element, type, handler, data) {
+               // For whatever reason, IE has trouble passing the window object
+               // around, causing it to be cloned in the process
+               if ( jQuery.browser.msie && element.setInterval != undefined )
+                       element = window;
+
+               // Make sure that the function being executed has a unique ID
+               if ( !handler.guid )
+                       handler.guid = this.guid++;
+                       
+               // if data is passed, bind to handler 
+               if( data != undefined ) { 
+                       // Create temporary function pointer to original handler 
+                       var fn = handler; 
+
+                       // Create unique handler function, wrapped around original handler 
+                       handler = function() { 
+                               // Pass arguments and context to original handler 
+                               return fn.apply(this, arguments); 
+                       };
+
+                       // Store data in unique handler 
+                       handler.data = data;
+
+                       // Set the guid of unique handler to the same of original handler, so it can be removed 
+                       handler.guid = fn.guid;
+               }
+
+               // Namespaced event handlers
+               var parts = type.split(".");
+               type = parts[0];
+               handler.type = parts[1];
+
+               // Init the element's event structure
+               var events = jQuery.data(element, "events") || jQuery.data(element, "events", {});
+               
+               var handle = jQuery.data(element, "handle", function(){
+                       // returned undefined or false
+                       var val;
+
+                       // Handle the second event of a trigger and when
+                       // an event is called after a page has unloaded
+                       if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+                               return val;
+                       
+                       val = jQuery.event.handle.apply(element, arguments);
+                       
+                       return val;
+               });
+
+               // Get the current list of functions bound to this event
+               var handlers = events[type];
+
+               // Init the event handler queue
+               if (!handlers) {
+                       handlers = events[type] = {};   
+                       
+                       // And bind the global event handler to the element
+                       if (element.addEventListener)
+                               element.addEventListener(type, handle, false);
+                       else
+                               element.attachEvent("on" + type, handle);
+               }
+
+               // Add the function to the element's handler list
+               handlers[handler.guid] = handler;
+
+               // Keep track of which events have been used, for global triggering
+               this.global[type] = true;
+       },
+
+       guid: 1,
+       global: {},
+
+       // Detach an event or set of events from an element
+       remove: function(element, type, handler) {
+               var events = jQuery.data(element, "events"), ret, index;
+
+               // Namespaced event handlers
+               if ( typeof type == "string" ) {
+                       var parts = type.split(".");
+                       type = parts[0];
+               }
+
+               if ( events ) {
+                       // type is actually an event object here
+                       if ( type && type.type ) {
+                               handler = type.handler;
+                               type = type.type;
+                       }
+                       
+                       if ( !type ) {
+                               for ( type in events )
+                                       this.remove( element, type );
+
+                       } else if ( events[type] ) {
+                               // remove the given handler for the given type
+                               if ( handler )
+                                       delete events[type][handler.guid];
+                               
+                               // remove all handlers for the given type
+                               else
+                                       for ( handler in events[type] )
+                                               // Handle the removal of namespaced events
+                                               if ( !parts[1] || events[type][handler].type == parts[1] )
+                                                       delete events[type][handler];
+
+                               // remove generic event handler if no more handlers exist
+                               for ( ret in events[type] ) break;
+                               if ( !ret ) {
+                                       if (element.removeEventListener)
+                                               element.removeEventListener(type, jQuery.data(element, "handle"), false);
+                                       else
+                                               element.detachEvent("on" + type, jQuery.data(element, "handle"));
+                                       ret = null;
+                                       delete events[type];
+                               }
+                       }
+
+                       // Remove the expando if it's no longer used
+                       for ( ret in events ) break;
+                       if ( !ret ) {
+                               jQuery.removeData( element, "events" );
+                               jQuery.removeData( element, "handle" );
+                       }
+               }
+       },
+
+       trigger: function(type, data, element, donative, extra) {
+               // Clone the incoming data, if any
+               data = jQuery.makeArray(data || []);
+
+               // Handle a global trigger
+               if ( !element ) {
+                       // Only trigger if we've ever bound an event for it
+                       if ( this.global[type] )
+                               jQuery("*").add([window, document]).trigger(type, data);
+
+               // Handle triggering a single element
+               } else {
+                       var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+                               // Check to see if we need to provide a fake event, or not
+                               evt = !data[0] || !data[0].preventDefault;
+                       
+                       // Pass along a fake event
+                       if ( evt )
+                               data.unshift( this.fix({ type: type, target: element }) );
+
+                       // Trigger the event
+                       if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
+                               val = jQuery.data(element, "handle").apply( element, data );
+
+                       // Handle triggering native .onfoo handlers
+                       if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+                               val = false;
+
+                       // Extra functions don't get the custom event object
+                       if ( evt )
+                               data.shift();
+
+                       // Handle triggering of extra function
+                       if ( extra && extra.apply( element, data ) === false )
+                               val = false;
+
+                       // Trigger the native events (except for clicks on links)
+                       if ( fn && donative !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+                               this.triggered = true;
+                               element[ type ]();
+                       }
+
+                       this.triggered = false;
+               }
+
+               return val;
+       },
+
+       handle: function(event) {
+               // returned undefined or false
+               var val;
+
+               // Empty object is for triggered events with no data
+               event = jQuery.event.fix( event || window.event || {} ); 
+
+               // Namespaced event handlers
+               var parts = event.type.split(".");
+               event.type = parts[0];
+
+               var c = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
+               args.unshift( event );
+
+               for ( var j in c ) {
+                       // Pass in a reference to the handler function itself
+                       // So that we can later remove it
+                       args[0].handler = c[j];
+                       args[0].data = c[j].data;
+
+                       // Filter the functions by class
+                       if ( !parts[1] || c[j].type == parts[1] ) {
+                               var tmp = c[j].apply( this, args );
+
+                               if ( val !== false )
+                                       val = tmp;
+
+                               if ( tmp === false ) {
+                                       event.preventDefault();
+                                       event.stopPropagation();
+                               }
+                       }
+               }
+
+               // Clean up added properties in IE to prevent memory leak
+               if (jQuery.browser.msie)
+                       event.target = event.preventDefault = event.stopPropagation =
+                               event.handler = event.data = null;
+
+               return val;
+       },
+
+       fix: function(event) {
+               // store a copy of the original event object 
+               // and clone to set read-only properties
+               var originalEvent = event;
+               event = jQuery.extend({}, originalEvent);
+               
+               // add preventDefault and stopPropagation since 
+               // they will not work on the clone
+               event.preventDefault = function() {
+                       // if preventDefault exists run it on the original event
+                       if (originalEvent.preventDefault)
+                               originalEvent.preventDefault();
+                       // otherwise set the returnValue property of the original event to false (IE)
+                       originalEvent.returnValue = false;
+               };
+               event.stopPropagation = function() {
+                       // if stopPropagation exists run it on the original event
+                       if (originalEvent.stopPropagation)
+                               originalEvent.stopPropagation();
+                       // otherwise set the cancelBubble property of the original event to true (IE)
+                       originalEvent.cancelBubble = true;
+               };
+               
+               // Fix target property, if necessary
+               if ( !event.target && event.srcElement )
+                       event.target = event.srcElement;
+                               
+               // check if target is a textnode (safari)
+               if (jQuery.browser.safari && event.target.nodeType == 3)
+                       event.target = originalEvent.target.parentNode;
+
+               // Add relatedTarget, if necessary
+               if ( !event.relatedTarget && event.fromElement )
+                       event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+               // Calculate pageX/Y if missing and clientX/Y available
+               if ( event.pageX == null && event.clientX != null ) {
+                       var e = document.documentElement, b = document.body;
+                       event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+                       event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
+               }
+                       
+               // Add which for key events
+               if ( !event.which && (event.charCode || event.keyCode) )
+                       event.which = event.charCode || event.keyCode;
+               
+               // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+               if ( !event.metaKey && event.ctrlKey )
+                       event.metaKey = event.ctrlKey;
+
+               // Add which for click: 1 == left; 2 == middle; 3 == right
+               // Note: button is not normalized, so don't use it
+               if ( !event.which && event.button )
+                       event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+                       
+               return event;
+       }
+};
+
+jQuery.fn.extend({
+       bind: function( type, data, fn ) {
+               return type == "unload" ? this.one(type, data, fn) : this.each(function(){
+                       jQuery.event.add( this, type, fn || data, fn && data );
+               });
+       },
+       
+       one: function( type, data, fn ) {
+               return this.each(function(){
+                       jQuery.event.add( this, type, function(event) {
+                               jQuery(this).unbind(event);
+                               return (fn || data).apply( this, arguments);
+                       }, fn && data);
+               });
+       },
+
+       unbind: function( type, fn ) {
+               return this.each(function(){
+                       jQuery.event.remove( this, type, fn );
+               });
+       },
+
+       trigger: function( type, data, fn ) {
+               return this.each(function(){
+                       jQuery.event.trigger( type, data, this, true, fn );
+               });
+       },
+
+       triggerHandler: function( type, data, fn ) {
+               if ( this[0] )
+                       return jQuery.event.trigger( type, data, this[0], false, fn );
+       },
+
+       toggle: function() {
+               // Save reference to arguments for access in closure
+               var a = arguments;
+
+               return this.click(function(e) {
+                       // Figure out which function to execute
+                       this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+                       
+                       // Make sure that clicks stop
+                       e.preventDefault();
+                       
+                       // and execute the function
+                       return a[this.lastToggle].apply( this, [e] ) || false;
+               });
+       },
+
+       hover: function(f,g) {
+               
+               // A private function for handling mouse 'hovering'
+               function handleHover(e) {
+                       // Check if mouse(over|out) are still within the same parent element
+                       var p = e.relatedTarget;
+       
+                       // Traverse up the tree
+                       while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
+                       
+                       // If we actually just moused on to a sub-element, ignore it
+                       if ( p == this ) return false;
+                       
+                       // Execute the right function
+                       return (e.type == "mouseover" ? f : g).apply(this, [e]);
+               }
+               
+               // Bind the function to the two event listeners
+               return this.mouseover(handleHover).mouseout(handleHover);
+       },
+       
+       ready: function(f) {
+               // Attach the listeners
+               bindReady();
+
+               // If the DOM is already ready
+               if ( jQuery.isReady )
+                       // Execute the function immediately
+                       f.apply( document, [jQuery] );
+                       
+               // Otherwise, remember the function for later
+               else
+                       // Add the function to the wait list
+                       jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
+       
+               return this;
+       }
+});
+
+jQuery.extend({
+       /*
+        * All the code that makes DOM Ready work nicely.
+        */
+       isReady: false,
+       readyList: [],
+       
+       // Handle when the DOM is ready
+       ready: function() {
+               // Make sure that the DOM is not already loaded
+               if ( !jQuery.isReady ) {
+                       // Remember that the DOM is ready
+                       jQuery.isReady = true;
+                       
+                       // If there are functions bound, to execute
+                       if ( jQuery.readyList ) {
+                               // Execute all of them
+                               jQuery.each( jQuery.readyList, function(){
+                                       this.apply( document );
+                               });
+                               
+                               // Reset the list of functions
+                               jQuery.readyList = null;
+                       }
+                       // Remove event listener to avoid memory leak
+                       if ( jQuery.browser.mozilla || jQuery.browser.opera )
+                               document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+                       
+                       // Remove script element used by IE hack
+                       if( !window.frames.length ) // don't remove if frames are present (#1187)
+                               jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+               }
+       }
+});
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+       "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
+       "submit,keydown,keypress,keyup,error").split(","), function(i,o){
+       
+       // Handle event binding
+       jQuery.fn[o] = function(f){
+               return f ? this.bind(o, f) : this.trigger(o);
+       };
+});
+
+var readyBound = false;
+
+function bindReady(){
+       if ( readyBound ) return;
+       readyBound = true;
+
+       // If Mozilla is used
+       if ( jQuery.browser.mozilla || jQuery.browser.opera )
+               // Use the handy event callback
+               document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
+       
+       // If IE is used, use the excellent hack by Matthias Miller
+       // http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
+       else if ( jQuery.browser.msie ) {
+       
+               // Only works if you document.write() it
+               document.write("<scr" + "ipt id=__ie_init defer=true " + 
+                       "src=//:><\/script>");
+       
+               // Use the defer script hack
+               var script = document.getElementById("__ie_init");
+               
+               // script does not exist if jQuery is loaded dynamically
+               if ( script ) 
+                       script.onreadystatechange = function() {
+                               if ( this.readyState != "complete" ) return;
+                               jQuery.ready();
+                       };
+       
+               // Clear from memory
+               script = null;
+       
+       // If Safari  is used
+       } else if ( jQuery.browser.safari )
+               // Continually check to see if the document.readyState is valid
+               jQuery.safariTimer = setInterval(function(){
+                       // loaded and complete are both valid states
+                       if ( document.readyState == "loaded" || 
+                               document.readyState == "complete" ) {
+       
+                               // If either one are found, remove the timer
+                               clearInterval( jQuery.safariTimer );
+                               jQuery.safariTimer = null;
+       
+                               // and execute any waiting functions
+                               jQuery.ready();
+                       }
+               }, 10); 
+
+       // A fallback to window.onload, that will always work
+       jQuery.event.add( window, "load", jQuery.ready );
+}
+jQuery.fn.extend({
+       load: function( url, params, callback ) {
+               if ( jQuery.isFunction( url ) )
+                       return this.bind("load", url);
+
+               var off = url.indexOf(" ");
+               if ( off >= 0 ) {
+                       var selector = url.slice(off, url.length);
+                       url = url.slice(0, off);
+               }
+
+               callback = callback || function(){};
+
+               // Default to a GET request
+               var type = "GET";
+
+               // If the second parameter was provided
+               if ( params )
+                       // If it's a function
+                       if ( jQuery.isFunction( params ) ) {
+                               // We assume that it's the callback
+                               callback = params;
+                               params = null;
+
+                       // Otherwise, build a param string
+                       } else {
+                               params = jQuery.param( params );
+                               type = "POST";
+                       }
+
+               var self = this;
+
+               // Request the remote document
+               jQuery.ajax({
+                       url: url,
+                       type: type,
+                       data: params,
+                       complete: function(res, status){
+                               // If successful, inject the HTML into all the matched elements
+                               if ( status == "success" || status == "notmodified" )
+                                       // See if a selector was specified
+                                       self.html( selector ?
+                                               // Create a dummy div to hold the results
+                                               jQuery("<div/>")
+                                                       // inject the contents of the document in, removing the scripts
+                                                       // to avoid any 'Permission Denied' errors in IE
+                                                       .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+                                                       // Locate the specified elements
+                                                       .find(selector) :
+
+                                               // If not, just inject the full result
+                                               res.responseText );
+
+                               // Add delay to account for Safari's delay in globalEval
+                               setTimeout(function(){
+                                       self.each( callback, [res.responseText, status, res] );
+                               }, 13);
+                       }
+               });
+               return this;
+       },
+
+       serialize: function() {
+               return jQuery.param(this.serializeArray());
+       },
+       serializeArray: function() {
+               return this.map(function(){
+                       return jQuery.nodeName(this, "form") ?
+                               jQuery.makeArray(this.elements) : this;
+               })
+               .filter(function(){
+                       return this.name && !this.disabled && 
+                               (this.checked || /select|textarea/i.test(this.nodeName) || 
+                                       /text|hidden|password/i.test(this.type));
+               })
+               .map(function(i, elem){
+                       var val = jQuery(this).val();
+                       return val == null ? null :
+                               val.constructor == Array ?
+                                       jQuery.map( val, function(i, val){
+                                               return {name: elem.name, value: val};
+                                       }) :
+                                       {name: elem.name, value: val};
+               }).get();
+       }
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){
+       jQuery.fn[o] = function(f){
+               return this.bind(o, f);
+       };
+});
+
+var jsc = (new Date).getTime();
+
+jQuery.extend({
+       get: function( url, data, callback, type ) {
+               // shift arguments if data argument was ommited
+               if ( jQuery.isFunction( data ) ) {
+                       callback = data;
+                       data = null;
+               }
+               
+               return jQuery.ajax({
+                       type: "GET",
+                       url: url,
+                       data: data,
+                       success: callback,
+                       dataType: type
+               });
+       },
+
+       getScript: function( url, callback ) {
+               return jQuery.get(url, null, callback, "script");
+       },
+
+       getJSON: function( url, data, callback ) {
+               return jQuery.get(url, data, callback, "json");
+       },
+
+       post: function( url, data, callback, type ) {
+               if ( jQuery.isFunction( data ) ) {
+                       callback = data;
+                       data = {};
+               }
+
+               return jQuery.ajax({
+                       type: "POST",
+                       url: url,
+                       data: data,
+                       success: callback,
+                       dataType: type
+               });
+       },
+
+       ajaxSetup: function( settings ) {
+               jQuery.extend( jQuery.ajaxSettings, settings );
+       },
+
+       ajaxSettings: {
+               global: true,
+               type: "GET",
+               timeout: 0,
+               contentType: "application/x-www-form-urlencoded",
+               processData: true,
+               async: true,
+               data: null
+       },
+       
+       // Last-Modified header cache for next request
+       lastModified: {},
+
+       ajax: function( s ) {
+               var jsonp, jsre = /=(\?|%3F)/g, status, data;
+
+               // Extend the settings, but re-extend 's' so that it can be
+               // checked again later (in the test suite, specifically)
+               s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+
+               // convert data if not already a string
+               if ( s.data && s.processData && typeof s.data != "string" )
+                       s.data = jQuery.param(s.data);
+
+               // Break the data into one single string
+               var q = s.url.indexOf("?");
+               if ( q > -1 ) {
+                       s.data = (s.data ? s.data + "&" : "") + s.url.slice(q + 1);
+                       s.url = s.url.slice(0, q);
+               }
+
+               // Handle JSONP Parameter Callbacks
+               if ( s.dataType == "jsonp" ) {
+                       if ( !s.data || !s.data.match(jsre) )
+                               s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+                       s.dataType = "json";
+               }
+
+               // Build temporary JSONP function
+               if ( s.dataType == "json" && s.data && s.data.match(jsre) ) {
+                       jsonp = "jsonp" + jsc++;
+                       s.data = s.data.replace(jsre, "=" + jsonp);
+
+                       // We need to make sure
+                       // that a JSONP style response is executed properly
+                       s.dataType = "script";
+
+                       // Handle JSONP-style loading
+                       window[ jsonp ] = function(tmp){
+                               data = tmp;
+                               success();
+                               // Garbage collect
+                               window[ jsonp ] = undefined;
+                               try{ delete window[ jsonp ]; } catch(e){}
+                       };
+               }
+
+               if ( s.dataType == "script" && s.cache == null )
+                       s.cache = false;
+
+               if ( s.cache === false && s.type.toLowerCase() == "get" )
+                       s.data = (s.data ? s.data + "&" : "") + "_=" + (new Date()).getTime();
+
+               // If data is available, append data to url for get requests
+               if ( s.data && s.type.toLowerCase() == "get" ) {
+                       s.url += "?" + s.data;
+
+                       // IE likes to send both get and post data, prevent this
+                       s.data = null;
+               }
+
+               // Watch for a new set of requests
+               if ( s.global && ! jQuery.active++ )
+                       jQuery.event.trigger( "ajaxStart" );
+
+               // If we're requesting a remote document
+               // and trying to load JSON or Script
+               if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+                       var head = document.getElementsByTagName("head")[0];
+                       var script = document.createElement("script");
+                       script.src = s.url;
+
+                       // Handle Script loading
+                       if ( !jsonp && (s.success || s.complete) ) {
+                               var done = false;
+
+                               // Attach handlers for all browsers
+                               script.onload = script.onreadystatechange = function(){
+                                       if ( !done && (!this.readyState || 
+                                                       this.readyState == "loaded" || this.readyState == "complete") ) {
+                                               done = true;
+                                               success();
+                                               complete();
+                                               head.removeChild( script );
+                                       }
+                               };
+                       }
+
+                       head.appendChild(script);
+
+                       // We handle everything using the script element injection
+                       return;
+               }
+
+               var requestDone = false;
+
+               // Create the request object; Microsoft failed to properly
+               // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+               var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+
+               // Open the socket
+               xml.open(s.type, s.url, s.async);
+
+               // Set the correct header, if data is being sent
+               if ( s.data )
+                       xml.setRequestHeader("Content-Type", s.contentType);
+
+               // Set the If-Modified-Since header, if ifModified mode.
+               if ( s.ifModified )
+                       xml.setRequestHeader("If-Modified-Since",
+                               jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" );
+
+               // Set header so the called script knows that it's an XMLHttpRequest
+               xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+               // Allow custom headers/mimetypes
+               if ( s.beforeSend )
+                       s.beforeSend(xml);
+                       
+               if ( s.global )
+                   jQuery.event.trigger("ajaxSend", [xml, s]);
+
+               // Wait for a response to come back
+               var onreadystatechange = function(isTimeout){
+                       // The transfer is complete and the data is available, or the request timed out
+                       if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) {
+                               requestDone = true;
+                               
+                               // clear poll interval
+                               if (ival) {
+                                       clearInterval(ival);
+                                       ival = null;
+                               }
+                               
+                               status = isTimeout == "timeout" && "timeout" ||
+                                       !jQuery.httpSuccess( xml ) && "error" ||
+                                       s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" ||
+                                       "success";
+
+                               if ( status == "success" ) {
+                                       // Watch for, and catch, XML document parse errors
+                                       try {
+                                               // process the data (runs the xml through httpData regardless of callback)
+                                               data = jQuery.httpData( xml, s.dataType );
+                                       } catch(e) {
+                                               status = "parsererror";
+                                       }
+                               }
+
+                               // Make sure that the request was successful or notmodified
+                               if ( status == "success" ) {
+                                       // Cache Last-Modified header, if ifModified mode.
+                                       var modRes;
+                                       try {
+                                               modRes = xml.getResponseHeader("Last-Modified");
+                                       } catch(e) {} // swallow exception thrown by FF if header is not available
+       
+                                       if ( s.ifModified && modRes )
+                                               jQuery.lastModified[s.url] = modRes;
+
+                                       // JSONP handles its own success callback
+                                       if ( !jsonp )
+                                               success();      
+                               } else
+                                       jQuery.handleError(s, xml, status);
+
+                               // Fire the complete handlers
+                               complete();
+
+                               // Stop memory leaks
+                               if ( s.async )
+                                       xml = null;
+                       }
+               };
+               
+               if ( s.async ) {
+                       // don't attach the handler to the request, just poll it instead
+                       var ival = setInterval(onreadystatechange, 13); 
+
+                       // Timeout checker
+                       if ( s.timeout > 0 )
+                               setTimeout(function(){
+                                       // Check to see if the request is still happening
+                                       if ( xml ) {
+                                               // Cancel the request
+                                               xml.abort();
+       
+                                               if( !requestDone )
+                                                       onreadystatechange( "timeout" );
+                                       }
+                               }, s.timeout);
+               }
+                       
+               // Send the data
+               try {
+                       xml.send(s.data);
+               } catch(e) {
+                       jQuery.handleError(s, xml, null, e);
+               }
+               
+               // firefox 1.5 doesn't fire statechange for sync requests
+               if ( !s.async )
+                       onreadystatechange();
+               
+               // return XMLHttpRequest to allow aborting the request etc.
+               return xml;
+
+               function success(){
+                       // If a local callback was specified, fire it and pass it the data
+                       if ( s.success )
+                               s.success( data, status );
+
+                       // Fire the global callback
+                       if ( s.global )
+                               jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+               }
+
+               function complete(){
+                       // Process result
+                       if ( s.complete )
+                               s.complete(xml, status);
+
+                       // The request was completed
+                       if ( s.global )
+                               jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                       // Handle the global AJAX counter
+                       if ( s.global && ! --jQuery.active )
+                               jQuery.event.trigger( "ajaxStop" );
+               }
+       },
+
+       handleError: function( s, xml, status, e ) {
+               // If a local callback was specified, fire it
+               if ( s.error ) s.error( xml, status, e );
+
+               // Fire the global callback
+               if ( s.global )
+                       jQuery.event.trigger( "ajaxError", [xml, s, e] );
+       },
+
+       // Counter for holding the number of active queries
+       active: 0,
+
+       // Determines if an XMLHttpRequest was successful or not
+       httpSuccess: function( r ) {
+               try {
+                       return !r.status && location.protocol == "file:" ||
+                               ( r.status >= 200 && r.status < 300 ) || r.status == 304 ||
+                               jQuery.browser.safari && r.status == undefined;
+               } catch(e){}
+               return false;
+       },
+
+       // Determines if an XMLHttpRequest returns NotModified
+       httpNotModified: function( xml, url ) {
+               try {
+                       var xmlRes = xml.getResponseHeader("Last-Modified");
+
+                       // Firefox always returns 200. check Last-Modified date
+                       return xml.status == 304 || xmlRes == jQuery.lastModified[url] ||
+                               jQuery.browser.safari && xml.status == undefined;
+               } catch(e){}
+               return false;
+       },
+
+       httpData: function( r, type ) {
+               var ct = r.getResponseHeader("content-type");
+               var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0;
+               var data = xml ? r.responseXML : r.responseText;
+
+               if ( xml && data.documentElement.tagName == "parsererror" )
+                       throw "parsererror";
+
+               // If the type is "script", eval it in global context
+               if ( type == "script" )
+                       jQuery.globalEval( data );
+
+               // Get the JavaScript object, if JSON is used.
+               if ( type == "json" )
+                       data = eval("(" + data + ")");
+
+               return data;
+       },
+
+       // Serialize an array of form elements or a set of
+       // key/values into a query string
+       param: function( a ) {
+               var s = [];
+
+               // If an array was passed in, assume that it is an array
+               // of form elements
+               if ( a.constructor == Array || a.jquery )
+                       // Serialize the form elements
+                       jQuery.each( a, function(){
+                               s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
+                       });
+
+               // Otherwise, assume that it's an object of key/value pairs
+               else
+                       // Serialize the key/values
+                       for ( var j in a )
+                               // If the value is an array then the key names need to be repeated
+                               if ( a[j] && a[j].constructor == Array )
+                                       jQuery.each( a[j], function(){
+                                               s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
+                                       });
+                               else
+                                       s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) );
+
+               // Return the resulting serialization
+               return s.join("&").replace(/%20/g, "+");
+       }
+
+});
+jQuery.fn.extend({
+       show: function(speed,callback){
+               return speed ?
+                       this.animate({
+                               height: "show", width: "show", opacity: "show"
+                       }, speed, callback) :
+                       
+                       this.filter(":hidden").each(function(){
+                               this.style.display = this.oldblock ? this.oldblock : "";
+                               if ( jQuery.css(this,"display") == "none" )
+                                       this.style.display = "block";
+                       }).end();
+       },
+       
+       hide: function(speed,callback){
+               return speed ?
+                       this.animate({
+                               height: "hide", width: "hide", opacity: "hide"
+                       }, speed, callback) :
+                       
+                       this.filter(":visible").each(function(){
+                               this.oldblock = this.oldblock || jQuery.css(this,"display");
+                               if ( this.oldblock == "none" )
+                                       this.oldblock = "block";
+                               this.style.display = "none";
+                       }).end();
+       },
+
+       // Save the old toggle function
+       _toggle: jQuery.fn.toggle,
+       
+       toggle: function( fn, fn2 ){
+               return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+                       this._toggle( fn, fn2 ) :
+                       fn ?
+                               this.animate({
+                                       height: "toggle", width: "toggle", opacity: "toggle"
+                               }, fn, fn2) :
+                               this.each(function(){
+                                       jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+                               });
+       },
+       
+       slideDown: function(speed,callback){
+               return this.animate({height: "show"}, speed, callback);
+       },
+       
+       slideUp: function(speed,callback){
+               return this.animate({height: "hide"}, speed, callback);
+       },
+
+       slideToggle: function(speed, callback){
+               return this.animate({height: "toggle"}, speed, callback);
+       },
+       
+       fadeIn: function(speed, callback){
+               return this.animate({opacity: "show"}, speed, callback);
+       },
+       
+       fadeOut: function(speed, callback){
+               return this.animate({opacity: "hide"}, speed, callback);
+       },
+       
+       fadeTo: function(speed,to,callback){
+               return this.animate({opacity: to}, speed, callback);
+       },
+       
+       animate: function( prop, speed, easing, callback ) {
+               var opt = jQuery.speed(speed, easing, callback);
+
+               return this[ opt.queue === false ? "each" : "queue" ](function(){
+                       opt = jQuery.extend({}, opt);
+                       var hidden = jQuery(this).is(":hidden"), self = this;
+                       
+                       for ( var p in prop ) {
+                               if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+                                       return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+                               if ( p == "height" || p == "width" ) {
+                                       // Store display property
+                                       opt.display = jQuery.css(this, "display");
+
+                                       // Make sure that nothing sneaks out
+                                       opt.overflow = this.style.overflow;
+                               }
+                       }
+
+                       if ( opt.overflow != null )
+                               this.style.overflow = "hidden";
+
+                       opt.curAnim = jQuery.extend({}, prop);
+                       
+                       jQuery.each( prop, function(name, val){
+                               var e = new jQuery.fx( self, opt, name );
+
+                               if ( /toggle|show|hide/.test(val) )
+                                       e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+                               else {
+                                       var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/),
+                                               start = e.cur(true) || 0;
+
+                                       if ( parts ) {
+                                               end = parseFloat(parts[2]),
+                                               unit = parts[3] || "px";
+
+                                               // We need to compute starting value
+                                               if ( unit != "px" ) {
+                                                       self.style[ name ] = end + unit;
+                                                       start = (end / e.cur(true)) * start;
+                                                       self.style[ name ] = start + unit;
+                                               }
+
+                                               // If a +/- token was provided, we're doing a relative animation
+                                               if ( parts[1] )
+                                                       end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+
+                                               e.custom( start, end, unit );
+                                       } else
+                                               e.custom( start, val, "" );
+                               }
+                       });
+
+                       // For JS strict compliance
+                       return true;
+               });
+       },
+       
+       queue: function(type, fn){
+               if ( !fn ) {
+                       fn = type;
+                       type = "fx";
+               }
+
+               if ( !arguments.length )
+                       return queue( this[0], type );
+
+               return this.each(function(){
+                       if ( fn.constructor == Array )
+                               queue(this, type, fn);
+                       else {
+                               queue(this, type).push( fn );
+                       
+                               if ( queue(this, type).length == 1 )
+                                       fn.apply(this);
+                       }
+               });
+       },
+
+       stop: function(){
+               var timers = jQuery.timers;
+
+               return this.each(function(){
+                       for ( var i = 0; i < timers.length; i++ )
+                               if ( timers[i].elem == this )
+                                       timers.splice(i--, 1);
+               }).dequeue();
+       }
+
+});
+
+var queue = function( elem, type, array ) {
+       if ( !elem )
+               return;
+
+       var q = jQuery.data( elem, type + "queue" );
+
+       if ( !q || array )
+               q = jQuery.data( elem, type + "queue", 
+                       array ? jQuery.makeArray(array) : [] );
+
+       return q;
+};
+
+jQuery.fn.dequeue = function(type){
+       type = type || "fx";
+
+       return this.each(function(){
+               var q = queue(this, type);
+
+               q.shift();
+
+               if ( q.length )
+                       q[0].apply( this );
+       });
+};
+
+jQuery.extend({
+       
+       speed: function(speed, easing, fn) {
+               var opt = speed && speed.constructor == Object ? speed : {
+                       complete: fn || !fn && easing || 
+                               jQuery.isFunction( speed ) && speed,
+                       duration: speed,
+                       easing: fn && easing || easing && easing.constructor != Function && easing
+               };
+
+               opt.duration = (opt.duration && opt.duration.constructor == Number ? 
+                       opt.duration : 
+                       { slow: 600, fast: 200 }[opt.duration]) || 400;
+       
+               // Queueing
+               opt.old = opt.complete;
+               opt.complete = function(){
+                       jQuery(this).dequeue();
+                       if ( jQuery.isFunction( opt.old ) )
+                               opt.old.apply( this );
+               };
+       
+               return opt;
+       },
+       
+       easing: {
+               linear: function( p, n, firstNum, diff ) {
+                       return firstNum + diff * p;
+               },
+               swing: function( p, n, firstNum, diff ) {
+                       return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+               }
+       },
+       
+       timers: [],
+
+       fx: function( elem, options, prop ){
+               this.options = options;
+               this.elem = elem;
+               this.prop = prop;
+
+               if ( !options.orig )
+                       options.orig = {};
+       }
+
+});
+
+jQuery.fx.prototype = {
+
+       // Simple function for setting a style value
+       update: function(){
+               if ( this.options.step )
+                       this.options.step.apply( this.elem, [ this.now, this ] );
+
+               (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+
+               // Set display property to block for height/width animations
+               if ( this.prop == "height" || this.prop == "width" )
+                       this.elem.style.display = "block";
+       },
+
+       // Get the current size
+       cur: function(force){
+               if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
+                       return this.elem[ this.prop ];
+
+               var r = parseFloat(jQuery.curCSS(this.elem, this.prop, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
+       },
+
+       // Start an animation from one number to another
+       custom: function(from, to, unit){
+               this.startTime = (new Date()).getTime();
+               this.start = from;
+               this.end = to;
+               this.unit = unit || this.unit || "px";
+               this.now = this.start;
+               this.pos = this.state = 0;
+               this.update();
+
+               var self = this;
+               function t(){
+                       return self.step();
+               }
+
+               t.elem = this.elem;
+
+               jQuery.timers.push(t);
+
+               if ( jQuery.timers.length == 1 ) {
+                       var timer = setInterval(function(){
+                               var timers = jQuery.timers;
+                               
+                               for ( var i = 0; i < timers.length; i++ )
+                                       if ( !timers[i]() )
+                                               timers.splice(i--, 1);
+
+                               if ( !timers.length )
+                                       clearInterval( timer );
+                       }, 13);
+               }
+       },
+
+       // Simple 'show' function
+       show: function(){
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.show = true;
+
+               // Begin the animation
+               this.custom(0, this.cur());
+
+               // Make sure that we start at a small width/height to avoid any
+               // flash of content
+               if ( this.prop == "width" || this.prop == "height" )
+                       this.elem.style[this.prop] = "1px";
+               
+               // Start by showing the element
+               jQuery(this.elem).show();
+       },
+
+       // Simple 'hide' function
+       hide: function(){
+               // Remember where we started, so that we can go back to it later
+               this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop );
+               this.options.hide = true;
+
+               // Begin the animation
+               this.custom(this.cur(), 0);
+       },
+
+       // Each step of an animation
+       step: function(){
+               var t = (new Date()).getTime();
+
+               if ( t > this.options.duration + this.startTime ) {
+                       this.now = this.end;
+                       this.pos = this.state = 1;
+                       this.update();
+
+                       this.options.curAnim[ this.prop ] = true;
+
+                       var done = true;
+                       for ( var i in this.options.curAnim )
+                               if ( this.options.curAnim[i] !== true )
+                                       done = false;
+
+                       if ( done ) {
+                               if ( this.options.display != null ) {
+                                       // Reset the overflow
+                                       this.elem.style.overflow = this.options.overflow;
+                               
+                                       // Reset the display
+                                       this.elem.style.display = this.options.display;
+                                       if ( jQuery.css(this.elem, "display") == "none" )
+                                               this.elem.style.display = "block";
+                               }
+
+                               // Hide the element if the "hide" operation was done
+                               if ( this.options.hide )
+                                       this.elem.style.display = "none";
+
+                               // Reset the properties, if the item has been hidden or shown
+                               if ( this.options.hide || this.options.show )
+                                       for ( var p in this.options.curAnim )
+                                               jQuery.attr(this.elem.style, p, this.options.orig[p]);
+                       }
+
+                       // If a callback was provided, execute it
+                       if ( done && jQuery.isFunction( this.options.complete ) )
+                               // Execute the complete function
+                               this.options.complete.apply( this.elem );
+
+                       return false;
+               } else {
+                       var n = t - this.startTime;
+                       this.state = n / this.options.duration;
+
+                       // Perform the easing function, defaults to swing
+                       this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+                       this.now = this.start + ((this.end - this.start) * this.pos);
+
+                       // Perform the next step of the animation
+                       this.update();
+               }
+
+               return true;
+       }
+
+};
+
+jQuery.fx.step = {
+       scrollLeft: function(fx){
+               fx.elem.scrollLeft = fx.now;
+       },
+
+       scrollTop: function(fx){
+               fx.elem.scrollTop = fx.now;
+       },
+
+       opacity: function(fx){
+               jQuery.attr(fx.elem.style, "opacity", fx.now);
+       },
+
+       _default: function(fx){
+               fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+       }
+};
+// The Offset Method
+// Originally By Brandon Aaron, part of the Dimension Plugin
+// http://jquery.com/plugins/project/dimensions
+jQuery.fn.offset = function() {
+       var left = 0, top = 0, elem = this[0], results;
+       
+       if ( elem ) with ( jQuery.browser ) {
+               var     absolute        = jQuery.css(elem, "position") == "absolute", 
+                       parent          = elem.parentNode, 
+                       offsetParent    = elem.offsetParent, 
+                       doc             = elem.ownerDocument,
+                       safari2         = safari && !absolute && parseInt(version) < 522;
+       
+               // Use getBoundingClientRect if available
+               if ( elem.getBoundingClientRect ) {
+                       box = elem.getBoundingClientRect();
+               
+                       // Add the document scroll offsets
+                       add(
+                               box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                               box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
+                       );
+               
+                       // IE adds the HTML element's border, by default it is medium which is 2px
+                       // IE 6 and IE 7 quirks mode the border width is overwritable by the following css html { border: 0; }
+                       // IE 7 standards mode, the border is always 2px
+                       if ( msie ) {
+                               var border = jQuery("html").css("borderWidth");
+                               border = (border == "medium" || jQuery.boxModel && parseInt(version) >= 7) && 2 || border;
+                               add( -border, -border );
+                       }
+       
+               // Otherwise loop through the offsetParents and parentNodes
+               } else {
+               
+                       // Initial element offsets
+                       add( elem.offsetLeft, elem.offsetTop );
+               
+                       // Get parent offsets
+                       while ( offsetParent ) {
+                               // Add offsetParent offsets
+                               add( offsetParent.offsetLeft, offsetParent.offsetTop );
+                       
+                               // Mozilla and Safari > 2 does not include the border on offset parents
+                               // However Mozilla adds the border for table cells
+                               if ( mozilla && /^t[d|h]$/i.test(parent.tagName) || !safari2 )
+                                       border( offsetParent );
+                               
+                               // Safari <= 2 doubles body offsets with an absolutely positioned element or parent
+                               if ( safari2 && !absolute && jQuery.css(offsetParent, "position") == "absolute" )
+                                       absolute = true;
+                       
+                               // Get next offsetParent
+                               offsetParent = offsetParent.offsetParent;
+                       }
+               
+                       // Get parent scroll offsets
+                       while ( parent.tagName && /^body|html$/i.test(parent.tagName) ) {
+                               // Work around opera inline/table scrollLeft/Top bug
+                               if ( /^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+                                       // Subtract parent scroll offsets
+                                       add( -parent.scrollLeft, -parent.scrollTop );
+                       
+                               // Mozilla does not add the border for a parent that has overflow != visible
+                               if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
+                                       border( parent );
+                       
+                               // Get next parent
+                               parent = parent.parentNode;
+                       }
+               
+                       // Safari doubles body offsets with an absolutely positioned element or parent
+                       if ( safari && absolute )
+                               add( -doc.body.offsetLeft, -doc.body.offsetTop );
+               }
+
+               // Return an object with top and left properties
+               results = { top: top, left: left };
+       }
+
+       return results;
+
+       function border(elem) {
+               add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+       }
+
+       function add(l, t) {
+               left += parseInt(l) || 0;
+               top += parseInt(t) || 0;
+       }
+};
+})();
diff --git a/src/manager/templates/static/nat.png b/src/manager/templates/static/nat.png
new file mode 100644 (file)
index 0000000..f669b27
Binary files /dev/null and b/src/manager/templates/static/nat.png differ
diff --git a/src/manager/templates/static/pipe-bad.png b/src/manager/templates/static/pipe-bad.png
new file mode 100644 (file)
index 0000000..dede311
Binary files /dev/null and b/src/manager/templates/static/pipe-bad.png differ
diff --git a/src/manager/templates/static/pipe-good.png b/src/manager/templates/static/pipe-good.png
new file mode 100644 (file)
index 0000000..9419fd3
Binary files /dev/null and b/src/manager/templates/static/pipe-good.png differ
diff --git a/src/manager/templates/static/pipe.png b/src/manager/templates/static/pipe.png
new file mode 100644 (file)
index 0000000..931e170
Binary files /dev/null and b/src/manager/templates/static/pipe.png differ
diff --git a/src/manager/templates/static/router.png b/src/manager/templates/static/router.png
new file mode 100644 (file)
index 0000000..53114d9
Binary files /dev/null and b/src/manager/templates/static/router.png differ
diff --git a/src/manager/templates/static/script.js b/src/manager/templates/static/script.js
new file mode 100644 (file)
index 0000000..7b2a582
--- /dev/null
@@ -0,0 +1,8 @@
+
+$(function(){
+  $(".expand > div").hide();
+  $(".expand > h1").toggle(
+    function(){$(this).parent(".expand").find("div").slideDown('fast');},
+    function(){$(this).parent(".expand").find("div").slideUp('fast');}
+  );
+});
diff --git a/src/manager/templates/static/strongswan.png b/src/manager/templates/static/strongswan.png
new file mode 100644 (file)
index 0000000..869188c
Binary files /dev/null and b/src/manager/templates/static/strongswan.png differ
index 986ae06..8a7f496 100644 (file)
-html {
-    height:100%;
-    width: auto;
-    margin:0;
-    padding:0;
-}
-
 
 body {
-       font-family: Verdana, Helvetica, sans-serif;
-       font-size: 12px;
-       width: 100%;
-       height:100%;
-    margin:0;
-    padding:0;
-    background-color: #EEEEEE;
-}
-
-h1 {
-       color: #203781;
-       font-size: 18px;
-       font-weight: bold;
+    font-family: Verdana, Helvetica, sans-serif;
+    font-size: .9em;
+    color: #230100;
+    background-color: #f7f4d3;
+    margin: 0;
 }
 
-h2 {
-       color: #203781;
-       font-size: 17px;
-       font-weight: bold;
+.content {
+    text-align: center;
 }
 
-h3 {
-       color: #203781;
-       font-size: 16px;
-       font-weight: bold;
+.content > * {
+    background-color: #e5bf5e;
+    border: solid 2px;
+    padding: .2em 1em .2em 1em;
+    margin: 1em;
+    text-align: left;
 }
 
-h4 {
-       color: #203781;
-       font-size: 15px;
-       font-weight: bold;
+textarea, select, input {
+       background-color: #ffec9e;
+       border: 1px solid;
+       padding: 1px 3px 1px 3px;
 }
 
-p {
-       line-height: 1.2;
-       font-size: 11px;
+.menu {
+       text-align: right;
+    background-color: #e5bf5e;
+    padding: 3px;
+    border-bottom: solid 2px;
 }
 
 a {
-    color: black;
-    font-size: 12px;   
+       color: black;
+       text-decoration: none;
 }
 
-#headermain {
-       min-height: 100%;
-       background-color: white;
-       margin-left: 188px;
+h1 {
+       margin-top: 1em;
+       
 }
 
-/* ##### Header ##### */
-
-#header {
-       width: 100%;
-       height: 30px;
-       background-color: #EEEEEE;
+hr {
+       border: solid 1px;
 }
 
-.gatewayname{
-       padding-top: 5px;
-    padding-left: 30px;
-    font-size: 12px;
+a img {
+       border: none;
 }
 
-/* ##### Left Side Bar ##### */
-
-.leftSideBar {
-       padding-top: 30px;
-       padding-left: 8px;
-       padding-right: 8px;
-       width: 170px;
-       float: left;
+.expand {
 }
 
-.leftSideBar .sideBarTitle {
-       color: black;
-       font-weight: bold;
-       font-size: 12px;
-       margin: 0.1ex 0 0.1ex 0;
+.expand h1 {
+    font-size: 1em;
+    cursor: pointer;
+    margin: 0;
 }
 
-.leftSideBar a {
-       color: #203781;
-       text-decoration: none;
-       display: block;
-       margin: 0;
-       padding: 0.8ex 1ex;
+.expand h1 span {
+       margin-left: 2em;
+       margin-right: 2em;
 }
 
-.leftSideBar a:hover {
-       color: black;
-       background-color: lightgrey;
-       text-decoration: none;
+.center {
+       text-align: center;
 }
 
-/* ##### Main ##### */
-
-#main {
-       padding-top: 10px;
-       padding-left: 30px;
-    color: black;
-    text-align: justify;
-    line-height: 1.5em;
+.left {
+       text-align: left;
 }
 
-/* ##### From Selection ##### */
-
-.formbody {
-    background-color: white;
-    height: auto;
+.right {
+       text-align: right;
 }
 
-.formbox {
-       width: 492px;
-       margin-top: 100px;
-       margin-left: auto;
-       margin-right: auto;
-       border-color: #333;
-       border-width: 1px;
-       border-style: solid;
-       padding: 10px;
+.highlight {
 }
 
-.formselection {
-       background-color: #EEEEEE;
-       border-color: #333;
-       border-width: 1px;
-       border-style: solid;
+.fleft {
+       margin-right: 2em;
+       float: left;
 }
 
-.selection {
-       background-color: white;
-       border-color: #333;
-       border-style: solid;
-       margin-left: 12px;
-       margin-right: 4px;
-       border-width: 1px;
-       width: 400px;
+.fright {
+       float: left;
 }
 
-.button {
-       font-size: 12px;
-       font-weight: bold;
-       width: 50px;
-       border-color: #333;
-       border-width: 1px;
-       border-style: solid;
-       background-color: lightgrey;
+.cleft {
+       clear:left;
 }
 
-.message {
-    color: red;
+.cright {
+       clear:right;
 }
 
-/* ##### Tables ##### */
-
-th {
-    padding-right: 15px;       
+.both {
+       clear:both;
 }
 
-td {
-       padding-right: 15px;
+.drawing {
+    border-collapse:collapse
 }
 
-/* ##### Lists ##### */
-
-ul {
-    list-style: None;
-    padding-left: 0;
+.drawing .images {
+       height: 100px;
 }
 
-li {
-    padding-bottom: 5px;       
+.drawing .images td {
+    padding: 0px;
+    width: 100px;
 }
 
-/* ##### Labels ##### */
+.drawing tr .left {
+       text-align: left;
+}
+.drawing tr .right {
+       text-align: right;
+}
 
-label {
-    font-weight: bold;
-}
\ No newline at end of file
index 75e8e0b..83c969c 100644 (file)
 <?cs include:"templates/header.cs" ?>
-<h1>List of IKE SA's</h1>
-<table border="1">
-  <tr>
-    <td colspan="4"></td>
-    <td colspan="3">Local</td>
-    <td colspan="3">Remote</td>
-  <tr>
-  <tr>
-    <td>ID</td>
-    <td>Status</td>
-    <td>Role</td>
-    <td>Config</td>
-    <td>ID</td>
-    <td>Address</td>
-    <td>SPI</td>
-    <td>ID</td>
-    <td>Address</td>
-    <td>SPI</td>
-  <tr>
-  <?cs each:ikesa = ikesas ?>
-    <td><?cs name:ikesa ?></td>
-    <td><?cs var:ikesa.status ?></td>
-    <td><?cs var:ikesa.role ?></td>
-    <td><?cs var:ikesa.peerconfig ?></td>
-    <td><?cs var:ikesa.local.identification ?></td>
-    <td><?cs var:ikesa.local.address ?>:<?cs var:ikesa.local.port ?></td>
-    <td><?cs var:ikesa.local.spi ?></td>
-    <td><?cs var:ikesa.remote.identification ?></td>
-    <td><?cs var:ikesa.remote.address ?>:<?cs var:ikesa.remote.port ?></td>
-    <td><?cs var:ikesa.remote.spi ?></td>
-  <?cs /each ?>
-  </tr>
-</table>
+<?cs each:ikesa = ikesas ?>
+  <div class="expand" id="ikesa-<?cs name:ikesa ?>">
+  <h1>
+       <?cs name:ikesa ?>:
+       <span><?cs var:ikesa.local.identification ?></span> &lt;-&gt; 
+       <span><?cs var:ikesa.remote.identification ?></span>
+  </h1> 
+  <div>
+    <hr/>
+    <table class="drawing">
+      <tr>
+        <td>
+        </td>
+        <td class="left" colspan="2">
+          <?cs var:ikesa.local.identification ?>
+        </td>
+        <td>
+        </td>
+        <td class="right" colspan="2">
+          <?cs var:ikesa.remote.identification ?>
+        </td>
+        <td>
+        </td>
+      </tr>
+      <tr>
+        <td>
+        </td>
+        <td>
+        </td>
+        <td class="center" colspan="3">
+          <?cs var:ikesa.local.spi ?>:<?cs var:ikesa.remote.spi ?>
+        </td>
+        <td>
+        </td>
+        <td>
+        </td>
+      </tr>
+      <tr class="images">
+        <td>
+               <?cs each:net = ikesa.childsas.local ?>
+                 <p><?cs var:net ?></p>
+               <?cs /each ?>
+        </td>
+        <td>
+          <?cs if:ikesa.role == "initiator" ?>
+          <img title="Local host is the initiator" src="<?cs var:base ?>/static/client-left.png"></img>
+          <?cs else ?>
+          <img title="Local host is the responder" src="<?cs var:base ?>/static/gateway-left.png"></img>
+          <?cs /if ?>
+        </td>
+        <td>
+          <?cs if:ikesa.local.nat == "true" ?>
+          <img title="Local host is behind a NAT router" src="<?cs var:base ?>/static/router.png"></img>
+          <?cs else ?>
+          <img title="Local host is not NATed" src="<?cs var:base ?>/static/pipe.png"></img>
+          <?cs /if ?>
+        </td>
+        <td>
+          <?cs if:ikesa.status == "established" ?>
+          <img title="IKE connection <?cs var:ikesa.status ?>" src="<?cs var:base ?>/static/pipe-good.png"></img>
+          <?cs else ?>
+          <img title="IKE connection in state <?cs var:ikesa.status ?>" src="<?cs var:base ?>/static/pipe-bad.png"></img>
+          <?cs /if ?>
+        </td>
+        <td>
+          <?cs if:ikesa.remote.nat == "true" ?>
+          <img title="Remote host is behind a NAT router" src="<?cs var:base ?>/static/router.png"></img>
+          <?cs else ?>
+          <img title="Remote host is the responder" src="<?cs var:base ?>/static/pipe.png"></img>
+          <?cs /if ?>
+        </td>
+        <td>
+          <?cs if:ikesa.role == "responder" ?>
+          <img title="Remote host is the initiator" src="<?cs var:base ?>/static/client-right.png"></img>
+          <?cs else ?>
+          <img title="Remote host is the responder" src="<?cs var:base ?>/static/gateway-right.png"></img>
+          <?cs /if ?>
+        </td>
+        <td>
+               <?cs each:net = ikesa.childsas.remote ?>
+                 <p><?cs var:net ?></p>
+               <?cs /each ?>
+        </td>
+      </tr>
+      <tr>
+        <td>
+        </td>
+        <td class="left" colspan="2">
+          <?cs var:ikesa.local.address ?>:<?cs var:ikesa.local.port ?>
+        </td>
+        <td>
+        </td>
+        <td class="right" colspan="2">
+          <?cs var:ikesa.remote.address ?>:<?cs var:ikesa.remote.port ?>
+        </td>
+        <td>
+        </td>
+      </tr>
+    </table>
+  </div>
+  </div>
+<?cs /each ?>
 <?cs include:"templates/footer.cs" ?>