Revert WebUI changeswebui-details

Reverted with: % git diff --binary HEAD..d4adbc8052faf18fb31e7b1865037aa107067d4b > revert.patch % git apply revert.patch % git commit -a
author: Stephen Gallagher <sgallagh@redhat.com> 2010-08-02 14:36:33 -0400
committer: Rob Crittenden <rcritten@redhat.com> 2010-08-02 16:28:07 -0400
commit: f9ff041c5cd5ac11af2edb59cb7a707582193df6 (patch)
tree: 78bdceb1b3b637be34fbb11ff34d8d17fdf88446
parent: 47d4fcdd8178ec4b8403efa4f80eaa009c32d78b (diff)
download: freeipa-webui-details.tar.gz
freeipa-webui-details.tar.xz
freeipa-webui-details.zip
72 files changed, 29 insertions, 10749 deletions
diff --git a/.gitignore b/.gitignore
index 08a1d85f5..7ed6c41dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,3 @@
 .bzr
 freeipa2-dev-doc
 build
-RELEASE
-daemons/ipa-version.h
-ipa-client/ipa-client.spec
-ipa-client/version.m4
-ipa.spec
-ipapython/setup.py
-ipapython/version.py
-version.m4
diff --git a/install/Makefile.am b/install/Makefile.am
index 80f04bd74..1b97afa5b 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -9,7 +9,6 @@ SUBDIRS =			\
         html			\
         migration		\
         share			\
-        static			\
         tools			\
         updates			\
         po			\
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf
index 85b37b834..dba47c5a4 100644
--- a/install/conf/ipa.conf
+++ b/install/conf/ipa.conf
@@ -5,12 +5,6 @@
 
 ProxyRequests Off
 
-
-#We use xhtml, a file format that the browser validates
-DirectoryIndex index.xhtml
-
-
-
 # ipa-rewrite.conf is loaded separately
 
 # This is required so the auto-configuration works with Firefox 2+
@@ -84,15 +78,6 @@ Alias /ipa/crl "/var/lib/pki-ca/publish"
 </Directory>
 
 
-# Static data files (maily webUI stuff like images)
-Alias /ipa/static "/usr/share/ipa/static"
-<Directory "/usr/share/ipa/static">
-  SetHandler None
-  AllowOverride None
-  Allow from all
-</Directory>
-
-
 # WebUI assets
 Alias /ipa-assets/ "/var/cache/ipa/assets/"
 <Directory "/var/cache/ipa/assets">
diff --git a/install/configure.ac b/install/configure.ac
index 3d0c1db02..eb2d3cd13 100644
--- a/install/configure.ac
+++ b/install/configure.ac
@@ -72,7 +72,6 @@ AC_CONFIG_FILES([
     html/Makefile
     migration/Makefile
     share/Makefile
-    static/Makefile
     tools/Makefile
     tools/man/Makefile
     updates/Makefile
diff --git a/install/po/test_lang b/install/po/test_lang
deleted file mode 100644
index e69de29bb..000000000
--- a/install/po/test_lang
+++ /dev/null
diff --git a/install/share/wsgi.py b/install/share/wsgi.py
index 2e0cd8f6b..f6b99a2dc 100644
--- a/install/share/wsgi.py
+++ b/install/share/wsgi.py
@@ -1,35 +1,8 @@
-# Authors:
-#   Pavel Zuna <pzuna@redhat.com>
-#
-# Copyright (C) 2010  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# 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; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 WSGI appliction for IPA server.
 """
 
-import json
-import urlparse
-from genshi.template import TemplateLoader, MarkupTemplate, TemplateNotFound
-
 from ipalib import api
-from ipalib.util import json_serialize
-from ipalib.request import context, destroy_context
-from ipaserver.rpcserver import not_found
-
-
 api.bootstrap(context='server', debug=True, log=None)
 try:
     api.finalize()
diff --git a/install/static/Image:Header_background.png b/install/static/Image:Header_background.png
deleted file mode 100644
index 0100aaa6d..000000000
--- a/install/static/Image:Header_background.png
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<meta name="keywords" content="Image:Header background.png,Image:Header background.png,Image:Header background.png" />
-<link rel="shortcut icon" href="/favicon.ico" />
-		<title>Image:Header background.png - Free IPA</title>
-		<style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "/wiki/skins/freeipa/main.css?7"; /*]]>*/</style>
-		<link rel="stylesheet" type="text/css" media="print" href="/wiki/skins/common/commonPrint.css" />
-		<!--[if lt IE 5.5000]><style type="text/css">@import "/wiki/skins/freeipa/IE50Fixes.css";</style><![endif]-->
-		<!--[if IE 5.5000]><style type="text/css">@import "/wiki/skins/freeipa/IE55Fixes.css";</style><![endif]-->
-		<!--[if IE 6]><style type="text/css">@import "/wiki/skins/freeipa/IE60Fixes.css";</style><![endif]-->
-		<!--[if IE 7]><style type="text/css">@import "/wiki/skins/freeipa/IE70Fixes.css?1";</style><![endif]-->
-		<!--[if lt IE 7]><script type="text/javascript" src="/wiki/skins/common/IEFixes.js"></script>
-		<meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-		<script type="text/javascript">var skin = 'freeipa';var stylepath = '/wiki/skins';</script>
-		<script type="text/javascript" src="/wiki/skins/common/wikibits.js"><!-- wikibits js --></script>
-		<script type="text/javascript" src="/wiki/index.php?title=-&amp;action=raw&amp;gen=js"><!-- site js --></script>
-		<style type="text/css">/*<![CDATA[*/
-@import "/wiki/index.php?title=MediaWiki:Common.css&action=raw&ctype=text/css&smaxage=18000";
-@import "/wiki/index.php?title=MediaWiki:Freeipa.css&action=raw&ctype=text/css&smaxage=18000";
-@import "/wiki/index.php?title=-&action=raw&gen=css&maxage=18000";
-/*]]>*/</style>
-		<!-- Head Scripts -->
-			</head>
-<body  class="ns-6 ltr">
-   <a href="/page/Main_Page" title="Main Page">
-   <img src="/wiki/skins/freeipa/free-ipa-logo_small.png" alt="FreeIPA" />
-   </a>
-
-	<div id="globalWrapper">
-
-		<div id="column-content">
-	<div id="content">
-
-	<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
-		<div class='portlet' id='p-navigation'>
-		<h5>Navigation</h5>
-		<div class='pBody'>
-			<ul>
-				<li id="n-Home"><a href="/page/Main_Page">Home</a></li>
-				<li id="n-About"><a href="/page/About">About</a></li>
-				<li id="n-News"><a href="/page/News">News</a></li>
-				<li id="n-Downloads"><a href="/page/Downloads">Downloads</a></li>
-				<li id="n-Contribute"><a href="/page/Contribute">Contribute</a></li>
-				<li id="n-Documentation"><a href="/page/DocumentationPortal">Documentation</a></li>
-			</ul>
-		</div>
-	</div>
-	<div id="p-banners" class="portlet">
-		<h5>banners</h5>
-		<a href="http://freeipa.org/page/Contribute"><img src="http://www.freeipa.org/wiki/images/4/42/Contribute-banner.png" alt="Contribute to FreeIPA!"></a>
-		<br />
-		<a href="http://freeipa.org/page/RHETProjects"><img src="http://www.freeipa.org/wiki/images/6/69/Et-banner.png"></a>
-	</div>
-	
-		<a name="top" id="top"></a>
-		   <!--<h1 class="firstHeading">Image:Header background.png</h1>-->
-		<div id="bodyContent">
-			<h3 id="siteSub">From Free IPA</h3>
-			<div id="contentSub"></div>
-									<div id="jump-to-nav">Jump to: <a href="#column-one">navigation</a>,<a href="#searchInput">search</a></div>
-			<!-- start content -->
-	<div id="p-search" class="portlet">
-		<!--<h5><label for="searchInput">Search</label></h5>-->
-		<div id="searchBody" class="pBody">
-			<form action="/page/Special:Search" id="searchform"><div>
-				<input id="searchInput" name="search" type="text" accesskey="f" value="" />
-					<br/>
-			        <input type='submit' name="go" class="searchButton" id="searchGoButton"	value="Go" />&nbsp;
-				<input type='submit' name="fulltext" class="searchButton" value="Search" />
-			</div></form>
-		</div>
-	</div>
-			<ul id="filetoc">
-			<li><a href="#file">Image</a></li>
-			<li><a href="#filehistory">File history</a></li>
-			<li><a href="#filelinks">Links</a></li>
-		</ul><div class="fullImageLink" id="file"><img border="0" src="/wiki/images/2/2c/Header_background.png" width="1" height="68" alt="" /></div><div class="fullMedia">
-<p><a href="/wiki/images/2/2c/Header_background.png" class='internal' title="Header background.png">Header_background.png</a> <span class="fileInfo"> (1KB, MIME type: <code>image/png</code>)</span>
-</p>
-</div>
-
-<!-- Saved in parser cache with key freeipawiki:pcache:idhash:1833-0!1!0!0!!en!2 and timestamp 20100713204014 -->
-
-<h2 id="filehistory">File history</h2>
-<p>Legend: (cur) = this is the current file, (del) = delete
-this old version, (rev) = revert to this old version.
-<br /><i>Click on date to see the file uploaded on that date</i>.</p>
-<ul class="special"><li> (del) (cur) <a href="/wiki/images/2/2c/Header_background.png" title="/wiki/images/2/2c/Header background.png">20:40, 13 July 2010</a> . . <a href="/wiki/index.php?title=User:Kybaker&amp;action=edit" class="new" title="User:Kybaker">Kybaker</a> (<a href="/wiki/index.php?title=User_talk:Kybaker&amp;action=edit" class="new" title="User talk:Kybaker">Talk</a>) . . 1x68 (170 bytes)</li>
-</ul>
-<br /><ul><li><a href="/wiki/index.php?title=Image:Header_background.png&amp;action=edit&amp;externaledit=true&amp;mode=file" title="Image:Header background.png">Edit this file using an external application</a><div>See the <a href="http://meta.wikimedia.org/wiki/Help:External_editors" class='external text' title="http://meta.wikimedia.org/wiki/Help:External_editors" rel="nofollow">setup instructions</a> for more information.</div>
-</li></ul><h2 id="filelinks">Links</h2>
-<p>The following pages link to this file:</p>
-<ul><li><a href="/page/Second_Round_Of_UI_design" title="Second Round Of UI design">Second Round Of UI design</a></li>
-</ul>
-<div class="printfooter">
-Retrieved from "<a href="http://freeipa.org/page/Image:Header_background.png">http://freeipa.org/page/Image:Header_background.png</a>"</div>
-			 			<!-- end content -->
-			<div class="visualClear"></div>
-		</div>
-	</div>
-		</div>
-		<div id="column-one">
-		</div><!-- end of the left (by default at least) column -->
-			<div class="visualClear"></div>
-
-	<script type="text/javascript"> if (window.runOnloadHook) runOnloadHook();</script>
-</div>
-
-	<div id="p-cactions" class="portlet">
-		<table><tr>
-		<td><strong>Views</strong>:&nbsp;</td>
-				 <td id="ca-nstab-image" class="selected"><a href="/page/Image:Header_background.png">File</a></td>
-				 <td id="ca-talk" class="new"><a href="/wiki/index.php?title=Image_talk:Header_background.png&amp;action=edit">Discussion</a></td>
-				 <td id="ca-edit"><a href="/wiki/index.php?title=Image:Header_background.png&amp;action=edit">Edit</a></td>
-				 <td id="ca-history"><a href="/wiki/index.php?title=Image:Header_background.png&amp;action=history">History</a></td>
-		</tr></table>
-	</div>
-
-	<div class="portlet" id="p-personal">
-			<table><tr>
-		<td><strong>Personal tools:&nbsp;</strong></td>
-				<td id="pt-login"><a href="/wiki/index.php?title=Special:Userlogin&amp;returnto=Image:Header_background.png">Log in / create account</a></td>
-			</tr></table>
-	</div>
-
-	<div class="portlet" id="p-tb">
-		<div class="pBody">
-		<table><tr>
-		<td><strong>Toolbox</strong>:&nbsp;</td>
-				<td id="t-whatlinkshere"><a href="/page/Special:Whatlinkshere/Image:Header_background.png">What links here</a></td>
-				<td id="t-recentchangeslinked"><a href="/page/Special:Recentchangeslinked/Image:Header_background.png">Related changes</a></td>
-<td id="t-upload"><a href="/page/Special:Upload">Upload file</a></td>
-<td id="t-specialpages"><a href="/page/Special:Specialpages">Special pages</a></td>
-				<td id="t-print"><a href="/wiki/index.php?title=Image:Header_background.png&amp;printable=yes">Printable version</a></td>				<td id="t-permalink"><a href="/wiki/index.php?title=Image:Header_background.png&amp;oldid=4338">Permanent link</a></td>		    </tr></table>
-		</div>
-	</div>
-
-			<div id="footer">
-				<div id="f-poweredbyico"><a href="http://www.mediawiki.org/"><img src="/wiki/skins/common/images/poweredby_mediawiki_88x31.png" alt="MediaWiki" /></a></div>
-		</div>
-
-<!-- Served by et.redhat.com in 0.24 secs. -->
-
-</body></html>
diff --git a/install/static/Mainnav-background.png b/install/static/Mainnav-background.png
deleted file mode 100644
index c3fdab317..000000000
--- a/install/static/Mainnav-background.png
+++ /dev/null
diff --git a/install/static/Mainnav-offtab.png b/install/static/Mainnav-offtab.png
deleted file mode 100644
index cf6debc50..000000000
--- a/install/static/Mainnav-offtab.png
+++ /dev/null
diff --git a/install/static/Mainnav-ontab.png b/install/static/Mainnav-ontab.png
deleted file mode 100644
index 2589fddb1..000000000
--- a/install/static/Mainnav-ontab.png
+++ /dev/null
diff --git a/install/static/Mainnav-seperatorbars.png b/install/static/Mainnav-seperatorbars.png
deleted file mode 100644
index 9d1a9d414..000000000
--- a/install/static/Mainnav-seperatorbars.png
+++ /dev/null
diff --git a/install/static/Makefile.am b/install/static/Makefile.am
deleted file mode 100644
index 762587179..000000000
--- a/install/static/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-NULL =
-
-appdir = $(IPA_DATA_DIR)/static
-app_DATA =                              \
-	but-reset.png			\
-	but-update.png			\
-	but-selected.png		\
-	but-unselected.png		\
-	ipa_logo_180x50.png		\
-	ipa.js				\
-	ipa.css				\
-	jquery.js			\
-	group.js 			\
-	group-details.inc		\
-	host.js 			\
-	hostgroup.js 			\
-	index.xhtml 			\
-	jquery.cookie.js 		\
-	navigation.js			\
-	netgroup.js 			\
-	pageparams.js 			\
-	search.js 			\
-	details.js 			\
-	user.js 			\
-	user-add.inc 			\
-	user-details.inc		\
-	ipalogo.png			\
-	gray-fade-line.png		\
-	Mainnav-background.png		\
-	Mainnav-offtab.png  		\
-	Mainnav-ontab.png  		\
-	Subnav-background.png		\
-	Subnav-offbutton.png		\
-	Subnav-onbutton.png		\
-	$(NULL)
-
-EXTRA_DIST =                            \
-        $(app_DATA)                     \
-        $(NULL)
-
-MAINTAINERCLEANFILES =                  \
-        *~                              \
-        Makefile.in
diff --git a/install/static/Subnav-background.png b/install/static/Subnav-background.png
deleted file mode 100644
index 00afe1e97..000000000
--- a/install/static/Subnav-background.png
+++ /dev/null
diff --git a/install/static/Subnav-offbutton.png b/install/static/Subnav-offbutton.png
deleted file mode 100644
index 859e5f5ee..000000000
--- a/install/static/Subnav-offbutton.png
+++ /dev/null
diff --git a/install/static/Subnav-onbutton.png b/install/static/Subnav-onbutton.png
deleted file mode 100644
index 2cee0a70b..000000000
--- a/install/static/Subnav-onbutton.png
+++ /dev/null
diff --git a/install/static/but-reset.png b/install/static/but-reset.png
deleted file mode 100644
index c2c4db1ed..000000000
--- a/install/static/but-reset.png
+++ /dev/null
diff --git a/install/static/but-selected.png b/install/static/but-selected.png
deleted file mode 100644
index 9a42053a7..000000000
--- a/install/static/but-selected.png
+++ /dev/null
diff --git a/install/static/but-unselected.png b/install/static/but-unselected.png
deleted file mode 100644
index ba9ed3327..000000000
--- a/install/static/but-unselected.png
+++ /dev/null
diff --git a/install/static/but-update.png b/install/static/but-update.png
deleted file mode 100644
index 719b651b3..000000000
--- a/install/static/but-update.png
+++ /dev/null
diff --git a/install/static/details.js b/install/static/details.js
deleted file mode 100644
index 385945c5d..000000000
--- a/install/static/details.js
+++ /dev/null
@@ -1,559 +0,0 @@
-/*  Authors:
- *    Pavel Zuna <pzuna@redhat.com>
- *
- * Copyright (C) 2010 Red Hat
- * see file 'COPYING' for use and warranty information
- *
- * 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; version 2 only
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/* IPA Object Details - populating definiton lists from entry data */
-
-/* REQUIRES: ipa.js */
-
-var IPA_DETAILS_POPULATE = 1;
-var IPA_DETAILS_UPDATE = 2;
-
-/* name of IPA object, that we're populating the lists for */
-var _ipa_obj_name = '';
-
-/* initialize the IPA Object Details library */
-function ipa_details_init(obj_name, url)
-{
-    ipa_init(url);
-    _ipa_obj_name = obj_name;
-}
-
-var _ipa_load_on_win_callback = null;
-var _ipa_load_on_fail_callback = null;
-
-var ipa_details_cache = null;
-
-function ipa_details_load(pkey, on_win, on_fail)
-{
-    if (!pkey)
-        return;
-
-    _ipa_load_on_win_callback = on_win;
-    _ipa_load_on_fail_callback = on_fail;
-
-    ipa_cmd(
-        'show', [pkey], {all: true}, _ipa_load_on_win, _ipa_load_on_fail,
-        _ipa_obj_name
-    );
-}
-
-function _ipa_load_on_win(data, text_status, xhr)
-{
-    if (_ipa_load_on_win_callback)
-        _ipa_load_on_win_callback(data, text_status, xhr);
-
-    if (data['error'])
-        return;
-
-    var result = data.result.result;
-
-    ipa_details_cache = $.extend(true, {}, result);
-    ipa_details_display(result);
-}
-
-function _ipa_load_on_fail(xhr, text_status, error_thrown)
-{
-    if (_ipa_load_on_fail_callback)
-        _ipa_load_on_fail_callback(xhr, text_status, error_thrown);
-}
-
-var _ipa_update_on_win_callback = null;
-var _ipa_update_on_fail_callback = null;
-
-function ipa_details_update(pkey, on_win, on_fail)
-{
-    if (!pkey)
-        return;
-
-    var modlist = {'all': true, 'setattr': [], 'addattr': []};
-    var attrs_wo_option = {};
-
-    $('.entryattrs input').each(function () {
-        var jobj = $(this);
-
-        var dt = jobj.parent().prevAll('dt').slice(0, 1);
-        if (!dt)
-            return;
-
-        var attr = dt.attr('title');
-        if (!attr)
-            return;
-
-        if (attr.indexOf('call_') == 0) {
-            var func = window[attr.substr(5)];
-            if (!func)
-                return;
-            func(dt, modlist, IPA_DETAILS_UPDATE);
-            return;
-        }
-
-        var param_info = ipa_get_param_info(attr);
-        if (param_info) {
-            modlist[attr] = jobj.val();
-            return;
-        }
-
-        if (!attrs_wo_option[attr])
-            attrs_wo_option[attr] = [];
-        attrs_wo_option[attr].push(jobj.val());
-    });
-
-    $('.entryattrs dt').each(function () {
-        var jobj = $(this);
-
-        var attr = jobj.attr('title');
-        if (!attr || attr.indexOf('call_') == 0)
-            return;
-
-        var next = jobj.next('dd');
-        if ((!next.length) || (!next.children('input').length))
-            attrs_wo_option[attr] = [''];
-    });
-
-    for (attr in attrs_wo_option) {
-        var values = attrs_wo_option[attr];
-        modlist['setattr'].push(attr + '=' + values[0]);
-        for (var i = 1; i < values.length; ++i)
-            modlist['addattr'].push(attr + '=' + values[i]);
-    }
-
-    _ipa_update_on_win_callback = on_win;
-    _ipa_update_on_fail_callback = on_fail;
-
-    ipa_cmd(
-        'mod', [pkey], modlist, _ipa_update_on_win, _ipa_update_on_fail,
-        _ipa_obj_name
-    );
-}
-
-function _ipa_update_on_win(data, text_status, xhr)
-{
-    if (_ipa_update_on_win_callback)
-        _ipa_update_on_win_callback(data, text_status, xhr);
-
-    if (data['error'])
-        return;
-
-    var result = data.result.result;
-    ipa_details_cache = $.extend(true, {}, result);
-    ipa_details_display(result);
-}
-
-function _ipa_update_on_fail(xhr, text_status, error_thrown)
-{
-    if (_ipa_update_on_fail_callback)
-        _ipa_update_on_fail_callback(xhr, text_status, error_thrown);
-}
-
-function ipa_details_create(dls)
-{
-    for (var i = 0; i < def_lists.length; ++i) {
-        var d = dls[i];
-        ipa_generate_dl($('hr').last(), d[0], d[1], d[2]);
-    }
-}
-
-var _ipa_h2_template = '<h2 onclick="_h2_on_click(this)">&#8722; I</h2>';
-var _ipa_dl_template = '<dl id="I" class="entryattrs"></dl>';
-var _ipa_dt_template = '<dt title="T">N:</dt>';
-
-function ipa_generate_dl(jobj, id, name, dts)
-{
-    if (!dts)
-        return;
-
-    jobj.after(_ipa_h2_template.replace('I', name));
-    jobj = jobj.next();
-    jobj.after(_ipa_dl_template.replace('I', id));
-    jobj = jobj.next();
-    jobj.after('<hr />');
-
-    for (var i = 0; i < dts.length; ++i) {
-        var label = '';
-        if (dts[i][0].indexOf('call_') != 0) {
-            var param_info = ipa_get_param_info(dts[i][0]);
-            if (param_info)
-                label = param_info['label'];
-        }
-        if ((!label) && (dts[i].length > 1))
-            label = dts[i][1];
-        jobj.append(
-            _ipa_dt_template.replace('T', dts[i][0]).replace('N', label)
-        );
-    }
-}
-
-/* HTML templates for ipa_details_display() */
-var _ipa_a_add_template =
-    '<a href="jslink" onclick="return (_ipa_add_on_click(this))" title="A">Add</a>';
-
-/* populate definition lists with the class 'entryattrs' with entry attributes
- *
- * The list has to be specially crafted for this function to work properly:
- * <dt> tags should have the 'title' attribute set to an LDAP attribute name
- * OR to a javascript function name prefixed with 'call_', which will be given
- * the <dt> object and entry_attrs as arguments.
- * Example:
- *   <dl class="entryattrs">
- *     <dt title="givenname">First Name:</dt>
- *     <dt title="call_some_callback">Some Attribute:</dt>
- *   </dl>
- *
- * arguments:
- *   entry_attrs - 'result' field as returned by ipa *-show commnads
- *                 (basically an associative array with attr:value pairs) */
-function ipa_details_display(entry_attrs)
-{
-    /* remove all <dd> tags i.e. all attribute values */
-    $('.entryattrs dd').remove();
-
-    /* go through all <dt> tags and pair them with newly created <dd>s */
-    $('.entryattrs dt').each(function () {
-        var jobj = $(this);
-
-        var attr = jobj.attr('title');
-        if (attr.indexOf('call_') == 0) {
-            /* title contains callback instead of attribute name */
-            var func = window[attr.substr(5)];
-            if (func)
-                func(jobj, entry_attrs, IPA_DETAILS_POPULATE);
-            else
-                jobj.after(_ipa_dd_first_template.replace('I', '-'));
-        } else {
-            /* title contains attribute name - default behaviour */
-            var value = entry_attrs[attr];
-            if (value) {
-                ipa_insert_first_dd(jobj, ipa_create_input(attr, value[0]));
-                for (var i = 1; i < value.length; ++i) {
-                    jobj = jobj.next();
-                    ipa_insert_other_dd(jobj, ipa_create_input(attr, value[i]));
-                }
-            } else {
-                ipa_insert_first_dd(jobj, _ipa_a_add_template.replace('A', attr));
-            }
-        }
-    });
-}
-
-var _ipa_dd_first_template = '<dd class="first">I</dd>';
-
-function ipa_insert_first_dd(jobj, content)
-{
-    jobj.after(_ipa_dd_first_template.replace('I', content));
-}
-
-var _ipa_dd_other_template = '<dd class="other">I</dd>';
-
-function ipa_insert_other_dd(jobj, content)
-{
-    jobj.after(_ipa_dd_other_template.replace('I', content));
-}
-
-
-/* mapping of parameter types to handlers used to create inputs */
-var _ipa_param_type_2_handler_map = {
-    'Str': _ipa_create_text_input,
-    'Int': _ipa_create_text_input,
-    'Bool': _ipa_create_text_input,
-};
-
-/* create an HTML element for displaying/editing an attribute
- * arguments:
- *   attr - LDAP attribute name
- *   value - the attributes value */
-function ipa_create_input(attr, value)
-{
-    var param_info = ipa_get_param_info(attr);
-    if (!param_info) {
-        /* no information about the param is available, default to text input */
-        return (
-            _ipa_create_text_input(attr, value, null) +
-            _ipa_create_remove_link(attr, null)
-        );
-    }
-
-    /* check if the param value can be modified */
-    if (param_info['primary_key'] || ('no_update' in param_info['flags']))
-        return (value.toString());
-
-    /* call handler by param class */
-    var handler = _ipa_param_type_2_handler_map[param_info['class']];
-    if (handler) {
-        return (
-            handler(attr, value, param_info) +
-            _ipa_create_remove_link(attr, param_info)
-        );
-    }
-
-    /* no handler for this type? don't allow modification */
-    return (value.toString());
-}
-
-/* HTML template for _ipa_create_remove_link() */
-var _ipa_a_remove_template =
-    '<a href="jslink" onclick="return (_ipa_remove_on_click(this))" title="A">Remove</a>';
-
-/* creates a Remove link for deleting attribute values */
-function _ipa_create_remove_link(attr, param_info)
-{
-    if (!param_info)
-        return (_ipa_a_remove_template.replace('A', attr));
-
-    /* check if the param is required or of the Password type
-     * if it is, then we don't want people to be able to remove it */
-    if ((param_info['required']) || (param_info['class'] == 'Password'))
-        return ('');
-
-    return (_ipa_a_remove_template.replace('A', attr));
-}
-
-/* HTML template for _ipa_create_text_input() */
-var _ipa_input_text_template =
-    '<input type="text" name="A" value="V" />';
-
-/* creates a input box for editing a string attribute */
-function _ipa_create_text_input(attr, value, param_info)
-{
-    return (
-        _ipa_input_text_template.replace('A', attr).replace(
-            'V', value.toString()
-        )
-    );
-}
-
-function ipa_details_reset()
-{
-    if (ipa_details_cache)
-        ipa_details_display(ipa_details_cache);
-}
-
-/* Event handlers */
-
-function _ipa_add_on_click(obj)
-{
-    var jobj = $(obj);
-    var par = jobj.parent();
-    par.append(ipa_create_input(jobj.attr('title'), ''));
-    jobj.next('input').focus();
-    jobj.remove();
-    return (false);
-}
-
-function _ipa_remove_on_click(obj)
-{
-    var jobj = $(obj);
-    var attr = jobj.attr('title');
-    var par = jobj.parent();
-
-    var next = par.next('dd');
-    if (next.length) {
-        if (par.hasClass('first')) {
-            next.addClass('first');
-            next.removeClass('other');
-        }
-        par.remove();
-    } else {
-        par.empty();
-        par.append(_ipa_a_add_template.replace('A', attr));
-    }
-
-    return (false);
-}
-
-var qs = ipa_parse_qs();
-
-/* "Top-level" code */
-
-function load_object(body,obj)
-{
-    if (!qs['pkey'])
-        return;
-    ipa_details_init(obj);
-    $('#butreset').click(reset_on_click);
-    $('#butupdate').click(update_on_click);
-    ipa_details_load(qs['pkey'], on_win);
-    $('h1').text('Managing user: ' + qs['pkey']);
-
-}
-
-function on_win(data, textStatus, xhr)
-{
-    if (data['error'])
-        alert(data['error']['message']);
-}
-
-function reset_on_click()
-{
-    if (ipa_details_cache)
-        ipa_details_display(ipa_details_cache);
-    return (false);
-}
-
-function update_on_click()
-{
-    ipa_details_update(qs['pkey'], on_win);
-    return (false);
-}
-
-/* H2 expand/collapse */
-
-function _h2_on_click(obj)
-{
-    var jobj = $(obj);
-    var txt = jobj.text().replace(/^\s*/, '');
-    if (txt.charCodeAt(0) == 8722) {
-        obj.dl = jobj.next().detach();
-        jobj.text('+' + txt.substr(1));
-    } else {
-        if (obj.dl)
-            obj.dl.insertAfter(obj);
-        jobj.text(
-            String.fromCharCode(8722) + txt.substr(1)
-        );
-    }
-}
-
-/* Account status Toggle button */
-
-function toggle_on_click(obj)
-{
-    var jobj = $(obj);
-    var val = jobj.attr('title');
-    if (val == 'Active') {
-        ipa_cmd(
-            'lock', [qs['pkey']], {}, on_lock_win, on_fail,
-            PluginData['name']
-        );
-    } else {
-        ipa_cmd(
-            'unlock', [qs['pkey']], {}, on_lock_win, on_fail,
-            PluginData['name']
-        );
-    }
-    return (false);
-}
-
-function on_lock_win(data, textStatus, xhr)
-{
-    if (data['error']) {
-        alert(data['error']['message']);
-        return;
-    }
-
-    var jobj = $('a[title=Active]');
-    if (jobj.length) {
-        if (ipa_details_cache) {
-            var memberof = ipa_details_cache['memberof'];
-            if (memberof) {
-                memberof.push(
-                    'cn=inactivated,cn=account inactivation'
-                );
-            } else {
-                memberof = ['cn=inactivated,cn=account inactivation'];
-            }
-            ipa_details_cache['memberof'] = memberof;
-            a_status(jobj.parent().prev(), ipa_details_cache);
-            jobj.parent().remove()
-        }
-        return;
-    }
-
-    var jobj = $('a[title=Inactive]');
-    if (jobj.length) {
-        if (ipa_details_cache) {
-            var memberof = ipa_details_cache['memberof'];
-            if (memberof) {
-                for (var i = 0; i < memberof.length; ++i) {
-                    if (memberof[i].indexOf('cn=inactivated,cn=account inactivation') != -1) {
-                        memberof.splice(i, 1);
-                        break;
-                    }
-                }
-            } else {
-                memberof = [];
-            }
-            ipa_details_cache['memberof'] = memberof;
-            a_status(jobj.parent().prev(), ipa_details_cache);
-            jobj.parent().remove();
-        }
-        return;
-    }
-}
-
-/* ATTRIBUTE CALLBACKS */
-
-var toggle_temp = 'S <a href="jslink" onclick="return (toggle_on_click(this))" title="S">Toggle</a>';
-function a_status(jobj, result, mode)
-{
-    if (mode != IPA_DETAILS_POPULATE)
-        return;
-
-    var memberof = result['memberof'];
-    if (memberof) {
-        for (var i = 0; i < memberof.length; ++i) {
-            if (memberof[i].indexOf('cn=inactivated,cn=account inactivation') != -1) {
-                var t = toggle_temp.replace(/S/g, 'Inactive');
-                ipa_insert_first_dd(jobj, t);
-                return;
-            }
-        }
-    }
-    ipa_insert_first_dd(jobj, toggle_temp.replace(/S/g, 'Inactive'));
-}
-
-var pwd_temp = '<a href="jslink" onclick="return (resetpwd_on_click(this))" title="A">Reset Password</a>';
-function a_password(jobj, result, mode)
-{
-    if (mode == IPA_DETAILS_POPULATE)
-        ipa_insert_first_dd(jobj, pwd_temp.replace('A', 'userpassword'));
-}
-
-var select_temp = '<select title="st"></select>';
-var option_temp = '<option value="V">V</option>';
-var states = [
-    'AL', 'AK', 'AS', 'AZ', 'AR', 'CA', 'CO', 'CT', 'DE', 'DC', 'FM',
-    'FL', 'GA', 'GU', 'HI', 'ID', 'IL', 'IN', 'IA', 'KS', 'KY', 'LA',
-    'ME', 'MH', 'MD', 'MA', 'MI', 'MN', 'MS', 'MO', 'MT', 'NE', 'NV',
-    'NH', 'NJ', 'NM', 'NY', 'NC', 'ND', 'MP', 'OH', 'OK', 'OR', 'PW',
-    'PA', 'PR', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VT', 'VI', 'VA',
-    'WA', 'WV', 'WI', 'WY', '',
-];
-function a_st(jobj, result, mode)
-{
-    if (mode != IPA_DETAILS_POPULATE)
-        return;
-
-    var next = jobj.next();
-    next.css('clear', 'none');
-    next.css('width', '70px');
-
-    ipa_insert_first_dd(jobj, select_temp);
-
-    var sel = jobj.next().children().first();
-    for (var i = 0; i < states.length; ++i)
-        sel.append(option_temp.replace(/V/g, states[i]));
-
-    var st = result['st'];
-    if (st)
-        sel.val(st);
-    else
-        sel.val('');
-}
-
diff --git a/install/static/gray-fade-line.png b/install/static/gray-fade-line.png
deleted file mode 100644
index 896cfca0e..000000000
--- a/install/static/gray-fade-line.png
+++ /dev/null
diff --git a/install/static/group-details.inc b/install/static/group-details.inc
deleted file mode 100644
index 445042b8d..000000000
--- a/install/static/group-details.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-<script type="text/javascript">
-  $(document).ready(function(){     
-  load_object($('body'),'group');
-  });
-</script>
-<h1>Managing group:</h1>
-<div id="buttons">
-  <a href="dummy"><img id="butreset" src="but-reset.png" alt="Reset" /></a>
-  <a href="dummy"><img id="butupdate" src="but-update.png" alt="Update" /></a>
-</div>
-<ul id="viewtype">
-  <li id="viewcaption">View:</li>
-  <li>
-    <img src="but-selected.png" alt="" />
-    Personal Details
-  </li>
-  <li>
-    <img src="but-unselected.png" alt="" />
-    <a href="memberof?pkey=${pkey}">Memberships</a>
-  </li>
-</ul>
-<hr />
-
-<h2 onclick="h2_on_click(this)">&#8722; Group Details</h2>
-<dl id="identity" class="entryattrs">
-  <dt title="cn">Group Name:</dt>
-  <dt title="description">Description:</dt>
-  <dt title="gidnumber">GID</dt>
-</dl>
-<hr />
-
-
diff --git a/install/static/group.js b/install/static/group.js
deleted file mode 100644
index c7db10f47..000000000
--- a/install/static/group.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function setupGroup(facet){
-    if (facet == "details"){
-	setupGroupDetails();
-    }else{
-	setupGroupSearch();
-    }
-}
-
-function setupGroupDetails(){
-
-    $('#search').css("visibility","hidden");
-    $('#content').css("visibility","visible");
-    $('#content').load("group-details.inc"); 
-
-    sampleData = "sampledata/groupshow.json";
-}
-
-function setupGroupSearch(){
-
-    var columns = [
-	{title:"Group Name",  column:"cn",render: function(current,cell){
-	    renderDetailColumn(current,cell,current[this.column],"group");
-	}},
-	{title:"GID",  column:"gidnumber",render: renderSimpleColumn},
-	{title:"Description",  column:"description",render: renderSimpleColumn}
-    ];
-
-    var groupSearchForm = new SearchForm("group", "find", columns);
-
-    $("#query").unbind();
-    $("#query").click(function(){
-	sampleData = "sampledata/grouplist.json";
-	executeSearch(groupSearchForm);
-    });
-    $("#new").unbind();
-    $("#new").click( function() {
-	alert("New Group...");
-    });
-
-
-}
diff --git a/install/static/groupmeta.js b/install/static/groupmeta.js
deleted file mode 100644
index ae8e64a78..000000000
--- a/install/static/groupmeta.js
+++ /dev/null
@@ -1,253 +0,0 @@
-			  
-var PluginData = {
-    "primary_key": "cn",
-    "default_attributes": [
-        "cn",
-        "description",
-        "gidnumber",
-        "member",
-        "memberof"
-    ],
-    "object_name_plural": "groups",
-    "container_dn": "cn=groups,cn=accounts",
-    "object_class_config": "ipagroupobjectclasses",
-    "hidden_attributes": [
-        "objectclass",
-        "aci"
-    ],
-    "uuid_attribute": "ipauniqueid",
-    "label": "User Groups",
-    "methods": [
-        "add",
-        "add_member",
-        "del",
-        "find",
-        "mod",
-        "remove_member",
-        "show"
-    ],
-    "object_name": "group",
-    "takes_params": [
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "name",
-            "primary_key": true,
-            "name": "cn",
-            "default": null,
-            "doc": "Group name",
-            "required": true,
-            "flags": [],
-            "label": "Group name",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "desc",
-            "primary_key": false,
-            "name": "description",
-            "default": null,
-            "doc": "Group description",
-            "required": true,
-            "flags": [],
-            "label": "Description",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "include": null,
-            "cli_name": "gid",
-            "primary_key": false,
-            "minvalue": null,
-            "doc": "GID (use this option to set it manually)",
-            "required": false,
-            "flags": [],
-            "label": "GID",
-            "default": null,
-            "autofill": false,
-            "multivalue": false,
-            "attribute": false,
-            "query": false,
-            "maxvalue": null,
-            "cli_short_name": null,
-            "type": "int",
-            "class": "Int",
-            "name": "gidnumber"
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "member_group",
-            "primary_key": false,
-            "name": "member_group",
-            "default": null,
-            "doc": "Member groups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Member groups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "member_user",
-            "primary_key": false,
-            "name": "member_user",
-            "default": null,
-            "doc": "Member users",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Member users",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "member",
-            "primary_key": false,
-            "name": "member",
-            "default": null,
-            "doc": "Failed members",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Failed members",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "user",
-            "primary_key": false,
-            "name": "user",
-            "default": null,
-            "doc": "Users",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Users",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "group",
-            "primary_key": false,
-            "name": "group",
-            "default": null,
-            "doc": "Groups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Groups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        }
-    ],
-    "attribute_members": {
-        "member": [
-            "user",
-            "group"
-        ],
-        "memberof": [
-            "group",
-            "netgroup",
-            "rolegroup",
-            "taskgroup"
-        ]
-    },
-    "parent_object": "",
-    "object_class": [
-        "ipausergroup"
-    ],
-    "name": "group"
-}
-			  
-ipa_objs['group'] = PluginData;
diff --git a/install/static/header.png b/install/static/header.png
deleted file mode 100644
index 01e562db6..000000000
--- a/install/static/header.png
+++ /dev/null
diff --git a/install/static/header_background.png b/install/static/header_background.png
deleted file mode 100644
index 07cc1e477..000000000
--- a/install/static/header_background.png
+++ /dev/null
diff --git a/install/static/header_logo.png b/install/static/header_logo.png
deleted file mode 100644
index 2b8e65361..000000000
--- a/install/static/header_logo.png
+++ /dev/null
diff --git a/install/static/host.js b/install/static/host.js
deleted file mode 100644
index ae672b85b..000000000
--- a/install/static/host.js
+++ /dev/null
@@ -1,46 +0,0 @@
-function setupHost(facet){
-    if (facet == "details"){
-	setupHostDetails();
-    }else{
-	setupHostSearch();
-    }
-}
-
-
-
-
-function setupHostDetails(){
-    var detailsForm = new DetailsForm();    
-}
-
-
-function setupHostSearch(){
-
-    sampleData = "sampledata/hostlist.json";
-    var columns = [
-	{title:"Host",column:"fqdn",render: function(current,cell){
-	    renderDetailColumn(current,cell,current[this.column],"group");
-	}},
-	{title:"Comment",   column: "description", render: renderSimpleColumn},
-	{title:"Enrolled?",  render: renderUnknownColumn},
-	{title:"Manages?",   render: renderUnknownColumn}
-    ];
-
- 
-    var hostSearchForm = new SearchForm("host", "find", columns);
-
-    $("#query").unbind();
-    $("#query").click(function(){
-	sampleData = "sampledata/hostlist.json";
-	executeSearch(hostSearchForm);
-    });
-
-    $("#new").unbind();
-    $("#new").click( function() {
-	alert("New Host...");
-    });
-
-
-}
-			  
-			  
-\ No newline at end of file
diff --git a/install/static/hostgroup.js b/install/static/hostgroup.js
deleted file mode 100644
index b6cb413fa..000000000
--- a/install/static/hostgroup.js
+++ /dev/null
@@ -1,43 +0,0 @@
-function setupHostgroup(facet){
-    if (facet == "details"){
-	setupHostgroupDetails();
-    }else{
-	setupHostgroupSearch();
-    }
-}
-
-
-
-
-function setupHostgroupDetails(){
-    var detailsForm = new DetailsForm();    
-}
-
-
-function setupHostgroupSearch(){
-
-
-    var columns = [
-	{title:"Hostgroup",column:"cn",render:  function(current,cell){
-	     renderDetailColumn(current,cell,current[this.column],"hostgroup");
-	 }},
-	{title:"Description", column:"description",render: renderSimpleColumn}];
-
-    var hostgroupSearchForm = new SearchForm("hostgroup", "find", columns);
-
-
-    $("#query").unbind();
-
-    $("#query").click(function(){
-	sampleData = "sampledata/hostgrouplist.json";
-	executeSearch(hostgroupSearchForm);
-    });
-    $("#new").unbind();
-    $("#new").click( function() {
-	alert("New Hostgroup...");
-    });
-
-
-}
-			  
-			  
-\ No newline at end of file
diff --git a/install/static/index.xhtml b/install/static/index.xhtml
deleted file mode 100644
index c6404fadb..000000000
--- a/install/static/index.xhtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>IPA: Identity Policy Audit</title>
-    <link href="ipa.css"  rel="stylesheet" type="text/css" />
-
-    <script type="text/javascript" src="jquery.js"></script>
-    <script type="text/javascript" src="jquery.cookie.js"></script>
-    <script type="text/javascript" src="ipa.js" />
-    <script type="text/javascript" src="pageparams.js" />
-
-    <script type="text/javascript" src="navigation.js" />
-    <script type="text/javascript" src="sampledata/develop.js" />
-    <script type="text/javascript" src="search.js" />
-    <script type="text/javascript" src="details.js" />
-    <script type="text/javascript" src="user.js" />
-    <script type="text/javascript" src="usermeta.js" />
-    <script type="text/javascript" src="group.js" />
-    <script type="text/javascript" src="groupmeta.js" />
-    <script type="text/javascript" src="host.js" />
-    <script type="text/javascript" src="hostgroup.js" />
-    <script type="text/javascript" src="netgroup.js" />
-
-    <script type="text/javascript">
-
-      $(document).ready(function(){     
-      buildNavigation();    
-      });
-      
-    </script>   
-  </head>
-  <body>
-    <div class="header" >
-      <span class="logo">
-	<a href="#"><img src="ipalogo.png" /></a>
-      </span>
-      <span class="LoggedInAs" id="loggedinas">
-	  Logged in as <strong>hardcoded@FREEIP.ORG</strong>
-      </span>
-    </div>
-    
-    <div id="navigation"> 
-      <div id="main-nav" />  
-      <div id="sub-nav">Edit: </div>
-    </div>
-
-    <div id="content" border="1"  style="visibility:hidden" >
-    </div>
-
-    <div id="search"  style="visibility:hidden">
-      <div class="searchControls" >
-	<span class="filter"  >
-	  <input id="queryFilter" type="text"/>
-	  <input id="query" type="submit" value="find" />	  
-	  <input id="new" type="submit" value="new" />	  
-	</span>
-	<span class="filter" id="searchButtons" />
-      </div> 
-      <table id="searchResultsTable"  class="SearchResults" >
-	<thead></thead>
-	<tfoot></tfoot>
-
-	<tbody></tbody>
-      </table>      
-    </div>
-
-  </body>
-</html>
diff --git a/install/static/ipa.css b/install/static/ipa.css
deleted file mode 100644
index 7c6fe4ae1..000000000
--- a/install/static/ipa.css
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Authors:
- *   Pavel Zuna <pzuna@redhat.com>
- *   Adam Young <ayoung@redhat.com>
- * 
- * Copyright (C) 2010 Red Hat
-*/
-
-body {
-    font-family: sans-serif;
-    font-size: 14pt;
-}
-
-a {
-    text-decoration: none;
-    border: 0;    
-}
-a img { border-width: 0; }
-a:link, a:visited {
-    text-decoration: none;
-    border: 0;
-}
-
-/*  ----  Header  ----  */
-div.header {
-    background-image: url(header_background.png);
-    background: -moz-linear-gradient(top, #65646e, #1f1f1f);
-    background-color: #1f1f1f;
-    height: 70px;
-}
-div.header span.LoggedInAs {
-    color: #fff;
-    padding-right: 10px;
-    line-height: 35px;
-    float: right;
-}
-div.header div.logo {
-    float: left;
-    padding: 10px 10px 0 10px;
-}
-div.header div.logo img {
-    border: 0;
-}
-
-
-div#view {
-    bottom: 0;
-    left: 0;
-    overflow: auto;
-    position: fixed;
-    right: 0;
-    top: 0;
-}
-
-div#header {
-    background: -moz-linear-gradient(top, #65646e, #1f1f1f);
-    background-color: #1f1f1f;
-    height: 70px;
-}
-
-div#header div#logo img {
-    border: 0;
-}
-
-div#header div#loggedinas {
-    color: #fff;
-    font-size: 12pt;
-    font-weight: bold;
-    line-height: 35px;
-    padding-right: 10px;
-    text-align: right;
-}
-
-div#header div#loggedinas a {
-    color: #fff;
-    text-decoration: underline;
-}
-
-h1 {
-    font-size: 26pt;
-    font-weight: bold;
-    margin-bottom: 30px;
-    margin-left: 15px;
-    margin-top: 18px;
-}
-
-div#content {
-    float: left;
-}
-
-
-div#content ul#viewtype {
-    padding-left: 20px;
-}
-
-div#content ul#viewtype li {
-    color: #656565;
-    display: inline;
-    font-weight: bold;
-    list-style-type: none;
-    padding-right: 20px;
-}
-
-div#content ul#viewtype li#viewcaption {
-    color: #000;
-    padding-right: 10px;
-}
-
-div#content ul#viewtype li img {
-    vertical-align: middle;
-}
-
-div#content ul#viewtype li a {
-    font-weight: normal;
-}
-
-
-div#content div#buttons img {
-    border: 0;
-}
-
-h2 {
-    font-size: 18pt;
-    font-weight: bold;
-    margin-left: 15px;
-    margin-top: 0;
-    margin-bottom: 0px;
-    text-align: left;
-}
-
-hr {
-    background-color: #b2b2b2;
-    clear: both;
-    color: #b2b2b2;
-    height: 1px;
-    margin-left: 15px;
-    margin-right: 15px;
-    margin-top: 10px;
-}
-
-dl.entryattrs {
-    clear: both;
-    margin-left: 15px;
-    margin-top: 18px;
-    white-space: nowrap;
-}
-
-dl.entryattrs dt {
-    clear: left;
-    float: left;
-    padding-bottom: 18px;
-    padding-right: 18px;
-    text-align: right;
-    width: 160px;
-}
-
-dl.entryattrs dd {
-    float: left;
-    padding-bottom: 18px;
-}
-
-dl.entryattrs dd.first {
-    margin-left: 0px;
-}
-
-dl.entryattrs dd.other {
-    clear: both;
-    margin-left: 178px;
-}
-
-dl.entryattrs input {
-    margin-right: 5px;
-}
-
-div#backtotop {
-    margin-left: 20px;
-    margin-right: 20px;
-    text-align: right;
-}
-
-
-/*Navigation */
-
-span.sub-nav-off > a:link, span.sub-nav-off >  a:visited{
-    color:white;
-}
-
-span.main-nav-off > a:link, span.main-nav-off >  a:visited{
-    color:white;
-}
- 
-#main-nav{
-    background-image: url(Mainnav-background.png);
-    font-size: 100%;
-}
-
-span.main-nav-on{
-    background-image: url(Mainnav-ontab.png);
-}
-
-span.main-nav-off{
-    background-image: url(Mainnav-offtab.png);
-}
-
-
-span.main-separator{
-    background: #333339;
-        padding:1px;
-}
-
-#sub-nav{
-    background-image: url(Subnav-background.png);
-    padding:5px;
-    color: white;
-    font-size: 80%;
-}
-
-span.sub-nav-on{
-    background-image: url(Subnav-onbutton.png);
-    margin: 10px;
-}
-
-span.sub-nav-off{
-    background-image: url(Subnav-offbutton.png);
-    margin: 10px;
-}
-
-
-
-
-/* Search  */
-
-#search{
-    float: left;
-    width: 80%;
-    margin: 10px;
-    padding: 10px;
-    background: #e8e8e8;
-}
-
-div.searchControls{
-    background:#a5a5a5;
-}
-
-
-
-#searchResultsTable{
-    padding: 0px;
-    width:100%;
-    border-width: thin;
-    border-style: solid;
-    border-color: black;
-}
-
-#searchResultsTable > a:link,a:visted{
-    color:black;
-}
-
-
-#searchResultsTable th{
-    background-color:gray;
-    color:white;
-}
-
-#searchResultsTable tr:nth-child(even){
-    background-color:#CCC;
-}
-#searchResultsTable tr:nth-child(odd){
-    background-color:#FFF;
-}
-
-
diff --git a/install/static/ipa.js b/install/static/ipa.js
deleted file mode 100644
index c0773db56..000000000
--- a/install/static/ipa.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Authors:
- *    Pavel Zuna <pzuna@redhat.com>
- *
- * Copyright (C) 2010 Red Hat
- * see file 'COPYING' for use and warranty information
- *
- * 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; version 2 only
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-
-
-//the develop.js file that follows will set this to true.
-//that file should only exist in the source file system
-//and should not get deployed to the web server
-var useSampleData = false;
-
-
-//Maximum number of records to return on any query.
-var sizelimit=100;
-
-/* IPA JSON-RPC helper */
-
-/* JSON-RPC ID counter */
-var ipa_jsonrpc_id = 0;
-
-/* IPA objects data in JSON format */
-var ipa_objs = {};
-
-/* initialize the IPA JSON-RPC helper
- * arguments:
- *   url - JSON-RPC URL to use (optional) */
-function ipa_init(url)
-{
-}
-
-/* call an IPA command over JSON-RPC
- * arguments:
- *   name - name of the command or method if objname is set
- *   args - list of positional arguments, e.g. [username]
- *   options - dict of options, e.g. {givenname: 'Pavel'}
- *   win_callback - function to call if the JSON request succeeds
- *   fail_callback - function to call if the JSON request fails
- *   objname - name of an IPA object (optional) */
-function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
-{
-    id = ipa_jsonrpc_id++;
-    if (objname)
-        name = objname + '_' + name;
-   
-    options.sizelimit	= sizelimit;
- 
-    var data = {
-        method: name,
-        params: [args, options],
-        id: id,
-    };
-    
-    var jsonUrl =  '/ipa/json';
-    if (useSampleData){
-	jsonUrl = sampleData;
-    }
-    $.ajax({
-	    beforeSend: function(xhrObj){
-		xhrObj.setRequestHeader("Content-Type","application/json");
-		xhrObj.setRequestHeader("Accept","application/json");
-	    },
-	    type: "POST",
-	    url: jsonUrl,
-	    processData: false,
-	    data: JSON.stringify(data),
-	    dataType: "json",
-            success: win_callback,
-            error: fail_callback,
-    });
-    
-    return (id);
-}
-
-/* parse query string into key:value dict
- * arguments:
- *   qs - query string (optional) */
-function ipa_parse_qs(qs)
-{
-    var dict = {};
-
-    if (!qs)
-        qs = location.search.substring(1, location.search.length);
-    qs = qs.replace(/\+/g, ' ');
-
-    var args = qs.split('&');
-    for (var i = 0; i < args.length; ++i) {
-        var parts = args[i].split('=', 2);
-        var key = decodeURIComponent(parts[0]);
-        if (parts.length == 2)
-            dict[key] = decodeURIComponent(parts[1]);
-        else
-            dict[key] = key;
-    }
-
-    return (dict);
-}
-
-/* helper function used to retrieve information about an attribute */
-function ipa_get_param_info(attr)
-{
-    var takes_params = ipa_objs[_ipa_obj_name]['takes_params'];
-    if (!takes_params)
-        return (null);
-
-    for (var i = 0; i < takes_params.length; ++i) {
-        if (takes_params[i]['name'] == attr)
-            return (takes_params[i]);
-    }
-
-    return (null);
-}
-
diff --git a/install/static/ipa_logo_180x50.png b/install/static/ipa_logo_180x50.png
deleted file mode 100644
index defa78cfd..000000000
--- a/install/static/ipa_logo_180x50.png
+++ /dev/null
diff --git a/install/static/ipalogo.png b/install/static/ipalogo.png
deleted file mode 100644
index defa78cfd..000000000
--- a/install/static/ipalogo.png
+++ /dev/null
diff --git a/install/static/jquery.cookie.js b/install/static/jquery.cookie.js
deleted file mode 100644
index 6df1faca2..000000000
--- a/install/static/jquery.cookie.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-/**
- * Create a cookie with the given name and value and other optional parameters.
- *
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Set the value of a cookie.
- * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
- * @desc Create a cookie with all available options.
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Create a session cookie.
- * @example $.cookie('the_cookie', null);
- * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
- *       used when the cookie was set.
- *
- * @param String name The name of the cookie.
- * @param String value The value of the cookie.
- * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
- * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
- *                             If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
- *                             If set to null or omitted, the cookie will be a session cookie and will not be retained
- *                             when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
- *                        require a secure protocol (like HTTPS).
- * @type undefined
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-
-/**
- * Get the value of a cookie with the given name.
- *
- * @example $.cookie('the_cookie');
- * @desc Get the value of a cookie.
- *
- * @param String name The name of the cookie.
- * @return The value of the cookie.
- * @type String
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-jQuery.cookie = function(name, value, options) {
-    if (typeof value != 'undefined') { // name and value given, set cookie
-        options = options || {};
-        if (value === null) {
-            value = '';
-            options.expires = -1;
-        }
-        var expires = '';
-        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
-            var date;
-            if (typeof options.expires == 'number') {
-                date = new Date();
-                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-            } else {
-                date = options.expires;
-            }
-            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
-        }
-        // CAUTION: Needed to parenthesize options.path and options.domain
-        // in the following expressions, otherwise they evaluate to undefined
-        // in the packed version for some reason...
-        var path = options.path ? '; path=' + (options.path) : '';
-        var domain = options.domain ? '; domain=' + (options.domain) : '';
-        var secure = options.secure ? '; secure' : '';
-        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
-    } else { // only name given, get cookie
-        var cookieValue = null;
-        if (document.cookie && document.cookie != '') {
-            var cookies = document.cookie.split(';');
-            for (var i = 0; i < cookies.length; i++) {
-                var cookie = jQuery.trim(cookies[i]);
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
-    }
-};
-\ No newline at end of file
diff --git a/install/static/jquery.js b/install/static/jquery.js
deleted file mode 100644
index fff677643..000000000
--- a/install/static/jquery.js
+++ /dev/null
@@ -1,6240 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function( window, undefined ) {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwnProperty = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	indexOf = Array.prototype.indexOf;
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = "body";
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					doc = (context ? context.ownerDocument || context : document);
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
-					}
-					
-					return jQuery.merge( this, selector );
-					
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					if ( elem ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $("TAG")
-			} else if ( !context && /^\w+$/.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return jQuery( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if (selector.selector !== undefined) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.4.2",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-		
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-	
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
-	},
-	
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-	
-	end: function() {
-		return this.prevObject || jQuery(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging object literal values or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
-					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
-						: jQuery.isArray(copy) ? [] : {};
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-	
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-	
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 13 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
-			}
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
-			}
-		}
-	},
-	
-	bindReady: function() {
-		if ( readyBound ) {
-			return;
-		}
-
-		readyBound = true;
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			return jQuery.ready();
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
-	},
-
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
-			return false;
-		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor
-			&& !hasOwnProperty.call(obj, "constructor")
-			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
-			return false;
-		}
-		
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-	
-		var key;
-		for ( key in obj ) {}
-		
-		return key === undefined || hasOwnProperty.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-	
-	error: function( msg ) {
-		throw msg;
-	},
-	
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-		
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
-
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
-
-		} else {
-			jQuery.error( "Invalid JSON: " + data );
-		}
-	},
-
-	noop: function() {},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
-			}
-		}
-
-		return object;
-	},
-
-	trim: function( text ) {
-		return (text || "").replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
-		}
-
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length, j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [];
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			if ( !inv !== !callback( elems[ i ], i ) ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var ret = [], value;
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
-
-			if ( value != null ) {
-				ret[ ret.length ] = value;
-			}
-		}
-
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
-
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
-		}
-
-		if ( !proxy && fn ) {
-			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
-			};
-		}
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
-
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
-		  	[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	browser: {}
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch( error ) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
-
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
-
-// Mutifunctional method to get and set values to a collection
-// The value/s can be optionally by executed if its a function
-function access( elems, key, value, exec, fn, pass ) {
-	var length = elems.length;
-	
-	// Setting many attributes
-	if ( typeof key === "object" ) {
-		for ( var k in key ) {
-			access( elems, k, key[k], exec, fn, value );
-		}
-		return elems;
-	}
-	
-	// Setting one attribute
-	if ( value !== undefined ) {
-		// Optionally, function values get executed if exec is true
-		exec = !pass && exec && jQuery.isFunction(value);
-		
-		for ( var i = 0; i < length; i++ ) {
-			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-		}
-		
-		return elems;
-	}
-	
-	// Getting an attribute
-	return length ? fn( elems[0], key ) : undefined;
-}
-
-function now() {
-	return (new Date).getTime();
-}
-(function() {
-
-	jQuery.support = {};
-
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + now();
-
-	div.style.display = "none";
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0];
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return;
-	}
-
-	jQuery.support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected,
-
-		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
-
-		// Will be defined later
-		deleteExpando: true,
-		checkClone: false,
-		scriptEval: false,
-		noCloneEvent: true,
-		boxModel: null
-	};
-
-	script.type = "text/javascript";
-	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
-
-	root.insertBefore( script, root.firstChild );
-
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
-	}
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete script.test;
-	
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
-	}
-
-	root.removeChild( script );
-
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
-		});
-		div.cloneNode(true).fireEvent("onclick");
-	}
-
-	div = document.createElement("div");
-	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
-
-	var fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
-
-	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
-	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
-
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-		document.body.removeChild( div ).style.display = 'none';
-
-		div = null;
-	});
-
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) { 
-		var el = document.createElement("div"); 
-		eventName = "on" + eventName; 
-
-		var isSupported = (eventName in el); 
-		if ( !isSupported ) { 
-			el.setAttribute(eventName, "return;"); 
-			isSupported = typeof el[eventName] === "function"; 
-		} 
-		el = null; 
-
-		return isSupported; 
-	};
-	
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
-
-	// release memory in IE
-	root = script = div = all = a = null;
-})();
-
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
-
-jQuery.extend({
-	cache: {},
-	
-	expando:expando,
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		"object": true,
-		"applet": true
-	},
-
-	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ], cache = jQuery.cache, thisCache;
-
-		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
-		}
-
-		// Compute a unique ID for the element
-		if ( !id ) { 
-			id = ++uuid;
-		}
-
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			elem[ expando ] = id;
-			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
-
-		} else if ( !cache[ id ] ) {
-			elem[ expando ] = id;
-			cache[ id ] = {};
-		}
-
-		thisCache = cache[ id ];
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined ) {
-			thisCache[ name ] = data;
-		}
-
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
-	},
-
-	removeData: function( elem, name ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( thisCache ) {
-				// Remove the section of cache data
-				delete thisCache[ name ];
-
-				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
-				}
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-			}
-
-			// Completely remove the data cache
-			delete cache[ id ];
-		}
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
-
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-			}
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
-				jQuery.data( this, key, value );
-			});
-		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
-		}
-
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
-
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
-		}
-
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
-
-		} else {
-			q.push( data );
-		}
-
-		return q;
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ), fn = queue.shift();
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift("inprogress");
-			}
-
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
-
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function( i, elem ) {
-			var queue = jQuery.queue( this, type, data );
-
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	}
-});
-var rclass = /[\n\t]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rspecialurl = /href|src|style/,
-	rtype = /(button|input)/i,
-	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i,
-	rradiocheck = /radio|checkbox/;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return access( this, name, value, true, jQuery.attr );
-	},
-
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
-		});
-	},
-
-	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspace );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split(rspace);
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className, i = 0, self = jQuery(this),
-					state = stateVal,
-					classNames = value.split( rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery.data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		if ( value === undefined ) {
-			var elem = this[0];
-
-			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-				}
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						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
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one ) {
-								return value;
-							}
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-				}
-
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
-				}
-				
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
-
-			}
-
-			return undefined;
-		}
-
-		var isFunction = jQuery.isFunction(value);
-
-		return this.each(function(i) {
-			var self = jQuery(this), val = value;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call(this, i, self.val());
-			}
-
-			// Typecast each time if the value is a Function and the appended
-			// value is therefore different each time.
-			if ( typeof val === "number" ) {
-				val += "";
-			}
-
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
-
-				jQuery( "option", this ).each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					this.selectedIndex = -1;
-				}
-
-			} else {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-		
-	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
-		}
-
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				var parent = elem.parentNode;
-				if ( parent ) {
-					parent.selectedIndex;
-	
-					// Make sure that it also works with optgroups, see #5701
-					if ( parent.parentNode ) {
-						parent.parentNode.selectedIndex;
-					}
-				}
-			}
-
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
-					}
-
-					elem[ name ] = value;
-				}
-
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
-				}
-
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
-
-				return elem[ name ];
-			}
-
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + value;
-				}
-
-				return elem.style.cssText;
-			}
-
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
-			}
-
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
-		}
-
-		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style instead.
-		return jQuery.style( elem, name, value );
-	}
-});
-var rnamespaces = /\.(.*)$/,
-	fcleanup = function( nm ) {
-		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-			return "\\" + ch;
-		});
-	};
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
-		}
-
-		var handleObjIn, handleObj;
-
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure
-		var elemData = jQuery.data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
-		}
-
-		var events = elemData.events = elemData.events || {},
-			eventHandle = elemData.handle, eventHandle;
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-		}
-
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
-
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
-
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
-
-			handleObj.type = type;
-			handleObj.guid = handler.guid;
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
-
-			// Keep track of which events have been used, for global triggering
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.data( elem ),
-			events = elemData && elemData.events;
-
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( var j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
-				}
-
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-
-			for ( var j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
-
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
-					}
-
-					if ( pos != null ) {
-						break;
-					}
-				}
-			}
-
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					removeEvent( elem, type, elemData.handle );
-				}
-
-				ret = null;
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
-			}
-		}
-	},
-
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
-		// Event object or event type
-		var type = event.type || event,
-			bubbling = arguments[3];
-
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[expando] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
-
-			if ( type.indexOf("!") >= 0 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
-
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
-
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
-
-			// Handle triggering a single element
-
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
-			}
-
-			// Clean up in case it is reused
-			event.result = undefined;
-			event.target = elem;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
-		}
-
-		event.currentTarget = elem;
-
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
-		if ( handle ) {
-			handle.apply( elem, data );
-		}
-
-		var parent = elem.parentNode || elem.ownerDocument;
-
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-				}
-			}
-
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (e) {}
-
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
-
-		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old,
-				isClick = jQuery.nodeName(target, "a") && type === "click",
-				special = jQuery.event.special[ type ] || {};
-
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
-
-				try {
-					if ( target[ type ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + type ];
-
-						if ( old ) {
-							target[ "on" + type ] = null;
-						}
-
-						jQuery.event.triggered = true;
-						target[ type ]();
-					}
-
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (e) {}
-
-				if ( old ) {
-					target[ "on" + type ] = old;
-				}
-
-				jQuery.event.triggered = false;
-			}
-		}
-	},
-
-	handle: function( event ) {
-		var all, handlers, namespaces, namespace, events;
-
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-		event.currentTarget = this;
-
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
-
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
-		}
-
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
-
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
-
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
-
-				// Filter the functions by class
-				if ( all || namespace.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, arguments );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
-	fix: function( event ) {
-		if ( event[ expando ] ) {
-			return event;
-		}
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
-
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary
-		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
-		}
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.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 doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? 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 !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
-	},
-
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
-
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
-			},
-
-			remove: function( handleObj ) {
-				var remove = true,
-					type = handleObj.origType.replace(rnamespaces, "");
-				
-				jQuery.each( jQuery.data(this, "events").live || [], function() {
-					if ( type === this.origType.replace(rnamespaces, "") ) {
-						remove = false;
-						return false;
-					}
-				});
-
-				if ( remove ) {
-					jQuery.event.remove( this, handleObj.origType, liveHandler );
-				}
-			}
-
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( this.setInterval ) {
-					this.onbeforeunload = eventHandle;
-				}
-
-				return false;
-			},
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	}
-};
-
-var removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		elem.removeEventListener( type, handle, false );
-	} : 
-	function( elem, type, handle ) {
-		elem.detachEvent( "on" + type, handle );
-	};
-
-jQuery.Event = function( src ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = now();
-
-	// Mark it as fixed
-	this[ expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-		}
-		// otherwise set the returnValue property of the original event to false (IE)
-		e.returnValue = false;
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
-
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
-		}
-	};
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-	 
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
-				return false;
-			}
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
-		}
-	};
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
-	var formElems = /textarea|input|select/i,
-
-	changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery.data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
-		}
-		
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			return jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
-	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange, 
-
-			click: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information/focus[in] is not needed anymore
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
-
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return formElems.test( this.nodeName );
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
-
-			return formElems.test( this.nodeName );
-		}
-	};
-
-	changeFilters = jQuery.event.special.change.filters;
-}
-
-function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
-}
-
-// Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				this.addEventListener( orig, handler, true );
-			}, 
-			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
-			}
-		};
-
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
-			e.type = fix;
-			return jQuery.event.handle.call( this, e );
-		}
-	});
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-		
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
-			}
-		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
-		}
-
-		return this;
-	},
-	
-	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
-	},
-	
-	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
-		} else {
-			return this.die( types, null, fn, selector );
-		}
-	},
-	
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while ( i < args.length ) {
-			jQuery.proxy( fn, args[ i++ ] );
-		}
-
-		return this.click( jQuery.proxy( fn, function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
-
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( type === "focus" || type === "blur" ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				context.each(function(){
-					jQuery.event.add( this, liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				});
-
-			} else {
-				// unbind live handler
-				context.unbind( liveConvert( type, selector ), fn );
-			}
-		}
-		
-		return this;
-	}
-});
-
-function liveHandler( event ) {
-	var stop, elems = [], selectors = [], args = arguments,
-		related, match, handleObj, elem, j, i, l, data,
-		events = jQuery.data( this, "events" );
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
-		return;
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( match[i].selector === handleObj.selector ) {
-				elem = match[i].elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
-			stop = false;
-			break;
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( fn ) {
-		return fn ? this.bind( name, fn ) : this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	window.attachEvent("onunload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
-/*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function(){
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function(selector, context, results, seed) {
-	results = results || [];
-	var origContext = context = context || document;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
-		soFar = m[3];
-		
-		parts.push( m[1] );
-		
-		if ( m[2] ) {
-			extra = m[3];
-			break;
-		}
-	}
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-			var ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
-		}
-
-		if ( context ) {
-			var ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-			set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray(set);
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				var cur = parts.pop(), pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-		} else if ( context && context.nodeType === 1 ) {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-		} else {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function(results){
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort(sortOrder);
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[i-1] ) {
-					results.splice(i--, 1);
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function(expr, set){
-	return Sizzle(expr, null, null, set);
-};
-
-Sizzle.find = function(expr, context, isXML){
-	var set, match;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var type = Expr.order[i], match;
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice(1,1);
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
-				set = Expr.find[ type ]( match, context, isXML );
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = context.getElementsByTagName("*");
-	}
-
-	return {set: set, expr: expr};
-};
-
-Sizzle.filter = function(expr, set, inplace, not){
-	var old = expr, result = [], curLoop = set, match, anyFound,
-		isXMLFilter = set && set[0] && isXML(set[0]);
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var filter = Expr.filter[ type ], found, item, left = match[1];
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-								} else {
-									curLoop[i] = false;
-								}
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-	leftMatch: {},
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-	attrHandle: {
-		href: function(elem){
-			return elem.getAttribute("href");
-		}
-	},
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !/\W/.test(part),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-		">": function(checkSet, part){
-			var isPartStr = typeof part === "string";
-
-			if ( isPartStr && !/\W/.test(part) ) {
-				part = part.toLowerCase();
-
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-			} else {
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-		"": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
-		},
-		"~": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
-		}
-	},
-	find: {
-		ID: function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? [m] : [];
-			}
-		},
-		NAME: function(match, context){
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [], results = context.getElementsByName(match[1]);
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-		TAG: function(match, context){
-			return context.getElementsByTagName(match[1]);
-		}
-	},
-	preFilter: {
-		CLASS: function(match, curLoop, inplace, result, not, isXML){
-			match = " " + match[1].replace(/\\/g, "") + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-		ID: function(match){
-			return match[1].replace(/\\/g, "");
-		},
-		TAG: function(match, curLoop){
-			return match[1].toLowerCase();
-		},
-		CHILD: function(match){
-			if ( match[1] === "nth" ) {
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-		ATTR: function(match, curLoop, inplace, result, not, isXML){
-			var name = match[1].replace(/\\/g, "");
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-		PSEUDO: function(match, curLoop, inplace, result, not){
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-					return false;
-				}
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
-		POS: function(match){
-			match.unshift( true );
-			return match;
-		}
-	},
-	filters: {
-		enabled: function(elem){
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-		disabled: function(elem){
-			return elem.disabled === true;
-		},
-		checked: function(elem){
-			return elem.checked === true;
-		},
-		selected: function(elem){
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			elem.parentNode.selectedIndex;
-			return elem.selected === true;
-		},
-		parent: function(elem){
-			return !!elem.firstChild;
-		},
-		empty: function(elem){
-			return !elem.firstChild;
-		},
-		has: function(elem, i, match){
-			return !!Sizzle( match[3], elem ).length;
-		},
-		header: function(elem){
-			return /h\d/i.test( elem.nodeName );
-		},
-		text: function(elem){
-			return "text" === elem.type;
-		},
-		radio: function(elem){
-			return "radio" === elem.type;
-		},
-		checkbox: function(elem){
-			return "checkbox" === elem.type;
-		},
-		file: function(elem){
-			return "file" === elem.type;
-		},
-		password: function(elem){
-			return "password" === elem.type;
-		},
-		submit: function(elem){
-			return "submit" === elem.type;
-		},
-		image: function(elem){
-			return "image" === elem.type;
-		},
-		reset: function(elem){
-			return "reset" === elem.type;
-		},
-		button: function(elem){
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
-		},
-		input: function(elem){
-			return /input|select|textarea|button/i.test(elem.nodeName);
-		}
-	},
-	setFilters: {
-		first: function(elem, i){
-			return i === 0;
-		},
-		last: function(elem, i, match, array){
-			return i === array.length - 1;
-		},
-		even: function(elem, i){
-			return i % 2 === 0;
-		},
-		odd: function(elem, i){
-			return i % 2 === 1;
-		},
-		lt: function(elem, i, match){
-			return i < match[3] - 0;
-		},
-		gt: function(elem, i, match){
-			return i > match[3] - 0;
-		},
-		nth: function(elem, i, match){
-			return match[3] - 0 === i;
-		},
-		eq: function(elem, i, match){
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function(elem, match, i, array){
-			var name = match[1], filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var i = 0, l = not.length; i < l; i++ ) {
-					if ( not[i] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
-			}
-		},
-		CHILD: function(elem, match){
-			var type = match[1], node = elem;
-			switch (type) {
-				case 'only':
-				case 'first':
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					if ( type === "first" ) { 
-						return true; 
-					}
-					node = elem;
-				case 'last':
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-					return true;
-				case 'nth':
-					var first = match[2], last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-					if ( first === 0 ) {
-						return diff === 0;
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-		ID: function(elem, match){
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-		TAG: function(elem, match){
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		CLASS: function(elem, match){
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-		ATTR: function(elem, match){
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-		POS: function(elem, match, i, array){
-			var name = match[2], filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS;
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){
-		return "\\" + (num - 0 + 1);
-	}));
-}
-
-var makeArray = function(array, results) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch(e){
-	makeArray = function(array, results) {
-		var ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var i = 0, l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-			} else {
-				for ( var i = 0; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( "sourceIndex" in document.documentElement ) {
-	sortOrder = function( a, b ) {
-		if ( !a.sourceIndex || !b.sourceIndex ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.sourceIndex ? -1 : 1;
-		}
-
-		var ret = a.sourceIndex - b.sourceIndex;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-} else if ( document.createRange ) {
-	sortOrder = function( a, b ) {
-		if ( !a.ownerDocument || !b.ownerDocument ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.ownerDocument ? -1 : 1;
-		}
-
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-function getText( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-}
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date).getTime();
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	var root = document.documentElement;
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function(match, context, isXML){
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
-			}
-		};
-
-		Expr.filter.ID = function(elem, match){
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-	root = form = null; // release memory in IE
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function(match, context){
-			var results = context.getElementsByTagName(match[1]);
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-		Expr.attrHandle.href = function(elem){
-			return elem.getAttribute("href", 2);
-		};
-	}
-
-	div = null; // release memory in IE
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle, div = document.createElement("div");
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function(query, context, extra, seed){
-			context = context || document;
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && context.nodeType === 9 && !isXML(context) ) {
-				try {
-					return makeArray( context.querySelectorAll(query), extra );
-				} catch(e){}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		div = null; // release memory in IE
-	})();
-}
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function(match, context, isXML) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	div = null; // release memory in IE
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-		if ( elem ) {
-			elem = elem[dir];
-			var match = false;
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-var contains = document.compareDocumentPosition ? function(a, b){
-	return !!(a.compareDocumentPosition(b) & 16);
-} : function(a, b){
-	return a !== b && (a.contains ? a.contains(b) : true);
-};
-
-var isXML = function(elem){
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function(selector, context){
-	var tmpSet = [], later = "", match,
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = getText;
-jQuery.isXMLDoc = isXML;
-jQuery.contains = contains;
-
-return;
-
-window.Sizzle = Sizzle;
-
-})();
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	slice = Array.prototype.slice;
-
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
-
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-	
-	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
-	},
-
-	closest: function( selectors, context ) {
-		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector;
-
-			if ( cur && selectors.length ) {
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
-
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[selector];
-
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
-						}
-					}
-					cur = cur.parentNode;
-				}
-			}
-
-			return ret;
-		}
-
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
-
-		return this.map(function( i, cur ) {
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-					return cur;
-				}
-				cur = cur.parentNode;
-			}
-			return null;
-		});
-	},
-	
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-		
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, slice.call(arguments).join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return jQuery.find.matches(expr, elems);
-	},
-	
-	dir: function( elem, dir, until ) {
-		var matched = [], cur = elem[dir];
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			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 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnocache = /<script|<object|<embed|<option|<style/i,
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
-	fcloseTag = function( all, front, tag ) {
-		return rselfClosing.test( tag ) ?
-			all :
-			front + "></" + tag + ">";
-	},
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append(this);
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
-	},
-	
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-		
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-		
-		return this;
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
-
-		// Return the cloned set
-		return ret;
-	},
-
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
-
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, fcloseTag);
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
-
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery(this), old = self.html();
-				self.empty().append(function(){
-					return value.call( this, i, old );
-				});
-			});
-
-		} else {
-			this.empty().append( value );
-		}
-
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
-
-				jQuery(this).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = buildFragment( args, this, scripts );
-			}
-			
-			fragment = results.fragment;
-			
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
-			}
-		}
-
-		return this;
-
-		function root( elem, cur ) {
-			return jQuery.nodeName(elem, "table") ?
-				(elem.getElementsByTagName("tbody")[0] ||
-				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-				elem;
-		}
-	}
-});
-
-function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
-
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-				}
-			}
-		}
-	});
-}
-
-function buildFragment( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
-		cacheable = true;
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults ) {
-			if ( cacheresults !== 1 ) {
-				fragment = cacheresults;
-			}
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-}
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [], insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-		
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-			
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
-				ret = ret.concat( elems );
-			}
-		
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-jQuery.extend({
-	clean: function( elems, context, fragment, scripts ) {
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		var ret = [];
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
-				elem = context.createTextNode( elem );
-
-			} else if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, fcloseTag);
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0],
-					div = context.createElement("div");
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( depth-- ) {
-					div = div.lastChild;
-				}
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !jQuery.support.tbody ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					var hasBody = rtbody.test(elem),
-						tbody = tag === "table" && !hasBody ?
-							div.firstChild && div.firstChild.childNodes :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !hasBody ?
-								div.childNodes :
-								[];
-
-					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-						}
-					}
-
-				}
-
-				// IE completely kills leading whitespace when innerHTML is used
-				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-				}
-
-				elem = div.childNodes;
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			for ( var i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-	
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-		
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			id = elem[ jQuery.expando ];
-			
-			if ( id ) {
-				data = cache[ id ];
-				
-				if ( data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						} else {
-							removeEvent( elem, type, data.handle );
-						}
-					}
-				}
-				
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-				
-				delete cache[ id ];
-			}
-		}
-	}
-});
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-	ralpha = /alpha\([^)]*\)/,
-	ropacity = /opacity=([^)]*)/,
-	rfloat = /float/i,
-	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-
-	cssShow = { position: "absolute", visibility: "hidden", display:"block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-
-	// cache check for defaultView.getComputedStyle
-	getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
-	// normalize float css property
-	styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	return access( this, name, value, true, function( elem, name, value ) {
-		if ( value === undefined ) {
-			return jQuery.curCSS( elem, name );
-		}
-		
-		if ( typeof value === "number" && !rexclude.test(name) ) {
-			value += "px";
-		}
-
-		jQuery.style( elem, name, value );
-	});
-};
-
-jQuery.extend({
-	style: function( elem, name, value ) {
-		// don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		// ignore negative width and height values #1599
-		if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-			value = undefined;
-		}
-
-		var style = elem.style || elem, set = value !== undefined;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" ) {
-			if ( set ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				style.zoom = 1;
-
-				// Set the alpha filter to set the opacity
-				var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-				var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
-				style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
-			}
-
-			return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-				(parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
-				"";
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
-
-		name = name.replace(rdashAlpha, fcamelCase);
-
-		if ( set ) {
-			style[ name ] = value;
-		}
-
-		return style[ name ];
-	},
-
-	css: function( elem, name, force, extra ) {
-		if ( name === "width" || name === "height" ) {
-			var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
-
-			function getWH() {
-				val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-				if ( extra === "border" ) {
-					return;
-				}
-
-				jQuery.each( which, function() {
-					if ( !extra ) {
-						val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
-					}
-
-					if ( extra === "margin" ) {
-						val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
-					} else {
-						val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
-					}
-				});
-			}
-
-			if ( elem.offsetWidth !== 0 ) {
-				getWH();
-			} else {
-				jQuery.swap( elem, props, getWH );
-			}
-
-			return Math.max(0, Math.round(val));
-		}
-
-		return jQuery.curCSS( elem, name, force );
-	},
-
-	curCSS: function( elem, name, force ) {
-		var ret, style = elem.style, filter;
-
-		// IE uses filters for opacity
-		if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-			ret = ropacity.test(elem.currentStyle.filter || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				"";
-
-			return ret === "" ?
-				"1" :
-				ret;
-		}
-
-		// Make sure we're using the right name for getting the float value
-		if ( rfloat.test( name ) ) {
-			name = styleFloat;
-		}
-
-		if ( !force && style && style[ name ] ) {
-			ret = style[ name ];
-
-		} else if ( getComputedStyle ) {
-
-			// Only "float" is needed here
-			if ( rfloat.test( name ) ) {
-				name = "float";
-			}
-
-			name = name.replace( rupper, "-$1" ).toLowerCase();
-
-			var defaultView = elem.ownerDocument.defaultView;
-
-			if ( !defaultView ) {
-				return null;
-			}
-
-			var computedStyle = defaultView.getComputedStyle( elem, null );
-
-			if ( computedStyle ) {
-				ret = computedStyle.getPropertyValue( name );
-			}
-
-			// We should always get a number back from opacity
-			if ( name === "opacity" && ret === "" ) {
-				ret = "1";
-			}
-
-		} else if ( elem.currentStyle ) {
-			var camelCase = name.replace(rdashAlpha, fcamelCase);
-
-			ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
-
-			// 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 ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-				// Remember the original values
-				var left = style.left, rsLeft = elem.runtimeStyle.left;
-
-				// Put in the new values to get a computed value out
-				elem.runtimeStyle.left = elem.currentStyle.left;
-				style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
-				ret = style.pixelLeft + "px";
-
-				// Revert the changed values
-				style.left = left;
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( var name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth, height = elem.offsetHeight,
-			skip = elem.nodeName.toLowerCase() === "tr";
-
-		return width === 0 && height === 0 && !skip ?
-			true :
-			width > 0 && height > 0 && !skip ?
-				false :
-				jQuery.curCSS(elem, "display") === "none";
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-var jsc = now(),
-	rscript = /<script(.|\s)*?\/script>/gi,
-	rselectTextarea = /select|textarea/i,
-	rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
-	jsre = /=\?(&|$)/,
-	rquery = /\?/,
-	rts = /(\?|&)_=.*?(&|$)/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	r20 = /%20/g,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load;
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" ) {
-			return _load.call( this, url );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		// 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 if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			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(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-	serializeArray: function() {
-		return this.map(function() {
-			return this.elements ? jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function() {
-			return this.name && !this.disabled &&
-				(this.checked || rselectTextarea.test(this.nodeName) ||
-					rinput.test(this.type));
-		})
-		.map(function( i, elem ) {
-			var val = jQuery(this).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray(val) ?
-					jQuery.map( val, function( val, i ) {
-						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);
-	};
-});
-
-jQuery.extend({
-
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			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 ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			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: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		username: null,
-		password: null,
-		traditional: false,
-		*/
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7 (can't request local files),
-		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
-			function() {
-				return new window.XMLHttpRequest();
-			} :
-			function() {
-				try {
-					return new window.ActiveXObject("Microsoft.XMLHTTP");
-				} catch(e) {}
-			},
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajax: function( origSettings ) {
-		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
-		
-		var jsonp, status, data,
-			callbackContext = origSettings && origSettings.context || s,
-			type = s.type.toUpperCase();
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType === "jsonp" ) {
-			if ( type === "GET" ) {
-				if ( !jsre.test( s.url ) ) {
-					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-				}
-			} else if ( !s.data || !jsre.test(s.data) ) {
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			}
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
-			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data ) {
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			}
-
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			window[ jsonp ] = window[ jsonp ] || function( tmp ) {
-				data = tmp;
-				success();
-				complete();
-				// Garbage collect
-				window[ jsonp ] = undefined;
-
-				try {
-					delete window[ jsonp ];
-				} catch(e) {}
-
-				if ( head ) {
-					head.removeChild( script );
-				}
-			};
-		}
-
-		if ( s.dataType === "script" && s.cache === null ) {
-			s.cache = false;
-		}
-
-		if ( s.cache === false && type === "GET" ) {
-			var ts = now();
-
-			// try replacing _= if it is there
-			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
-
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for get requests
-		if ( s.data && type === "GET" ) {
-			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && ! jQuery.active++ ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1] !== location.protocol || parts[2] !== location.host);
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			script.src = s.url;
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
-			}
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				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();
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-					}
-				};
-			}
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object
-		var xhr = s.xhr();
-
-		if ( !xhr ) {
-			return;
-		}
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if ( s.username ) {
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		} else {
-			xhr.open(type, s.url, s.async);
-		}
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set the correct header, if data is being sent
-			if ( s.data || origSettings && origSettings.contentType ) {
-				xhr.setRequestHeader("Content-Type", s.contentType);
-			}
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery.lastModified[s.url] ) {
-					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
-				}
-
-				if ( jQuery.etag[s.url] ) {
-					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
-				}
-			}
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			// Only send the header if it's not a remote XHR
-			if ( !remote ) {
-				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*" :
-				s.accepts._default );
-		} catch(e) {}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && s.beforeSend.call(callbackContext, xhr, s) === false ) {
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global ) {
-			trigger("ajaxSend", [xhr, s]);
-		}
-
-		// Wait for a response to come back
-		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted
-			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
-				// Opera doesn't call onreadystatechange before this point
-				// so we simulate the call
-				if ( !requestDone ) {
-					complete();
-				}
-
-				requestDone = true;
-				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
-				}
-
-			// The transfer is complete and the data is available, or the request timed out
-			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
-
-				status = isTimeout === "timeout" ?
-					"timeout" :
-					!jQuery.httpSuccess( xhr ) ?
-						"error" :
-						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
-							"notmodified" :
-							"success";
-
-				var errMsg;
-
-				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( xhr, s.dataType, s );
-					} catch(err) {
-						status = "parsererror";
-						errMsg = err;
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status === "success" || status === "notmodified" ) {
-					// JSONP handles its own success callback
-					if ( !jsonp ) {
-						success();
-					}
-				} else {
-					jQuery.handleError(s, xhr, status, errMsg);
-				}
-
-				// Fire the complete handlers
-				complete();
-
-				if ( isTimeout === "timeout" ) {
-					xhr.abort();
-				}
-
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
-				}
-			}
-		};
-
-		// Override the abort handler, if we can (IE doesn't allow it, but that's OK)
-		// Opera doesn't fire onreadystatechange at all on abort
-		try {
-			var oldAbort = xhr.abort;
-			xhr.abort = function() {
-				if ( xhr ) {
-					oldAbort.call( xhr );
-				}
-
-				onreadystatechange( "abort" );
-			};
-		} catch(e) { }
-
-		// Timeout checker
-		if ( s.async && s.timeout > 0 ) {
-			setTimeout(function() {
-				// Check to see if the request is still happening
-				if ( xhr && !requestDone ) {
-					onreadystatechange( "timeout" );
-				}
-			}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
-		} catch(e) {
-			jQuery.handleError(s, xhr, null, e);
-			// Fire the complete handlers
-			complete();
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async ) {
-			onreadystatechange();
-		}
-
-		function success() {
-			// If a local callback was specified, fire it and pass it the data
-			if ( s.success ) {
-				s.success.call( callbackContext, data, status, xhr );
-			}
-
-			// Fire the global callback
-			if ( s.global ) {
-				trigger( "ajaxSuccess", [xhr, s] );
-			}
-		}
-
-		function complete() {
-			// Process result
-			if ( s.complete ) {
-				s.complete.call( callbackContext, xhr, status);
-			}
-
-			// The request was completed
-			if ( s.global ) {
-				trigger( "ajaxComplete", [xhr, s] );
-			}
-
-			// Handle the global AJAX counter
-			if ( s.global && ! --jQuery.active ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-		}
-		
-		function trigger(type, args) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) {
-			s.error.call( s.context || s, xhr, status, e );
-		}
-
-		// Fire the global callback
-		if ( s.global ) {
-			(s.context ? jQuery(s.context) : jQuery.event).trigger( "ajaxError", [xhr, s, e] );
-		}
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol === "file:" ||
-				// Opera returns 0 when status is 304
-				( xhr.status >= 200 && xhr.status < 300 ) ||
-				xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
-		} catch(e) {}
-
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		var lastModified = xhr.getResponseHeader("Last-Modified"),
-			etag = xhr.getResponseHeader("Etag");
-
-		if ( lastModified ) {
-			jQuery.lastModified[url] = lastModified;
-		}
-
-		if ( etag ) {
-			jQuery.etag[url] = etag;
-		}
-
-		// Opera returns 0 when status is 304
-		return xhr.status === 304 || xhr.status === 0;
-	},
-
-	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type") || "",
-			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			jQuery.error( "parsererror" );
-		}
-
-		// Allow a pre-filtering function to sanitize the response
-		// s is checked to keep backwards compatibility
-		if ( s && s.dataFilter ) {
-			data = s.dataFilter( data, type );
-		}
-
-		// The filter can actually parse the response
-		if ( typeof data === "string" ) {
-			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				data = jQuery.parseJSON( data );
-
-			// If the type is "script", eval it in global context
-			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
-			}
-		}
-
-		return data;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [];
-		
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-		
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray(a) || a.jquery ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-			
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[prefix] );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join("&").replace(r20, "+");
-
-		function buildParams( prefix, obj ) {
-			if ( jQuery.isArray(obj) ) {
-				// Serialize array item.
-				jQuery.each( obj, function( i, v ) {
-					if ( traditional || /\[\]$/.test( prefix ) ) {
-						// Treat each array item as a scalar.
-						add( prefix, v );
-					} else {
-						// If array item is non-scalar (array or object), encode its
-						// numeric index to resolve deserialization ambiguity issues.
-						// Note that rack (as of 1.0.0) can't currently deserialize
-						// nested arrays properly, and attempting to do so may cause
-						// a server error. Possible fixes are to modify rack's
-						// deserialization algorithm or to provide an option or flag
-						// to force array serialization to be shallow.
-						buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v );
-					}
-				});
-					
-			} else if ( !traditional && obj != null && typeof obj === "object" ) {
-				// Serialize object item.
-				jQuery.each( obj, function( k, v ) {
-					buildParams( prefix + "[" + k + "]", v );
-				});
-					
-			} else {
-				// Serialize scalar item.
-				add( prefix, obj );
-			}
-		}
-
-		function add( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction(value) ? value() : value;
-			s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-		}
-	}
-});
-var elemdisplay = {},
-	rfxtypes = /toggle|show|hide/,
-	rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	];
-
-jQuery.fn.extend({
-	show: function( speed, callback ) {
-		if ( speed || speed === 0) {
-			return this.animate( genFx("show", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-
-				this[i].style.display = old || "";
-
-				if ( jQuery.css(this[i], "display") === "none" ) {
-					var nodeName = this[i].nodeName, display;
-
-					if ( elemdisplay[ nodeName ] ) {
-						display = elemdisplay[ nodeName ];
-
-					} else {
-						var elem = jQuery("<" + nodeName + " />").appendTo("body");
-
-						display = elem.css("display");
-
-						if ( display === "none" ) {
-							display = "block";
-						}
-
-						elem.remove();
-
-						elemdisplay[ nodeName ] = display;
-					}
-
-					jQuery.data(this[i], "olddisplay", display);
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = jQuery.data(this[j], "olddisplay") || "";
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, callback);
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var old = jQuery.data(this[i], "olddisplay");
-				if ( !old && old !== "none" ) {
-					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( var j = 0, k = this.length; j < k; j++ ) {
-				this[j].style.display = "none";
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2 ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete );
-		}
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			var opt = jQuery.extend({}, optall), p,
-				hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
-				self = this;
-
-			for ( p in prop ) {
-				var name = p.replace(rdashAlpha, fcamelCase);
-
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-					p = name;
-				}
-
-				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
-					return opt.complete.call(this);
-				}
-
-				if ( ( p === "height" || p === "width" ) && this.style ) {
-					// Store display property
-					opt.display = jQuery.css(this, "display");
-
-					// Make sure that nothing sneaks out
-					opt.overflow = this.style.overflow;
-				}
-
-				if ( jQuery.isArray( prop[p] ) ) {
-					// Create (if needed) and add to specialEasing
-					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
-					prop[p] = prop[p][0];
-				}
-			}
-
-			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 ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-
-				} else {
-					var parts = rfxnum.exec(val),
-						start = e.cur(true) || 0;
-
-					if ( parts ) {
-						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							self.style[ name ] = (end || 1) + unit;
-							start = ((end || 1) / 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;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		var timers = jQuery.timers;
-
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
-	}
-
-});
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, callback ) {
-		return this.animate( props, speed, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? speed : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function() {
-			if ( opt.queue !== false ) {
-				jQuery(this).dequeue();
-			}
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( 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.call( 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 ) {
-			this.elem.style.display = "block";
-		}
-	},
-
-	// Get the current size
-	cur: function( force ) {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-		return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		this.startTime = now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		var self = this;
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval(jQuery.fx.tick, 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.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// 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.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = now(), done = true;
-
-		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = 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
-					var old = jQuery.data(this.elem, "olddisplay");
-					this.elem.style.display = old ? old : 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 ) {
-					jQuery(this.elem).hide();
-				}
-
-				// 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.style(this.elem, p, this.options.orig[p]);
-					}
-				}
-
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-			}
-
-			return false;
-
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
-			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
-			this.pos = jQuery.easing[specialEasing || defaultEasing](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.extend( jQuery.fx, {
-	tick: function() {
-		var timers = jQuery.timers;
-
-		for ( var i = 0; i < timers.length; i++ ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-		
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-	
-	speeds: {
-		slow: 600,
- 		fast: 200,
- 		// Default speed
- 		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style(fx.elem, "opacity", fx.now);
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
-			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			top  = box.top  + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
-			left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var offsetParent = elem.offsetParent, prevOffsetParent = elem,
-			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
-			body = doc.body, defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop, left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed", checkDiv.style.top = "20px";
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative";
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop, left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
-			left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-	
-	setOffset: function( elem, options, i ) {
-		// set position first, in-case top/left are set even on static elem
-		if ( /static/.test( jQuery.curCSS( elem, "position" ) ) ) {
-			elem.style.position = "relative";
-		}
-		var curElem   = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curTop    = parseInt( jQuery.curCSS( elem, "top",  true ), 10 ) || 0,
-			curLeft   = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		var props = {
-			top:  (options.top  - curOffset.top)  + curTop,
-			left: (options.left - curOffset.left) + curLeft
-		};
-		
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
-		offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
-		parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function(val) {
-		var elem = this[0], win;
-		
-		if ( !elem ) {
-			return null;
-		}
-
-		if ( val !== undefined ) {
-			// Set the scroll offset
-			return this.each(function() {
-				win = getWindow( this );
-
-				if ( win ) {
-					win.scrollTo(
-						!i ? val : jQuery(win).scrollLeft(),
-						 i ? val : jQuery(win).scrollTop()
-					);
-
-				} else {
-					this[ method ] = val;
-				}
-			});
-		} else {
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
-	};
-});
-
-function getWindow( elem ) {
-	return ("scrollTo" in elem && elem.document) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			jQuery.css( this[0], type, false, "padding" ) :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-		
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
-
-		return ("scrollTo" in elem && elem.document) ? // does it walk and quack like a window?
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-			elem.document.body[ "client" + name ] :
-
-			// Get document width or height
-			(elem.nodeType === 9) ? // is it a document
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					elem.documentElement["client" + name],
-					elem.body["scroll" + name], elem.documentElement["scroll" + name],
-					elem.body["offset" + name], elem.documentElement["offset" + name]
-				) :
-
-				// Get or set width or height on the element
-				size === undefined ?
-					// Get width or height on the element
-					jQuery.css( elem, type ) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, typeof size === "string" ? size : size + "px" );
-	};
-
-});
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-})(window);
diff --git a/install/static/json2.js b/install/static/json2.js
deleted file mode 100644
index a1a3b170c..000000000
--- a/install/static/json2.js
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
-    http://www.JSON.org/json2.js
-    2010-03-20
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-
-
-    This file creates a global JSON object containing two methods: stringify
-    and parse.
-
-        JSON.stringify(value, replacer, space)
-            value       any JavaScript value, usually an object or array.
-
-            replacer    an optional parameter that determines how object
-                        values are stringified for objects. It can be a
-                        function or an array of strings.
-
-            space       an optional parameter that specifies the indentation
-                        of nested structures. If it is omitted, the text will
-                        be packed without extra whitespace. If it is a number,
-                        it will specify the number of spaces to indent at each
-                        level. If it is a string (such as '\t' or '&nbsp;'),
-                        it contains the characters used to indent at each level.
-
-            This method produces a JSON text from a JavaScript value.
-
-            When an object value is found, if the object contains a toJSON
-            method, its toJSON method will be called and the result will be
-            stringified. A toJSON method does not serialize: it returns the
-            value represented by the name/value pair that should be serialized,
-            or undefined if nothing should be serialized. The toJSON method
-            will be passed the key associated with the value, and this will be
-            bound to the value
-
-            For example, this would serialize Dates as ISO strings.
-
-                Date.prototype.toJSON = function (key) {
-                    function f(n) {
-                        // Format integers to have at least two digits.
-                        return n < 10 ? '0' + n : n;
-                    }
-
-                    return this.getUTCFullYear()   + '-' +
-                         f(this.getUTCMonth() + 1) + '-' +
-                         f(this.getUTCDate())      + 'T' +
-                         f(this.getUTCHours())     + ':' +
-                         f(this.getUTCMinutes())   + ':' +
-                         f(this.getUTCSeconds())   + 'Z';
-                };
-
-            You can provide an optional replacer method. It will be passed the
-            key and value of each member, with this bound to the containing
-            object. The value that is returned from your method will be
-            serialized. If your method returns undefined, then the member will
-            be excluded from the serialization.
-
-            If the replacer parameter is an array of strings, then it will be
-            used to select the members to be serialized. It filters the results
-            such that only members with keys listed in the replacer array are
-            stringified.
-
-            Values that do not have JSON representations, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped; in arrays they will be replaced with null. You can use
-            a replacer function to replace those with JSON values.
-            JSON.stringify(undefined) returns undefined.
-
-            The optional space parameter produces a stringification of the
-            value that is filled with line breaks and indentation to make it
-            easier to read.
-
-            If the space parameter is a non-empty string, then that string will
-            be used for indentation. If the space parameter is a number, then
-            the indentation will be that many spaces.
-
-            Example:
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
-            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
-            text = JSON.stringify([new Date()], function (key, value) {
-                return this[key] instanceof Date ?
-                    'Date(' + this[key] + ')' : value;
-            });
-            // text is '["Date(---current time---)"]'
-
-
-        JSON.parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = JSON.parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
-                var d;
-                if (typeof value === 'string' &&
-                        value.slice(0, 5) === 'Date(' &&
-                        value.slice(-1) === ')') {
-                    d = new Date(value.slice(5, -1));
-                    if (d) {
-                        return d;
-                    }
-                }
-                return value;
-            });
-
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-*/
-
-/*jslint evil: true, strict: false */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
-    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
-    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
-    lastIndex, length, parse, prototype, push, replace, slice, stringify,
-    test, toJSON, toString, valueOf
-*/
-
-
-// Create a JSON object only if one does not already exist. We create the
-// methods in a closure to avoid creating global variables.
-
-if (!this.JSON) {
-    this.JSON = {};
-}
-
-(function () {
-
-    function f(n) {
-        // Format integers to have at least two digits.
-        return n < 10 ? '0' + n : n;
-    }
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-
-        Date.prototype.toJSON = function (key) {
-
-            return isFinite(this.valueOf()) ?
-                   this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z' : null;
-        };
-
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
-    }
-
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        gap,
-        indent,
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        },
-        rep;
-
-
-    function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-        escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
-    }
-
-
-    function str(key, holder) {
-
-// Produce a string from holder[key].
-
-        var i,          // The loop counter.
-            k,          // The member key.
-            v,          // The member value.
-            length,
-            mind = gap,
-            partial,
-            value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-        if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function') {
-            value = value.toJSON(key);
-        }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-        if (typeof rep === 'function') {
-            value = rep.call(holder, key, value);
-        }
-
-// What happens next depends on the value's type.
-
-        switch (typeof value) {
-        case 'string':
-            return quote(value);
-
-        case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-            return isFinite(value) ? String(value) : 'null';
-
-        case 'boolean':
-        case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-            return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-        case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-            if (!value) {
-                return 'null';
-            }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-            gap += indent;
-            partial = [];
-
-// Is the value an array?
-
-            if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                length = value.length;
-                for (i = 0; i < length; i += 1) {
-                    partial[i] = str(i, value) || 'null';
-                }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
-                gap = mind;
-                return v;
-            }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-            if (rep && typeof rep === 'object') {
-                length = rep.length;
-                for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
-            gap = mind;
-            return v;
-        }
-    }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
-    if (typeof JSON.stringify !== 'function') {
-        JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-            var i;
-            gap = '';
-            indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-            return str('', {'': value});
-        };
-    }
-
-
-// If the JSON object does not yet have a parse method, give it one.
-
-    if (typeof JSON.parse !== 'function') {
-        JSON.parse = function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
-            var j;
-
-            function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
-                var k, v, value = holder[key];
-                if (value && typeof value === 'object') {
-                    for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
-                            v = walk(value, k);
-                            if (v !== undefined) {
-                                value[k] = v;
-                            } else {
-                                delete value[k];
-                            }
-                        }
-                    }
-                }
-                return reviver.call(holder, key, value);
-            }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
-            text = String(text);
-            cx.lastIndex = 0;
-            if (cx.test(text)) {
-                text = text.replace(cx, function (a) {
-                    return '\\u' +
-                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-                });
-            }
-
-// In the second stage, we run the text against regular expressions that look
-// for non-JSON patterns. We are especially concerned with '()' and 'new'
-// because they can cause invocation, and '=' because it can cause mutation.
-// But just to be safe, we want to reject all unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-            if (/^[\],:{}\s]*$/.
-test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
-            }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-            throw new SyntaxError('JSON.parse');
-        };
-    }
-}());
diff --git a/install/static/minus-disabled.png b/install/static/minus-disabled.png
deleted file mode 100644
index 3dcbd72be..000000000
--- a/install/static/minus-disabled.png
+++ /dev/null
diff --git a/install/static/minus-enabled.png b/install/static/minus-enabled.png
deleted file mode 100644
index 5a98ebbb1..000000000
--- a/install/static/minus-enabled.png
+++ /dev/null
diff --git a/install/static/minus-hover.png b/install/static/minus-hover.png
deleted file mode 100644
index 7875dbe1c..000000000
--- a/install/static/minus-hover.png
+++ /dev/null
diff --git a/install/static/navigation.js b/install/static/navigation.js
deleted file mode 100644
index c8562ad57..000000000
--- a/install/static/navigation.js
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-function setLoggedInText(principal){
-    $("#loggedinas").html( "Logged in as  " + principal);
-}
-
-function whoamiSuccess(response){
-
-    $.cookie("whoami", response.result.summary);        
-    setLoggedInText(response.result.summary);
-}
-
-function unimplemented(facet){
-
-    showContent();
-    $('#content').append("<div>Not yet implemented.</div>");
-
-}
-
-function buildNavigation(){
-    params= getPageParams(); 
-    var tab = params["tab"];
-    
-    if (!tab){
-	tab=$.cookie("lastpage");        
-    }
-    if  ( !tab ) {
-	tab="user";
-    }
-
-    var facet = params["facet"];
-
-
-    var siteMap = [{name:"IDENTITY",
-		    tab:"user",
-		    children : [
-			{name:"Users",tab:"user",  setup: setupUser},
-			{name:"Groups",tab:"group",setup: setupGroup},
-			{name:"Hosts",tab:"host",  setup:  setupHost},
-			{name:"Hostgroups",
-			 tab:"hostgroup", 
-			 setup:  setupHostgroup},
-			{name:"Netgroups",tab:"netgroup", setup:setupNetgroup}
-		    ]},
-		   {name:"POLICY",  tab:"policy", setup: unimplemented},
-		   {name:"CONFIG",  tab:"config", setup: unimplemented }];
-
-    
-    var separator = $("<span class='main-separator' />");
-
-    var currentMain =  siteMap[0];
-    for (var i = 0 ; i < siteMap.length; i++){
-	current = siteMap[i];
-	if (i > 0){
-	    $('#main-nav').append(separator.clone());
-	}
-	var tabClass =  "main-nav-off";
-	if  (tab == current.tab){
-	    currentMain =  current;	    
-	    tabClass = "main-nav-on";
-	}
-	
-	var span = $("<span/>", {
-	    "class": tabClass,
-	    id: "span-tab-"+current.tab,
-	});
-
-	$("<a/>",{
-	    "id": "tab-"+current.tab,
-	    href:  "#?tab="+current.tab,
-	    text: current.name,
-	    click: setActiveTab
-	}).appendTo(span);
-	
-	span.appendTo("#main-nav")
-    }
-
-
-    if (currentMain.children){
-    var selectedSub;
-	for (var i =0; i < currentMain.children.length; i++){
-	    var currentSub = currentMain.children[i];
-	    
-	    var tabClass =  "sub-nav-off";
-	    if  (tab == currentSub.tab){
-		tabClass = "sub-nav-on";
-		selectedSub = currentSub;
-	    }
-	    
-	    var span =  $("<span/>", {
-		"class": tabClass,
-		id: "span-subtab-"+currentSub.tab
-	    });
-	    
-	    $("<a/>",{
-		"id": "subtab-"+currentSub.tab,
-		href:  "#?tab="+currentSub.tab,
-		text: currentSub.name,
-		click: setActiveSubtab,
-	    }).appendTo(span);
-	    	    
-	    span.appendTo("#sub-nav");
-	}
-	
-	if (selectedSub  && selectedSub.setup){
-	    selectedSub.setup(facet);
-	}
-    }else if (currentMain && currentMain.setup){
-	currentMain.setup(facet);
-    }
-
-    sampleData = "sampledata/whoami.json";
-    var whoami = $.cookie("whoami");        
-    if (whoami == null){
-	ipa_cmd( 'whoami', [], {}, whoamiSuccess);
-    }else{
-	setLoggedInText(whoami);
-    }
-}
-
-
-function setActiveTab(){
-
-    var setupFunctions = {
-	user:     setupUser, 
-	policy:   unimplemented,
-	config:   unimplemented};
-
-
-
-   var tabName = this.id.substring("tab-".length);
-    $(".main-nav-on").removeClass('main-nav-on').addClass("main-nav-off")
-    var activeTab = "#span-tab-"+tabName;
-    $(activeTab).removeClass('main-nav-off').addClass("main-nav-on")
-
-    setupFunctions[tabName]();
-
-}
-
-function setActiveSubtab(){
-
-    var setupFunctions = {
-	user:     setupUser, 
-	group:    setupGroup, 
-	host:     setupHost,
-	hostgroup:setupHostgroup,
-	netgroup:setupNetgroup,
-};
-
-
- 
-
-    var subtabName = this.id.substring("subtab-".length);
-    $(".sub-nav-on").removeClass('sub-nav-on').addClass("sub-nav-off")
-    var active = "#span-subtab-"+subtabName;
-    $(active).removeClass('sub-nav-off').addClass("sub-nav-on")
-
-    setupFunctions[subtabName]();
-
-}
-\ No newline at end of file
diff --git a/install/static/netgroup.js b/install/static/netgroup.js
deleted file mode 100644
index 6df2398a3..000000000
--- a/install/static/netgroup.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function setupNetgroup(facet){
-    if (facet == "details"){
-	setupNetgroupDetails();
-    }else{
-	setupNetgroupSearch();
-    }
-}
-
-
-
-
-function setupNetgroupDetails(){
-    var detailsForm = new DetailsForm();    
-}
-
-
-function setupNetgroupSearch(){
-
-
-    var columns = [
-	{title:"Netgroup",column:"cn",render:  function(current,cell){
-	    renderDetailColumn(current,cell,current[this.column],"netgroup");
-	}},
-	{title:"Description", column:"description",render: renderSimpleColumn}];
-   
-    var netgroupSearchForm = new SearchForm("netgroup", "find", columns);
-
-    $("#query").unbind();
-    $("#query").click(function(){
-	sampleData = "sampledata/netgrouplist.json";
-	executeSearch(netgroupSearchForm);
-    });
-    $("#new").unbind();
-    $("#new").click( function() {
-	alert("New Netgroup...");
-    });
-
-
-}
-			  
-			  
-\ No newline at end of file
diff --git a/install/static/pageparams.js b/install/static/pageparams.js
deleted file mode 100644
index 88ceed4c9..000000000
--- a/install/static/pageparams.js
+++ /dev/null
@@ -1,15 +0,0 @@
-function getPageParams(){
-    var qsParm = new Array();
-    var query = window.location.search.substring(1);
-    var parms = query.split("&");
-    for (var i=0; i<parms.length; i++) {
-	var pos = parms[i].indexOf('=');
-	if (pos > 0) {
-	    var key = parms[i].substring(0,pos);
-	    var val = parms[i].substring(pos+1);
-	    qsParm[key] = val;
-	}
-    }
-    return qsParm;
-} 
-
diff --git a/install/static/plus-disabled.png b/install/static/plus-disabled.png
deleted file mode 100644
index cb0e874f9..000000000
--- a/install/static/plus-disabled.png
+++ /dev/null
diff --git a/install/static/plus-enabled.png b/install/static/plus-enabled.png
deleted file mode 100644
index 74882af75..000000000
--- a/install/static/plus-enabled.png
+++ /dev/null
diff --git a/install/static/plus-hover.png b/install/static/plus-hover.png
deleted file mode 100644
index e9b2278cf..000000000
--- a/install/static/plus-hover.png
+++ /dev/null
diff --git a/install/static/sampledata/develop.js b/install/static/sampledata/develop.js
deleted file mode 100644
index 5c5275b5b..000000000
--- a/install/static/sampledata/develop.js
+++ /dev/null
@@ -1,3 +0,0 @@
-//This should not be packaged up, and so we should only get a true value when working inside the file system
-useSampleData = true;
-
diff --git a/install/static/sampledata/grouplist.json b/install/static/sampledata/grouplist.json
deleted file mode 100644
index 01c7d4ddd..000000000
--- a/install/static/sampledata/grouplist.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "count": 5, 
-        "result": [
-            {
-                "cn": [
-                    "admins"
-                ], 
-                "description": [
-                    "Account administrators group"
-                ], 
-                "dn": "cn=admins,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gidnumber": [
-                    "1948497956"
-                ], 
-                "member_user": [
-                    "admin"
-                ]
-            }, 
-            {
-                "cn": [
-                    "ipausers"
-                ], 
-                "description": [
-                    "Default group for all users"
-                ], 
-                "dn": "cn=ipausers,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gidnumber": [
-                    "1948497957"
-                ], 
-                "member_user": [
-                    "kfrog", 
-                    "moi"
-                ]
-            }, 
-            {
-                "cn": [
-                    "editors"
-                ], 
-                "description": [
-                    "Limited admins who can edit other users"
-                ], 
-                "dn": "cn=editors,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gidnumber": [
-                    "1948497958"
-                ]
-            }, 
-            {
-                "cn": [
-                    "deleteme"
-                ], 
-                "description": [
-                    "This is a group that should go away."
-                ], 
-                "dn": "cn=deleteme,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
-            }, 
-            {
-                "cn": [
-                    "testgroup"
-                ], 
-                "description": [
-                    "Detlete this if you see it"
-                ], 
-                "dn": "cn=testgroup,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gidnumber": [
-                    "1948497959"
-                ]
-            }
-        ], 
-        "summary": "5 groups matched", 
-        "truncated": false
-    }
-}
-\ No newline at end of file
diff --git a/install/static/sampledata/groupshow.json b/install/static/sampledata/groupshow.json
deleted file mode 100644
index b026985f0..000000000
--- a/install/static/sampledata/groupshow.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "result": {
-            "cn": [
-                "ipausers"
-            ], 
-            "description": [
-                "Default group for all users"
-            ], 
-            "dn": "cn=ipausers,cn=groups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-            "gidnumber": [
-                "1079249048"
-            ], 
-            "member": [
-                "uid=gsmile,cn=users,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "uid=kfrog,cn=users,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "uid=count123,cn=users,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-            ], 
-            "member_user": [
-                "gsmile", 
-                "kfrog", 
-                "count123"
-            ], 
-            "memberof": [], 
-            "objectclass": [
-                "top", 
-                "groupofnames", 
-                "nestedgroup", 
-                "ipausergroup", 
-                "posixgroup"
-            ]
-        }, 
-        "summary": null, 
-        "value": "ipausers"
-    }
-}
diff --git a/install/static/sampledata/hostgrouplist.json b/install/static/sampledata/hostgrouplist.json
deleted file mode 100644
index fe69c2a31..000000000
--- a/install/static/sampledata/hostgrouplist.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "count": 2, 
-        "result": [
-            {
-                "cn": [
-                    "host-live"
-                ], 
-                "description": [
-                    "Live servers"
-                ], 
-                "dn": "cn=host-live,cn=hostgroups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "member": [], 
-                "memberof": []
-            }, 
-            {
-                "cn": [
-                    "stage-live"
-                ], 
-                "description": [
-                    "Staging servers"
-                ], 
-                "dn": "cn=stage-live,cn=hostgroups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "member": [], 
-                "memberof": []
-            }
-        ], 
-        "summary": "2 hostgroups matched", 
-        "truncated": false
-    }
-}
-\ No newline at end of file
diff --git a/install/static/sampledata/hostlist.json b/install/static/sampledata/hostlist.json
deleted file mode 100644
index b02e7bd87..000000000
--- a/install/static/sampledata/hostlist.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "count": 2, 
-        "result": [
-            {
-                "dn": "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "enrolledby": [], 
-                "fqdn": [
-                    "vm-121.idm.lab.bos.redhat.com"
-                ], 
-                "krbprincipalname": [
-                    "host/vm-121.idm.lab.bos.redhat.com@IDM.LAB.BOS.REDHAT.COM"
-                ], 
-                "memberof": []
-            }, 
-            {
-                "description": [
-                    "sample host"
-                ], 
-                "dn": "fqdn=ayounghost1.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "enrolledby": [], 
-                "fqdn": [
-                    "ayounghost1.idm.lab.bos.redhat.com"
-                ], 
-                "l": [
-                    "VM-lab"
-                ], 
-                "memberof": [], 
-                "nshardwareplatform": [
-                    "kvm"
-                ], 
-                "nshostlocation": [
-                    "VM-lab"
-                ], 
-                "nsosversion": [
-                    "F13"
-                ]
-            }
-        ], 
-        "summary": "2 hosts matched", 
-        "truncated": false
-    }
-}
-\ No newline at end of file
diff --git a/install/static/sampledata/hostshow.json b/install/static/sampledata/hostshow.json
deleted file mode 100644
index f15370b07..000000000
--- a/install/static/sampledata/hostshow.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "result": {
-            "cn": [
-                "vm-121.idm.lab.bos.redhat.com"
-            ], 
-            "dn": "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-            "enrolledby": [], 
-            "fqdn": [
-                "vm-121.idm.lab.bos.redhat.com"
-            ], 
-            "ipauniqueid": [
-                "b54b73a8-8ba8-11df-80bc-00163e26b89e"
-            ], 
-            "krbextradata": [
-                {
-                    "__base64__": "AAKOoTdMYWRtaW4vYWRtaW5ASURNLkxBQi5CT1MuUkVESEFULkNPTQA="
-                }
-            ], 
-            "krblastpwdchange": [
-                "20100709222414Z"
-            ], 
-            "krbpasswordexpiration": [
-                "19700101000000Z"
-            ], 
-            "krbprincipalname": [
-                "host/vm-121.idm.lab.bos.redhat.com@IDM.LAB.BOS.REDHAT.COM"
-            ], 
-            "krbticketflags": [
-                "0"
-            ], 
-            "managedby": [
-                "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-            ], 
-            "memberof": [], 
-            "objectclass": [
-                "top", 
-                "ipaobject", 
-                "nshost", 
-                "ipahost", 
-                "ipaservice", 
-                "pkiuser", 
-                "krbprincipalaux", 
-                "krbprincipal", 
-                "krbticketpolicyaux"
-            ], 
-            "serverhostname": [
-                "vm-121"
-            ]
-        }, 
-        "summary": null, 
-        "value": "vm-121.idm.lab.bos.redhat.com"
-    }
-}
diff --git a/install/static/sampledata/netgrouplist.json b/install/static/sampledata/netgrouplist.json
deleted file mode 100644
index 84d696cca..000000000
--- a/install/static/sampledata/netgrouplist.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "count": 2, 
-        "result": [
-            {
-                "cn": [
-                    "net-stage"
-                ], 
-                "description": [
-                    "staging servers"
-                ], 
-                "dn": "ipauniqueid=f6ee9f40-9456-11df-973b-00163e26b89e,cn=ng,cn=alt,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "memberhost": [], 
-                "memberof": [], 
-                "memberuser": [
-                    "cn=muppets,cn=groups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-                ], 
-                "memberuser_group": [
-                    "muppets"
-                ], 
-                "nisdomainname": [
-                    "idm.lab.bos.redhat.com"
-                ]
-            }, 
-            {
-                "cn": [
-                    "net-live"
-                ], 
-                "description": [
-                    "live servers"
-                ], 
-                "dn": "ipauniqueid=f763e426-9456-11df-934d-00163e26b89e,cn=ng,cn=alt,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-                "memberhost": [
-                    "cn=host-live,cn=hostgroups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-                ], 
-                "memberhost_hostgroup": [
-                    "host-live"
-                ], 
-                "memberof": [], 
-                "memberuser": [
-                    "cn=muppets,cn=groups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-                ], 
-                "memberuser_group": [
-                    "muppets"
-                ], 
-                "nisdomainname": [
-                    "idm.lab.bos.redhat.com"
-                ]
-            }
-        ], 
-        "summary": null, 
-        "truncated": false
-    }
-}
-\ No newline at end of file
diff --git a/install/static/sampledata/userlist.json b/install/static/sampledata/userlist.json
deleted file mode 100644
index 432a3c5e4..000000000
--- a/install/static/sampledata/userlist.json
+++ /dev/null
@@ -1,246 +0,0 @@
-
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "count": 4, 
-        "result": [
-            {
-                "cn": [
-                    "Administrator"
-                ], 
-                "dn": "uid=admin,cn=users,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gecos": [
-                    "Administrator"
-                ], 
-                "gidnumber": [
-                    "444194797"
-                ], 
-                "homedirectory": [
-                    "/home/admin"
-                ], 
-                "krblastpwdchange": [
-                    "20100614200400Z"
-                ], 
-                "krbpasswordexpiration": [
-                    "20100912200400Z"
-                ], 
-                "krbprincipalname": [
-                    "admin@AYOUNG.BOSTON.DEVEL.REDHAT.COM"
-                ], 
-                "loginshell": [
-                    "/bin/bash"
-                ], 
-                "memberof_group": [
-                    "admins"
-                ], 
-                "memberof_rolegroup": [
-                    "replicaadmin"
-                ], 
-                "memberof_taskgroup": [
-                    "managereplica", 
-                    "deletereplica"
-                ], 
-                "objectclass": [
-                    "top", 
-                    "person", 
-                    "posixaccount", 
-                    "krbprincipalaux", 
-                    "krbticketpolicyaux", 
-                    "inetuser"
-                ], 
-                "sn": [
-                    "Administrator"
-                ], 
-                "uid": [
-                    "admin"
-                ], 
-                "uidnumber": [
-                    "444194797"
-                ]
-            }, 
-            {
-                "cn": [
-                    "Kermit Frog"
-                ], 
-                "dn": "uid=kfrog,cn=users,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gecos": [
-                    "Some of my best friends are Geckos"
-                ], 
-                "gidnumber": [
-                    "444194798"
-                ], 
-                "givenname": [
-                    "Kermit"
-                ], 
-                "homedirectory": [
-                    "/home/kfrog"
-                ], 
-                "ipauniqueid": [
-                    "89dc1f68-77f3-11df-afb7-525400ed2d11"
-                ], 
-                "krbprincipalname": [
-                    "kfrog"
-                ], 
-                "loginshell": [
-                    "/bin/sh"
-                ], 
-                "mail": [
-                    "kfrog@pbs.org"
-                ], 
-                "memberof_group": [
-                    "ipausers"
-                ], 
-                "objectclass": [
-                    "top", 
-                    "person", 
-                    "organizationalperson", 
-                    "inetorgperson", 
-                    "inetuser", 
-                    "posixaccount", 
-                    "krbprincipalaux", 
-                    "krbticketpolicyaux", 
-                    "radiusprofile", 
-                    "ipaobject"
-                ], 
-                "sn": [
-                    "Frog"
-                ], 
-                "street": [
-                    "55 Seasame Street"
-                ], 
-                "title": [
-                    "Reporter"
-                ], 
-                "uid": [
-                    "kfrog"
-                ], 
-                "uidnumber": [
-                    "444194798"
-                ]
-            }, 
-            {
-                "cn": [
-                    "Oscar Grouch"
-                ], 
-                "dn": "uid=scram,cn=users,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gecos": [
-                    "scram"
-                ], 
-                "gidnumber": [
-                    "444194798"
-                ], 
-                "givenname": [
-                    "Oscar"
-                ], 
-                "homedirectory": [
-                    "/home/trash"
-                ], 
-                "ipauniqueid": [
-                    "adba909c-77f3-11df-ae3f-525400ed2d11"
-                ], 
-                "krbprincipalname": [
-                    "scram"
-                ], 
-                "loginshell": [
-                    "/bin/sh"
-                ], 
-                "mail": [
-                    "oscar@pbs.org"
-                ], 
-                "memberof_group": [
-                    "ipausers"
-                ], 
-                "objectclass": [
-                    "top", 
-                    "person", 
-                    "organizationalperson", 
-                    "inetorgperson", 
-                    "inetuser", 
-                    "posixaccount", 
-                    "krbprincipalaux", 
-                    "krbticketpolicyaux", 
-                    "radiusprofile", 
-                    "ipaobject"
-                ], 
-                "sn": [
-                    "Grouch"
-                ], 
-                "street": [
-                    "123a Sesame Street"
-                ], 
-                "title": [
-                    "Sys Admin"
-                ], 
-                "uid": [
-                    "scram"
-                ], 
-                "uidnumber": [
-                    "444194799"
-                ]
-            }, 
-            {
-                "cn": [
-                    "Sid Monster"
-                ], 
-                "dn": "uid=cookie,cn=users,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                "gecos": [
-                    "cookie"
-                ], 
-                "gidnumber": [
-                    "444194798"
-                ], 
-                "givenname": [
-                    "Sid"
-                ], 
-                "homedirectory": [
-                    "cookie"
-                ], 
-                "ipauniqueid": [
-                    "c7d10507-77f3-11df-ac53-525400ed2d11"
-                ], 
-                "krbprincipalname": [
-                    "cookie"
-                ], 
-                "loginshell": [
-                    "/bin/sh"
-                ], 
-                "mail": [
-                    "cookie@pbs.org"
-                ], 
-                "memberof_group": [
-                    "ipausers"
-                ], 
-                "objectclass": [
-                    "top", 
-                    "person", 
-                    "organizationalperson", 
-                    "inetorgperson", 
-                    "inetuser", 
-                    "posixaccount", 
-                    "krbprincipalaux", 
-                    "krbticketpolicyaux", 
-                    "radiusprofile", 
-                    "ipaobject"
-                ], 
-                "sn": [
-                    "Monster"
-                ], 
-                "street": [
-                    "123 Sesame Street"
-                ], 
-                "title": [
-                    "Chef"
-                ], 
-                "uid": [
-                    "cookie"
-                ], 
-                "uidnumber": [
-                    "444194800"
-                ]
-            }
-        ], 
-        "summary": "4 users matched", 
-        "truncated": false
-    }
-}
diff --git a/install/static/sampledata/usershow.json b/install/static/sampledata/usershow.json
deleted file mode 100644
index eb2a35d1c..000000000
--- a/install/static/sampledata/usershow.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "result": {
-            "cn": [
-                "Kermit Frog"
-            ], 
-            "dn": "uid=kfrog,cn=users,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", 
-            "gecos": [
-                "kfrog"
-            ], 
-            "gidnumber": [
-                "1079249051"
-            ], 
-            "givenname": [
-                "Kermit"
-            ], 
-            "homedirectory": [
-                "/home/kfrog"
-            ], 
-            "ipauniqueid": [
-                "41bcf085-8baa-11df-8155-00163e26b89e"
-            ], 
-            "krbprincipalname": [
-                "kfrog@IDM.LAB.BOS.REDHAT.COM"
-            ], 
-            "loginshell": [
-                "/bin/sh"
-            ], 
-            "mail": [
-                "kfrog@redhat.com"
-            ], 
-	    "memberof": [
-                   "cn=ipausers,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com", 
-                   "cn=muppets,cn=groups,cn=accounts,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
-               ], 
-               "memberof_group": [
-                   "ipausers", 
-                   "muppets"
-               ], 
-            "mepmanagedentry": [
-                "cn=kfrog,cn=groups,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com"
-            ], 
-            "objectclass": [
-                "top", 
-                "person", 
-                "organizationalperson", 
-                "inetorgperson", 
-                "inetuser", 
-                "posixaccount", 
-                "krbprincipalaux", 
-                "krbticketpolicyaux", 
-                "radiusprofile", 
-                "ipaobject", 
-                "mepOriginEntry"
-            ], 
-            "sn": [
-                "Frog"
-            ], 
-            "uid": [
-                "kfrog"
-            ], 
-            "uidnumber": [
-                "1079249051"
-            ]
-        }, 
-        "summary": null, 
-        "value": "kfrog"
-    }
-}
diff --git a/install/static/sampledata/whoami.json b/install/static/sampledata/whoami.json
deleted file mode 100644
index a922d3720..000000000
--- a/install/static/sampledata/whoami.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "error": null, 
-    "id": 0, 
-    "result": {
-        "summary": "admin@AYOUNG.BOSTON.DEVEL.REDHAT.COM"
-    }
-}
diff --git a/install/static/search.js b/install/static/search.js
deleted file mode 100644
index 6ed626f4e..000000000
--- a/install/static/search.js
+++ /dev/null
@@ -1,127 +0,0 @@
-//useSampleData is defined in index.xhtml.  Work around for development
-var sampleData;
-
-
-function clearOld(){
-    $('#searchResultsTable thead').html("");
-    $('#searchResultsTable tfoot').html("");
-    $('#searchResultsTable tbody').find("tr").remove();
-    $('#content').html("");
-}
-
-function showSearch(){
-    clearOld();
-    $('#search').css("visibility","visible");
-    $('#content').css("visibility","hidden");
-    $('#search').css("display","block");
-    $('#content').css("display","none");
-
-}
-
-function showContent(){
-    clearOld();
-    $('#search').css("visibility","hidden");
-    $('#content').css("visibility","visible");
-    $('#search').css("display","none");
-    $('#content').css("display","block");
-}
-
-//Columns is an array of items in the form 
-// {title, column,  render}
-//title: the the value that goes at the head of the column
-//filed: the column in the response used for populating the value
-//render: the function used to generate  cell.innerHtml 
-//       it is in the form:
-//       render(current, cell)        
-//        current is the row in response
-//        cell is the td in the table
-
-
-//These are helper functions, either assigned to the rneder method
-//Or called from a thin wrapper render method
-function  renderSimpleColumn(current,cell){
-	cell.innerHTML = current[this.column];
-}
-
-
-function  renderUnknownColumn(current,cell){
-    cell.innerHTML = "Unknown";
-}
-
-function renderDetailColumn(current,cell,pkey,obj){ 	
-    link = document.createElement("a");
-    link.href= "?tab=" +obj+"&facet=details&pkey="+pkey;
-    link.innerHTML = pkey;
-    cell.appendChild(link);	
-}
-
-
-
-function SearchForm(obj, method, cols){
-
-    this.buildColumnHeaders =  function (){
-	var columnHeaders  = document.createElement("tr");
-	for (var i =0 ; i != this.columns.length ;i++){
-	    var th = document.createElement("th");
-	    th.innerHTML = this.columns[i].title;
-	    columnHeaders.appendChild(th);
-	}
-	$('#searchResultsTable thead:last').append(columnHeaders); 	
-    }   
-
-
-    this.renderResultRow = function(current){
-	var row = document.createElement("tr");
-	var cell;
-	var link;
-	for(var index = 0 ; index < this.columns.length; index++){
-	    this.columns[index].render(current, row.insertCell(-1));
-	}
-	return row;
-    }
-
-    this.searchSuccess = function (json){	
-	if (json.result.truncated){
-	    $("#searchResultsTable tfoot").html("More than "+sizelimit+" results returned.  First "+ sizelimit+" results shown." );
-	}else{
-	    $("#searchResultsTable tfoot").html(json.result.summary);
-	}
-	$("#searchResultsTable tbody").find("tr").remove();
-	for (var index = 0; index !=  json.result.result.length; index++){
-	var current = json.result.result[index];
-	    $('#searchResultsTable tbody:last').append(this.renderResultRow(current));
-	}
-    }
-
-    this.obj = obj;
-    this.method = method;
-    this.columns = cols;
-
-    showSearch();
-
-    $('#searchResultsTable thead').html("");
-    $('#searchResultsTable tbody').html("");
-    $("#new").click(function(){
-	location.href="?tab="+obj+"&facet=add";
-    });
-    this.buildColumnHeaders();
-}
-
-
-executeSearch = function(searchForm){
-    var queryFilter = $("#queryFilter").val();
-    
-    $('#searchResultsTable tbody').html("");
-  
-    ipa_cmd(searchForm.method,
-	    [queryFilter], 
-	    {"all":"true"},
-	    function(json){
-		searchForm.searchSuccess(json);
-	    },
-	    function(json){
-		alert("Search Failed");
-	    },searchForm.obj);    
-
-}
-
diff --git a/install/static/user-add.inc b/install/static/user-add.inc
deleted file mode 100644
index 208b133a4..000000000
--- a/install/static/user-add.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-<script type="text/javascript">
-  $(document).ready(function(){     
-  $("#addEdit").click(addEditUser);
-  $("#addAnother").click(addAnotherUser);
-
-  /*this is a placeholder. We will need to I18N */
-  $("#content h1").text( "Add a User."); 
-  });
-</script>
-<div id="buttons">
-  <span>Add and :</span>
-  <input id="addEdit" type='button' value="Edit" />
-  <span>|</span>
-  <input id="addAnother" type='button' value="Add Another" />
-</div>
-
-<h1></h1>
-<dl class="entryattrs">
-  <dt title="login">login</dt>
-  <dd><input id='login' type='text' value=''/></dd>
-  <dt	title ="firstname">First  Name</dt>
-  <dd><input id='firstname' type='text' value=''/></dd>
-  <dt title="lastname">Last Name</dt>
-  <dd><input id='lastname' type='text' value=''/></dd>
-</dl>
diff --git a/install/static/user-details.inc b/install/static/user-details.inc
deleted file mode 100644
index 0f9bdd1f3..000000000
--- a/install/static/user-details.inc
+++ /dev/null
@@ -1,267 +0,0 @@
-<script type="text/javascript">
-
-
-        //<![CDATA[
-        var qs = ipa_parse_qs();
-
-        var def_lists = [
-            ['identity', 'Identity Details', [
-                    ['title', 'Title'],
-                    ['givenname', 'First Name'],
-                    ['sn', 'Last Name'],
-                    ['cn', 'Full Name'],
-                    ['displayname', 'Dispaly Name'],
-                    ['initials', 'Initials']
-                ]
-            ],
-            ['account', 'Account Details', [
-                    ['call_a_status', 'Account Status'],
-                    ['uid', 'Login'],
-                    ['call_a_password', 'Password'],
-                    ['uidnumber', 'UID'],
-                    ['gidnumber', 'GID'],
-                    ['homedirectory', 'homedirectory']
-                ]
-            ],
-            ['contact', 'Contact Details', [
-                    ['mail', 'E-mail Address'],
-                    ['call_a_numbers', 'Numbers']
-                ]
-            ],
-            ['address', 'Mailing Address', [
-                    ['street', 'Address'],
-                    ['location', 'City'],
-                    ['call_a_st', 'State'],
-                    ['postalcode', 'ZIP']
-                ]
-            ],
-            ['employee', 'Employee Information', [
-                    ['ou', 'Org. Unit'],
-                    ['call_a_manager', 'Manager']
-                ]
-            ],
-            ['misc', 'Misc. Information', [
-                    ['carlicense', 'Car License']
-                ]
-            ]
-        ];
-
-
-        /* "Top-level" code */
-
-        function load_object(body)
-        {
-            ipa_details_init('user');
-            ipa_details_create(def_lists);
-
-            $('#butreset').click(reset_on_click);
-            $('#butupdate').click(update_on_click);
-
-            if (qs['principal']) {
-                ipa_cmd(
-                    'find', [], {'krbprincipalname': qs['principal']},
-                    on_win_find, null, 'user'
-                );
-                return;
-            }
-
-            if (!qs['pkey'])
-                return;
-
-            ipa_details_load(qs['pkey'], on_win);
-            $('h1').text('Managing user: ' + qs['pkey']);
-        }
-
-        function on_win(data, textStatus, xhr)
-        {
-            if (data['error'])
-                alert(data['error']['message']);
-        }
-
-        function on_win_find(data, textStatus, xhr)
-        {
-            if (data['error']) {
-                alert(data['error']['message']);
-                return;
-            }
-
-            var result = data.result.result;
-            if (result.length == 1) {
-                var entry_attrs = result[0];
-                qs['pkey'] = entry_attrs['uid'][0];
-
-                ipa_details_load(qs['pkey'], on_win);
-                $('h1').text('Managing user: ' + qs['pkey']);
-            }
-        }
-
-        function reset_on_click()
-        {
-            ipa_details_reset();
-            return (false);
-        }
-
-        function update_on_click()
-        {
-            ipa_details_update(qs['pkey'], on_win);
-            return (false);
-        }
-
-        /* Account status Toggle button */
-
-        function toggle_on_click(obj)
-        {
-            var jobj = $(obj);
-            var val = jobj.attr('title');
-            if (val == 'Active') {
-                ipa_cmd(
-                    'lock', [qs['pkey']], {}, on_lock_win, on_fail,
-                    ipa_objs['user']['name']
-                );
-            } else {
-                ipa_cmd(
-                    'unlock', [qs['pkey']], {}, on_lock_win, on_fail,
-                    ipa_objs['user']['name']
-                );
-            }
-            return (false);
-        }
-
-        function on_lock_win(data, textStatus, xhr)
-        {
-            if (data['error']) {
-                alert(data['error']['message']);
-                return;
-            }
-
-            var jobj = $('a[title=Active]');
-            if (jobj.length) {
-                if (ipa_details_cache) {
-                    var memberof = ipa_details_cache['memberof'];
-                    if (memberof) {
-                        memberof.push(
-                            'cn=inactivated,cn=account inactivation'
-                        );
-                    } else {
-                        memberof = ['cn=inactivated,cn=account inactivation'];
-                    }
-                    ipa_details_cache['memberof'] = memberof;
-                    a_status(jobj.parent().prev(), ipa_details_cache);
-                    jobj.parent().remove()
-                }
-                return;
-            }
-
-            var jobj = $('a[title=Inactive]');
-            if (jobj.length) {
-                if (ipa_details_cache) {
-                    var memberof = ipa_details_cache['memberof'];
-                    if (memberof) {
-                        for (var i = 0; i < memberof.length; ++i) {
-                            if (memberof[i].indexOf('cn=inactivated,cn=account inactivation') != -1) {
-                                memberof.splice(i, 1);
-                                break;
-                            }
-                        }
-                    } else {
-                        memberof = [];
-                    }
-                    ipa_details_cache['memberof'] = memberof;
-                    a_status(jobj.parent().prev(), ipa_details_cache);
-                    jobj.parent().remove();
-                }
-                return;
-            }
-        }
-
-        /* ATTRIBUTE CALLBACKS */
-
-        var toggle_temp = 'S <a href="jslink" onclick="return (toggle_on_click(this))" title="S">Toggle</a>';
-        function a_status(jobj, result, mode)
-        {
-            if (mode != IPA_DETAILS_POPULATE)
-                return;
-
-            var memberof = result['memberof'];
-            if (memberof) {
-                for (var i = 0; i < memberof.length; ++i) {
-                    if (memberof[i].indexOf('cn=inactivated,cn=account inactivation') != -1) {
-                        var t = toggle_temp.replace(/S/g, 'Inactive');
-                        ipa_insert_first_dd(jobj, t);
-                        return;
-                    }
-                }
-            }
-            ipa_insert_first_dd(jobj, toggle_temp.replace(/S/g, 'Inactive'));
-        }
-
-        var pwd_temp = '<a href="jslink" onclick="return (resetpwd_on_click(this))" title="A">Reset Password</a>';
-        function a_password(jobj, result, mode)
-        {
-            if (mode == IPA_DETAILS_POPULATE)
-                ipa_insert_first_dd(jobj, pwd_temp.replace('A', 'userpassword'));
-        }
-
-        var select_temp = '<select title="st"></select>';
-        var option_temp = '<option value="V">V</option>';
-        var states = [
-            'AL', 'AK', 'AS', 'AZ', 'AR', 'CA', 'CO', 'CT', 'DE', 'DC', 'FM',
-            'FL', 'GA', 'GU', 'HI', 'ID', 'IL', 'IN', 'IA', 'KS', 'KY', 'LA',
-            'ME', 'MH', 'MD', 'MA', 'MI', 'MN', 'MS', 'MO', 'MT', 'NE', 'NV',
-            'NH', 'NJ', 'NM', 'NY', 'NC', 'ND', 'MP', 'OH', 'OK', 'OR', 'PW',
-            'PA', 'PR', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VT', 'VI', 'VA',
-            'WA', 'WV', 'WI', 'WY', '',
-        ];
-        function a_st(jobj, result, mode)
-        {
-            if (mode != IPA_DETAILS_POPULATE)
-                return;
-
-            var next = jobj.next();
-            next.css('clear', 'none');
-            next.css('width', '70px');
-
-            ipa_insert_first_dd(jobj, select_temp);
-
-            var sel = jobj.next().children().first();
-            for (var i = 0; i < states.length; ++i)
-                sel.append(option_temp.replace(/V/g, states[i]));
-
-            var st = result['st'];
-            if (st)
-                sel.val(st);
-            else
-                sel.val('');
-        }
-
-  //]]>
-
-  $(document).ready(function(){     
-  sampleData = "sampledata/usershow.json";
-  load_object($('body'),'user');
-  });
-</script>   
-    <h1>Managing user:</h1>
-    <div id="buttons">
-    <a href="dummy"><img id="butreset" src="but-reset.png" alt="Reset" /></a>
-    <a href="dummy"><img id="butupdate" src="but-update.png" alt="Update" /></a>
-    </div>
-
-    <ul id="viewtype">
-      <li id="viewcaption">View:</li>
-      <li>
-        <img src="but-selected.png" alt="" />
-        Identity Details
-      </li>
-      <li>
-        <img src="but-unselected.png" alt="" />
-        <a href="memberof?pkey=${pkey}">Memberships</a>
-      </li>
-    </ul>
-    <hr />
-    <div id="backtotop">
-      <a href="#viewtype">Back to Top</a>
-    </div>
-    
-
-
diff --git a/install/static/user-groups.inc b/install/static/user-groups.inc
deleted file mode 100644
index d292672f4..000000000
--- a/install/static/user-groups.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-<script type="text/javascript">
-
-$(document).ready( initializeUserGroupEnrollments);
-    
-</script>
-
-
-<h1>Enroll in Groups</h1>
-
-<form> 
-  <div style="border-width:1px">
-    <div >
-      <input type="text"/>
-      <input id="query" type="button" value="Find Groups"/>
-
-      <span style="float:right"> 
-	<input id="cancelEnrollGroups" type="button" value="Cancel"/>
-	<input id="enrollGroups" type="button" value="Enroll"/>
-      </span>
-
-    </div>
-    <div  id="results"  style="border: 2px solid rgb(0, 0, 0); position:relative;  height:200px;" >
-      <div style="float:left;">
-	<div>Groups</div>
-	<select id="grouplist" width="150px" size="10" multiple="true" >
-	</select>
-      </div>
-      <div style="float:left;">
-	<p><input id="removeFromList" type="button" value="&lt;&lt;"/> </p>
-	<p><input id="addToList" type="button" value="&gt;&gt;"/></p>
-      </div>
-      <div style="float:left;">
-	<div>Prospective Enrollments</div>
-	<select id="enrollments" width="150px"  size="10" multiple="true" >
-	</select>
-      </div>
-    </div>
-    <hr/>
-    <div>Message Area</div>
-    <hr/>
-    <div>
-      <span style="float:left">
-	<p>*Enter Group Names and Press Groups</p>
-	<p>*More stuff</p>
-	<p>*More stuff</p>
-      </span>
-    </div>
-  </div>
-</form>
diff --git a/install/static/user.html b/install/static/user.html
deleted file mode 100644
index c7a77b8ac..000000000
--- a/install/static/user.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3c.org/1999/xhtml" lang="en" xml:lang="en"
-    xmlns:py="http://genshi.edgewall.org/">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>jQuery test page for IPA</title>
-
-    <link href="ipa.css" rel="stylesheet" type="text/css" />
-
-    <script src="jquery.js" type="text/javascript"> </script>
-    <script src="ipa.js" type="text/javascript"> </script>
-    <script src="user.js" type="text/javascript"> </script>
-    <script src="details.js" type="text/javascript"> </script>
-
-</head>
-
-<body onload="load_object(this)">
-<div id="view">
-    <div id="header">
-        <div id="logo">
-            <a href="#">
-                <img src="ipa_logo_180x50.png" />
-            </a>
-        </div>
-        <div id="loggedinas">
-            Logged in as <a href="user?principal=${context.principal}" py:content="context.principal"> </a>
-        </div>
-    </div>
-
-    <div id="content">
-        <h1>Managing user:</h1>
-        <div id="buttons">
-            <a href="dummy"><img id="butreset" src="but-reset.png" alt="Reset" /></a>
-            <a href="dummy"><img id="butupdate" src="but-update.png" alt="Update" /></a>
-        </div>
-        <ul id="viewtype">
-            <li id="viewcaption">View:</li>
-            <li>
-                <img src="but-selected.png" alt="" />
-                Personal Details
-            </li>
-            <li>
-                <img src="but-unselected.png" alt="" />
-                <a href="memberof?pkey=${pkey}">Memberships</a>
-            </li>
-        </ul>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Identity Details</h2>
-        <dl id="identity" class="entryattrs">
-            <dt title="title">Title:</dt>
-            <dt title="givenname">First Name:</dt>
-            <dt title="sn">Last Name:</dt>
-            <dt title="cn">Full Name:</dt>
-            <dt title="displayname">Display Name:</dt>
-            <dt title="initials">Initials:</dt>
-        </dl>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Account Details</h2>
-        <dl id="account" class="entryattrs">
-            <dt title="call_a_status">Account Status:</dt>
-            <dt title="uid">Login:</dt>
-            <dt title="call_a_password">Password:</dt>
-            <dt title="uidnumber">UID:</dt>
-            <dt title="gidnumber">GID:</dt>
-            <dt title="homedirectory">Home Directory:</dt>
-        </dl>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Contact Details</h2>
-        <dl id="contact" class="entryattrs">
-            <dt title="mail">E-mail Address:</dt>
-            <dt title="call_a_numbers">Numbers:</dt>
-        </dl>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Mailing Address</h2>
-        <dl id="mailing" class="entryattrs">
-            <dt title="street">Address:</dt>
-            <dt title="location">City:</dt>
-            <dt title="call_a_st">State:</dt>
-            <dt title="postalCode">ZIP:</dt>
-        </dl>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Employee Information</h2>
-        <dl id="employee" class="entryattrs">
-            <dt title="ou">Org. Unit:</dt>
-            <dt title="call_a_manager">Manager:</dt>
-        </dl>
-        <hr />
-
-        <h2 onclick="h2_on_click(this)">&#8722; Misc. Information</h2>
-        <dl id="misc" class="entryattrs">
-            <dt title="carlicense">Car License:</dt>
-        </dl>
-        <hr />
-
-        <div id="backtotop">
-            <a href="#viewtype">Back to Top</a>
-        </div>
-    </div>
-</div>
-</body>
-
-</html>
-
diff --git a/install/static/user.js b/install/static/user.js
deleted file mode 100644
index 7146ff97e..000000000
--- a/install/static/user.js
+++ /dev/null
@@ -1,268 +0,0 @@
-function setupUser(facet){
-    if (facet == "details"){
-	setupUserDetails()
-    }else  if (facet == "add"){
-	setupAddUser();
-    }else  if (facet == "group"){
-	setupUserGroupEnrollmentSearch();
-    }else  if (facet == "groupmembership"){
-	setupUserGroupMembership();
-    }else{
-
-	setupUserSearch();
-    }
-}
-
-function add_user_fail(reason){
-     alert("Add User Failed:"+JSON.stringify(reason));
-}
-
-function addUser(on_success){
-
-    var options = {  givenname:  $("#firstname").val(), 
-		     sn:  $("#lastname").val(), 
-		    uid :        $("#login").val()};
-    
-    ipa_cmd( 'add', [], options, on_success, add_user_fail, 'user' );
-}
-
-function addAnotherUser(){
-
-    addUser(setupAddUser);
-}
-
-function addEditUser(){
-    addUser(function (response){ 
-	location.href="index.xhtml?tab=user&facet=details&pkey="+$("#login").val();   
-    });
-}
-
-function setupAddUser(){
-
-    showContent();
-
-    $('#content').load("user-add.inc"); 
-}
-
-
-function setupUserDetails(){
-    showContent();
-    $('#content').load("user-details.inc"); 
-    sampleData = "sampledata/usershow.json";
-}
-
-function  renderSimpleColumn(current,cell){
-	cell.innerHTML = current[this.column];
-}
-
-function renderUserLinks(current, cell){
-	link = document.createElement("a");
-	cell.appendChild(link);
-
-    $("<a/>",{
-	href:"?tab=user&facet=details&pkey="+current.uid,
-	html:  "[D]",
-	click:setupUserDetails,
-    }).appendTo(cell);
-	
-    $("<a/>",{
-	href: "#tab=user&facet=details&pkey="+current.uid,
-	click:setupUserGroupMembership,
-	html: "[G]"
-    }).appendTo(cell);
-
-    $("<a/>",{	
-	href:"?tab=user&facet=netgroup&pkey="+current.uid,
-	html: "[N]"
-    }).appendTo(cell);
-
-    $("<a/>",{	
-	href:"?tab=user&facet=role&pkey="+current.uid,
-	html:"[R]"
-    }).appendTo(cell);
-}
-
-
-
-function renderUserDetailColumn(current,cell){ 	
-    renderDetailColumn(current,cell,current[this.column],"user");
-}
-
-
-var columns  = [
-    {title:"Name",     column:"cn",             render: renderSimpleColumn},
-    {title:"Login",    column:"uid",            render: renderUserDetailColumn},
-    {title:"UID",      column:"uidnumber",      render: renderSimpleColumn},
-    {title:"EMAIL",    column:"mail",           render: renderSimpleColumn},
-    {title:"Phone",    column:"telephonenumber",render: renderSimpleColumn},
-    {title:"Job Title",column:"title",          render: renderSimpleColumn},
-    {title:"Actions",  column:"none",           render: renderUserLinks}
-];
-
-function setupUserSearch(){
-    var userSearchForm = new SearchForm("user", "find", columns);    
-
-    $("#query").unbind();
-    $("#query").click(function(){
-	sampleData = "sampledata/userlist.json";	
-	executeSearch(userSearchForm);
-    });
-    $("#new").unbind();
-    $("#new").click(setupAddUser);
-
-}
-
-/*Usr group enrollement:  
-  given a user, manage the groups in which they are enrolled */
-function populateUserGroupFailure(){
-    alert("Can't find user");
-}
-
-
-
-function setupUserGroupEnrollmentSearch(pkey){
-    sampleData = "sampledata/usershow.json";
-    showContent();
-    $("#content").load("user-groups.inc");
-}
-
-
-function populateUserGroupSearch(searchResults){
-    results = searchResults.result;
- 	$("#grouplist").html("");
-	for (var i =0; i != searchResults.result.count; i++){
-	    var li = document.createElement("option");
-	    li.value = searchResults.result.result[i].cn;
-	    li.innerHTML = searchResults.result.result[i].cn;
-	    $("#grouplist").append(li); 
-	}
-}
-
-var currentUserToEnroll;
-var groupsToEnroll;
-
-function enrollUserInGroupSuccess(response){
-    enrollUserInNextGroup();
-}
-
-function enrollUserInGroupFailure(response){
-    alert("enrollUserInGroupFailure");
-}
-
-function enrollUserInNextGroup(){
-   var  currentGroupToEnroll = 	groupsToEnroll.shift();
-
-    if (currentGroupToEnroll){
-	var options = {"user":currentUserToEnroll};
-	var args = [currentGroupToEnroll];
-	
-        ipa_cmd( 'add_member',args, options ,  
-		 enrollUserInGroupSuccess,
-		 enrollUserInGroupFailure, 'group' );
-    }else{
-	setupUserGroupMembership();
-    }
-}
-
-function initializeUserGroupEnrollments(){
-
-    $('h1').text('Enroll user ' + qs['pkey'] + ' in groups');
-
-    $("#enrollGroups").click(function(){
-	groupsToEnroll =  [];
-	$('#enrollments').children().each(function(i, selected){ 
-	    groupsToEnroll.push(selected.value); 	   
-	});
-	
-	currentUserToEnroll = qs['pkey'];
-	enrollUserInNextGroup();
-    });
-
-    $("#addToList").click(function(){
-	$('#grouplist :selected').each(function(i, selected){ 
-	    $("#enrollments").append(selected); 	   
-	});
-	$('#grouplist :selected').remove();
-    });
-
-    $("#removeFromList").click(function(){
-	$('#enrollments :selected').each(function(i, selected){ 
-	    $("#grouplist").append(selected); 	   
-	});
-	$('#enrollments :selected').remove();
-    });
-        
-    $("#query").click(function(){
-         sampleData="sampledata/grouplist.json";
-         ipa_cmd( 'find', [], {}, populateUserGroupSearch, populateUserGroupFailure, 'group' );
-
-    });
-            
-}
-
-
-function renderUserGroupColumn(){
-}
-
-/*Group Membership&*/
-
-function  renderUserGroupColumn(current,cell){
-	cell.innerHTML = "Nothing to see here";
-}
-
-var groupMembershipColumns  = [
-    {title:"Group",       column:"cn",        render: renderUserGroupColumn},
-    {title:"GID",         column:"gid",       render: renderUserGroupColumn},
-    {title:"Description", column:"uidnumber", render: renderUserGroupColumn},
-
-];
-
-
-function populateUserEnrollments(userData){
-
-    var memberof_group = userData.result.result.memberof_group
-    for (var j = 0; j < memberof_group.length; j++){
-	var row  = document.createElement("tr");
-
-	var td = document.createElement("td");
-	td.innerHTML = memberof_group[j];
-	row.appendChild(td);
-
-	td = document.createElement("td");
-	td.innerHTML = "TBD";
-	row.appendChild(td);
-
-	var td = document.createElement("td");
-	td.innerHTML = "TBD";
-	row.appendChild(td);
-
-	$('#searchResultsTable thead:last').append(row); 	
-    } 
-}
-
-
-function setupUserGroupMembership(){
-
-    $("#searchButtons").html("");
-
-    $("<input/>",{
-	type:  'button',
-	value: 'enroll',
-	click: setupUserGroupEnrollmentSearch
-    }).appendTo("#searchButtons");
-
-    
-    showSearch();    
-    var columnHeaders  = document.createElement("tr");
-    for (var i =0 ; i != groupMembershipColumns.length ;i++){
-	var th = document.createElement("th");
-	th.innerHTML = groupMembershipColumns[i].title;
-	columnHeaders.appendChild(th);
-    }
-    $('#searchResultsTable thead:last').append(columnHeaders); 	
-
-    sampleData="sampledata/usershow.json";    
-    ipa_cmd( 'show', [qs['pkey']], {}, populateUserEnrollments, populateUserGroupFailure, 'user' );
-
-
-}
-\ No newline at end of file
diff --git a/install/static/usermeta.js b/install/static/usermeta.js
deleted file mode 100644
index 855435f3b..000000000
--- a/install/static/usermeta.js
+++ /dev/null
@@ -1,415 +0,0 @@
-//TODO:  This data should be fetched from a separate web URL and 
-//generated off the metadata for the user object
-//but it is basically static.
-
-var PluginData = {
-    "primary_key": "uid",
-    "default_attributes": [
-        "uid",
-        "givenname",
-        "sn",
-        "homedirectory",
-        "loginshell",
-        "ou",
-        "telephonenumber",
-        "title",
-        "memberof"
-    ],
-    "object_name_plural": "users",
-    "container_dn": "cn=users,cn=accounts",
-    "object_class_config": "ipauserobjectclasses",
-    "hidden_attributes": [
-        "objectclass",
-        "aci"
-    ],
-    "uuid_attribute": "ipauniqueid",
-    "label": "Users",
-    "methods": [
-        "add",
-        "del",
-        "find",
-        "lock",
-        "mod",
-        "show",
-        "unlock"
-    ],
-    "object_name": "user",
-    "takes_params": [
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "login",
-            "primary_key": true,
-            "name": "uid",
-            "default": null,
-            "doc": "User login",
-            "required": true,
-            "flags": [],
-            "label": "User login",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "first",
-            "primary_key": false,
-            "name": "givenname",
-            "default": null,
-            "doc": "First name",
-            "required": true,
-            "flags": [],
-            "label": "First name",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "last",
-            "primary_key": false,
-            "name": "sn",
-            "default": null,
-            "doc": "Last name",
-            "required": true,
-            "flags": [],
-            "label": "Last name",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "homedir",
-            "primary_key": false,
-            "name": "homedirectory",
-            "default": null,
-            "doc": "Home directory",
-            "required": false,
-            "flags": [],
-            "label": "Home directory",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "gecos",
-            "primary_key": false,
-            "name": "gecos",
-            "default": null,
-            "doc": "GECOS field",
-            "required": false,
-            "flags": [],
-            "label": "GECOS field",
-            "autofill": true,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "shell",
-            "primary_key": false,
-            "name": "loginshell",
-            "default": "/bin/sh",
-            "doc": "Login shell",
-            "required": false,
-            "flags": [],
-            "label": "Login shell",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "principal",
-            "primary_key": false,
-            "name": "krbprincipalname",
-            "default": null,
-            "doc": "Kerberos principal",
-            "required": false,
-            "flags": [],
-            "label": "Kerberos principal",
-            "autofill": true,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "email",
-            "primary_key": false,
-            "name": "mail",
-            "default": null,
-            "doc": "Email address",
-            "required": false,
-            "flags": [],
-            "label": "Email address",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": [
-                "webui"
-            ],
-            "minlength": null,
-            "include": null,
-            "cli_name": "password",
-            "primary_key": false,
-            "name": "userpassword",
-            "default": null,
-            "doc": "Set the user password",
-            "required": false,
-            "flags": [],
-            "label": "Password",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Password",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "include": null,
-            "cli_name": "uid",
-            "primary_key": false,
-            "minvalue": null,
-            "doc": "User ID Number (system will assign one if not provided)",
-            "required": false,
-            "flags": [],
-            "label": "UID",
-            "default": 999,
-            "autofill": true,
-            "multivalue": false,
-            "attribute": false,
-            "query": false,
-            "maxvalue": null,
-            "cli_short_name": null,
-            "type": "int",
-            "class": "Int",
-            "name": "uidnumber"
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "street",
-            "primary_key": false,
-            "name": "street",
-            "default": null,
-            "doc": "Street address",
-            "required": false,
-            "flags": [],
-            "label": "Street address",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "memberof_group",
-            "primary_key": false,
-            "name": "memberof_group",
-            "default": null,
-            "doc": "Groups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Groups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "memberof_netgroup",
-            "primary_key": false,
-            "name": "memberof_netgroup",
-            "default": null,
-            "doc": "Netgroups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Netgroups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "memberof_rolegroup",
-            "primary_key": false,
-            "name": "memberof_rolegroup",
-            "default": null,
-            "doc": "Rolegroups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Rolegroups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        },
-        {
-            "exclude": null,
-            "minlength": null,
-            "include": null,
-            "cli_name": "memberof_taskgroup",
-            "primary_key": false,
-            "name": "memberof_taskgroup",
-            "default": null,
-            "doc": "Taskgroups",
-            "required": false,
-            "flags": [
-                "no_update",
-                "no_create",
-                "no_search"
-            ],
-            "label": "Taskgroups",
-            "autofill": false,
-            "multivalue": false,
-            "pattern": null,
-            "type": "unicode",
-            "attribute": false,
-            "query": false,
-            "cli_short_name": null,
-            "length": null,
-            "class": "Str",
-            "maxlength": null
-        }
-    ],
-    "attribute_members": {
-        "memberof": [
-            "group",
-            "netgroup",
-            "rolegroup",
-            "taskgroup"
-        ]
-    },
-    "parent_object": "",
-    "object_class": [
-        "posixaccount"
-    ],
-    "name": "user"
-}
-
-ipa_objs['user'] = PluginData;
diff --git a/ipa.spec.in b/ipa.spec.in
index 885056bc0..0ccf7018f 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -391,12 +391,6 @@ fi
 %{_usr}/share/ipa/migration/invalid.html
 %{_usr}/share/ipa/migration/migration.css
 %{_usr}/share/ipa/migration/migration.py*
-%dir %{_usr}/share/ipa/static
-%{_usr}/share/ipa/static/*.png
-%{_usr}/share/ipa/static/*.css
-%{_usr}/share/ipa/static/*.js
-%dir %{_usr}/share/ipa/static
-%{_usr}/share/ipa/static/*
 %dir %{_sysconfdir}/ipa
 %dir %{_sysconfdir}/ipa/html
 %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html
diff --git a/ipalib/constants.py b/ipalib/constants.py
index 65589f105..66f13f25c 100644
--- a/ipalib/constants.py
+++ b/ipalib/constants.py
@@ -114,7 +114,6 @@ DEFAULT_CONFIG = (
     # WebUI stuff:
     ('webui_prod', True),
     ('webui_assets_dir', None),
-    ('webui_new_layout', False),
 
     # Debugging:
     ('verbose', 0),
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index db1cae4f2..d320f02e0 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -666,7 +666,7 @@ class Command(HasParam):
         performs is executed remotely.
         """
         if self.api.env.in_server:
-		return self.execute(*args, **options)
+            return self.execute(*args, **options)
         return self.forward(*args, **options)
 
     def execute(self, *args, **kw):
diff --git a/ipalib/parameters.py b/ipalib/parameters.py
index a628b6f53..f97c42218 100644
--- a/ipalib/parameters.py
+++ b/ipalib/parameters.py
@@ -100,17 +100,15 @@ a more detailed description for clarity.
 """
 
 import re
-import csv
-import json
-
 from types import NoneType
-from util import make_repr, json_serialize
+from util import make_repr
 from request import ugettext
 from plugable import ReadOnly, lock, check_name
 from errors import ConversionError, RequirementError, ValidationError
 from errors import PasswordMismatch
 from constants import NULLS, TYPE_ERROR, CALLABLE_ERROR
 from text import Gettext, FixMe
+import csv
 
 
 class DefaultFrom(ReadOnly):
@@ -854,20 +852,6 @@ class Param(ReadOnly):
                     pass
         return self.default
 
-    def __json__(self):
-        json_dict = {}
-        for (a, k, d) in self.kwargs:
-            if k in (callable, DefaultFrom):
-                continue
-            elif isinstance(getattr(self, a), frozenset):
-                json_dict[a] = [k for k in getattr(self, a, [])]
-            else:
-                json_dict[a] = getattr(self, a, '')
-        json_dict['class'] = self.__class__.__name__
-        json_dict['name'] = self.name
-        json_dict['type'] = self.type.__name__
-        return json_dict
-
 
 class Bool(Param):
     """
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 4b8699744..2b0ff2d73 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -21,16 +21,14 @@ Base classes for LDAP plugins.
 """
 
 import re
-import json
 
 from ipalib import crud, errors, uuid
 from ipalib import Method, Object
-from ipalib import Flag, Int, List, Str
+from ipalib import Flag, List, Str
 from ipalib.base import NameSpace
 from ipalib.cli import to_cli, from_cli
 from ipalib import output
 from ipalib.text import _
-from ipalib.util import json_serialize
 
 
 def validate_add_attribute(ugettext, attr):
@@ -48,12 +46,11 @@ def get_attributes(attrs):
     """
     Given a list of values in the form name=value, return a list of name.
     """
-    if not attrs:
-        return []
     attrlist=[]
     for attr in attrs:
         m = re.match("\s*(.*?)\s*=\s*(.*?)\s*$", attr)
         attrlist.append(str(m.group(1)).lower())
+
     return attrlist
 
 
@@ -115,6 +112,7 @@ class LDAPObject(Object):
                         entry_attrs.setdefault(new_attr, []).append(
                             ldap_obj.get_primary_key_from_dn(member)
                         )
+            del entry_attrs[attr]
 
     def handle_not_found(self, *keys):
         raise errors.NotFound(
@@ -123,20 +121,6 @@ class LDAPObject(Object):
             }
         )
 
-    json_friendly_attributes = (
-        'parent_object', 'container_dn', 'object_name', 'object_name_plural',
-        'object_class', 'object_class_config', 'default_attributes', 'label',
-        'hidden_attributes', 'uuid_attribute', 'attribute_members', 'name',
-        'takes_params',
-    )
-    def __json__(self):
-        json_dict = dict(
-            (a, getattr(self, a)) for a in self.json_friendly_attributes
-        )
-        json_dict['primary_key'] = self.primary_key.name
-        json_dict['methods'] = [m for m in self.methods]
-        return json_dict
-
 
 # Options used by create and update.
 _attr_options = (
@@ -401,6 +385,7 @@ class LDAPUpdate(LDAPQuery, crud.Update):
     """
     Update an LDAP entry.
     """
+
     takes_options = _attr_options
 
     def execute(self, *keys, **options):
@@ -438,26 +423,26 @@ class LDAPUpdate(LDAPQuery, crud.Update):
         set.
         """
         if 'addattr' in options:
-            setset = set(get_attributes(options.get('setattr', [])))
-            addset = set(get_attributes(options['addattr']))
-            difflist = list(addset.difference(setset))
-            if difflist:
+            try:
+                (dn, old_entry) = ldap.get_entry(
+                    dn, attrs_list, normalize=self.obj.normalize_dn
+                )
+            except errors.ExecutionError, e:
                 try:
-                    (dn, old_entry) = ldap.get_entry(
-                        dn, difflist, normalize=self.obj.normalize_dn
+                    (dn, old_entry) = self._call_exc_callbacks(
+                        keys, options, e, ldap.get_entry, dn, attrs_list,
+                        normalize=self.obj.normalize_dn
                     )
-                except errors.ExecutionError, e:
-                    try:
-                        (dn, old_entry) = self._call_exc_callbacks(
-                            keys, options, e, ldap.get_entry, dn, attrs_list,
-                            normalize=self.obj.normalize_dn
-                        )
-                    except errors.NotFound:
-                        self.obj.handle_not_found(*keys)
-                for a in old_entry:
-                    if not isinstance(entry_attrs[a], (list, tuple)):
-                        entry_attrs[a] = [entry_attrs[a]]
-                    entry_attrs[a] += old_entry[a]
+                except errors.NotFound:
+                    self.obj.handle_not_found(*keys)
+            attrlist = get_attributes(options['addattr'])
+            for attr in attrlist:
+                if attr in old_entry:
+                    if type(entry_attrs[attr]) in (tuple,list):
+                        entry_attrs[attr] = old_entry[attr] + entry_attrs[attr]
+                    else:
+                        old_entry[attr].append(entry_attrs[attr])
+                        entry_attrs[attr] = old_entry[attr]
 
         try:
             ldap.update_entry(dn, entry_attrs, normalize=self.obj.normalize_dn)
@@ -809,25 +794,6 @@ class LDAPSearch(CallbackInterface, crud.Search):
     """
     Retrieve all LDAP entries matching the given criteria.
     """
-    takes_options = (
-        Int('timelimit',
-            label=_('Time Limit'),
-            doc=_('Time limit of search in seconds (default 1)'),
-            flags=['no_dispaly'],
-            minvalue=0,
-            default=1,
-            autofill=True,
-        ),
-        Int('sizelimit',
-            label=_('Size Limit'),
-            doc=_('Maximum number of entries returned (default 3000)'),
-            flags=['no_dispaly'],
-            minvalue=0,
-            default=3000,
-            autofill=True,
-        ),
-    )
-
     def get_args(self):
         for key in self.obj.get_ancestor_primary_keys():
             yield key
@@ -891,9 +857,7 @@ class LDAPSearch(CallbackInterface, crud.Search):
 
         try:
             (entries, truncated) = ldap.find_entries(
-                filter, attrs_list, base_dn, scope=ldap.SCOPE_ONELEVEL,
-                time_limit=options.get('timelimit', 1),
-                size_limit=options.get('sizelimit', 3000)
+                filter, attrs_list, base_dn, scope=ldap.SCOPE_ONELEVEL
             )
         except errors.ExecutionError, e:
             try:
diff --git a/ipalib/plugins/whoami.py b/ipalib/plugins/whoami.py
deleted file mode 100644
index 4742eb0a8..000000000
--- a/ipalib/plugins/whoami.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Authors:
-#   Adam Young <ayoung@redhat.com>
-#
-# Copyright (C) 2010  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# 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; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-"""
-whoami plugin:  tells you your current principal
-"""
-
-
-from ipalib import api, errors
-from ipalib import Command, Str
-from ipalib import output, util
-
-
-class whoami(Command):
-    """
-    Reflects user principal
-    """
-    has_output = (
-        output.summary,
-    )
-
-    def execute(self):
-        return dict(summary=util.get_current_principal())
-
-api.register(whoami)
-
diff --git a/ipalib/util.py b/ipalib/util.py
index f5f0c9641..76be9a6d7 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -1,8 +1,7 @@
 # Authors:
 #   Jason Gerard DeRose <jderose@redhat.com>
-#   Pavel Zuna <pzuna@redhat.com>
 #
-# Copyright (C) 2010  Red Hat
+# Copyright (C) 2008  Red Hat
 # see file 'COPYING' for use and warranty information
 #
 # This program is free software; you can redistribute it and/or
@@ -31,12 +30,6 @@ import socket
 from ipalib import errors
 
 
-def json_serialize(obj):
-    if not callable(getattr(obj, '__json__', None)):
-        # raise TypeError('%r is not JSON serializable')
-        return ''
-    return obj.__json__()
-
 def get_current_principal():
     try:
         return unicode(krbV.default_context().default_ccache().principal().name)
diff --git a/setup.py b/setup.py
index bb7102bf4..91f75910e 100755
--- a/setup.py
+++ b/setup.py
@@ -82,9 +82,6 @@ setup(
         'ipaserver.plugins',
         'ipaserver.install',
     ],
-    package_data={
-        'ipawebui': ['static/*.png', 'static/*.js'],
-    },
     scripts=['ipa'],
     data_files = [('share/man/man1', ["ipa.1"])],
 )
diff --git a/tests/test_ipalib/test_text.py b/tests/test_ipalib/test_text.py
index ac156fe03..580c68f70 100644
--- a/tests/test_ipalib/test_text.py
+++ b/tests/test_ipalib/test_text.py
@@ -70,8 +70,8 @@ def test_gettext():
     art the string "foo" would render as: "-->foo<--"
     '''
 
-    localedir='install/po/test_locale'
-    test_file='install/po/test.po'
+    localedir='../../install/po/test_locale'
+    test_file='../../install/po/test.po'
 
     # The test installs the test message catalog under the en_US
     # (e.g. U.S. English) language. It would be nice to use a dummy
author	Stephen Gallagher <sgallagh@redhat.com>	2010-08-02 14:36:33 -0400
committer	Rob Crittenden <rcritten@redhat.com>	2010-08-02 16:28:07 -0400
commit	f9ff041c5cd5ac11af2edb59cb7a707582193df6 (patch)
tree	78bdceb1b3b637be34fbb11ff34d8d17fdf88446
parent	47d4fcdd8178ec4b8403efa4f80eaa009c32d78b (diff)
download	freeipa-webui-details.tar.gz freeipa-webui-details.tar.xz freeipa-webui-details.zip