From 9f3511ad80724a6b9b74df7a0b7af068f2f657f9 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Fri, 6 Jan 2012 23:23:29 -0500
Subject: [PATCH 01/73] started working on ff event problem (still have to
 track down everywhere it's happening), added a feature to color the set a
 problem to be added is hovering over

---
 htdocs/css/library_browser.css |   3 +
 htdocs/js/library_browser.js   | 279 ++++++++++++++++-----------------
 2 files changed, 139 insertions(+), 143 deletions(-)

diff --git a/htdocs/css/library_browser.css b/htdocs/css/library_browser.css
index 411f04f1e9..8f8a6506da 100644
--- a/htdocs/css/library_browser.css
+++ b/htdocs/css/library_browser.css
@@ -86,6 +86,9 @@ body {
 	background:#00ADEE;
 }
 
+#app_box .drophover{
+	background:#FF0000;
+}
 #app_box .ww_selected{
 	background: gray;
 }
diff --git a/htdocs/js/library_browser.js b/htdocs/js/library_browser.js
index eae30fd48c..b2ee37383d 100644
--- a/htdocs/js/library_browser.js
+++ b/htdocs/js/library_browser.js
@@ -100,150 +100,142 @@ function showErrorResponse(data){
  * unobtrusively start up our javascript
  */
 $(document).ready(function() {
-					// do stuff when DOM is ready
-
-					// get usernames and keys from hidden variables:
-					var myUser = document.getElementById("hidden_user").value;
-					var mySessionKey = document.getElementById("hidden_key").value;
-					var myCourseID = document.getElementById("hidden_courseID").value;
-					// check to make sure that our credentials are available.
-					if (myUser && mySessionKey && myCourseID) {
-						listLibRequest.user = myUser;
-						listLibRequest.session_key = mySessionKey;
-						listLibRequest.courseID = myCourseID;
-					} else {
-						updateMessage("missing hidden credentials: user "
-								+ myUser + " session_key " + mySessionKey
-								+ " courseID" + myCourseID);
-					}
+	// do stuff when DOM is ready
+
+	// get usernames and keys from hidden variables:
+	var myUser = document.getElementById("hidden_user").value;
+	var mySessionKey = document.getElementById("hidden_key").value;
+	var myCourseID = document.getElementById("hidden_courseID").value;
+	// check to make sure that our credentials are available.
+	if (myUser && mySessionKey && myCourseID) {
+		listLibRequest.user = myUser;
+		listLibRequest.session_key = mySessionKey;
+		listLibRequest.courseID = myCourseID;
+	} else {
+		updateMessage("missing hidden credentials: user "
+				+ myUser + " session_key " + mySessionKey
+				+ " courseID" + myCourseID);
+	}
 
-					// get our sets
-					setList = new SetList();
-
-					// attach function for deleting selected problems
-					document
-							.getElementById("delete_problem")
-							.addEventListener(
-									"click",
-									function(event) {
-										var currentTabId = $("#problems_container div.ui-tabs-panel:not(.ui-tabs-hide)")[0].id;
-										console.log(currentTabId);
-										// only care if it's a set
-										if (currentTabId != "library_tab") {
-
-											var problems = $(".ww_selected");
-											var set = setList.sets[document
-													.getElementById(
-															currentTabId)
-													.getAttribute("data-uid")];
-											console.log(problems);
-											problems.each(function(index) {
-												set.removeProblem($(this).attr(
-														"data-path"));
-											});
-										}
-									}, false);
-
-					// attach undo and redo
-					document.getElementById("undo_button").addEventListener(
-							"click", undo, false);
-					document.getElementById("redo_button").addEventListener(
-							"click", redo, false);
-
-					$("#dialog").dialog({
-						autoOpen : false,
-						modal : true
-					});
-					// create set button listner
-					document.getElementById("create_set").addEventListener(
-							"click", function() {
-								Set.createSet(setList, false);
-								$("#dialog").dialog('close');
-							});
-
-					document.getElementById("new_problem_set")
-							.addEventListener("click", function() {
-								setList.createSet();
-							}, false);
-
-					// this stil doesn't work
-					$("#new_problem_set").droppable({
-						tolerance : 'pointer',
-						drop : function(event, ui) {
-							problemPlaceholder = ui.draggable.attr("data-path")
-							$("#dialog").dialog('open');
-						}
-					});
+	// get our sets
+	setList = new SetList();
+
+	// attach function for deleting selected problems
+	document.getElementById("delete_problem").addEventListener("click", function(event) {
+		var currentTabId = $("#problems_container div.ui-tabs-panel:not(.ui-tabs-hide)")[0].id;
+		console.log(currentTabId);
+		// only care if it's a set
+		if (currentTabId != "library_tab") {
+
+			var problems = $(".ww_selected");
+			var set = setList.sets[document
+					.getElementById(
+							currentTabId)
+					.getAttribute("data-uid")];
+			console.log(problems);
+			problems.each(function(index) {
+				set.removeProblem($(this).attr(
+						"data-path"));
+			});
+		}
+	}, false);
+
+	// attach undo and redo
+	document.getElementById("undo_button").addEventListener("click", undo, false);
+	document.getElementById("redo_button").addEventListener("click", redo, false);
+
+	$("#dialog").dialog({
+		autoOpen : false,
+		modal : true
+	});
+	// create set button listner
+	document.getElementById("create_set").addEventListener("click", function() {
+		Set.createSet(setList, false);
+		$("#dialog").dialog('close');
+	});
+
+	document.getElementById("new_problem_set").addEventListener("click", function() {
+		setList.createSet();
+	}, false);
 
-					// some window set up:
-					$tabs = $("#problems_container")
-							.tabs(
-									{
-										closable : true,
-										add : function(event, ui) {
+	// this stil doesn't work
+	$("#new_problem_set").droppable({
+		tolerance : 'pointer',
+		drop : function(event, ui) {
+			problemPlaceholder = ui.draggable.attr("data-path")
+			$("#dialog").dialog('open');
+		}
+	});
+
+	// some window set up:
+	$tabs = $("#problems_container")
+			.tabs(
+					{
+						closable : true,
+						add : function(event, ui) {
+							document
+									.getElementById(
+											"library_link")
+									.removeChild(
 											document
-													.getElementById(
-															"library_link")
-													.removeChild(
-															document
-																	.getElementById("library_link").lastChild);
-											console.log("adding a tab");
-											$tabs.tabs('select', '#'
-													+ ui.panel.id);
-											$(".ww_selected").removeClass(
-													"ww_selected");// probably reduntant but I want to make sure nothing stays selected
-										},
-										create : function(event, ui) {
+													.getElementById("library_link").lastChild);
+							console.log("adding a tab");
+							$tabs.tabs('select', '#'
+									+ ui.panel.id);
+							$(".ww_selected").removeClass(
+									"ww_selected");// probably reduntant but I want to make sure nothing stays selected
+						},
+						create : function(event, ui) {
+							document
+									.getElementById(
+											"library_link")
+									.removeChild(
 											document
-													.getElementById(
-															"library_link")
-													.removeChild(
-															document
-																	.getElementById("library_link").lastChild);
-											$(".ww_selected").removeClass(
-													"ww_selected");
-										},
-										select : function(event, ui) {
-											$(".ww_selected").removeClass(
-													"ww_selected");
-										},
-										remove : function(event, ui) {
+													.getElementById("library_link").lastChild);
+							$(".ww_selected").removeClass(
+									"ww_selected");
+						},
+						select : function(event, ui) {
+							$(".ww_selected").removeClass(
+									"ww_selected");
+						},
+						remove : function(event, ui) {
+							document
+									.getElementById(
+											"library_link")
+									.removeChild(
 											document
-													.getElementById(
-															"library_link")
-													.removeChild(
-															document
-																	.getElementById("library_link").lastChild);
-											$(".ww_selected").removeClass(
-													"ww_selected");
-										}
-									});
-
-					$("#problems_container").removeClass("ui-corner-all");
-					
-					listLibRequest.xml_command = "listLibraries";
+													.getElementById("library_link").lastChild);
+							$(".ww_selected").removeClass(
+									"ww_selected");
+						}
+					});
+
+	$("#problems_container").removeClass("ui-corner-all");
 	
-					updateMessage("Loading libraries... may take some time");
-		
-					$.post(webserviceURL, listLibRequest,
-							function(data) {
-								console.log(data);
-								try {
-									var response = $.parseJSON(data);
-									console.log("result: " + response.server_response);
-									updateMessage(response.server_response);
-									cardCatalog = new CardCatolog(response.result_data.split(","));
-								} catch (err) {
-									console.log(err);
-									var myWindow = window.open('', '',
-											'width=500,height=800');
-									myWindow.document.write(data);
-									myWindow.focus();
-								}
-							});
-					
-					
-				});
+	listLibRequest.xml_command = "listLibraries";
+
+	updateMessage("Loading libraries... may take some time");
+
+	$.post(webserviceURL, listLibRequest,
+			function(data) {
+				console.log(data);
+				try {
+					var response = $.parseJSON(data);
+					console.log("result: " + response.server_response);
+					updateMessage(response.server_response);
+					cardCatalog = new CardCatolog(response.result_data.split(","));
+				} catch (err) {
+					console.log(err);
+					var myWindow = window.open('', '',
+							'width=500,height=800');
+					myWindow.document.write(data);
+					myWindow.focus();
+				}
+			});
+	
+	
+});
 
 function CardCatolog(libNames) {
 	this.searchBox = new Search();
@@ -354,8 +346,8 @@ CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
 	newLibList.id = "libList" + (this.displayBox.childNodes.length + 1);
 	newLibList.setAttribute("data-propName", currentLibrary.path);
 	var workAroundTheClosure = this;
-	newLibList.addEventListener("change", function() {
-		workAroundTheClosure.onLibSelect(currentLibrary);
+	newLibList.addEventListener("change", function(event) {
+		workAroundTheClosure.onLibSelect(event, currentLibrary);
 	}, false);
 
 	for ( var name in currentLibrary.children) {
@@ -386,7 +378,7 @@ CardCatolog.prototype.renderProblems = function(start, limit) {
 };
 
 
-CardCatolog.prototype.onLibSelect = function(currentLibrary) {
+CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
 	this.topProbIndex = 0;
 	//this.library.problems.list = new Object();
 	//this.updateLibrary();
@@ -850,8 +842,6 @@ Set.prototype.loadProblems = function(shouldRender) {
 				}
 				document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
 				if (shouldRender) {
-					console.log(workAroundTheClosure.name);
-					
 					$('a[href="#'+workAroundTheClosure.name+'"] span').text(workAroundTheClosure.name+" ("+ workAroundTheClosure.problemArray.length + ") ");
 					workAroundTheClosure.renderSet();
 				}
@@ -1083,6 +1073,9 @@ SetList.prototype.renderList = function(setName) {
 	$(addingSet).droppable(
 			{
 				tolerance : 'pointer',
+				
+				hoverClass: 'drophover',
+				
 				drop : function(event, ui) {
 					var recievingSet = workAroundSetList[this
 							.getAttribute("data-uid")];

From 66480b2416cdfb83d074fa023a03261b43640bab Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Fri, 23 Mar 2012 20:39:24 -0400
Subject: [PATCH 02/73] ghe3: implemented Datepicker

---
 conf/templates/math3/math3.css                |   14 +-
 conf/templates/math3/system.template          |  114 +-
 htdocs/js/hmwksets_handlers.js                |    8 +-
 .../Instructor/ProblemSetList.pm              | 1076 ++++++++++-------
 lib/WeBWorK/Localize/en.po                    |   14 +-
 5 files changed, 741 insertions(+), 485 deletions(-)

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index a47a1627e5..992c952741 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -285,7 +285,6 @@ clear: both;
 
 #loginstatus {
 	color: white;
-	/* position: absolute; */
 	top: -75px;
 	left: 1170px;
 	width: 200px;
@@ -294,7 +293,7 @@ clear: both;
 	padding: 0;
 	margin: 1ex .5em .1ex .1em;
 	font-size: smaller;
-}
+} 
 
 /*Relative Positioning -- a alternate style for the loginstatus which uses relative positioning.  Tested, but was decided that it didn't work great. Feel free to uncomment if you want to try it out.*/
 
@@ -432,8 +431,7 @@ clear: both;
  * it is emitted by WW code in ProblemSet.pl (not in system.template) ! */
 #InfoPanel {
     font-size:100%;
-	float: right;
-	max-width: 400px;
+	max-width: 100%;
 	overflow: auto;
 	/*margin-right: -1px;*/
 	background-color: #fff;
@@ -716,7 +714,7 @@ span.gray_button{
 	width: 100%;
 }
 
-/*Styles specifically for the problem viewer*/
+Styles specifically for the problem viewer
 
 #problem_viewer_form{
 	margin-left: 10px;
@@ -758,7 +756,7 @@ span.gray_button{
 	margin-top: 10%;
 	margin-left: 10%;
 	margin-right: 10%;
-}
+}*/
 
 #editor{
 	width: 750px;
@@ -810,11 +808,11 @@ div.problem_sets_options {
 table.problem_set_table{
 	margin-top: 30px;
 	width: 640px;
-	text-align: left;
+	text-align: center;
 }
 
 /*BUG FIXES*/
 
 table#grades_table pre{
 	float: left;
-}
+}
\ No newline at end of file
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 2bbad2f1f1..91e3d0a424 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -32,6 +32,9 @@
 <!--#if can="output_tabber_CSS"-->
 	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/tabber.css"/>
 <!--#endif-->
+<!--#if can="output_jquery_ui_CSS"-->
+	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/jquery-ui-1.8.18.custom.css"/>
+<!--#endif-->
 <!--#if can="output_JS"-->
 	<!--#output_JS-->
 <!--#endif-->
@@ -93,66 +96,67 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#endif -->
-			<!--#if can="output_problem_body"--> 
-			<!-- ====  print body parts if possible  -->		
-			  <div class="Body" style="background-color:#ffffff">
-			
-				<!--#if can="output_custom_edit_message"-->
-					<!--#output_custom_edit_message-->
-				<!--#endif-->
-				<!--#if can="output_summary"-->
-						<!--#output_summary-->
-				<!--#endif-->
-				
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-				
-				<!--#if can="output_form_start"-->
-					<!--#output_form_start-->
-					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-						<div class="problem">
-							<!--#if can="output_problem_body"-->
-								<!--#output_problem_body-->
-							<!--#endif-->
-							<!--#if can="output_message"-->
-								<!--#output_message-->
+			<!--#else-->
+				 <!--#if can="output_problem_body"--> 
+			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
+					  <div class="Body" style="background-color:#ffffff">
+		
+						<!--#if can="output_custom_edit_message"-->
+							<!--#output_custom_edit_message-->
+						<!--#endif-->
+						<!--#if can="output_summary"-->
+								<!--#output_summary-->
+							</div>
+						<!--#endif-->
+						
+						<!--#if can="output_hidden_info"-->
+							<!--#output_hidden_info-->
+						<!--#endif-->
+						
+						<!--#if can="output_form_start"-->
+							<!--#output_form_start-->
+							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+								<div class="problem">
+									<!--#if can="output_problem_body"-->
+										<!--#output_problem_body-->
+									<!--#endif-->
+									<!--#if can="output_message"-->
+										<!--#output_message-->
+									<!--#endif-->
+									<!--#if can="output_editorLink"-->
+										<!--#output_editorLink-->
+									<!--#endif-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_editorLink"-->
-								<!--#output_editorLink-->
+							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+								<p>
+									<!--#if can="output_checkboxes"-->
+										<!--#output_checkboxes-->
+									<!--#endif-->
+									<!--#if can="output_submit_buttons"-->
+										<!--#output_submit_buttons-->
+									<!--#endif-->
+								</p>
 							<!--#endif-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-						<p>
-							<!--#if can="output_checkboxes"-->
-								<!--#output_checkboxes-->
+							<!--#if can="output_score_summary"-->
+								<div class="scoreSummary">
+									<!--#output_score_summary-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_submit_buttons"-->
-								<!--#output_submit_buttons-->
+							<!--#if can="output_misc"-->
+								<!--#output_misc-->
 							<!--#endif-->
-						</p>
-					<!--#endif-->
-					<!--#if can="output_score_summary"-->
-						<div class="scoreSummary">
-							<!--#output_score_summary-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_misc"-->
-						<!--#output_misc-->
-					<!--#endif-->
-					</form>
-				</div>	  
-			<!-- ====  end printing body parts   -->
-			<!--#else-->
-			<!-- ==== couldn't print body parts so we'll print entire body -->	
-					  <div class="Body" style="background-color:#ffffff">
-					  <!--#body-->
+							</form>
+						<!--#endif-->
 					  </div>
-			<!-- ==== end printing entire body ===>
-			<!--#endif-->
-			
+
+				<!--#else-->
+				<!-- ==== couldn't print body parts so we'll print entire body -->	
+						  <div class="Body" style="background-color:#ffffff">
+						  <!--#body-->
+						  </div>
+				<!--#endif-->
+
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
diff --git a/htdocs/js/hmwksets_handlers.js b/htdocs/js/hmwksets_handlers.js
index 2b9b6b0a6d..647e303880 100644
--- a/htdocs/js/hmwksets_handlers.js
+++ b/htdocs/js/hmwksets_handlers.js
@@ -13,6 +13,8 @@ function hmwksets_add_filter_elements() {
 }
 
 addOnLoadEvent(function() {
-	document.getElementById("filter_select").onchange = hmwksets_add_filter_elements;
-	hmwksets_add_filter_elements();
-});
\ No newline at end of file
+	if(document.getElementById("filter_select") != null){
+		document.getElementById("filter_select").onchange = hmwksets_add_filter_elements;
+	}
+});
+
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index ed52a2d741..0f05d3da9e 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -263,7 +263,7 @@ sub pre_header_initialize {
 		my @setsToScore = ();
 	
 		if ($scope eq "none") { 
-			return "No sets selected for scoring.";
+			return $r->maketext("No sets selected for scoring".".");
 		} elsif ($scope eq "all") {
 			@setsToScore = @{ $r->param("allSetIDs") };
 		} elsif ($scope eq "visible") {
@@ -303,7 +303,7 @@ sub initialize {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	########## set initial values for state fields
@@ -336,12 +336,12 @@ sub initialize {
 	
 	$self->{editMode} = $r->param("editMode") || 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify homework sets.")))
 		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
 	
 	$self->{exportMode} = $r->param("exportMode") || 0;
 
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify set definition files."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify set definition files.")))
 		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
 	
 	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
@@ -372,7 +372,7 @@ sub initialize {
 	$self->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
-			die "Action $actionID not found";
+			die $r->maketext("Action [_1] not found", $actionID);
 		}
 		# Check permissions
 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
@@ -383,20 +383,17 @@ sub initialize {
 			}
 			my %actionParams = $self->getActionParams($actionID);
 			my %tableParams = $self->getTableParams();
-			$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
-			$self->addmessage(
-			                     $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
-			                     CGI::hr()
-			);
+			$self->addmessage(CGI::div({class=>"Message"}, $r->maketext("Results of last action performed").": "));
+			$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
 		} else {
-			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
+			return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to perform this action.")));
 		}
 		
 		
 
 	} else {
 	
-		$self->addgoodmessage("Please select action to be performed.");
+		$self->addgoodmessage($r->maketext("Please select action to be performed."));
 	}
 		
 
@@ -418,7 +415,7 @@ sub body {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	# This table can be consulted when display-ready forms of field names are needed.
@@ -426,7 +423,6 @@ sub body {
 		$setTemplate->FIELDS();
 	
 	@prettyFieldNames{qw(
-		select
 		problems
 		users
 		filename
@@ -439,18 +435,17 @@ sub body {
 		visible
 		enable_reduced_scoring	
 	)} = (
-		"Select",
-		"Edit<br> Problems",
-		"Edit<br> Assigned Users",
-		"Set Definition Filename",
-		"Edit<br> Set Data", 
-		"Set Header", 
-		"Hardcopy Header", 
-		"Open Date", 
-		"Due Date", 
-		"Answer Date", 
-		"Visible",
-		"Reduced Credit<br> Enabled" 
+		$r->maketext("Edit Problems"),
+		$r->maketext("Edit Assigned Users"),
+		$r->maketext("Set Definition Filename"),
+		$r->maketext("Edit Set Data"), 
+		$r->maketext("Set Header"), 
+		$r->maketext("Hardcopy Header"), 
+		$r->maketext("Open Date"), 
+		$r->maketext("Due Date"), 
+		$r->maketext("Answer Date"), 
+		$r->maketext("Visible"),
+		$r->maketext("Reduced Credit Enabled") 
 	);
 	
 
@@ -497,9 +492,14 @@ sub body {
 		@Sets = sort $primarySortSub @Sets;
 	}
 
+	########## print site identifying information
+	
+	print WeBWorK::CGI_labeled_input(-type=>"button", -id=>"show_hide", -input_attr=>{-value=>$r->maketext("Show/Hide Site Description"), -class=>"button_input"});
+	print CGI::p({-id=>"site_description", -style=>"display:none"}, CGI::em($r->maketext("_HMWKSETS_EDITOR_DESCRIPTION")));
+	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form", -id=>"edit_form_id"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -528,10 +528,10 @@ sub body {
 	
 	########## print action forms
 	
-	print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students.")) if $editMode;
+	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the set for ALL students."))) if $editMode;
 
-	print CGI::start_table({});
-	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+	# print CGI::start_table({});
+	print CGI::p($r->maketext("Select an action to perform").":");
 
 	my @formsToShow;
 	if ($editMode) {
@@ -545,52 +545,66 @@ sub body {
 	}
 	
 	my $i = 0;
+	my @divArr = ();
+
 	foreach my $actionID (@formsToShow) {
 		# Check permissions
 		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
 		my $actionForm = "${actionID}_form";
-		my $onChange = "document.problemsetlist.action[$i].checked=true";
+		#my $onChange = "document.problemsetlist.action[$i].checked=true";
+		my $onChange = "";
 		my %actionParams = $self->getActionParams($actionID);
 		
-		print CGI::Tr({-valign=>"top"},
-			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
-			CGI::td({}, $self->$actionForm($onChange, %actionParams))
-		);
+		# print CGI::Tr({-valign=>"top"},
+			# CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			# CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		# );
+		
+		my $extraspace = (ucfirst(WeBWorK::split_cap($actionID)) eq "Filter") ? "" : CGI::br();
 		
+		push @divArr, join("",
+			CGI::h3($r->maketext(ucfirst(WeBWorK::split_cap($actionID)))),
+			CGI::span({-class=>"radio_span"}, WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionID."_id", -label_text=>$r->maketext(ucfirst(WeBWorK::split_cap($actionID))), -input_attr=>{-name=>"action", -value=>$actionID}, -label_attr=>{-class=>"radio_label"})),
+			CGI::br(),
+			$self->$actionForm($onChange, %actionParams),
+			CGI::br(),
+			$extraspace,
+		);
 		$i++;
 	}
 	
-	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all sets',
+	my $divArrRef = \@divArr;
+	
+	print CGI::div({-class=>"tabber"},
+		CGI::div({-class=>"tabbertab"},$divArrRef)
+		);
+	
+	my $selectAll =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_all", -input_attr=>{-name=>'check_all', -value=>$r->maketext('Select all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                           document.problemsetlist.elements[i].checked = true
 	                       }
 	                    }" });
-   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all sets',
+   	my $selectNone =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_none", -input_attr=>{-name=>'check_none', -value=>$r->maketext('Unselect all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                          document.problemsetlist.elements[i].checked = false
 	                       }
 	                    }" });
 	unless ($editMode or $exportMode) {
-		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
-			$selectAll." ". $selectNone
-			)
-		);
+		print $selectAll." ". $selectNone;
 	}
-	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
-		CGI::submit(-value=>"Take Action!"))
-	);
-	print CGI::end_table();
-	
+	print WeBWorK::CGI_labeled_input(-type=>"reset", -id=>"clear_entries", -input_attr=>{-value=>$r->maketext("Clear"), -class=>"button_input"});
+	print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"take_action", -input_attr=>{-value=>$r->maketext("Take Action!"), -class=>"button_input"}).CGI::br().CGI::br();
+
 	########## print table
 	
 	########## first adjust heading if in editMode
-	$prettyFieldNames{set_id} = "Edit All <br> Set Data" if $editMode;
-	$prettyFieldNames{enable_reduced_scoring} = 'Enable Reduced<br>Credit' if $editMode;
+	$prettyFieldNames{set_id} = $r->maketext("Edit All Set Data") if $editMode;
+	$prettyFieldNames{enable_reduced_scoring} = $r->maketext('Enable Reduced Credit') if $editMode;
 	
 	
-	print CGI::p({},"Showing ", scalar @visibleSetIDs, " out of ", scalar @allSetIDs, " sets.");
+	print CGI::p({},$r->maketext("Showing [_1] out of [_2] sets.", scalar @visibleSetIDs, scalar @allSetIDs));
 	
 	$self->printTableHTML(\@Sets, \%prettyFieldNames,
 		editMode => $editMode,
@@ -644,58 +658,43 @@ sub getTableParams {
 
 sub filter_form {
 	my ($self, $onChange, %actionParams) = @_;
-	#return CGI::table({}, CGI::Tr({-valign=>"top"},
-	#	CGI::td({}, 
+	my $r = $self->r;
+
 	return join("", 
-			"Show ",
-			CGI::popup_menu(
-				-name => "action.filter.scope",
-				-values => [qw(all none selected match_ids visible unvisible)],
-				-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
-				-labels => {
-					all => "all sets",
-					none => "no sets",
-					selected => "sets checked below",
-					visible => "sets visible to students",
-					unvisible => "sets hidden from students", 
-					match_ids => "sets with matching set IDs:",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"filter_select",
+				-label_text=>$r->maketext("Show which sets?").": ",
+				-input_attr=>{
+					-name => "action.filter.scope",
+					-values => [qw(all none selected match_ids visible unvisible)],
+					-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
+					-labels => {
+						all => $r->maketext("all sets"),
+						none => $r->maketext("no sets"),
+						selected => $r->maketext("selected sets"),
+						visible => $r->maketext("visible sets"),
+						unvisible => $r->maketext("hidden sets"), 
+						match_ids => $r->maketext("enter matching set IDs below"),
+					},
+					-onchange => $onChange,
+				}
 			),
+			CGI::br(),
 			" ",
-			CGI::textfield(
-				-name => "action.filter.set_ids",
-				-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
-				-width => "50",
-				-onchange => $onChange,
+			CGI::div({-id=>"filter_elements"},
+			WeBWorK::CGI_labeled_input(
+				-type=>"text",
+				-id=>"filter_text",
+				-label_text=>$r->maketext("Match on what? (separate multiple IDs with commas)").": ",
+				-input_attr=>{
+					-name => "action.filter.set_ids",
+					-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
+					-width => "50",
+					-onchange => $onChange,
+				}
+			), CGI::span({-id=>"filter_err_msg", -class=>"ResultsWithError"}, $r->maketext("Please enter in a value to match in the filter field.")),
 			),
-			" (separate multiple IDs with commas)",
-			CGI::br(),
-#			"Open dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.open_date",
-#				-values => [ keys %{ $self->{open_dates} } ],
-#				-default => $actionParams{"action.filter.open_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{open_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Due dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.due_date",
-#				-values => [ keys %{ $self->{due_dates} } ],
-#				-default => $actionParams{"action.filter.due_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{due_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Answer dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.answer_date",
-#				-values => [ keys %{ $self->{answer_dates} } ],
-#				-default => $actionParams{"action.filter.answer_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{answer_dates}) },
-#				-onchange => $onChange,
-#			),
-			
 	);
 }
 
@@ -710,16 +709,18 @@ sub filter_handler {
 	my $result;
 	
 	my $scope = $actionParams->{"action.filter.scope"}->[0];
+	
 	if ($scope eq "all") {
-		$result = "showing all sets";
+		$result = $r->maketext("showing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "none") {
-		$result = "showing no sets";
+		$result = $r->maketext("showing no sets");
 		$self->{visibleSetIDs} = [];
 	} elsif ($scope eq "selected") {
-		$result = "showing selected sets";
+		$result = $r->maketext("showing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	} elsif ($scope eq "match_ids") {
+		#my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		$self->{visibleSetIDs} = \@setIDs;
 	} elsif ($scope eq "match_open_date") {
@@ -748,45 +749,55 @@ sub filter_handler {
 
 sub sort_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 	return join ("",
-		"Primary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.primary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_1",
+			-label_text=>$r->maketext("Sort by").": ",
+			-input_attr=>{
+				-name => "action.sort.primary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" Secondary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.secondary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_2",
+			-label_text=>$r->maketext("Then by").": ",
+			-input_attr=>{
+				-name => "action.sort.secondary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		".",
 	);
 }
 
 sub sort_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 	
 	my $primary = $actionParams->{"action.sort.primary"}->[0];
 	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
@@ -795,52 +806,58 @@ sub sort_handler {
 	$self->{secondarySortField} = $secondary;
 
 	my %names = (
-		set_id		=> "Set Name",
-		set_header	=> "Set Header",
-		hardcopy_header	=> "Hardcopy Header",
-		open_date	=> "Open Date",
-		due_date	=> "Due Date",
-		answer_date	=> "Answer Date",
-		visible	=> "Visibility",
+		set_id		=> $r->maketext("Set Name"),
+		set_header	=> $r->maketext("Set Header"),
+		hardcopy_header	=> $r->maketext("Hardcopy Header"),
+		open_date	=> $r->maketext("Open Date"),
+		due_date	=> $r->maketext("Due Date"),
+		answer_date	=> $r->maketext("Answer Date"),
+		visible	=> $r->maketext("Visibility"),
 	);
 	
-	return "sort by $names{$primary} and then by $names{$secondary}.";
+	return $r->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary});
 }
 
 
 sub edit_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Edit ",
-		CGI::popup_menu(
-			-name => "action.edit.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"edit_select",
+			-label_text=>$r->maketext("Edit which sets?").": ",
+			-input_attr=>{
+				-name => "action.edit.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
 
 sub edit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.edit.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "editing all sets";
+		$result = $r->maketext("editing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = "editing visible sets";
+		$result = $r->maketext("editing visible sets");
 		# leave visibleUserIDs alone
 	} elsif ($scope eq "selected") {
-		$result = "editing selected sets";
+		$result = $r->maketext("editing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{editMode} = 1;
@@ -850,32 +867,42 @@ sub edit_handler {
 
 sub publish_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.publish.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.publish.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.publish.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.publish.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.publish.value"}->[0] || "1",
-			-labels => {
-				0 => "hidden",
-				1 => "visible",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_visibility_select",
+			-label_text=>$r->maketext("Choose visibility of the sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.publish.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Hidden"),
+					1 => $r->maketext("Visible"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" for students.",
 	);
 }
 
@@ -890,22 +917,22 @@ sub publish_handler {
 	my $scope = $actionParams->{"action.publish.scope"}->[0];
 	my $value = $actionParams->{"action.publish.value"}->[0];
 
-	my $verb = $value ? "made visible for" : "hidden from";
+	my $verb = $value ? $r->maketext("made visible for") : $r->maketext("hidden from");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result = CGI::div({class=>"ResultsWithError"},"No change made to any set.");
+		$result = CGI::div({class=>"ResultsWithError"},$r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All sets [_1] all students", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All visible sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All visible sets [_1] all students", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All selected sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All selected sets [_1] all students", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -918,32 +945,42 @@ sub publish_handler {
 }
 sub enable_reduced_scoring_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
-			-labels => {
-				0 => "disable",
-				1 => "enable",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_enable_disable_select",
+			-label_text=>$r->maketext("Enable/Disable reduced scoring for selected sets").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Disable"),
+					1 => $r->maketext("Enable"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" reduced sccoring.",
 	);
 }
 
@@ -958,22 +995,22 @@ sub enable_reduced_scoring_handler {
 	my $scope = $actionParams->{"action.enable_reduced_scoring.scope"}->[0];
 	my $value = $actionParams->{"action.enable_reduced_scoring.value"}->[0];
 
-	my $verb = $value ? "enabled" : "disabled";
+	my $verb = $value ? $r->maketext("enabled") : $r->maketext("disabled");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result =  CGI::div({class=>"ResultsWithError"}, "No change made to any set.");
+		$result =  CGI::div({class=>"ResultsWithError"}, $r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for all sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for all sets", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for visable sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for visable sets", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for selected sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for selected sets", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -987,19 +1024,24 @@ sub enable_reduced_scoring_handler {
 
 sub score_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Score ",
-		CGI::popup_menu(
-			-name => "action.score.scope",
-			-values => [qw(none all selected)],
-			-default => $actionParams{"action.score.scope"}->[0] || "none",
-			-labels => {
-				none => "no sets.",
-				all => "all sets.",
-				selected => "selected sets.",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"score_select",
+			-label_text=>$r->maketext("Score which sets?").": ",
+			-input_attr=>{
+				-name => "action.score.scope",
+				-values => [qw(none all selected)],
+				-default => $actionParams{"action.score.scope"}->[0] || "none",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 	
@@ -1019,7 +1061,7 @@ sub score_handler {
 	
 	if ($scope eq "none") { 
 		@setsToScore = ();
-		return "No sets selected for scoring.";
+		return $r->maketext("No sets selected for scoring");
 	} elsif ($scope eq "all") {
 		@setsToScore = @{ $self->{allSetIDs} };
 	} elsif ($scope eq "visible") {
@@ -1043,23 +1085,26 @@ sub score_handler {
 
 sub delete_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		CGI::div({class=>"ResultsWithError"}, 
-			"Delete ",
-			CGI::popup_menu(
+		CGI::span({-class=>"ResultsWithError"}, CGI::em($r->maketext("Warning: Deletion destroys all user-related data and is not undoable!"))),CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"delete_select",
+			-label_text=>$r->maketext("Delete how many?").": ",
+			-input_attr=>{
 				-name => "action.delete.scope",
 				-values => [qw(none selected)],
 				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
 				-labels => {
-					none => "no sets.",
+					none => $r->maketext("no sets"),
 					#visible => "visible sets.",
-					selected => "selected sets.",
+					selected => $r->maketext("selected sets"),
 				},
 				-onchange => $onChange,
-			),
-			CGI::em(" Deletion destroys all set-related data and is not undoable!"),
-		)
+			}
+		),
 	);
 }
 
@@ -1094,34 +1139,42 @@ sub delete_handler {
 	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
 	
 	my $num = @setIDsToDelete;
-	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num set" .
-	                                           ($num == 1 ? "" : "s")
-	);
+	 return CGI::div({class=>"ResultsWithoutError"},  $r->maketext("deleted [_1] sets", $num) );
 }
 
 sub create_form {
 	my ($self, $onChange, %actionParams) = @_;
-
 	my $r      = $self->r;
 	
-	return "Create a new set named: ", 
-		CGI::textfield(
-			-name => "action.create.name",
-			-value => $actionParams{"action.create.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+	return join("",
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"create_text",
+			-label_text=>$r->maketext("Name the new set").": ",
+			-input_attr=>{
+				-name => "action.create.name",
+				-value => $actionParams{"action.create.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
-		" as ",
-		CGI::popup_menu(
-			-name => "action.create.type",
-			-values => [qw(empty copy)],
-			-default => $actionParams{"action.create.type"}->[0] || "empty",
-			-labels => {
-				empty => "a new empty set.",
-				copy => "a duplicate of the first selected set.",
-			},
-			-onchange => $onChange,
-		);
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"create_select",
+			-label_text=>$r->maketext("Create as what type of set?").": ",
+			-input_attr=>{
+				-name => "action.create.type",
+				-values => [qw(empty copy)],
+				-default => $actionParams{"action.create.type"}->[0] || "empty",
+				-labels => {
+					empty => $r->maketext("a new empty set"),
+					copy => $r->maketext("a duplicate of the first selected set"),
+				},
+				-onchange => $onChange,
+			}
+		),
+	);
 			
 }
 
@@ -1132,8 +1185,8 @@ sub create_handler {
 	my $db     = $r->db;
 	
 	my $newSetID = $actionParams->{"action.create.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: no set name specified!") unless $newSetID =~ /\S/;
-	return CGI::div({class => "ResultsWithError"}, "Set $newSetID exists.  No set created") if $db->existsGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: no set name specified!")) unless $newSetID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Set [_1] exists.  No set created", $newSetID)) if $db->existsGlobalSet($newSetID);
 	my $newSetRecord = $db->newGlobalSet;
 	my $oldSetID = $self->{selectedSetIDs}->[0];
 
@@ -1154,7 +1207,7 @@ sub create_handler {
 		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
 		$db->addGlobalSet($newSetRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless $oldSetID =~ /\S/;
+		return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless $oldSetID =~ /\S/;
 		$newSetRecord = $db->getGlobalSet($oldSetID);
 		$newSetRecord->set_id($newSetID);
 		$db->addGlobalSet($newSetRecord);
@@ -1193,9 +1246,9 @@ sub create_handler {
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 	push @{ $self->{allSetIds} }, $newSetID;
 	
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: [_1]", $@)) if $@;
 	
-	 return CGI::div({class=>"ResultsWithoutError"},"Successfully created new set $newSetID" );
+	 return CGI::div({class=>"ResultsWithoutError"},$r->maketext("Successfully created new set [_1]", $newSetID));
 	
 }
 
@@ -1217,45 +1270,65 @@ sub import_form {
 			);
 	
 	return join(" ",
-		"Import ",
-		CGI::popup_menu(
-			-name => "action.import.number",
-			-values => [ 1, 8 ],
-			-default => $actionParams{"action.import.number"}->[0] || "1",
-			-labels => {
-				1 => "a single set",
-				8 => "multiple sets",
-			},
-			-onchange => "$onChange;$importScript",
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_amt_select",
+			-label_text=>$r->maketext("Import how many sets?").": ",
+			-input_attr=>{
+				-name => "action.import.number",
+				-values => [ 1, 8 ],
+				-default => $actionParams{"action.import.number"}->[0] || "1",
+				-labels => {
+					1 => $r->maketext("a single set"),
+					8 => $r->maketext("multiple sets"),
+				},
+				-onchange => "$onChange;$importScript",
+			}
 		),
-		" from ", # set definition file(s) ",
-		CGI::popup_menu(
-			-name => "action.import.source",
-			-values => [ "", $self->getDefList() ],
-			-labels => { "" => "the following file(s)" },
-			-default => $actionParams{"action.import.source"}->[0] || "",
-			-size => $actionParams{"action.import.number"}->[0] || "1",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_source_select",
+			-label_text=>$r->maketext("Import from where?").": ",
+			-input_attr=>{
+				-name => "action.import.source",
+				-values => [ "", $self->getDefList() ],
+				-labels => { "" => $r->maketext("Enter filenames below") },
+				-default => $actionParams{"action.import.source"}->[0] || "",
+				-size => $actionParams{"action.import.number"}->[0] || "1",
+				-onchange => $onChange,
+			},
+			-label_attr=>{-id=>"import_source_select_label"}
 		),
-		" with set name(s): ",
-		CGI::textfield(
-			-name => "action.import.name",
-			-value => $actionParams{"action.import.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"import_text",
+			-label_text=>$r->maketext("Import sets with names").": ",
+			-input_attr=>{
+				-name => "action.import.name",
+				-value => $actionParams{"action.import.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
+		CGI::br(),
 		($authz->hasPermissions($user, "assign_problem_sets")) 
 			?
-			"assigning this set to " .
-			CGI::popup_menu(
-				-name => "action.import.assign",
-				-value => [qw(user all)],
-				-default => $actionParams{"action.import.assign"}->[0] || "user",
-				-labels => {
-					all => "all current users.",
-					user => "only $user.",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"import_users_select",
+				-label_text=>$r->maketext("Assign this set to which users?").": ",
+				-input_attr=>{
+					-name => "action.import.assign",
+					-value => [qw(all none)],
+					-default => $actionParams{"action.import.assign"}->[0] || "none",
+					-labels => {
+						all => $r->maketext("all users"),
+						none => $r->maketext("no users"),
+					},
+					-onchange => $onChange,
+				}
 			)
 			:
 			""	#user does not have permissions to assign problem sets
@@ -1264,6 +1337,7 @@ sub import_form {
 
 sub import_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my @fileNames = @{ $actionParams->{"action.import.source"} };
 	my $newSetName = $actionParams->{"action.import.name"}->[0];
@@ -1280,28 +1354,29 @@ sub import_handler {
 	my $numSkipped = @$skipped;
 
    return CGI::div(
-		{class=>"ResultsWithoutError"},	
-		$numAdded . " set" . ($numAdded == 1 ? "" : "s") . " added, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped"
-		. " (" . join (", ", @$skipped) . ") "
-	);
+		{class=>"ResultsWithoutError"},	$r->maketext("[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])", $numAdded, $numSkipped, join(", ", @$skipped)));
 }
 
 sub export_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Export ",
-		CGI::popup_menu(
-			-name => "action.export.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.export.scope"}->[0] || "visible",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"export_select",
+			-label_text=>$r->maketext("Export which sets?").": ",
+			-input_attr=>{
+				-name => "action.export.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.export.scope"}->[0] || "visible",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1309,19 +1384,20 @@ sub export_form {
 # this does not actually export any files, rather it sends us to a new page in order to export the files
 sub export_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.export.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "exporting all sets";
+		$result = $r->maketext("exporting all sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
 
 	} elsif ($scope eq "visible") {
-		$result = "exporting visible sets";
+		$result = $r->maketext("exporting visible sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs};
 	} elsif ($scope eq "selected") {
-		$result = "exporting selected sets";
+		$result = $r->maketext("exporting selected sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{exportMode} = 1;
@@ -1331,7 +1407,8 @@ sub export_handler {
 
 sub cancelExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon export";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon export"));
 }
 
 sub cancelExport_handler {
@@ -1349,12 +1426,13 @@ sub cancelExport_handler {
 	}
 	$self->{exportMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
+	return CGI::div({class=>"ResultsWithError"},  $r->maketext("export abandoned"));
 }
 
 sub saveExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Export selected sets.";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Export selected sets"));
 }
 
 sub saveExport_handler {
@@ -1384,17 +1462,14 @@ sub saveExport_handler {
 	
 	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
 
-	return 	CGI::div( {class=>$resultFont},
-	    $numExported . " set" . ($numExported == 1 ? "" : "s") . " exported, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped."
-		. (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")
-		);
+	return 	CGI::div({class=>$resultFont}, $r->maketext("[_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])", $numExported, $numSkipped, (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")));
 
 }
 
 sub cancelEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon changes"));
 }
 
 sub cancelEdit_handler {
@@ -1412,12 +1487,13 @@ sub cancelEdit_handler {
 	}
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes abandoned"));
 }
 
 sub saveEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Save changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Save changes"));
 }
 
 sub saveEdit_handler {
@@ -1446,20 +1522,20 @@ sub saveEdit_handler {
 		my $curr_time = time;
 		my $seconds_per_year = 31_556_926;
 		my $cutoff = $curr_time + $seconds_per_year*10;
-		return CGI::div({class=>'ResultsWithError'}, "Error: open date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->open_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: due date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: due date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->due_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: answer date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->answer_date > $cutoff;
 		
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date)  {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Due date must come after open date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Due date must come after open date in set [_1]", $setID));
 		}
 		if ($Set->due_date > $Set->answer_date) {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Answer date must come after due date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Answer date must come after due date in set [_1]", $setID));
 		}
 		
 		$db->putGlobalSet($Set);
@@ -1475,7 +1551,7 @@ sub saveEdit_handler {
 	
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes saved") );
 }
 
 sub duplicate_form {
@@ -1487,12 +1563,16 @@ sub duplicate_form {
 	return "" unless @visible_sets == 1;
 	
 	return join ("", 
-		"Duplicate this set and name it: ", 
-		CGI::textfield(
-			-name => "action.duplicate.name",
-			-value => $actionParams{"action.duplicate.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"duplicate_text",
+			-label_text=>$r->maketext("Duplicate this set and name it").": ",
+			-input_attr=>{
+				-name => "action.duplicate.name",
+				-value => $actionParams{"action.duplicate.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1504,11 +1584,11 @@ sub duplicate_handler {
 	my $db = $r->db;
 	
 	my $oldSetID = $self->{selectedSetIDs}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless defined($oldSetID) and $oldSetID =~ /\S/;	
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless defined($oldSetID) and $oldSetID =~ /\S/;	
 	my $newSetID = $actionParams->{"action.duplicate.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set name specified!") unless $newSetID =~ /\S/;		
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set name specified!")) unless $newSetID =~ /\S/;		
 	# DBFIXME checking for existence -- don't need to fetch
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: set $newSetID already exists!") if defined $db->getGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: set [_1] already exists!", $newSetID)) if defined $db->getGlobalSet($newSetID);
 
 	my $newSet = $db->getGlobalSet($oldSetID);
 	$newSet->set_id($newSetID);
@@ -1522,9 +1602,9 @@ sub duplicate_handler {
 	
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: [_1]", $@)) if $@;
 	
-	return "SUCCESS";
+	return $r->maketext("Success");
 }
 
 ################################################################################
@@ -1540,22 +1620,26 @@ sub bySetID         { $a->set_id         cmp $b->set_id         }
 #FIXME  eventually we may be able to remove these checks, if we can trust 
 # that the dates are always defined
 # dates which are the empty string '' or undefined  are treated as 0
-sub byOpenDate      { my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
+sub byOpenDate      {
+					  my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
                       return $result unless $@;
                       warn "Open date not correctly defined.";
                       return 0;
 }
-sub byDueDate       { my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
+sub byDueDate       { 
+					  my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
                       return $result unless $@;
                       warn "Due date not correctly defined.";
                       return 0;
 }
-sub byAnswerDate    { my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
+sub byAnswerDate    { 
+					  my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
                       return $result unless $@;
                       warn "Answer date not correctly defined.";
                       return 0;
 }
-sub byVisible     { my $result = eval{$a->visible      cmp $b->visible   };      
+sub byVisible     {   
+					  my $result = eval{$a->visible      cmp $b->visible   };      
                       return $result unless $@;
                       warn "Visibility status not correctly defined.";
                       return 0;
@@ -1595,7 +1679,7 @@ sub importSetsFromDef {
 
 	# FIXME: do we really want everything to fail on one bad file name?
 	foreach my $fileName (@setDefFiles) {
-		die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
+		die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
 			unless -r "$dir/$fileName";
 	}
 
@@ -1661,7 +1745,7 @@ sub importSetsFromDef {
 
 		#create the set
 		eval {$db->addGlobalSet($newSetRecord)};
-		die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
+		die $r->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
 
 		#do we need to add locations to the set_locations table?
 		if ( $restrictIP ne 'No' && $restrictLoc ) {
@@ -1671,18 +1755,13 @@ sub importSetsFromDef {
 					$newSetLocation->set_id( $setName );
 					$newSetLocation->location_id( $restrictLoc );
 					eval {$db->addGlobalSetLocation($newSetLocation)};
-					warn("error adding set location $restrictLoc " .
-					     "for set $setName: $@") if $@;
+					warn($r->maketext("error adding set location [_1] for set [_2]: [_3]", $restrictLoc, $setName, $@)) if $@;
 				} else {
 					# this should never happen.
-					warn("input set location $restrictLoc" .
-					     " already exists for set " . 
-					     "$setName.\n");
+					warn($r->maketext("input set location [_1] already exists for set [_2].", $restrictLoc, $setName)."\n");
 				}
 			} else { 
-				warn("restriction location $restrictLoc " .
-				     "does not exist.  IP restrictions have " .
-				     "been ignored.\n");
+				warn($r->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.", $restrictLoc)."\n");
 				$newSetRecord->restrict_ip('No');
 				$newSetRecord->relax_restrict_ip('No');
 				eval { $db->putGlobalSet($newSetRecord) };
@@ -1725,6 +1804,8 @@ sub readSetDef {
 	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
+	
+	my $r = $self->r;
 
 	if ($fileName =~ m|^set([.\w-]+)\.def$|) {
 		$setName = $1;
@@ -1817,7 +1898,7 @@ sub readSetDef {
 			} elsif ($item eq 'problemList') {
 				last;
 			} else {
-				warn "readSetDef error, can't read the line: ||$line||";
+				warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
 			}
 		}
 
@@ -1827,7 +1908,7 @@ sub readSetDef {
 		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
 	
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronological order.";
+			warn $r->maketext("The open date: [_1], due date: [_2], and answer date: [_3] must be defined and in chronological order.", $openDate, $dueDate, $answerDate);
 		}
 
 		# Check header file names
@@ -1844,26 +1925,21 @@ sub readSetDef {
 		# check that the values for hideWork and hideScore are valid
 		if ( $hideScore ne 'N' && $hideScore ne 'Y' && 
 		     $hideScore ne 'BeforeAnswerDate' ) {
-			warn("The value $hideScore for the hideScore option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScore)."\n");
 			$hideScore = 'N';
 		}
 		if ( $hideWork ne 'N' && $hideWork ne 'Y' && 
 		     $hideWork ne 'BeforeAnswerDate' ) {
-			warn("The value $hideWork for the hideWork option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.", $hideWork)."\n");
 			$hideWork = 'N';
 		}
 		if ( $timeCap ne '0' && $timeCap ne '1' ) {
-			warn("The value $timeCap for the capTimeLimit option " .
-			     "is not valid; it will be replaced with '0'.\n");
+			warn($r->maketext("The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.", $timeCap)."\n");
 			$timeCap = '0';
 		}
 		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
 		     $restrictIP ne 'RestrictTo' ) {
-			warn("The value $restrictIP for the restrictIP " .
-			     "option is not valid; it will be replaced " . 
-			     "with 'No'.\n");
+			warn($r->maketext("The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.", $restrictIP)."\n");
 			$restrictIP = 'No';
 			$restrictLoc = '';
 			$relaxRestrictIP = 'No';
@@ -1871,9 +1947,7 @@ sub readSetDef {
 		if ( $relaxRestrictIP ne 'No' && 
 		     $relaxRestrictIP ne 'AfterAnswerDate' &&
 		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
-			warn("The value $relaxRestrictIP for the " .
-			     "relaxRestrictIP option is not valid; it will " . 
-			     "be replaced with 'No'.\n");
+			warn($r->maketext("The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.", $relaxRestrictIP)."\n");
 			$relaxRestrictIP = 'No';
 		}
 		# to verify that restrictLoc is valid requires a database
@@ -1943,7 +2017,7 @@ sub readSetDef {
 		 $relaxRestrictIP,
 		);
 	} else {
-		warn "Can't open file $filePath\n";
+		warn $r->maketext("Can't open file [_1]", $filePath)."\n";
 	}
 }
 
@@ -1964,14 +2038,14 @@ SET:	foreach my $set (keys %filenames) {
 		# files can be exported to sub directories but not parent directories
 		if ($fileName =~ /\.\./) {
 			push @skipped, $set;
-			$reason{$set} = "Illegal filename contains '..'";
+			$reason{$set} = $r->maketext("Illegal filename contains '..'");
 			next SET;
 		}
 
 		my $setRecord = $db->getGlobalSet($set);
 		unless (defined $setRecord) {
 			push @skipped, $set;
-			$reason{$set} = "No record found.";
+			$reason{$set} = $r->maketext("No record found.");
 			next SET;
 		}
 		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
@@ -1979,7 +2053,7 @@ SET:	foreach my $set (keys %filenames) {
 		# back up existing file
 		if(-e $filePath) {
 			rename($filePath, "$filePath.bak") or 
-				$reason{$set} = "Existing file $filePath could not be backed up and was lost.";
+				$reason{$set} = $r->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
 		}
 		
 		my $openDate     = $self->formatDateTime($setRecord->open_date);
@@ -1995,7 +2069,7 @@ SET:	foreach my $set (keys %filenames) {
 			my $problemRecord = $db->getGlobalProblem($set, $prob); # checked
 			unless (defined $problemRecord) {
 				push @skipped, $set;
-				$reason{$set} = "No record found for problem $prob.";
+				$reason{$set} = $r->maketext("No record found for problem [_1].", $prob);
 				next SET;
 			}
 			my $source_file   = $problemRecord->source_file();
@@ -2065,7 +2139,7 @@ EOF
 		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
 		eval {
 			local *SETDEF;
-			open SETDEF, ">$filePath" or die "Failed to open $filePath";
+			open SETDEF, ">$filePath" or die $r->maketext("Failed to open [_1]", $filePath);
 			print SETDEF $fileContents;
 			close SETDEF;
 		};
@@ -2088,7 +2162,7 @@ EOF
 ################################################################################
 
 sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
+	my ($self, $fieldName, $value, $properties, $dateTimeScripts) = @_;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
@@ -2101,16 +2175,130 @@ sub fieldEditHTML {
 	}
 	
 	if ($type eq "number" or $type eq "text") {
-		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+		my $id = $fieldName."_id";
+		my $out = CGI::input({type=>"text", name=>$fieldName, id=>$id, value=>"", size=>$size});
+		my $content = "";
+		my $bareName = "";
+		my $timezone = substr($value, -3);
+		
+		if(index($fieldName, ".open_date") != -1){
+			my @temp = split(/.open_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.open_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testopenDate = new Date(dateText);
+            var testdueDate = new Date(dueDateTextBox.val());
+            if (testopenDate > testdueDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var open = \$(this).datetimepicker('getDate');
+		var open_obj = new Date(open.getTime());
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'minDate', open_obj);
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".due_date") != -1){
+			my @temp = split(/.due_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.due_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+		var openDateTextBox = \$('#$bareName\\\\.open_date_id');
+        var answersDateTextBox = \$('#$bareName\\\\.answer_date_id');
+
+        if (openDateTextBox.val() != '') {
+            var testopenDate = new Date(openDateTextBox.val());
+			var testdueDate = new Date(dateText);
+            if (testopenDate > testdueDate)
+                openDateTextBox.val(dateText);
+        }
+        else {
+            openDateTextBox.val(dateText);
+        }
+
+		if (answersDateTextBox.val() != '') {
+			var testdueDate = new Date(dateText);
+			var testanswersDate = new Date(answersDateTextBox.val());
+			if(testdueDate > testanswersDate)
+				answersDateTextBox.val(dateText);
+		}
+		else {
+			answersDateTextBox.val(dateText);
+		}
+    },
+    onSelect: function (selectedDateTime){
+        var due = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.open_date_id').datetimepicker('option', 'maxDate', new Date(due.getTime()));
+		\$('#$bareName\\\\.answer_date_id').datetimepicker('option', 'minDate', new Date(due.getTime()));
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".answer_date") != -1){
+			my @temp = split(/.answer_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.answer_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testdueDate = new Date(dueDateTextBox.val());
+            var testanswersDate = new Date(dateText);
+            if (testdueDate > testanswersDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var answers = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'maxDate', new Date(answers.getTime()));
+    }
+});
+CONTENT
+		}
+		
+		push @$dateTimeScripts, $content;
+		return $out;
 	}
 	
 	if ($type eq "filelist") {
-		return CGI::popup_menu({
-			name => $fieldName,
-			value => [ sort keys %$headerFiles ],
-			labels => $headerFiles,
-			default => $value || 0,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName,
+				value => [ sort keys %$headerFiles ],
+				labels => $headerFiles,
+				default => $value || 0,
+			}
+		),
 	}
 
 	if ($type eq "enumerable") {
@@ -2128,12 +2316,17 @@ sub fieldEditHTML {
 			$value = $synonyms->{"*"};
 		}
 		
-		return CGI::popup_menu({
-			name => $fieldName, 
-			values => [keys %$items],
-			default => $value,
-			labels => $items,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName, 
+				values => [keys %$items],
+				default => $value,
+				labels => $items,
+			}
+		),
 	}
 	
 	if ($type eq "checked") {
@@ -2141,11 +2334,16 @@ sub fieldEditHTML {
 		# FIXME: kludge (R)
 		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
 		# in which case the hidden field overrides the parameter with a 0
-		return CGI::checkbox(
-			-name => $fieldName,
-			-checked => $value,
-			-label => "",
-			-value => 1
+		return WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				-name => $fieldName,
+				-checked => $value,
+				-label => "",
+				-value => 1
+			}
 		) . CGI::hidden(
 			-name => $fieldName,
 			-value => 0
@@ -2168,8 +2366,8 @@ sub recordEditHTML {
 	my $exportMode = $options{exportMode};
 	my $setSelected = $options{setSelected};
 
-	my $visibleClass = $Set->visible ? "visible" : "hidden";
-	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? 'Reduced Credit Enabled' : 'Reduced Credit Disabled';
+	my $visibleClass = $Set->visible ? $r->maketext("visible") : $r->maketext("hidden");
+	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? $r->maketext('Reduced Credit Enabled') : $r->maketext('Reduced Credit Disabled');
 
 	my $users = $db->countSetUsers($Set->set_id);
 	my $totalUsers = $self->{totalUsers};
@@ -2199,26 +2397,39 @@ sub recordEditHTML {
 					: CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
 	$fakeRecord{filename} = CGI::input({-name => "set.$set_id", -value=>"set$set_id.def", -size=>60});
 					
-		
+	
 	# Select
 	if ($editMode) {
 		# column not there
 	} else {
 		# selection checkbox
-		push @tableCells, CGI::checkbox(
-			-name => "selected_sets",
-			-value => $set_id,
-			-checked => $setSelected,
-			-label => "",
+		# Set ID
+		my $label = "";
+		if ($editMode) {
+			$label = CGI::a({href=>$problemListURL}, "$set_id");
+		} else {		
+			$label = CGI::font({class=>$visibleClass}, $set_id . $imageLink);
+		}
+		
+		push @tableCells, WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$set_id."_id",
+			-label_text=>$label,
+			-input_attr=>$setSelected ?
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-checked => "checked",
+				-class => "table_checkbox",
+			}
+			:
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-class => "table_checkbox",
+			}
 		);
 	}
-	
-	# Set ID
-	if ($editMode) {
-		push @tableCells, CGI::a({href=>$problemListURL}, "$set_id");
-	} else {		
-	push @tableCells, CGI::font({class=>$visibleClass}, $set_id . $imageLink);
-	}
 
 	# Problems link
 	if ($editMode) {
@@ -2249,6 +2460,10 @@ sub recordEditHTML {
 	# make a hash out of this so we can test membership easily
 	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
 	
+	my @chooseDateTimeScripts = ();
+	
+	push @chooseDateTimeScripts, "addOnLoadEvent(function() {";
+
 	# Set Fields
 	foreach my $field (@fieldsToShow) {
 		next unless exists $nonkeyfields{$field};
@@ -2258,15 +2473,20 @@ sub recordEditHTML {
 		$properties{access} = "readonly" unless $editMode;
 		$fieldValue = $self->formatDateTime($fieldValue) if $field =~ /_date/;
 		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /visible/ and not $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enable_reduced_scoring/ and not $editMode;
-		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /visible/ and not $editMode;
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enable_reduced_scoring/ and not $editMode;
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties, \@chooseDateTimeScripts));
 		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
-
+	
+	push @chooseDateTimeScripts, "});";
+	
 	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
+	
+	my $out = CGI::Tr({}, CGI::td({}, \@tableCells));
+	my $scripts = CGI::start_script({-type=>"text/javascript"}).(join("", @chooseDateTimeScripts)).CGI::end_script();
 
-	return CGI::Tr({}, CGI::td({}, \@tableCells));
+	return $out.$scripts;
 }
 
 sub printTableHTML {
@@ -2316,22 +2536,25 @@ sub printTableHTML {
 	
 	@headers = sort @headers;
 	my %headers = map { $_ => $_ } @headers;
-	$headers{""} = "Use System Default";
+	$headers{""} = $r->maketext("Use System Default");
 	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
 
 
 	my @tableHeadings = map { $fieldNames{$_} } @realFieldNames;
+	shift @tableHeadings;
 	
 	# prepend selection checkbox? only if we're NOT editing!
 #	unshift @tableHeadings, "Select", "Set", "Problems" unless $editMode;
 
 	# print the table
 	if ($editMode or $exportMode) {
-		print CGI::start_table({});
+		print CGI::start_table({-id=>"set_table_id", -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	} else {
-		print CGI::start_table({-border=>1});
+		print CGI::start_table({-id=>"set_table_id", -border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	}
 	
+	print CGI::caption($r->maketext("Set List"));
+	
 	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
 	
 
@@ -2352,10 +2575,41 @@ sub printTableHTML {
 	##########################################
 	
 	print CGI::p(
-                      CGI::i("No sets shown.  Choose one of the options above to list the sets in the course.")
+                      CGI::i($r->maketext("No sets shown.  Choose one of the options above to list the sets in the course."))
 	) unless @Sets;
 }
 
+# output_JS subroutine
+
+# outputs all of the Javascript required for this page
+
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-1.8.18.custom.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-timepicker-addon.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/form_checker_hmwksets.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/hmwksets_handlers.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/show_hide.js"}), CGI::end_script();
+	return "";
+}
+
+# Just tells template to output the stylesheet for Tabber
+sub output_tabber_CSS{
+	return "";
+}
+
+#Tells template to output stylesheet for Jquery-UI
+sub output_jquery_ui_CSS{
+	return "";
+}
+
 1;
 
 =head1 AUTHOR
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index 919041b220..818f0501ce 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -1,8 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: WeBWorK Online Homework System\n"
@@ -18,7 +13,7 @@ msgstr ""
 
 #
 msgid "_REDUCED_CREDIT_MESSAGE_1"
-msgstr "This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3 % of the original."
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3\% of the original."
 
 #
 msgid "_REQUEST_ERROR"
@@ -50,7 +45,7 @@ msgstr "Prev"
 
 #
 msgid "navProbListGrey"
-msgstr "Up"
+msgstr "tr: Up"
 
 #
 msgid "navNextGrey"
@@ -62,7 +57,7 @@ msgstr "This is the classlist editor page, where you can view and edit the recor
 
 #
 msgid "_REDUCED_CREDIT_MESSAGE_2"
-msgstr "This assignment had a Reduced Credit Period that began %1 andended on the due date, %2.  During that period all additional work done counted %3 % of the original."
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 andended on the due date, %2.  During that period all additional work done counted %3\% of the original."
 
 #
 msgid "_LOGIN_MESSAGE"
@@ -80,3 +75,6 @@ msgstr "Prev"
 msgid "_GUEST_LOGIN_MESSAGE"
 msgstr "This course supports guest logins. Click %1 to log into this course as a guest."
 
+#
+msgid "_PROBLEM_SET_SUMMARY"
+msgstr "This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."

From 91d5c1188929940516d1f5e9319876ea2149c17f Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Fri, 23 Mar 2012 20:44:14 -0400
Subject: [PATCH 03/73] ghe3: implemented Datepicker (commit2)

---
 htdocs/css/jquery-ui-1.8.18.custom.css   |  573 ++++++++++
 htdocs/js/jquery-1.7.1.min.js            |    4 +
 htdocs/js/jquery-ui-1.8.18.custom.min.js |  356 ++++++
 htdocs/js/jquery-ui-timepicker-addon.js  | 1326 ++++++++++++++++++++++
 4 files changed, 2259 insertions(+)
 create mode 100644 htdocs/css/jquery-ui-1.8.18.custom.css
 create mode 100644 htdocs/js/jquery-1.7.1.min.js
 create mode 100644 htdocs/js/jquery-ui-1.8.18.custom.min.js
 create mode 100644 htdocs/js/jquery-ui-timepicker-addon.js

diff --git a/htdocs/css/jquery-ui-1.8.18.custom.css b/htdocs/css/jquery-ui-1.8.18.custom.css
new file mode 100644
index 0000000000..97e1dd84a8
--- /dev/null
+++ b/htdocs/css/jquery-ui-1.8.18.custom.css
@@ -0,0 +1,573 @@
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.18
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+
+/* css for timepicker */
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 85px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
\ No newline at end of file
diff --git a/htdocs/js/jquery-1.7.1.min.js b/htdocs/js/jquery-1.7.1.min.js
new file mode 100644
index 0000000000..ee0233703d
--- /dev/null
+++ b/htdocs/js/jquery-1.7.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.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 contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.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|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={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,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/htdocs/js/jquery-ui-1.8.18.custom.min.js b/htdocs/js/jquery-ui-1.8.18.custom.min.js
new file mode 100644
index 0000000000..f00a62f133
--- /dev/null
+++ b/htdocs/js/jquery-ui-1.8.18.custom.min.js
@@ -0,0 +1,356 @@
+/*!
+ * jQuery UI 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */(function(a,b){function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;if(!b.href||!g||f.nodeName.toLowerCase()!=="map")return!1;h=a("img[usemap=#"+g+"]")[0];return!!h&&d(h)}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}a.ui=a.ui||{};a.ui.version||(a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d){function h(b,c,d,f){a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)});return c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){if(c===b)return g["inner"+d].call(this);return this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){if(typeof b!="number")return g["outer"+d].call(this,b);return this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!!d&&!!a.element[0].parentNode)for(var e=0;e<d.length;e++)a.options[d[e][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(b,c){if(a(b).css("overflow")==="hidden")return!1;var d=c&&c==="left"?"scrollLeft":"scrollTop",e=!1;if(b[d]>0)return!0;b[d]=1,e=b[d]>0,b[d]=0;return e},isOverAxis:function(a,b,c){return a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.ui.isOverAxis(c,e,g)}}))})(jQuery);/*!
+ * jQuery UI Widget 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */(function(a,b){if(a.cleanData){var c=a.cleanData;a.cleanData=function(b){for(var d=0,e;(e=b[d])!=null;d++)try{a(e).triggerHandler("remove")}catch(f){}c(b)}}else{var d=a.fn.remove;a.fn.remove=function(b,c){return this.each(function(){c||(!b||a.filter(b,[this]).length)&&a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b){}});return d.call(a(this),b,c)})}}a.widget=function(b,c,d){var e=b.split(".")[0],f;b=b.split(".")[1],f=e+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][f]=function(c){return!!a.data(c,b)},a[e]=a[e]||{},a[e][b]=function(a,b){arguments.length&&this._createWidget(a,b)};var g=new c;g.options=a.extend(!0,{},g.options),a[e][b].prototype=a.extend(!0,g,{namespace:e,widgetName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBaseClass:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=function(c,d){a.fn[c]=function(e){var f=typeof e=="string",g=Array.prototype.slice.call(arguments,1),h=this;e=!f&&g.length?a.extend.apply(null,[!0,e].concat(g)):e;if(f&&e.charAt(0)==="_")return h;f?this.each(function(){var d=a.data(this,c),f=d&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!==d&&f!==b){h=f;return!1}}):this.each(function(){var b=a.data(this,c);b?b.option(e||{})._init():a.data(this,c,new d(e,this))});return h}},a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this),this.element=a(c),this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this._create(),this._trigger("create"),this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled")},widget:function(){return this.element},option:function(c,d){var e=c;if(arguments.length===0)return a.extend({},this.options);if(typeof c=="string"){if(d===b)return this.options[c];e={},e[c]=d}this._setOptions(e);return this},_setOptions:function(b){var c=this;a.each(b,function(a,b){c._setOption(a,b)});return this},_setOption:function(a,b){this.options[a]=b,a==="disabled"&&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",b);return this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);this.element.trigger(c,d);return!(a.isFunction(g)&&g.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);/*!
+ * jQuery UI Mouse 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */(function(a,b){var c=!1;a(document).mouseup(function(a){c=!1}),a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){if(!0===a.data(c.target,b.widgetName+".preventClickEvent")){a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation();return!1}}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(b){if(!c){this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var d=this,e=b.which==1,f=typeof this.options.cancel=="string"&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=this._mouseStart(b)!==!1;if(!this._mouseStarted){b.preventDefault();return!0}}!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return d._mouseMove(a)},this._mouseUpDelegate=function(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),c=!0;return!0}},_mouseMove:function(b){if(a.browser.msie&&!(document.documentMode>=9)&&!b.button)return this._mouseUp(b);if(this._mouseStarted){this._mouseDrag(b);return b.preventDefault()}this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b));return!this._mouseStarted},_mouseUp:function(b){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b));return!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);/*
+ * jQuery UI Position 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */(function(a,b){a.ui=a.ui||{};var c=/left|center|right/,d=/top|center|bottom/,e="center",f={},g=a.fn.position,h=a.fn.offset;a.fn.position=function(b){if(!b||!b.of)return g.apply(this,arguments);b=a.extend({},b);var h=a(b.of),i=h[0],j=(b.collision||"flip").split(" "),k=b.offset?b.offset.split(" "):[0,0],l,m,n;i.nodeType===9?(l=h.width(),m=h.height(),n={top:0,left:0}):i.setTimeout?(l=h.width(),m=h.height(),n={top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at="left top",l=m=0,n={top:b.of.pageY,left:b.of.pageX}):(l=h.outerWidth(),m=h.outerHeight(),n=h.offset()),a.each(["my","at"],function(){var a=(b[this]||"").split(" ");a.length===1&&(a=c.test(a[0])?a.concat([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=c.test(a[0])?a[0]:e,a[1]=d.test(a[1])?a[1]:e,b[this]=a}),j.length===1&&(j[1]=j[0]),k[0]=parseInt(k[0],10)||0,k.length===1&&(k[1]=k[0]),k[1]=parseInt(k[1],10)||0,b.at[0]==="right"?n.left+=l:b.at[0]===e&&(n.left+=l/2),b.at[1]==="bottom"?n.top+=m:b.at[1]===e&&(n.top+=m/2),n.left+=k[0],n.top+=k[1];return this.each(function(){var c=a(this),d=c.outerWidth(),g=c.outerHeight(),h=parseInt(a.curCSS(this,"marginLeft",!0))||0,i=parseInt(a.curCSS(this,"marginTop",!0))||0,o=d+h+(parseInt(a.curCSS(this,"marginRight",!0))||0),p=g+i+(parseInt(a.curCSS(this,"marginBottom",!0))||0),q=a.extend({},n),r;b.my[0]==="right"?q.left-=d:b.my[0]===e&&(q.left-=d/2),b.my[1]==="bottom"?q.top-=g:b.my[1]===e&&(q.top-=g/2),f.fractions||(q.left=Math.round(q.left),q.top=Math.round(q.top)),r={left:q.left-h,top:q.top-i},a.each(["left","top"],function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position={fit:{left:function(b,c){var d=a(window),e=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft();b.left=e>0?b.left-e:Math.max(b.left-c.collisionPosition.left,b.left)},top:function(b,c){var d=a(window),e=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=e>0?b.top-e:Math.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c.at[0]!==e){var d=a(window),f=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft(),g=c.my[0]==="left"?-c.elemWidth:c.my[0]==="right"?c.elemWidth:0,h=c.at[0]==="left"?c.targetWidth:-c.targetWidth,i=-2*c.offset[0];b.left+=c.collisionPosition.left<0?g+h+i:f>0?g+h+i:0}},top:function(b,c){if(c.at[1]!==e){var d=a(window),f=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop(),g=c.my[1]==="top"?-c.elemHeight:c.my[1]==="bottom"?c.elemHeight:0,h=c.at[1]==="top"?c.targetHeight:-c.targetHeight,i=-2*c.offset[1];b.top+=c.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}}},a.offset.setOffset||(a.offset.setOffset=function(b,c){/static/.test(a.curCSS(b,"position"))&&(b.style.position="relative");var d=a(b),e=d.offset(),f=parseInt(a.curCSS(b,"top",!0),10)||0,g=parseInt(a.curCSS(b,"left",!0),10)||0,h={top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.call(b,h):d.css(h)},a.fn.offset=function(b){var c=this[0];if(!c||!c.ownerDocument)return null;if(b)return this.each(function(){a.offset.setOffset(this,b)});return h.call(this)}),function(){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d,e,g,h,i;d=document.createElement(b?"div":"body"),g={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=g[j];d.appendChild(c),e=b||document.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText="position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;",h=a(c).offset(function(a,b){return b}).offset(),d.innerHTML="",e.removeChild(d),i=h.top+h.left+(b?2e3:0),f.fractions=i>21&&i<22}()})(jQuery);/*
+ * jQuery UI Draggable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1},_create:function(){this.options.helper=="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},destroy:function(){if(!!this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy();return this}},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is(".ui-resizable-handle"))return!1;this.handle=this._getHandle(b);if(!this.handle)return!1;c.iframeFix&&a(c.iframeFix===!0?"iframe":c.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(a(this).offset()).appendTo("body")});return!0},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b),this._cacheHelperProportions(),a.ui.ddmanager&&(a.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt),c.containment&&this._setContainment();if(this._trigger("start",b)===!1){this._clear();return!1}this._cacheHelperProportions(),a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.helper.addClass("ui-draggable-dragging"),this._mouseDrag(b,!0),a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,b);return!0},_mouseDrag:function(b,c){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute");if(!c){var d=this._uiHash();if(this._trigger("drag",b,d)===!1){this._mouseUp({});return!1}this.position=d.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,b);return!1},_mouseStop:function(b){var c=!1;a.ui.ddmanager&&!this.options.dropBehaviour&&(c=a.ui.ddmanager.drop(this,b)),this.dropped&&(c=this.dropped,this.dropped=!1);if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return!1;if(this.options.revert=="invalid"&&!c||this.options.revert=="valid"&&c||this.options.revert===!0||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,c)){var d=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){d._trigger("stop",b)!==!1&&d._clear()})}else this._trigger("stop",b)!==!1&&this._clear();return!1},_mouseUp:function(b){this.options.iframeFix===!0&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,b);return a.ui.mouse.prototype._mouseUp.call(this,b)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?!0:!1;a(this.options.handle,this.element).find("*").andSelf().each(function(){this==b.target&&(c=!0)});return c},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b])):c.helper=="clone"?this.element.clone().removeAttr("id"):this.element;d.parents("body").length||d.appendTo(c.appendTo=="parent"?this.element[0].parentNode:c.appendTo),d[0]!=this.element[0]&&!/(fixed|absolute)/.test(d.css("position"))&&d.css("position","absolute");return d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[b.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,b.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(b.containment=="document"?0:a(window).scrollLeft())+a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(b.containment=="document"?0:a(window).scrollTop())+(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)&&b.containment.constructor!=Array){var c=a(b.containment),d=c[0];if(!d)return;var e=c.offset(),f=a(d).css("overflow")!="hidden";this.containment=[(parseInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft"),10)||0),(parseInt(a(d).css("borderTopWidth"),10)||0)+(parseInt(a(d).css("paddingTop"),10)||0),(f?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(f?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(a(d).css("borderTopWidth"),10)||0)-(parseInt(a(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=c}else b.containment.constructor==Array&&(this.containment=b.containment)},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName),f=b.pageX,g=b.pageY;if(this.originalPosition){var h;if(this.containment){if(this.relative_container){var i=this.relative_container.offset();h=[this.containment[0]+i.left,this.containment[1]+i.top,this.containment[2]+i.left,this.containment[3]+i.top]}else h=this.containment;b.pageX-this.offset.click.left<h[0]&&(f=h[0]+this.offset.click.left),b.pageY-this.offset.click.top<h[1]&&(g=h[1]+this.offset.click.top),b.pageX-this.offset.click.left>h[2]&&(f=h[2]+this.offset.click.left),b.pageY-this.offset.click.top>h[3]&&(g=h[3]+this.offset.click.top)}if(c.grid){var j=c.grid[1]?this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1]:this.originalPageY;g=h?j-this.offset.click.top<h[1]||j-this.offset.click.top>h[3]?j-this.offset.click.top<h[1]?j+c.grid[1]:j-c.grid[1]:j:j;var k=c.grid[0]?this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0]:this.originalPageX;f=h?k-this.offset.click.left<h[0]||k-this.offset.click.left>h[2]?k-this.offset.click.left<h[0]?k+c.grid[0]:k-c.grid[0]:k:k}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(b,c,d){d=d||this._uiHash(),a.ui.plugin.call(this,b,[c,d]),b=="drag"&&(this.positionAbs=this._convertPositionTo("absolute"));return a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(a){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),a.extend(a.ui.draggable,{version:"1.8.18"}),a.ui.plugin.add("draggable","connectToSortable",{start:function(b,c){var d=a(this).data("draggable"),e=d.options,f=a.extend({},c,{item:d.element});d.sortables=[],a(e.connectToSortable).each(function(){var c=a.data(this,"sortable");c&&!c.options.disabled&&(d.sortables.push({instance:c,shouldRevert:c.options.revert}),c.refreshPositions(),c._trigger("activate",b,f))})},stop:function(b,c){var d=a(this).data("draggable"),e=a.extend({},c,{item:d.element});a.each(d.sortables,function(){this.instance.isOver?(this.instance.isOver=0,d.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(b),this.instance.options.helper=this.instance.options._helper,d.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",b,e))})},drag:function(b,c){var d=a(this).data("draggable"),e=this,f=function(b){var c=this.offset.click.top,d=this.offset.click.left,e=this.positionAbs.top,f=this.positionAbs.left,g=b.height,h=b.width,i=b.top,j=b.left;return a.ui.isOver(e+c,f+d,i,j,g,h)};a.each(d.sortables,function(f){this.instance.positionAbs=d.positionAbs,this.instance.helperProportions=d.helperProportions,this.instance.offset.click=d.offset.click,this.instance._intersectsWith(this.instance.containerCache)?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=a(e).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return c.helper[0]},b.target=this.instance.currentItem[0],this.instance._mouseCapture(b,!0),this.instance._mouseStart(b,!0,!0),this.instance.offset.click.top=d.offset.click.top,this.instance.offset.click.left=d.offset.click.left,this.instance.offset.parent.left-=d.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=d.offset.parent.top-this.instance.offset.parent.top,d._trigger("toSortable",b),d.dropped=this.instance.element,d.currentItem=d.element,this.instance.fromOutside=d),this.instance.currentItem&&this.instance._mouseDrag(b)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",b,this.instance._uiHash(this.instance)),this.instance._mouseStop(b,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),d._trigger("fromSortable",b),d.dropped=!1)})}}),a.ui.plugin.add("draggable","cursor",{start:function(b,c){var d=a("body"),e=a(this).data("draggable").options;d.css("cursor")&&(e._cursor=d.css("cursor")),d.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;d._cursor&&a("body").css("cursor",d._cursor)}}),a.ui.plugin.add("draggable","opacity",{start:function(b,c){var d=a(c.helper),e=a(this).data("draggable").options;d.css("opacity")&&(e._opacity=d.css("opacity")),d.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;d._opacity&&a(c.helper).css("opacity",d._opacity)}}),a.ui.plugin.add("draggable","scroll",{start:function(b,c){var d=a(this).data("draggable");d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML"&&(d.overflowOffset=d.scrollParent.offset())},drag:function(b,c){var d=a(this).data("draggable"),e=d.options,f=!1;if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!="x")d.overflowOffset.top+d.scrollParent[0].offsetHeight-b.pageY<e.scrollSensitivity?d.scrollParent[0].scrollTop=f=d.scrollParent[0].scrollTop+e.scrollSpeed:b.pageY-d.overflowOffset.top<e.scrollSensitivity&&(d.scrollParent[0].scrollTop=f=d.scrollParent[0].scrollTop-e.scrollSpeed);if(!e.axis||e.axis!="y")d.overflowOffset.left+d.scrollParent[0].offsetWidth-b.pageX<e.scrollSensitivity?d.scrollParent[0].scrollLeft=f=d.scrollParent[0].scrollLeft+e.scrollSpeed:b.pageX-d.overflowOffset.left<e.scrollSensitivity&&(d.scrollParent[0].scrollLeft=f=d.scrollParent[0].scrollLeft-e.scrollSpeed)}else{if(!e.axis||e.axis!="x")b.pageY-a(document).scrollTop()<e.scrollSensitivity?f=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<e.scrollSensitivity&&(f=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed));if(!e.axis||e.axis!="y")b.pageX-a(document).scrollLeft()<e.scrollSensitivity?f=a(document).scrollLeft(a(document).scrollLeft()-e.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<e.scrollSensitivity&&(f=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed))}f!==!1&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(d,b)}}),a.ui.plugin.add("draggable","snap",{start:function(b,c){var d=a(this).data("draggable"),e=d.options;d.snapElements=[],a(e.snap.constructor!=String?e.snap.items||":data(draggable)":e.snap).each(function(){var b=a(this),c=b.offset();this!=d.element[0]&&d.snapElements.push({item:this,width:b.outerWidth(),height:b.outerHeight(),top:c.top,left:c.left})})},drag:function(b,c){var d=a(this).data("draggable"),e=d.options,f=e.snapTolerance,g=c.offset.left,h=g+d.helperProportions.width,i=c.offset.top,j=i+d.helperProportions.height;for(var k=d.snapElements.length-1;k>=0;k--){var l=d.snapElements[k].left,m=l+d.snapElements[k].width,n=d.snapElements[k].top,o=n+d.snapElements[k].height;if(!(l-f<g&&g<m+f&&n-f<i&&i<o+f||l-f<g&&g<m+f&&n-f<j&&j<o+f||l-f<h&&h<m+f&&n-f<i&&i<o+f||l-f<h&&h<m+f&&n-f<j&&j<o+f)){d.snapElements[k].snapping&&d.options.snap.release&&d.options.snap.release.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snapping=!1;continue}if(e.snapMode!="inner"){var p=Math.abs(n-j)<=f,q=Math.abs(o-i)<=f,r=Math.abs(l-h)<=f,s=Math.abs(m-g)<=f;p&&(c.position.top=d._convertPositionTo("relative",{top:n-d.helperProportions.height,left:0}).top-d.margins.top),q&&(c.position.top=d._convertPositionTo("relative",{top:o,left:0}).top-d.margins.top),r&&(c.position.left=d._convertPositionTo("relative",{top:0,left:l-d.helperProportions.width}).left-d.margins.left),s&&(c.position.left=d._convertPositionTo("relative",{top:0,left:m}).left-d.margins.left)}var t=p||q||r||s;if(e.snapMode!="outer"){var p=Math.abs(n-i)<=f,q=Math.abs(o-j)<=f,r=Math.abs(l-g)<=f,s=Math.abs(m-h)<=f;p&&(c.position.top=d._convertPositionTo("relative",{top:n,left:0}).top-d.margins.top),q&&(c.position.top=d._convertPositionTo("relative",{top:o-d.helperProportions.height,left:0}).top-d.margins.top),r&&(c.position.left=d._convertPositionTo("relative",{top:0,left:l}).left-d.margins.left),s&&(c.position.left=d._convertPositionTo("relative",{top:0,left:m-d.helperProportions.width}).left-d.margins.left)}!d.snapElements[k].snapping&&(p||q||r||s||t)&&d.options.snap.snap&&d.options.snap.snap.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snapping=p||q||r||s||t}}}),a.ui.plugin.add("draggable","stack",{start:function(b,c){var d=a(this).data("draggable").options,e=a.makeArray(a(d.stack)).sort(function(b,c){return(parseInt(a(b).css("zIndex"),10)||0)-(parseInt(a(c).css("zIndex"),10)||0)});if(!!e.length){var f=parseInt(e[0].style.zIndex)||0;a(e).each(function(a){this.style.zIndex=f+a}),this[0].style.zIndex=f+e.length}}}),a.ui.plugin.add("draggable","zIndex",{start:function(b,c){var d=a(c.helper),e=a(this).data("draggable").options;d.css("zIndex")&&(e._zIndex=d.css("zIndex")),d.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;d._zIndex&&a(c.helper).css("zIndex",d._zIndex)}})})(jQuery);/*
+ * jQuery UI Droppable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */(function(a,b){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect"},_create:function(){var b=this.options,c=b.accept;this.isover=0,this.isout=1,this.accept=a.isFunction(c)?c:function(a){return a.is(c)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},a.ui.ddmanager.droppables[b.scope]=a.ui.ddmanager.droppables[b.scope]||[],a.ui.ddmanager.droppables[b.scope].push(this),b.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];for(var c=0;c<b.length;c++)b[c]==this&&b.splice(c,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(b,c){b=="accept"&&(this.accept=a.isFunction(c)?c:function(a){return a.is(c)}),a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),c&&this._trigger("activate",b,this.ui(c))},_deactivate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),c&&this._trigger("deactivate",b,this.ui(c))},_over:function(b){var c=a.ui.ddmanager.current;!!c&&(c.currentItem||c.element)[0]!=this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",b,this.ui(c)))},_out:function(b){var c=a.ui.ddmanager.current;!!c&&(c.currentItem||c.element)[0]!=this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",b,this.ui(c)))},_drop:function(b,c){var d=c||a.ui.ddmanager.current;if(!d||(d.currentItem||d.element)[0]==this.element[0])return!1;var e=!1;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var b=a.data(this,"droppable");if(b.options.greedy&&!b.options.disabled&&b.options.scope==d.options.scope&&b.accept.call(b.element[0],d.currentItem||d.element)&&a.ui.intersect(d,a.extend(b,{offset:b.element.offset()}),b.options.tolerance)){e=!0;return!1}});if(e)return!1;if(this.accept.call(this.element[0],d.currentItem||d.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",b,this.ui(d));return this.element}return!1},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}}),a.extend(a.ui.droppable,{version:"1.8.18"}),a.ui.intersect=function(b,c,d){if(!c.offset)return!1;var e=(b.positionAbs||b.position.absolute).left,f=e+b.helperProportions.width,g=(b.positionAbs||b.position.absolute).top,h=g+b.helperProportions.height,i=c.offset.left,j=i+c.proportions.width,k=c.offset.top,l=k+c.proportions.height;switch(d){case"fit":return i<=e&&f<=j&&k<=g&&h<=l;case"intersect":return i<e+b.helperProportions.width/2&&f-b.helperProportions.width/2<j&&k<g+b.helperProportions.height/2&&h-b.helperProportions.height/2<l;case"pointer":var m=(b.positionAbs||b.position.absolute).left+(b.clickOffset||b.offset.click).left,n=(b.positionAbs||b.position.absolute).top+(b.clickOffset||b.offset.click).top,o=a.ui.isOver(n,m,k,i,c.proportions.height,c.proportions.width);return o;case"touch":return(g>=k&&g<=l||h>=k&&h<=l||g<k&&h>l)&&(e>=i&&e<=j||f>=i&&f<=j||e<i&&f>j);default:return!1}},a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(b,c){var d=a.ui.ddmanager.droppables[b.options.scope]||[],e=c?c.type:null,f=(b.currentItem||b.element).find(":data(droppable)").andSelf();droppablesLoop:for(var g=0;g<d.length;g++){if(d[g].options.disabled||b&&!d[g].accept.call(d[g].element[0],b.currentItem||b.element))continue;for(var h=0;h<f.length;h++)if(f[h]==d[g].element[0]){d[g].proportions.height=0;continue droppablesLoop}d[g].visible=d[g].element.css("display")!="none";if(!d[g].visible)continue;e=="mousedown"&&d[g]._activate.call(d[g],c),d[g].offset=d[g].element.offset(),d[g].proportions={width:d[g].element[0].offsetWidth,height:d[g].element[0].offsetHeight}}},drop:function(b,c){var d=!1;a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){!this.options||(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)&&(d=this._drop.call(this,c)||d),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],b.currentItem||b.element)&&(this.isout=1,this.isover=0,this._deactivate.call(this,c)))});return d},dragStart:function(b,c){b.element.parents(":not(body,html)").bind("scroll.droppable",function(){b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)})},drag:function(b,c){b.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(b,c),a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var d=a.ui.intersect(b,this,this.options.tolerance),e=!d&&this.isover==1?"isout":d&&this.isover==0?"isover":null;if(!e)return;var f;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");g.length&&(f=a.data(g[0],"droppable"),f.greedyChild=e=="isover"?1:0)}f&&e=="isover"&&(f.isover=0,f.isout=1,f._out.call(f,c)),this[e]=1,this[e=="isout"?"isover":"isout"]=0,this[e=="isover"?"_over":"_out"].call(this,c),f&&e=="isout"&&(f.isout=0,f.isover=1,f._over.call(f,c))}})},dragStop:function(b,c){b.element.parents(":not(body,html)").unbind("scroll.droppable"),b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)}}})(jQuery);/*
+ * jQuery UI Resizable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1e3},_create:function(){var b=this,c=this.options;this.element.addClass("ui-resizable"),a.extend(this,{_aspectRatio:!!c.aspectRatio,aspectRatio:c.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:c.helper||c.ghost||c.animate?c.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("resizable",this.element.data("resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=c.handles||(a(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor==String){this.handles=="all"&&(this.handles="n,e,s,w,se,sw,ne,nw");var d=this.handles.split(",");this.handles={};for(var e=0;e<d.length;e++){var f=a.trim(d[e]),g="ui-resizable-"+f,h=a('<div class="ui-resizable-handle '+g+'"></div>');/sw|se|ne|nw/.test(f)&&h.css({zIndex:++c.zIndex}),"se"==f&&h.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[f]=".ui-resizable-"+f,this.element.append(h)}}this._renderAxis=function(b){b=b||this.element;for(var c in this.handles){this.handles[c].constructor==String&&(this.handles[c]=a(this.handles[c],this.element).show());if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var d=a(this.handles[c],this.element),e=0;e=/sw|ne|nw|se|n|s/.test(c)?d.outerHeight():d.outerWidth();var f=["padding",/ne|nw|n/.test(c)?"Top":/se|sw|s/.test(c)?"Bottom":/^e$/.test(c)?"Right":"Left"].join("");b.css(f,e),this._proportionallyResize()}if(!a(this.handles[c]).length)continue}},this._renderAxis(this.element),this._handles=a(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){if(!b.resizing){if(this.className)var a=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=a&&a[1]?a[1]:"se"}}),c.autoHide&&(this._handles.hide(),a(this.element).addClass("ui-resizable-autohide").hover(function(){c.disabled||(a(this).removeClass("ui-resizable-autohide"),b._handles.show())},function(){c.disabled||b.resizing||(a(this).addClass("ui-resizable-autohide"),b._handles.hide())})),this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(b){a(b).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var c=this.element;c.after(this.originalElement.css({position:c.css("position"),width:c.outerWidth(),height:c.outerHeight(),top:c.css("top"),left:c.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle),b(this.originalElement);return this},_mouseCapture:function(b){var c=!1;for(var d in this.handles)a(this.handles[d])[0]==b.target&&(c=!0);return!this.options.disabled&&c},_mouseStart:function(b){var d=this.options,e=this.element.position(),f=this.element;this.resizing=!0,this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()},(f.is(".ui-draggable")||/absolute/.test(f.css("position")))&&f.css({position:"absolute",top:e.top,left:e.left}),this._renderProxy();var g=c(this.helper.css("left")),h=c(this.helper.css("top"));d.containment&&(g+=a(d.containment).scrollLeft()||0,h+=a(d.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:g,top:h},this.size=this._helper?{width:f.outerWidth(),height:f.outerHeight()}:{width:f.width(),height:f.height()},this.originalSize=this._helper?{width:f.outerWidth(),height:f.outerHeight()}:{width:f.width(),height:f.height()},this.originalPosition={left:g,top:h},this.sizeDiff={width:f.outerWidth()-f.width(),height:f.outerHeight()-f.height()},this.originalMousePosition={left:b.pageX,top:b.pageY},this.aspectRatio=typeof d.aspectRatio=="number"?d.aspectRatio:this.originalSize.width/this.originalSize.height||1;var i=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",i=="auto"?this.axis+"-resize":i),f.addClass("ui-resizable-resizing"),this._propagate("start",b);return!0},_mouseDrag:function(b){var c=this.helper,d=this.options,e={},f=this,g=this.originalMousePosition,h=this.axis,i=b.pageX-g.left||0,j=b.pageY-g.top||0,k=this._change[h];if(!k)return!1;var l=k.apply(this,[b,i,j]),m=a.browser.msie&&a.browser.version<7,n=this.sizeDiff;this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)l=this._updateRatio(l,b);l=this._respectSize(l,b),this._propagate("resize",b),c.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"}),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),this._updateCache(l),this._trigger("resize",b,this.ui());return!1},_mouseStop:function(b){this.resizing=!1;var c=this.options,d=this;if(this._helper){var e=this._proportionallyResizeElements,f=e.length&&/textarea/i.test(e[0].nodeName),g=f&&a.ui.hasScroll(e[0],"left")?0:d.sizeDiff.height,h=f?0:d.sizeDiff.width,i={width:d.helper.width()-h,height:d.helper.height()-g},j=parseInt(d.element.css("left"),10)+(d.position.left-d.originalPosition.left)||null,k=parseInt(d.element.css("top"),10)+(d.position.top-d.originalPosition.top)||null;c.animate||this.element.css(a.extend(i,{top:k,left:j})),d.helper.height(d.size.height),d.helper.width(d.size.width),this._helper&&!c.animate&&this._proportionallyResize()}a("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",b),this._helper&&this.helper.remove();return!1},_updateVirtualBoundaries:function(a){var b=this.options,c,e,f,g,h;h={minWidth:d(b.minWidth)?b.minWidth:0,maxWidth:d(b.maxWidth)?b.maxWidth:Infinity,minHeight:d(b.minHeight)?b.minHeight:0,maxHeight:d(b.maxHeight)?b.maxHeight:Infinity};if(this._aspectRatio||a)c=h.minHeight*this.aspectRatio,f=h.minWidth/this.aspectRatio,e=h.maxHeight*this.aspectRatio,g=h.maxWidth/this.aspectRatio,c>h.minWidth&&(h.minWidth=c),f>h.minHeight&&(h.minHeight=f),e<h.maxWidth&&(h.maxWidth=e),g<h.maxHeight&&(h.maxHeight=g);this._vBoundaries=h},_updateCache:function(a){var b=this.options;this.offset=this.helper.offset(),d(a.left)&&(this.position.left=a.left),d(a.top)&&(this.position.top=a.top),d(a.height)&&(this.size.height=a.height),d(a.width)&&(this.size.width=a.width)},_updateRatio:function(a,b){var c=this.options,e=this.position,f=this.size,g=this.axis;d(a.height)?a.width=a.height*this.aspectRatio:d(a.width)&&(a.height=a.width/this.aspectRatio),g=="sw"&&(a.left=e.left+(f.width-a.width),a.top=null),g=="nw"&&(a.top=e.top+(f.height-a.height),a.left=e.left+(f.width-a.width));return a},_respectSize:function(a,b){var c=this.helper,e=this._vBoundaries,f=this._aspectRatio||b.shiftKey,g=this.axis,h=d(a.width)&&e.maxWidth&&e.maxWidth<a.width,i=d(a.height)&&e.maxHeight&&e.maxHeight<a.height,j=d(a.width)&&e.minWidth&&e.minWidth>a.width,k=d(a.height)&&e.minHeight&&e.minHeight>a.height;j&&(a.width=e.minWidth),k&&(a.height=e.minHeight),h&&(a.width=e.maxWidth),i&&(a.height=e.maxHeight);var l=this.originalPosition.left+this.originalSize.width,m=this.position.top+this.size.height,n=/sw|nw|w/.test(g),o=/nw|ne|n/.test(g);j&&n&&(a.left=l-e.minWidth),h&&n&&(a.left=l-e.maxWidth),k&&o&&(a.top=m-e.minHeight),i&&o&&(a.top=m-e.maxHeight);var p=!a.width&&!a.height;p&&!a.left&&a.top?a.top=null:p&&!a.top&&a.left&&(a.left=null);return a},_proportionallyResize:function(){var b=this.options;if(!!this._proportionallyResizeElements.length){var c=this.helper||this.element;for(var d=0;d<this._proportionallyResizeElements.length;d++){var e=this._proportionallyResizeElements[d];if(!this.borderDif){var f=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],g=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];this.borderDif=a.map(f,function(a,b){var c=parseInt(a,10)||0,d=parseInt(g[b],10)||0;return c+d})}if(a.browser.msie&&(!!a(c).is(":hidden")||!!a(c).parents(":hidden").length))continue;e.css({height:c.height()-this.borderDif[0]-this.borderDif[2]||0,width:c.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var b=this.element,c=this.options;this.elementOffset=b.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var d=a.browser.msie&&a.browser.version<7,e=d?1:0,f=d?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+f,height:this.element.outerHeight()+f,position:"absolute",left:this.elementOffset.left-e+"px",top:this.elementOffset.top-e+"px",zIndex:++c.zIndex}),this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(a,b,c){return{width:this.originalSize.width+b}},w:function(a,b,c){var d=this.options,e=this.originalSize,f=this.originalPosition;return{left:f.left+b,width:e.width-b}},n:function(a,b,c){var d=this.options,e=this.originalSize,f=this.originalPosition;return{top:f.top+c,height:e.height-c}},s:function(a,b,c){return{height:this.originalSize.height+c}},se:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},sw:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,c,d]))},ne:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},nw:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,c,d]))}},_propagate:function(b,c){a.ui.plugin.call(this,b,[c,this.ui()]),b!="resize"&&this._trigger(b,c,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),a.extend(a.ui.resizable,{version:"1.8.18"}),a.ui.plugin.add("resizable","alsoResize",{start:function(b,c){var d=a(this).data("resizable"),e=d.options,f=function(b){a(b).each(function(){var b=a(this);b.data("resizable-alsoresize",{width:parseInt(b.width(),10),height:parseInt(b.height(),10),left:parseInt(b.css("left"),10),top:parseInt(b.css("top"),10)})})};typeof e.alsoResize=="object"&&!e.alsoResize.parentNode?e.alsoResize.length?(e.alsoResize=e.alsoResize[0],f(e.alsoResize)):a.each(e.alsoResize,function(a){f(a)}):f(e.alsoResize)},resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.originalSize,g=d.originalPosition,h={height:d.size.height-f.height||0,width:d.size.width-f.width||0,top:d.position.top-g.top||0,left:d.position.left-g.left||0},i=function(b,d){a(b).each(function(){var b=a(this),e=a(this).data("resizable-alsoresize"),f={},g=d&&d.length?d:b.parents(c.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(g,function(a,b){var c=(e[b]||0)+(h[b]||0);c&&c>=0&&(f[b]=c||null)}),b.css(f)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?a.each(e.alsoResize,function(a,b){i(a,b)}):i(e.alsoResize)},stop:function(b,c){a(this).removeData("resizable-alsoresize")}}),a.ui.plugin.add("resizable","animate",{stop:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d._proportionallyResizeElements,g=f.length&&/textarea/i.test(f[0].nodeName),h=g&&a.ui.hasScroll(f[0],"left")?0:d.sizeDiff.height,i=g?0:d.sizeDiff.width,j={width:d.size.width-i,height:d.size.height-h},k=parseInt(d.element.css("left"),10)+(d.position.left-d.originalPosition.left)||null,l=parseInt(d.element.css("top"),10)+(d.position.top-d.originalPosition.top)||null;d.element.animate(a.extend(j,l&&k?{top:l,left:k}:{}),{duration:e.animateDuration,easing:e.animateEasing,step:function(){var c={width:parseInt(d.element.css("width"),10),height:parseInt(d.element.css("height"),10),top:parseInt(d.element.css("top"),10),left:parseInt(d.element.css("left"),10)};f&&f.length&&a(f[0]).css({width:c.width,height:c.height}),d._updateCache(c),d._propagate("resize",b)}})}}),a.ui.plugin.add("resizable","containment",{start:function(b,d){var e=a(this).data("resizable"),f=e.options,g=e.element,h=f.containment,i=h instanceof a?h.get(0):/parent/.test(h)?g.parent().get(0):h;if(!!i){e.containerElement=a(i);if(/document/.test(h)||h==document)e.containerOffset={left:0,top:0},e.containerPosition={left:0,top:0},e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight};else{var j=a(i),k=[];a(["Top","Right","Left","Bottom"]).each(function(a,b){k[a]=c(j.css("padding"+b))}),e.containerOffset=j.offset(),e.containerPosition=j.position(),e.containerSize={height:j.innerHeight()-k[3],width:j.innerWidth()-k[1]};var l=e.containerOffset,m=e.containerSize.height,n=e.containerSize.width,o=a.ui.hasScroll(i,"left")?i.scrollWidth:n,p=a.ui.hasScroll(i)?i.scrollHeight:m;e.parentData={element:i,left:l.left,top:l.top,width:o,height:p}}}},resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.containerSize,g=d.containerOffset,h=d.size,i=d.position,j=d._aspectRatio||b.shiftKey,k={top:0,left:0},l=d.containerElement;l[0]!=document&&/static/.test(l.css("position"))&&(k=g),i.left<(d._helper?g.left:0)&&(d.size.width=d.size.width+(d._helper?d.position.left-g.left:d.position.left-k.left),j&&(d.size.height=d.size.width/e.aspectRatio),d.position.left=e.helper?g.left:0),i.top<(d._helper?g.top:0)&&(d.size.height=d.size.height+(d._helper?d.position.top-g.top:d.position.top),j&&(d.size.width=d.size.height*e.aspectRatio),d.position.top=d._helper?g.top:0),d.offset.left=d.parentData.left+d.position.left,d.offset.top=d.parentData.top+d.position.top;var m=Math.abs((d._helper?d.offset.left-k.left:d.offset.left-k.left)+d.sizeDiff.width),n=Math.abs((d._helper?d.offset.top-k.top:d.offset.top-g.top)+d.sizeDiff.height),o=d.containerElement.get(0)==d.element.parent().get(0),p=/relative|absolute/.test(d.containerElement.css("position"));o&&p&&(m-=d.parentData.left),m+d.size.width>=d.parentData.width&&(d.size.width=d.parentData.width-m,j&&(d.size.height=d.size.width/d.aspectRatio)),n+d.size.height>=d.parentData.height&&(d.size.height=d.parentData.height-n,j&&(d.size.width=d.size.height*d.aspectRatio))},stop:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.position,g=d.containerOffset,h=d.containerPosition,i=d.containerElement,j=a(d.helper),k=j.offset(),l=j.outerWidth()-d.sizeDiff.width,m=j.outerHeight()-d.sizeDiff.height;d._helper&&!e.animate&&/relative/.test(i.css("position"))&&a(this).css({left:k.left-h.left-g.left,width:l,height:m}),d._helper&&!e.animate&&/static/.test(i.css("position"))&&a(this).css({left:k.left-h.left-g.left,width:l,height:m})}}),a.ui.plugin.add("resizable","ghost",{start:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.size;d.ghost=d.originalElement.clone(),d.ghost.css({opacity:.25,display:"block",position:"relative",height:f.height,width:f.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof e.ghost=="string"?e.ghost:""),d.ghost.appendTo(d.helper)},resize:function(b,c){var d=a(this).data("resizable"),e=d.options;d.ghost&&d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})},stop:function(b,c){var d=a(this).data("resizable"),e=d.options;d.ghost&&d.helper&&d.helper.get(0).removeChild(d.ghost.get(0))}}),a.ui.plugin.add("resizable","grid",{resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.size,g=d.originalSize,h=d.originalPosition,i=d.axis,j=e._aspectRatio||b.shiftKey;e.grid=typeof e.grid=="number"?[e.grid,e.grid]:e.grid;var k=Math.round((f.width-g.width)/(e.grid[0]||1))*(e.grid[0]||1),l=Math.round((f.height-g.height)/(e.grid[1]||1))*(e.grid[1]||1);/^(se|s|e)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l):/^(ne)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l,d.position.top=h.top-l):/^(sw)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l,d.position.left=h.left-k):(d.size.width=g.width+k,d.size.height=g.height+l,d.position.top=h.top-l,d.position.left=h.left-k)}});var c=function(a){return parseInt(a,10)||0},d=function(a){return!isNaN(parseInt(a,10))}})(jQuery);/*
+ * jQuery UI Selectable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch"},_create:function(){var b=this;this.element.addClass("ui-selectable"),this.dragged=!1;var c;this.refresh=function(){c=a(b.options.filter,b.element[0]),c.addClass("ui-selectee"),c.each(function(){var b=a(this),c=b.offset();a.data(this,"selectable-item",{element:this,$element:b,left:c.left,top:c.top,right:c.left+b.outerWidth(),bottom:c.top+b.outerHeight(),startselected:!1,selected:b.hasClass("ui-selected"),selecting:b.hasClass("ui-selecting"),unselecting:b.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=c.addClass("ui-selectee"),this._mouseInit(),this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable"),this._mouseDestroy();return this},_mouseStart:function(b){var c=this;this.opos=[b.pageX,b.pageY];if(!this.options.disabled){var d=this.options;this.selectees=a(d.filter,this.element[0]),this._trigger("start",b),a(d.appendTo).append(this.helper),this.helper.css({left:b.clientX,top:b.clientY,width:0,height:0}),d.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var d=a.data(this,"selectable-item");d.startselected=!0,!b.metaKey&&!b.ctrlKey&&(d.$element.removeClass("ui-selected"),d.selected=!1,d.$element.addClass("ui-unselecting"),d.unselecting=!0,c._trigger("unselecting",b,{unselecting:d.element}))}),a(b.target).parents().andSelf().each(function(){var d=a.data(this,"selectable-item");if(d){var e=!b.metaKey&&!b.ctrlKey||!d.$element.hasClass("ui-selected");d.$element.removeClass(e?"ui-unselecting":"ui-selected").addClass(e?"ui-selecting":"ui-unselecting"),d.unselecting=!e,d.selecting=e,d.selected=e,e?c._trigger("selecting",b,{selecting:d.element}):c._trigger("unselecting",b,{unselecting:d.element});return!1}})}},_mouseDrag:function(b){var c=this;this.dragged=!0;if(!this.options.disabled){var d=this.options,e=this.opos[0],f=this.opos[1],g=b.pageX,h=b.pageY;if(e>g){var i=g;g=e,e=i}if(f>h){var i=h;h=f,f=i}this.helper.css({left:e,top:f,width:g-e,height:h-f}),this.selectees.each(function(){var i=a.data(this,"selectable-item");if(!!i&&i.element!=c.element[0]){var j=!1;d.tolerance=="touch"?j=!(i.left>g||i.right<e||i.top>h||i.bottom<f):d.tolerance=="fit"&&(j=i.left>e&&i.right<g&&i.top>f&&i.bottom<h),j?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,c._trigger("selecting",b,{selecting:i.element}))):(i.selecting&&((b.metaKey||b.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),c._trigger("unselecting",b,{unselecting:i.element}))),i.selected&&!b.metaKey&&!b.ctrlKey&&!i.startselected&&(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,c._trigger("unselecting",b,{unselecting:i.element})))}});return!1}},_mouseStop:function(b){var c=this;this.dragged=!1;var d=this.options;a(".ui-unselecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-unselecting"),d.unselecting=!1,d.startselected=!1,c._trigger("unselected",b,{unselected:d.element})}),a(".ui-selecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected"),d.selecting=!1,d.selected=!0,d.startselected=!0,c._trigger("selected",b,{selected:d.element})}),this._trigger("stop",b),this.helper.remove();return!1}}),a.extend(a.ui.selectable,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Sortable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},destroy:function(){a.Widget.prototype.destroy.call(this),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--)this.items[b].item.removeData(this.widgetName+"-item");return this},_setOption:function(b,c){b==="disabled"?(this.options[b]=c,this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(b,c){var d=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(b);var e=null,f=this,g=a(b.target).parents().each(function(){if(a.data(this,d.widgetName+"-item")==f){e=a(this);return!1}});a.data(b.target,d.widgetName+"-item")==f&&(e=a(b.target));if(!e)return!1;if(this.options.handle&&!c){var h=!1;a(this.options.handle,e).find("*").andSelf().each(function(){this==b.target&&(h=!0)});if(!h)return!1}this.currentItem=e,this._removeCurrentsFromItems();return!0},_mouseStart:function(b,c,d){var e=this.options,f=this;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,e.cursorAt&&this._adjustOffsetFromHelper(e.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setContainment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=a("body").css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!d)for(var g=this.containers.length-1;g>=0;g--)this.containers[g]._trigger("activate",b,f._uiHash(this));a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b);return!0},_mouseDrag:function(b){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var c=this.options,d=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.overflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-this.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(document).scrollTop()<c.scrollSensitivity?d=a(document).scrollTop(a(document).scrollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<c.scrollSensitivity&&(d=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!==!1&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var e=this.items.length-1;e>=0;e--){var f=this.items[e],g=f.item[0],h=this._intersectsWithPointer(f);if(!h)continue;if(g!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],g):!0)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash());break}}this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs;return!1},_mouseStop:function(b,c){if(!!b){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.revert){var d=this,e=d.placeholder.offset();d.reverting=!0,a(this.helper).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-d.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1}},cancel:function(){var b=this;if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",null,b._uiHash(this)),this.containers[c].containerCache.over=0)}this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem));return this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=");return d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")});return d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l=d+j>h&&d+j<i&&b+k>f&&b+k<g;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left,b.width),e=c&&d,f=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();if(!e)return!1;return this.floating?g&&g=="right"||f=="down"?2:1:f&&(f=="down"?2:1)},_intersectsWithSides:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.height/2,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left+b.width/2,b.width),e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return this.floating&&f?f=="right"&&d||f=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a),this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){var c=this,d=[],e=[],f=this._connectWith();if(f&&b)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var g=e.length-1;g>=0;g--)e[g][0].each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:function(){var a=this.currentItem.find(":data("+this.widgetName+"-item)");for(var b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.items=[],this.containers=[this];var c=this.items,d=this,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],f=this._connectWith();if(f&&this.ready)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.items,j.element),j]),this.containers.push(j))}}for(var g=e.length-1;g>=0;g--){var k=e[g][1],l=e[g][0];for(var i=0,m=l.length;i<m;i++){var n=a(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var c=this.items.length-1;c>=0;c--){var d=this.items[c];if(d.instance!=this.currentContainer&&this.currentContainer&&d.item[0]!=this.currentItem[0])continue;var e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item;b||(d.width=e.outerWidth(),d.height=e.outerHeight());var f=e.offset();d.left=f.left,d.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var c=this.containers.length-1;c>=0;c--){var f=this.containers[c].element.offset();this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(b){var c=b||this,d=c.options;if(!d.placeholder||d.placeholder.constructor==String){var e=d.placeholder;d.placeholder={element:function(){var b=a(document.createElement(c.currentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];e||(b.style.visibility="hidden");return b},update:function(a,b){if(!e||!!d.forcePlaceholderSize)b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10))}}}c.placeholder=a(d.placeholder.element.call(c.element,c.currentItem)),c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_contactContainers:function(b){var c=null,d=null;for(var e=this.containers.length-1;e>=0;e--){if(a.ui.contains(this.currentItem[0],this.containers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].containerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]))continue;c=this.containers[e],d=e}else this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.containers[e].containerCache.over=0)}if(!!c)if(this.containers.length===1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1;else if(this.currentContainer!=this.containers[d]){var f=1e4,g=null,h=this.positionAbs[this.containers[d].floating?"left":"top"];for(var i=this.items.length-1;i>=0;i--){if(!a.ui.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var j=this.items[i][this.containers[d].floating?"left":"top"];Math.abs(j-h)<f&&(f=Math.abs(j-h),g=this.items[i])}if(!g&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[d],g?this._rearrange(b,g,null,!0):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("change",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.width==""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].style.height==""||c.forceHelperSize)&&d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)){var c=a(b.containment)[0],d=a(b.containment).offset(),e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var f=b.pageX,g=b.pageY;if(this.originalPosition){this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top));if(c.grid){var h=this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1];g=this.containment?h-this.offset.click.top<this.containment[1]||h-this.offset.click.top>this.containment[3]?h-this.offset.click.top<this.containment[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0];f=this.containment?i-this.offset.click.left<this.containment[0]||i-this.offset.click.left>this.containment[2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this,f=this.counter;window.setTimeout(function(){f==e.counter&&e.refreshPositions(!d)},0)},_clear:function(b,c){this.reverting=!1;var d=[],e=this;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=="auto"||this._storedCSS[f]=="static")this._storedCSS[f]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c&&d.push(function(a){this._trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiHash())});for(var f=this.containers.length-1;f>=0;f--)a.ui.contains(this.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.containers[f])),d.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=this.containers.length-1;f>=0;f--)c||d.push(function(a){return function(b){a._trigger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over&&(d.push(function(a){return function(b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over=0);this._storedCursor&&a("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}return!1}c||this._trigger("beforeStop",b,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!c){for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}this.fromOutside=!1;return!0},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.extend(a.ui.sortable,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Accordion 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:!0,clearStyle:!1,collapsible:!1,event:"click",fillSpace:!1,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:!1,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var b=this,c=b.options;b.running=0,b.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"),b.headers=b.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){c.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){c.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){c.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){c.disabled||a(this).removeClass("ui-state-focus")}),b.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");if(c.navigation){var d=b.element.find("a").filter(c.navigationFilter).eq(0);if(d.length){var e=d.closest(".ui-accordion-header");e.length?b.active=e:b.active=d.closest(".ui-accordion-content").prev()}}b.active=b._findActive(b.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top"),b.active.next().addClass("ui-accordion-content-active"),b._createIcons(),b.resize(),b.element.attr("role","tablist"),b.headers.attr("role","tab").bind("keydown.accordion",function(a){return b._keydown(a)}).next().attr("role","tabpanel"),b.headers.not(b.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide(),b.active.length?b.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):b.headers.eq(0).attr("tabIndex",0),a.browser.safari||b.headers.find("a").attr("tabIndex",-1),c.event&&b.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(a){b._clickHandler.call(b,a,this),a.preventDefault()})},_createIcons:function(){var b=this.options;b.icons&&(a("<span></span>").addClass("ui-icon "+b.icons.header).prependTo(this.headers),this.active.children(".ui-icon").toggleClass(b.icons.header).toggleClass(b.icons.headerSelected),this.element.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.children(".ui-icon").remove(),this.element.removeClass("ui-accordion-icons")},destroy:function(){var b=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex"),this.headers.find("a").removeAttr("tabIndex"),this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");(b.autoHeight||b.fillHeight)&&c.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b=="active"&&this.activate(c),b=="icons"&&(this._destroyIcons(),c&&this._createIcons()),b=="disabled"&&this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(b){if(!(this.options.disabled||b.altKey||b.ctrlKey)){var c=a.ui.keyCode,d=this.headers.length,e=this.headers.index(b.target),f=!1;switch(b.keyCode){case c.RIGHT:case c.DOWN:f=this.headers[(e+1)%d];break;case c.LEFT:case c.UP:f=this.headers[(e-1+d)%d];break;case c.SPACE:case c.ENTER:this._clickHandler({target:b.target},b.target),b.preventDefault()}if(f){a(b.target).attr("tabIndex",-1),a(f).attr("tabIndex",0),f.focus();return!1}return!0}},resize:function(){var b=this.options,c;if(b.fillSpace){if(a.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height(),a.browser.msie&&this.element.parent().css("overflow",d),this.headers.each(function(){c-=a(this).outerHeight(!0)}),this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")}else b.autoHeight&&(c=0,this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c));return this},activate:function(a){this.options.active=a;var b=this._findActive(a)[0];this._clickHandler({target:b},b);return this},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===!1?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(b,c){var d=this.options;if(!d.disabled){if(!b.target){if(!d.collapsible)return;this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),this.active.next().addClass("ui-accordion-content-active");var e=this.active.next(),f={options:d,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:e},g=this.active=a([]);this._toggle(g,e,f);return}var h=a(b.currentTarget||c),i=h[0]===this.active[0];d.active=d.collapsible&&i?!1:this.headers.index(h);if(this.running||!d.collapsible&&i)return;var j=this.active,g=h.next(),e=this.active.next(),f={options:d,newHeader:i&&d.collapsible?a([]):h,oldHeader:this.active,newContent:i&&d.collapsible?a([]):g,oldContent:e},k=this.headers.index(this.active[0])>this.headers.index(h[0]);this.active=i?a([]):h,this._toggle(g,e,f,i,k),j.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),i||(h.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected),h.next().addClass("ui-accordion-content-active"));return}},_toggle:function(b,c,d,e,f){var g=this,h=g.options;g.toShow=b,g.toHide=c,g.data=d;var i=function(){if(!!g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data),g.running=c.size()===0?b.size():c.size();if(h.animated){var j={};h.collapsible&&e?j={toShow:a([]),toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace}:j={toShow:b,toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace},h.proxied||(h.proxied=h.animated),h.proxiedDuration||(h.proxiedDuration=h.duration),h.animated=a.isFunction(h.proxied)?h.proxied(j):h.proxied,h.duration=a.isFunction(h.proxiedDuration)?h.proxiedDuration(j):h.proxiedDuration;var k=a.ui.accordion.animations,l=h.duration,m=h.animated;m&&!k[m]&&!a.easing[m]&&(m="slide"),k[m]||(k[m]=function(a){this.slide(a,{easing:m,duration:l||700})}),k[m](j)}else h.collapsible&&e?b.toggle():(c.hide(),b.show()),i(!0);c.prev().attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).blur(),b.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;this.running||(this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""}),this.toHide.removeClass("ui-accordion-content-active"),this.toHide.length&&(this.toHide.parent()[0].className=this.toHide.parent()[0].className),this._trigger("change",null,this.data))}}),a.extend(a.ui.accordion,{version:"1.8.18",animations:{slide:function(b,c){b=a.extend({easing:"swing",duration:300},b,c);if(!b.toHide.size())b.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},b);else{if(!b.toShow.size()){b.toHide.animate({height:"hide",paddingTop:"hide",paddingBottom:"hide"},b);return}var d=b.toShow.css("overflow"),e=0,f={},g={},h=["height","paddingTop","paddingBottom"],i,j=b.toShow;i=j[0].style.width,j.width(j.parent().width()-parseFloat(j.css("paddingLeft"))-parseFloat(j.css("paddingRight"))-(parseFloat(j.css("borderLeftWidth"))||0)-(parseFloat(j.css("borderRightWidth"))||0)),a.each(h,function(c,d){g[d]="hide";var e=(""+a.css(b.toShow[0],d)).match(/^([\d+-.]+)(.*)$/);f[d]={value:e[1],unit:e[2]||"px"}}),b.toShow.css({height:0,overflow:"hidden"}).show(),b.toHide.filter(":hidden").each(b.complete).end().filter(":visible").animate(g,{step:function(a,c){c.prop=="height"&&(e=c.end-c.start===0?0:(c.now-c.start)/(c.end-c.start)),b.toShow[0].style[c.prop]=e*f[c.prop].value+f[c.prop].unit},duration:b.duration,easing:b.easing,complete:function(){b.autoHeight||b.toShow.css("height",""),b.toShow.css({width:i,overflow:d}),b.complete()}})}},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1e3:200})}}})})(jQuery);/*
+ * jQuery UI Autocomplete 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */(function(a,b){var c=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var b=this,c=this.element[0].ownerDocument,d;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!b.options.disabled&&!b.element.propAttr("readOnly")){d=!1;var e=a.ui.keyCode;switch(c.keyCode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._move("nextPage",c);break;case e.UP:b._move("previous",c),c.preventDefault();break;case e.DOWN:b._move("next",c),c.preventDefault();break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active&&(d=!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.select(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:clearTimeout(b.searching),b.searching=setTimeout(function(){b.term!=b.element.val()&&(b.selectedItem=null,b.search(null,c))},b.options.delay)}}}).bind("keypress.autocomplete",function(a){d&&(d=!1,a.preventDefault())}).bind("focus.autocomplete",function(){b.options.disabled||(b.selectedItem=null,b.previous=b.element.val())}).bind("blur.autocomplete",function(a){b.options.disabled||(clearTimeout(b.searching),b.closing=setTimeout(function(){b.close(a),b._change(a)},150))}),this._initSource(),this.response=function(){return b._response.apply(b,arguments)},this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",c)[0]).mousedown(function(c){var d=b.menu.element[0];a(c.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(c){c.target!==b.element[0]&&c.target!==d&&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTimeout(b.closing)},13)}).menu({focus:function(a,c){var d=c.item.data("item.autocomplete");!1!==b._trigger("focus",a,{item:d})&&/^key/.test(a.originalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=d.item.data("item.autocomplete"),f=b.previous;b.element[0]!==c.activeElement&&(b.element.focus(),b.previous=f,setTimeout(function(){b.previous=f,b.selectedItem=e},1)),!1!==b._trigger("select",a,{item:e})&&b.element.val(e.value),b.term=b.element.val(),b.close(a),b.selectedItem=e},blur:function(a,c){b.menu.element.is(":visible")&&b.element.val()!==b.term&&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.beforeunloadHandler=function(){b.element.removeAttr("autocomplete")},a(window).bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.menu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandler),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b==="source"&&this._initSource(),b==="appendTo"&&this.menu.element.appendTo(a(c||"body",this.element[0].ownerDocument)[0]),b==="disabled"&&c&&this.xhr&&this.xhr.abort()},_initSource:function(){var b=this,d,e;a.isArray(this.options.source)?(d=this.options.source,this.source=function(b,c){c(a.ui.autocomplete.filter(d,b.term))}):typeof this.options.source=="string"?(e=this.options.source,this.source=function(d,f){b.xhr&&b.xhr.abort(),b.xhr=a.ajax({url:e,data:d,dataType:"json",context:{autocompleteRequest:++c},success:function(a,b){this.autocompleteRequest===c&&f(a)},error:function(){this.autocompleteRequest===c&&f([])}})}):this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val(),this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==!1)return this._search(a)},_search:function(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.source({term:a},this.response)},_response:function(a){!this.options.disabled&&a&&a.length?(a=this._normalize(a),this._suggest(a),this._trigger("open")):this.close(),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(b){if(b.length&&b[0].label&&b[0].value)return b;return a.map(b,function(b){if(typeof b=="string")return{label:b,value:b};return a.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){var c=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resizeMenu(),c.position(a.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=this;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){return a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visible"))this.search(null,b);else{if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.deactivate();return}this.menu[a](b)}},widget:function(){return this.menu.element}}),a.extend(a.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(b,c){var d=new RegExp(a.ui.autocomplete.escapeRegex(c),"i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(jQuery),function(a){a.widget("ui.menu",{_create:function(){var b=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){!a(c.target).closest(".ui-menu-item a").length||(c.preventDefault(),b.select(c))}),this.refresh()},refresh:function(){var b=this,c=this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouseleave(function(){b.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var c=b.offset().top-this.element.offset().top,d=this.element.scrollTop(),e=this.element.height();c<0?this.element.scrollTop(d+c):c>=e&&this.element.scrollTop(d+c-e+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end(),this._trigger("focus",a,{item:b})},deactivate:function(){!this.active||(this.active.children("a").removeClass("ui-state-hover").removeAttr("id"),this._trigger("blur"),this.active=null)},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.active)this.activate(c,this.element.children(b));else{var d=this.active[a+"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,this.element.children(b))}},nextPage:function(b){if(this.hasScroll()){if(!this.active||this.last()){this.activate(b,this.element.children(".ui-menu-item:first"));return}var c=this.active.offset().top,d=this.element.height(),e=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=this.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!this.active||this.first()){this.activate(b,this.element.children(".ui-menu-item:last"));return}var c=this.active.offset().top,d=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c+d-a(this).height();return b<10&&b>-10}),result.length||(result=this.element.children(".ui-menu-item:first")),this.activate(b,result)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);/*
+ * jQuery UI Button 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){var c,d,e,f,g="ui-button ui-widget ui-state-default ui-corner-all",h="ui-state-hover ui-state-active ",i="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",j=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},k=function(b){var c=b.name,d=b.form,e=a([]);c&&(d?e=a(d).find("[name='"+c+"']"):e=a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form}));return e};a.widget("ui.button",{options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",j),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.propAttr("disabled"):this.element.propAttr("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var b=this,h=this.options,i=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(i?"":" ui-state-active"),m="ui-state-focus";h.label===null&&(h.label=this.buttonElement.html()),this.buttonElement.addClass(g).attr("role","button").bind("mouseenter.button",function(){h.disabled||(a(this).addClass("ui-state-hover"),this===c&&a(this).addClass("ui-state-active"))}).bind("mouseleave.button",function(){h.disabled||a(this).removeClass(l)}).bind("click.button",function(a){h.disabled&&(a.preventDefault(),a.stopImmediatePropagation())}),this.element.bind("focus.button",function(){b.buttonElement.addClass(m)}).bind("blur.button",function(){b.buttonElement.removeClass(m)}),i&&(this.element.bind("change.button",function(){f||b.refresh()}),this.buttonElement.bind("mousedown.button",function(a){h.disabled||(f=!1,d=a.pageX,e=a.pageY)}).bind("mouseup.button",function(a){!h.disabled&&(d!==a.pageX||e!==a.pageY)&&(f=!0)})),this.type==="checkbox"?this.buttonElement.bind("click.button",function(){if(h.disabled||f)return!1;a(this).toggleClass("ui-state-active"),b.buttonElement.attr("aria-pressed",b.element[0].checked)}):this.type==="radio"?this.buttonElement.bind("click.button",function(){if(h.disabled||f)return!1;a(this).addClass("ui-state-active"),b.buttonElement.attr("aria-pressed","true");var c=b.element[0];k(c).not(c).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown.button",function(){if(h.disabled)return!1;a(this).addClass("ui-state-active"),c=this,a(document).one("mouseup",function(){c=null})}).bind("mouseup.button",function(){if(h.disabled)return!1;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(b){if(h.disabled)return!1;(b.keyCode==a.ui.keyCode.SPACE||b.keyCode==a.ui.keyCode.ENTER)&&a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(b){b.keyCode===a.ui.keyCode.SPACE&&a(this).click()})),this._setOption("disabled",h.disabled),this._resetButton()},_determineButtonType:function(){this.element.is(":checkbox")?this.type="checkbox":this.element.is(":radio")?this.type="radio":this.element.is("input")?this.type="input":this.type="button";if(this.type==="checkbox"||this.type==="radio"){var a=this.element.parents().filter(":last"),b="label[for='"+this.element.attr("id")+"']";this.buttonElement=a.find(b),this.buttonElement.length||(a=a.length?a.siblings():this.element.siblings(),this.buttonElement=a.filter(b),this.buttonElement.length||(this.buttonElement=a.find(b))),this.element.addClass("ui-helper-hidden-accessible");var c=this.element.is(":checked");c&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.attr("aria-pressed",c)}else this.buttonElement=this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(g+" "+h+" "+i).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title"),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);b==="disabled"?c?this.element.propAttr("disabled",!0):this.element.propAttr("disabled",!1):this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b),this.type==="radio"?k(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass(i),c=a("<span></span>",this.element[0].ownerDocument).addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary,f=[];d.primary||d.secondary?(this.options.text&&f.push("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary")),d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>"),d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>"),this.options.text||(f.push(e?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||b.attr("title",c))):f.push("ui-button-text-only"),b.addClass(f.join(" "))}}}),a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c),a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(b?"ui-corner-left":"ui-corner-right").end().end()},destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy"),a.Widget.prototype.destroy.call(this)}})})(jQuery);/*
+ * jQuery UI Dialog 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */(function(a,b){var c="ui-dialog ui-widget ui-widget-content ui-corner-all ",d={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},e={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},f=a.attrFn||{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0,click:!0};a.widget("ui.dialog",{options:{autoOpen:!0,buttons:{},closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",collision:"fit",using:function(b){var c=a(this).css(b).offset().top;c<0&&a(this).css("top",b.top-c)}},resizable:!0,show:null,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTitle=this.element.attr("title"),typeof this.originalTitle!="string"&&(this.originalTitle=""),this.options.title=this.options.title||this.originalTitle;var b=this,d=b.options,e=d.title||"&#160;",f=a.ui.dialog.getTitleId(b.element),g=(b.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass(c+d.dialogClass).css({zIndex:d.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(c){d.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode===a.ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(a){b.moveToTop(!1,a)}),h=b.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g),i=(b.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),j=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){j.addClass("ui-state-hover")},function(){j.removeClass("ui-state-hover")}).focus(function(){j.addClass("ui-state-focus")}).blur(function(){j.removeClass("ui-state-focus")}).click(function(a){b.close(a);return!1}).appendTo(i),k=(b.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(d.closeText).appendTo(j),l=a("<span></span>").addClass("ui-dialog-title").attr("id",f).html(e).prependTo(i);a.isFunction(d.beforeclose)&&!a.isFunction(d.beforeClose)&&(d.beforeClose=d.beforeclose),i.find("*").add(i).disableSelection(),d.draggable&&a.fn.draggable&&b._makeDraggable(),d.resizable&&a.fn.resizable&&b._makeResizable(),b._createButtons(d.buttons),b._isOpen=!1,a.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy(),a.uiDialog.hide(),a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"),a.uiDialog.remove(),a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(b){var c=this,d,e;if(!1!==c._trigger("beforeClose",b)){c.overlay&&c.overlay.destroy(),c.uiDialog.unbind("keypress.ui-dialog"),c._isOpen=!1,c.options.hide?c.uiDialog.hide(c.options.hide,function(){c._trigger("close",b)}):(c.uiDialog.hide(),c._trigger("close",b)),a.ui.dialog.overlay.resize(),c.options.modal&&(d=0,a(".ui-dialog").each(function(){this!==c.uiDialog[0]&&(e=a(this).css("z-index"),isNaN(e)||(d=Math.max(d,e)))}),a.ui.dialog.maxZ=d);return c}},isOpen:function(){return this._isOpen},moveToTop:function(b,c){var d=this,e=d.options,f;if(e.modal&&!b||!e.stack&&!e.modal)return d._trigger("focus",c);e.zIndex>a.ui.dialog.maxZ&&(a.ui.dialog.maxZ=e.zIndex),d.overlay&&(a.ui.dialog.maxZ+=1,d.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)),f={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()},a.ui.dialog.maxZ+=1,d.uiDialog.css("z-index",a.ui.dialog.maxZ),d.element.attr(f),d._trigger("focus",c);return d},open:function(){if(!this._isOpen){var b=this,c=b.options,d=b.uiDialog;b.overlay=c.modal?new a.ui.dialog.overlay(b):null,b._size(),b._position(c.position),d.show(c.show),b.moveToTop(!0),c.modal&&d.bind("keydown.ui-dialog",function(b){if(b.keyCode===a.ui.keyCode.TAB){var c=a(":tabbable",this),d=c.filter(":first"),e=c.filter(":last");if(b.target===e[0]&&!b.shiftKey){d.focus(1);return!1}if(b.target===d[0]&&b.shiftKey){e.focus(1);return!1}}}),a(b.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus(),b._isOpen=!0,b._trigger("open");return b}},_createButtons:function(b){var c=this,d=!1,e=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);c.uiDialog.find(".ui-dialog-buttonpane").remove(),typeof b=="object"&&b!==null&&a.each(b,function(){return!(d=!0)}),d&&(a.each(b,function(b,d){d=a.isFunction(d)?{click:d,text:b}:d;var e=a('<button type="button"></button>').click(function(){d.click.apply(c.element[0],arguments)}).appendTo(g);a.each(d,function(a,b){a!=="click"&&(a in f?e[a](b):e.attr(a,b))}),a.fn.button&&e.button()}),e.appendTo(c.uiDialog))},_makeDraggable:function(){function f(a){return{position:a.position,offset:a.offset}}var b=this,c=b.options,d=a(document),e;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(d,g){e=c.height==="auto"?"auto":a(this).height(),a(this).height(a(this).height()).addClass("ui-dialog-dragging"),b._trigger("dragStart",d,f(g))},drag:function(a,c){b._trigger("drag",a,f(c))},stop:function(g,h){c.position=[h.position.left-d.scrollLeft(),h.position.top-d.scrollTop()],a(this).removeClass("ui-dialog-dragging").height(e),b._trigger("dragStop",g,f(h)),a.ui.dialog.overlay.resize()}})},_makeResizable:function(c){function h(a){return{originalPosition:a.originalPosition,originalSize:a.originalSize,position:a.position,size:a.size}}c=c===b?this.options.resizable:c;var d=this,e=d.options,f=d.uiDialog.css("position"),g=typeof c=="string"?c:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:g,start:function(b,c){a(this).addClass("ui-dialog-resizing"),d._trigger("resizeStart",b,h(c))},resize:function(a,b){d._trigger("resize",a,h(b))},stop:function(b,c){a(this).removeClass("ui-dialog-resizing"),e.height=a(this).height(),e.width=a(this).width(),d._trigger("resizeStop",b,h(c)),a.ui.dialog.overlay.resize()}}).css("position",f).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(b){var c=[],d=[0,0],e;if(b){if(typeof b=="string"||typeof b=="object"&&"0"in b)c=b.split?b.split(" "):[b[0],b[1]],c.length===1&&(c[1]=c[0]),a.each(["left","top"],function(a,b){+c[a]===c[a]&&(d[a]=c[a],c[a]=b)}),b={my:c.join(" "),at:c.join(" "),offset:d.join(" ")};b=a.extend({},a.ui.dialog.prototype.options.position,b)}else b=a.ui.dialog.prototype.options.position;e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},b)),e||this.uiDialog.hide()},_setOptions:function(b){var c=this,f={},g=!1;a.each(b,function(a,b){c._setOption(a,b),a in d&&(g=!0),a in e&&(f[a]=b)}),g&&this._size(),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",f)},_setOption:function(b,d){var e=this,f=e.uiDialog;switch(b){case"beforeclose":b="beforeClose";break;case"buttons":e._createButtons(d);break;case"closeText":e.uiDialogTitlebarCloseText.text(""+d);break;case"dialogClass":f.removeClass(e.options.dialogClass).addClass(c+d);break;case"disabled":d?f.addClass("ui-dialog-disabled"):f.removeClass("ui-dialog-disabled");break;case"draggable":var g=f.is(":data(draggable)");g&&!d&&f.draggable("destroy"),!g&&d&&e._makeDraggable();break;case"position":e._position(d);break;case"resizable":var h=f.is(":data(resizable)");h&&!d&&f.resizable("destroy"),h&&typeof d=="string"&&f.resizable("option","handles",d),!h&&d!==!1&&e._makeResizable(d);break;case"title":a(".ui-dialog-title",e.uiDialogTitlebar).html(""+(d||"&#160;"))}a.Widget.prototype._setOption.apply(e,arguments)},_size:function(){var b=this.options,c,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0}),b.minWidth>b.width&&(b.width=b.minWidth),c=this.uiDialog.css({height:"auto",width:b.width}).height(),d=Math.max(0,b.minHeight-c);if(b.height==="auto")if(a.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();var f=this.element.css("height","auto").height();e||this.uiDialog.hide(),this.element.height(Math.max(f,d))}else this.element.height(Math.max(b.height-c,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}}),a.extend(a.ui.dialog,{version:"1.8.18",uuid:0,maxZ:0,getTitleId:function(a){var b=a.attr("id");b||(this.uuid+=1,b=this.uuid);return"ui-dialog-title-"+b},overlay:function(b){this.$el=a.ui.dialog.overlay.create(b)}}),a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(b){this.instances.length===0&&(setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return!1})},1),a(document).bind("keydown.dialog-overlay",function(c){b.options.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode===a.ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}),a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize));var c=(this.oldInstances.pop()||a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});a.fn.bgiframe&&c.bgiframe(),this.instances.push(c);return c},destroy:function(b){var c=a.inArray(b,this.instances);c!=-1&&this.oldInstances.push(this.instances.splice(c,1)[0]),this.instances.length===0&&a([document,window]).unbind(".dialog-overlay"),b.remove();var d=0;a.each(this.instances,function(){d=Math.max(d,this.css("z-index"))}),this.maxZ=d},height:function(){var b,c;if(a.browser.msie&&a.browser.version<7){b=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight),c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return b<c?a(window).height()+"px":b+"px"}return a(document).height()+"px"},width:function(){var b,c;if(a.browser.msie){b=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth),c=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return b<c?a(window).width()+"px":b+"px"}return a(document).width()+"px"},resize:function(){var b=a([]);a.each(a.ui.dialog.overlay.instances,function(){b=b.add(this)}),b.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}}),a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);/*
+ * jQuery UI Slider 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){var c=5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var b=this,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",g=d.values&&d.values.length||1,h=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":"")),this.range=a([]),d.range&&(d.range===!0&&(d.values||(d.values=[this._valueMin(),this._valueMin()]),d.values.length&&d.values.length!==2&&(d.values=[d.values[0],d.values[0]])),this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range==="min"||d.range==="max"?" ui-slider-range-"+d.range:"")));for(var i=e.length;i<g;i+=1)h.push(f);this.handles=e.add(a(h.join("")).appendTo(b.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-state-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.handles.keydown(function(d){var e=a(this).data("index.ui-slider-handle"),f,g,h,i;if(!b.options.disabled){switch(d.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=!0,a(this).addClass("ui-state-active"),f=b._start(d,e);if(f===!1)return}}i=b.options.step,b.options.values&&b.options.values.length?g=h=b.values(e):g=h=b.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=b._valueMin();break;case a.ui.keyCode.END:h=b._valueMax();break;case a.ui.keyCode.PAGE_UP:h=b._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(g-(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g===b._valueMax())return;h=b._trimAlignValue(g+i);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(g===b._valueMin())return;h=b._trimAlignValue(g-i)}b._slide(d,e,h)}}).keyup(function(c){var d=a(this).data("index.ui-slider-handle");b._keySliding&&(b._keySliding=!1,b._stop(c,d),b._change(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),this._animateOff=!1},destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider"),this._mouseDestroy();return this},_mouseCapture:function(b){var c=this.options,d,e,f,g,h,i,j,k,l;if(c.disabled)return!1;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),d={x:b.pageX,y:b.pageY},e=this._normValueFromMouse(d),f=this._valueMax()-this._valueMin()+1,h=this,this.handles.each(function(b){var c=Math.abs(e-h.values(b));f>c&&(f=c,g=a(this),i=b)}),c.range===!0&&this.values(1)===c.min&&(i+=1,g=a(this.handles[i])),j=this._start(b,i);if(j===!1)return!1;this._mouseSliding=!0,h._handleIndex=i,g.addClass("ui-state-active").focus(),k=g.offset(),l=!a(b.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:b.pageX-k.left-g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,e),this._animateOff=!0;return!0},_mouseStart:function(a){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);this._slide(a,this._handleIndex,c);return!1},_mouseStop:function(a){this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1;return!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;this.orientation==="horizontal"?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),d<0&&(d=0),this.orientation==="vertical"&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e;return this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values());return this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),this.options.values.length===2&&this.options.range===!0&&(b===0&&c>d||b===1&&c<d)&&(c=d),c!==this.values(b)&&(e=this.values(),e[b]=c,f=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e}),d=this.values(b?0:1),f!==!1&&this.values(b,c,!0))):c!==this.value()&&(f=this._trigger("slide",a,{handle:this.handles[b],value:c}),f!==!1&&this.value(c))},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("change",a,c)}},value:function(a){if(arguments.length)this.options.value=this._trimAlignValue(a),this._refreshValue(),this._change(null,0);else return this._value()},values:function(b,c){var d,e,f;if(arguments.length>1)this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),this._change(null,b);else{if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();d=this.options.values,e=arguments[0];for(f=0;f<d.length;f+=1)d[f]=this._trimAlignValue(e[f]),this._change(null,f);this._refreshValue()}},_setOption:function(b,c){var d,e=0;a.isArray(this.options.values)&&(e=this.options.values.length),a.Widget.prototype._setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled"));break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(d=0;d<e;d+=1)this._change(null,d);this._animateOff=!1}},_value:function(){var a=this.options.value;a=this._trimAlignValue(a);return a},_values:function(a){var b,c,d;if(arguments.length){b=this.options.values[a],b=this._trimAlignValue(b);return b}c=this.options.values.slice();for(d=0;d<c.length;d+=1)c[d]=this._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;Math.abs(c)*2>=b&&(d+=c>0?b:-b);return parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var b=this.options.range,c=this.options,d=this,e=this._animateOff?!1:c.animate,f,g={},h,i,j,k;this.options.values&&this.options.values.length?this.handles.each(function(b,i){f=(d.values(b)-d._valueMin())/(d._valueMax()-d._valueMin())*100,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",a(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range===!0&&(d.orientation==="horizontal"?(b===0&&d.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b===0&&d.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=f}):(i=this.value(),j=this._valueMin(),k=this._valueMax(),f=k!==j?(i-j)/(k-j)*100:0,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},c.animate),b==="max"&&this.orientation==="horizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,duration:c.animate}),b==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b==="max"&&this.orientation==="vertical"&&this.range[e?"animate":"css"]({height:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Tabs 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){function f(){return++d}function e(){return++c}var c=0,d=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(!0)},_setOption:function(a,b){if(a=="selected"){if(this.options.collapsible&&b==this.options.selected)return;this.select(b)}else this.options[a]=b,this._tabify()},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=a(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0].style.removeAttribute("filter")}var d=this,e=this.options,f=/^#.+/;this.list=this.element.find("ol,ul").eq(0),this.lis=a(" > li:has(a[href])",this.list),this.anchors=this.lis.map(function(){return a("a",this)[0]}),this.panels=a([]),this.anchors.each(function(b,c){var g=a(c).attr("href"),h=g.split("#")[0],i;h&&(h===location.toString().split("#")[0]||(i=a("base")[0])&&h===i.href)&&(g=c.hash,c.href=g);if(f.test(g))d.panels=d.panels.add(d.element.find(d._sanitizeSelector(g)));else if(g&&g!=="#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*$/,""));var j=d._tabId(c);c.href="#"+j;var k=d.element.find("#"+j);k.length||(k=a(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("destroy.tabs",!0)),d.panels=d.panels.add(k)}else e.disabled.push(b)}),c?(this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top"),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e.selected===b?(location.hash&&this.anchors.each(function(a,b){if(b.hash==location.hash){e.selected=a;return!1}}),typeof e.selected!="number"&&e.cookie&&(e.selected=parseInt(d._cookie(),10)),typeof e.selected!="number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=e.selected||(this.lis.length?0:-1)):e.selected===null&&(e.selected=-1),e.selected=e.selected>=0&&this.anchors[e.selected]||e.selected<0?e.selected:0,e.disabled=a.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selected,e.disabled)!=-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected ui-state-active"),e.selected>=0&&this.anchors.length&&(d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.element.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.selected],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.anchors).unbind(".tabs"),d.lis=d.anchors=d.panels=null})):e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e.selected,e.cookie);for(var g=0,h;h=this.lis[g];g++)a(h)[a.inArray(g,e.disabled)!=-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");e.cache===!1&&this.anchors.removeData("cache.tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=="mouseover"){var i=function(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui-state-"+a)},j=function(a,b){b.removeClass("ui-state-"+a)};this.lis.bind("mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.tabs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",function(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=e.fx[0],l=e.fx[1]):k=l=e.fx);var n=l?function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-tabs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show",null,d._ui(b,c[0]))},o=k?function(a,b){b.animate(k,k.duration||"normal",function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var b=this,c=a(b).closest("li"),f=d.panels.filter(":not(.ui-tabs-hide)"),g=d.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-selected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-state-processing")||d.panels.filter(":animated").length||d._trigger("select",null,d._ui(this,g[0]))===!1){this.blur();return!1}e.selected=d.anchors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected")){e.selected=-1,e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur();return!1}if(!f.length){e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur();return!1}}e.cookie&&d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs",function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifier.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(){return!1})},_getIndex:function(a){typeof a=="string"&&(a=this.anchors.index(this.anchors.filter("[href$="+a+"]")));return a},destroy:function(){var b=this.options;this.abort(),this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each(function(){var b=a.data(this,"href.tabs");b&&(this.href=b);var c=a(this).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeData(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-state-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie(null,b.cookie);return this},add:function(c,d,e){e===b&&(e=this.anchors.length);var f=this,g=this.options,h=a(g.tabTemplate.replace(/#\{href\}/g,c).replace(/#\{label\}/g,d)),i=c.indexOf("#")?this._tabId(a("a",h)[0]):c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destroy.tabs",!0);var j=f.element.find("#"+i);j.length||(j=a(g.panelTemplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"),e>=this.lis.length?(h.appendTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.lis[e]),j.insertBefore(this.panels[e])),g.disabled=a.map(g.disabled,function(a,b){return a>=e?++a:a}),this._tabify(),this.anchors.length==1&&(g.selected=0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass("ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,this._ui(this.anchors[e],this.panels[e]));return this},remove:function(b){b=this._getIndex(b);var c=this.options,d=this.lis.eq(b).remove(),e=this.panels.eq(b).remove();d.hasClass("ui-tabs-selected")&&this.anchors.length>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=a.map(a.grep(c.disabled,function(a,c){return a!=b}),function(a,c){return a>=b?--a:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0]));return this},enable:function(b){b=this._getIndex(b);var c=this.options;if(a.inArray(b,c.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled"),c.disabled=a.grep(c.disabled,function(a,c){return a!=b}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(a){a=this._getIndex(a);var b=this,c=this.options;a!=c.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a])));return this},select:function(a){a=this._getIndex(a);if(a==-1)if(this.options.collapsible&&this.options.selected!=-1)a=this.options.selected;else return this;this.anchors.eq(a).trigger(this.options.event+".tabs");return this},load:function(b){b=this._getIndex(b);var c=this,d=this.options,e=this.anchors.eq(b)[0],f=a.data(e,"load.tabs");this.abort();if(!f||this.element.queue("tabs").length!==0&&a.data(e,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(d.spinner){var g=a("span",e);g.data("label.tabs",g.html()).html(d.spinner)}this.xhr=a.ajax(a.extend({},d.ajaxOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}})),c.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cleanup();return this},url:function(a,b){this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}}),a.extend(a.ui.tabs,{version:"1.8.18"}),a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(a,b){var c=this,d=this.options,e=c._rotate||(c._rotate=function(b){clearTimeout(c.rotation),c.rotation=setTimeout(function(){var a=d.selected;c.select(++a<c.anchors.length?a:0)},a),b&&b.stopPropagation()}),f=c._unrotate||(c._unrotate=b?function(a){t=d.selected,e()}:function(a){a.clientX&&c.rotate(null)});a?(this.element.bind("tabsshow",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),this.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),delete this._rotate,delete this._unrotate);return this}})})(jQuery);/*
+ * jQuery UI Datepicker 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */(function($,undefined){function isArray(a){return a&&($.browser.safari&&typeof a=="object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(\)/))}function extendRemove(a,b){$.extend(a,b);for(var c in b)if(b[c]==null||b[c]==undefined)a[c]=b[c];return a}function bindHover(a){var b="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout",function(a){var c=$(a.target).closest(b);!c.length||c.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(c){var d=$(c.target).closest(b);!$.datepicker._isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])&&!!d.length&&(d.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-prev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-next")&&d.addClass("ui-datepicker-next-hover"))})}function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}$.extend($.ui,{datepicker:{version:"1.8.18"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){extendRemove(this._defaults,a||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(a,b){var c=a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:b?bindHover($('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=$(a);b.append=$([]),b.trigger=$([]);c.hasClass(this.markerClassName)||(this._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.settings.disabled&&this._disableDatepicker(a))},_attachments:function(a,b){var c=this._get(b,"appendText"),d=this._get(b,"isRTL");b.append&&b.append.remove(),c&&(b.append=$('<span class="'+this._appendClass+'">'+c+"</span>"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),b.trigger&&b.trigger.remove();var e=this._get(b,"showOn");(e=="focus"||e=="both")&&a.focus(this._showDatepicker);if(e=="button"||e=="both"){var f=this._get(b,"buttonText"),g=this._get(b,"buttonImage");b.trigger=$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:g,alt:f,title:f}):$('<button type="button"></button>').addClass(this._triggerClass).html(g==""?f:$("<img/>").attr({src:g,alt:f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){$.datepicker._datepickerShowing&&$.datepicker._lastInput==a[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=a[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(a[0])):$.datepicker._showDatepicker(a[0]);return!1})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var d=function(a){var b=0,c=0;for(var d=0;d<a.length;d++)a[d].length>b&&(b=a[d].length,c=d);return c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=$(a);c.hasClass(this.markerClassName)||(c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._getDefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.settings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block"))},_dialogDatepicker:function(a,b,c,d,e){var f=this._dialogInst;if(!f){this.uuid+=1;var g="dp"+this.uuid;this._dialogInput=$('<input type="text" id="'+g+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),f=this._dialogInst=this._newInst(this._dialogInput,!1),f.settings={},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),b=b&&b.constructor==Date?this._formatDate(f,b):b,this._dialogInput.val(b),this._pos=e?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=document.documentElement.clientWidth,i=document.documentElement.clientHeight,j=document.documentElement.scrollLeft||document.body.scrollLeft,k=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[h/2-100+j,i/2-150+k]}this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),f.settings.onSelect=c,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,f);return this},_destroyDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();$.removeData(a,PROP_NAME),d=="input"?(c.append.remove(),c.trigger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(d=="div"||d=="span")&&b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!1,c.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().removeClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b})}},_disableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!0,c.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().addClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b}),this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(b){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(a,b,c){var d=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?$.extend({},$.datepicker._defaults):d?b=="all"?$.extend({},d.settings):this._get(d,b):null;var e=b||{};typeof b=="string"&&(e={},e[b]=c);if(d){this._curInst==d&&this._hideDatepicker();var f=this._getDateDatepicker(a,!0),g=this._getMinMaxDate(d,"min"),h=this._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!==null&&e.dateFormat!==undefined&&e.minDate===undefined&&(d.settings.minDate=this._formatDate(d,g)),h!==null&&e.dateFormat!==undefined&&e.maxDate===undefined&&(d.settings.maxDate=this._formatDate(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),this._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var b=this._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:function(a,b){var c=this._getInst(a);c&&(this._setDate(c,b),this._updateDatepicker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=this._getInst(a);c&&!c.inline&&this._setDateFromField(c,b);return c?this._getDate(c):null},_doKeyDown:function(a){var b=$.datepicker._getInst(a.target),c=!0,d=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=!0;if($.datepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDatepicker(),c=!1;break;case 13:var e=$("td."+$.datepicker._dayOverClass+":not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=$.datepicker._get(b,"onSelect");if(f){var g=$.datepicker._formatDate(b);f.apply(b.input?b.input[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=a.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker._gotoToday(a.target),c=a.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7,"D"),c=a.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?-1:1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=a.ctrlKey||a.metaKey;break;default:c=!1}else a.keyCode==36&&a.ctrlKey?$.datepicker._showDatepicker(this):c=!1;c&&(a.preventDefault(),a.stopPropagation())},_doKeyPress:function(a){var b=$.datepicker._getInst(a.target);if($.datepicker._get(b,"constrainInput")){var c=$.datepicker._possibleChars($.datepicker._get(b,"dateFormat")),d=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.indexOf(d)>-1}},_doKeyUp:function(a){var b=$.datepicker._getInst(a.target);if(b.input.val()!=b.lastVal)try{var c=$.datepicker.parseDate($.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatConfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlternate(b),$.datepicker._updateDatepicker(b))}catch(a){$.datepicker.log(a)}return!0},_showDatepicker:function(a){a=a.target||a,a.nodeName.toLowerCase()!="input"&&(a=$("input",a.parentNode)[0]);if(!$.datepicker._isDisabledDatepicker(a)&&$.datepicker._lastInput!=a){var b=$.datepicker._getInst(a);$.datepicker._curInst&&$.datepicker._curInst!=b&&($.datepicker._curInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var c=$.datepicker._get(b,"beforeShow"),d=c?c.apply(a,[a,b]):{};if(d===!1)return;extendRemove(b.settings,d),b.lastVal=null,$.datepicker._lastInput=a,$.datepicker._setDateFromField(b),$.datepicker._inDialog&&(a.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(a),$.datepicker._pos[1]+=a.offsetHeight);var e=!1;$(a).parents().each(function(){e|=$(this).css("position")=="fixed";return!e}),e&&$.browser.opera&&($.datepicker._pos[0]-=document.documentElement.scrollLeft,$.datepicker._pos[1]-=document.documentElement.scrollTop);var f={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,b.dpDiv.empty(),b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b),f=$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.left+"px",top:f.top+"px"});if(!b.inline){var g=$.datepicker._get(b,"showAnim"),h=$.datepicker._get(b,"duration"),i=function(){var a=b.dpDiv.find("iframe.ui-datepicker-cover");if(!!a.length){var c=$.datepicker._getBorders(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this;b.maxRows=4;var c=$.datepicker._getBorders(a.dpDiv);instActive=a,a.dpDiv.empty().append(this._generateHTML(a));var d=a.dpDiv.find("iframe.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOverClass+" a").mouseover();var e=this._getNumberOfMonths(a),f=e[1],g=17;a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css("width",g*f+"em"),a.dpDiv[(e[0]!=1||e[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),a==$.datepicker._curInst&&$.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var h=a.yearshtml;setTimeout(function(){h===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(a){return{thin:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var d=a.dpDiv.outerWidth(),e=a.dpDiv.outerHeight(),f=a.input?a.input.outerWidth():0,g=a.input?a.input.outerHeight():0,h=document.documentElement.clientWidth+$(document).scrollLeft(),i=document.documentElement.clientHeight+$(document).scrollTop();b.left-=this._get(a,"isRTL")?d-f:0,b.left-=c&&b.left==a.input.offset().left?$(document).scrollLeft():0,b.top-=c&&b.top==a.input.offset().top+g?$(document).scrollTop():0,b.left-=Math.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),b.top-=Math.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0);return b},_findPos:function(a){var b=this._getInst(a),c=this._get(b,"isRTL");while(a&&(a.type=="hidden"||a.nodeType!=1||$.expr.filters.hidden(a)))a=a[c?"previousSibling":"nextSibling"];var d=$(a).offset();return[d.left,d.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=$.data(a,PROP_NAME))&&this._datepickerShowing){var c=this._get(b,"showAnim"),d=this._get(b,"duration"),e=this,f=function(){$.datepicker._tidyDialog(b),e._curInst=null};$.effects&&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,f):b.dpDiv[c=="slideDown"?"slideUp":c=="fadeIn"?"fadeOut":"hide"](c?d:null,f),c||f(),this._datepickerShowing=!1;var g=this._get(b,"onClose");g&&g.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(!!$.datepicker._curInst){var b=$(a.target),c=$.datepicker._getInst(b[0]);(b[0].id!=$.datepicker._mainDivId&&b.parents("#"+$.datepicker._mainDivId).length==0&&!b.hasClass($.datepicker.markerClassName)&&!b.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=c)&&$.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){var d=$(a),e=this._getInst(d[0]);this._isDisabledDatepicker(d[0])||(this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e))},_gotoToday:function(a){var b=$(a),c=this._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.currentDay)c.selectedDay=c.currentDay,c.drawMonth=c.selectedMonth=c.currentMonth,c.drawYear=c.selectedYear=c.currentYear;else{var d=new Date;c.selectedDay=d.getDate(),c.drawMonth=c.selectedMonth=d.getMonth(),c.drawYear=c.selectedYear=d.getFullYear()}this._notifyChange(c),this._adjustDate(b)},_selectMonthYear:function(a,b,c){var d=$(a),e=this._getInst(d[0]);e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10),this._notifyChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=$(a);if(!$(d).hasClass(this._unselectableClass)&&!this._isDisabledDatepicker(e[0])){var f=this._getInst(e[0]);f.selectedDay=f.currentDay=$("a",d).html(),f.selectedMonth=f.currentMonth=b,f.selectedYear=f.currentYear=c,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){var b=$(a),c=this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(a,b){var c=$(a),d=this._getInst(c[0]);b=b!=null?b:this._formatDate(d),d.input&&d.input.val(b),this._updateAlternate(d);var e=this._get(d,"onSelect");e?e.apply(d.input?d.input[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateDatepicker(d):(this._hideDatepicker(),this._lastInput=d.input[0],typeof d.input[0]!="object"&&d.input.focus(),this._lastInput=null)},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),d=this._getDate(a),e=this.formatDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}},noWeekends:function(a){var b=a.getDay();return[b>0&&b<6,""]},iso8601Week:function(a){var b=new Date(a.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();b.setMonth(0),b.setDate(1);return Math.floor(Math.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var d=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;d=typeof d!="string"?d:(new Date).getFullYear()%100+parseInt(d,10);var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,g=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,h=(c?c.monthNames:null)||this._defaults.monthNames,i=-1,j=-1,k=-1,l=-1,m=!1,n=function(b){var c=s+1<a.length&&a.charAt(s+1)==b;c&&s++;return c},o=function(a){var c=n(a),d=a=="@"?14:a=="!"?20:a=="y"&&c?4:a=="o"?3:2,e=new RegExp("^\\d{1,"+d+"}"),f=b.substring(r).match(e);if(!f)throw"Missing number at position "+r;r+=f[0].length;return parseInt(f[0],10)},p=function(a,c,d){var e=$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(function(a,b){return-(a[1].length-b[1].length)}),f=-1;$.each(e,function(a,c){var d=c[1];if(b.substr(r,d.length).toLowerCase()==d.toLowerCase()){f=c[0],r+=d.length;return!1}});if(f!=-1)return f+1;throw"Unknown name at position "+r},q=function(){if(b.charAt(r)!=a.charAt(s))throw"Unexpected literal at position "+r;r++},r=0;for(var s=0;s<a.length;s++)if(m)a.charAt(s)=="'"&&!n("'")?m=!1:q();else switch(a.charAt(s)){case"d":k=o("d");break;case"D":p("D",e,f);break;case"o":l=o("o");break;case"m":j=o("m");break;case"M":j=p("M",g,h);break;case"y":i=o("y");break;case"@":var t=new Date(o("@"));i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"!":var t=new Date((o("!")-this._ticksTo1970)/1e4);i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"'":n("'")?q():m=!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters found in date: "+b.substring(r);i==-1?i=(new Date).getFullYear():i<100&&(i+=(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=d?0:-100));if(l>-1){j=1,k=l;for(;;){var u=this._getDaysInMonth(i,j-1);if(k<=u)break;j++,k-=u}}var t=this._daylightSavingAdjust(new Date(i,j-1,k));if(t.getFullYear()!=i||t.getMonth()+1!=j||t.getDate()!=k)throw"Invalid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,e=(c?c.dayNames:null)||this._defaults.dayNames,f=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,h=function(b){var c=m+1<a.length&&a.charAt(m+1)==b;c&&m++;return c},i=function(a,b,c){var d=""+b;if(h(a))while(d.length<c)d="0"+d;return d},j=function(a,b,c,d){return h(a)?d[b]:c[b]},k="",l=!1;if(b)for(var m=0;m<a.length;m++)if(l)a.charAt(m)=="'"&&!h("'")?l=!1:k+=a.charAt(m);else switch(a.charAt(m)){case"d":k+=i("d",b.getDate(),2);break;case"D":k+=j("D",b.getDay(),d,e);break;case"o":k+=i("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":k+=i("m",b.getMonth()+1,2);break;case"M":k+=j("M",b.getMonth(),f,g);break;case"y":k+=h("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=b.getTime();break;case"!":k+=b.getTime()*1e4+this._ticksTo1970;break;case"'":h("'")?k+="'":l=!0;break;default:k+=a.charAt(m)}return k},_possibleChars:function(a){var b="",c=!1,d=function(b){var c=e+1<a.length&&a.charAt(e+1)==b;c&&e++;return c};for(var e=0;e<a.length;e++)if(c)a.charAt(e)=="'"&&!d("'")?c=!1:b+=a.charAt(e);else switch(a.charAt(e)){case"d":case"m":case"y":case"@":b+="0123456789";break;case"D":case"M":return null;case"'":d("'")?b+="'":c=!0;break;default:b+=a.charAt(e)}return b},_get:function(a,b){return a.settings[b]!==undefined?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),d=a.lastVal=a.input?a.input.val():null,e,f;e=f=this._getDefaultDate(a);var g=this._getFormatConfig(a);try{e=this.parseDate(c,d,g)||f}catch(h){this.log(h),d=b?"":d}a.selectedDay=e.getDate(),a.drawMonth=a.selectedMonth=e.getMonth(),a.drawYear=a.selectedYear=e.getFullYear(),a.currentDay=d?e.getDate():0,a.currentMonth=d?e.getMonth():0,a.currentYear=d?e.getFullYear():0,this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var d=function(a){var b=new Date;b.setDate(b.getDate()+a);return b},e=function(b){try{return $.datepicker.parseDate($.datepicker._get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=d.getFullYear(),f=d.getMonth(),g=d.getDate(),h=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,i=h.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=parseInt(i[1],10);break;case"w":case"W":g+=parseInt(i[1],10)*7;break;case"m":case"M":f+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f));break;case"y":case"Y":e+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f))}i=h.exec(b)}return new Date(e,f,g)},f=b==null||b===""?c:typeof b=="string"?e(b):typeof b=="number"?isNaN(b)?c:d(b):new Date(b.getTime());f=f&&f.toString()=="Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMilliseconds(0));return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var d=!b,e=a.selectedMonth,f=a.selectedYear,g=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=g.getDate(),a.drawMonth=a.selectedMonth=a.currentMonth=g.getMonth(),a.drawYear=a.selectedYear=a.currentYear=g.getFullYear(),(e!=a.selectedMonth||f!=a.selectedYear)&&!c&&this._notifyChange(a),this._adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return b},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),d=this._get(a,"showButtonPanel"),e=this._get(a,"hideIfNoPrevNext"),f=this._get(a,"navigationAsDateFormat"),g=this._getNumberOfMonths(a),h=this._get(a,"showCurrentAtPos"),i=this._get(a,"stepMonths"),j=g[0]!=1||g[1]!=1,k=this._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=this._getMinMaxDate(a,"min"),m=this._getMinMaxDate(a,"max"),n=a.drawMonth-h,o=a.drawYear;n<0&&(n+=12,o--);if(m){var p=this._daylightSavingAdjust(new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=l&&p<l?l:p;while(this._daylightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=11,o--)}a.drawMonth=n,a.drawYear=o;var q=this._get(a,"prevText");q=f?this.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=this._canAdjustMonth(a,-1,o,n)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', -"+i+", 'M');\""+' title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>":e?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>",s=this._get(a,"nextText");s=f?this.formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatConfig(a)):s;var t=this._canAdjustMonth(a,1,o,n)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', +"+i+", 'M');\""+' title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":e?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>",u=this._get(a,"currentText"),v=this._get(a,"gotoCurrent")&&a.currentDay?k:b;u=f?this.formatDate(u,v,this._getFormatConfig(a)):u;var w=a.inline?"":'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+dpuuid+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>",x=d?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?w:"")+(this._isInRange(a,v)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._gotoToday('#"+a.id+"');\""+">"+u+"</button>":"")+(c?"":w)+"</div>":"",y=parseInt(this._get(a,"firstDay"),10);y=isNaN(y)?0:y;var z=this._get(a,"showWeek"),A=this._get(a,"dayNames"),B=this._get(a,"dayNamesShort"),C=this._get(a,"dayNamesMin"),D=this._get(a,"monthNames"),E=this._get(a,"monthNamesShort"),F=this._get(a,"beforeShowDay"),G=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths"),I=this._get(a,"calculateWeek")||this.iso8601Week,J=this._getDefaultDate(a),K="";for(var L=0;L<g[0];L++){var M="";this.maxRows=4;for(var N=0;N<g[1];N++){var O=this._daylightSavingAdjust(new Date(o,n,a.selectedDay)),P=" ui-corner-all",Q="";if(j){Q+='<div class="ui-datepicker-group';if(g[1]>1)switch(N){case 0:Q+=" ui-datepicker-group-first",P=" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=" ui-datepicker-group-last",P=" ui-corner-"+(c?"left":"right");break;default:Q+=" ui-datepicker-group-middle",P=""}Q+='">'}Q+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+P+'">'+(/all|left/.test(P)&&L==0?c?t:r:"")+(/all|right/.test(P)&&L==0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</div><table class="ui-datepicker-calendar"><thead>'+"<tr>";var R=z?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(var S=0;S<7;S++){var T=(S+y)%7;R+="<th"+((S+y+6)%7>=5?' class="ui-datepicker-week-end"':"")+">"+'<span title="'+A[T]+'">'+C[T]+"</span></th>"}Q+=R+"</tr></thead><tbody>";var U=this._getDaysInMonth(o,n);o==a.selectedYear&&n==a.selectedMonth&&(a.selectedDay=Math.min(a.selectedDay,U));var V=(this._getFirstDayOfMonth(o,n)-y+7)%7,W=Math.ceil((V+U)/7),X=j?this.maxRows>W?this.maxRows:W:W;this.maxRows=X;var Y=this._daylightSavingAdjust(new Date(o,n,1-V));for(var Z=0;Z<X;Z++){Q+="<tr>";var _=z?'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(Y)+"</td>":"";for(var S=0;S<7;S++){var ba=F?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],bb=Y.getMonth()!=n,bc=bb&&!H||!ba[0]||l&&Y<l||m&&Y>m;_+='<td class="'+((S+y+6)%7>=5?" ui-datepicker-week-end":"")+(bb?" ui-datepicker-other-month":"")+(Y.getTime()==O.getTime()&&n==a.selectedMonth&&a._keyEvent||J.getTime()==Y.getTime()&&J.getTime()==O.getTime()?" "+this._dayOverClass:"")+(bc?" "+this._unselectableClass+" ui-state-disabled":"")+(bb&&!G?"":" "+ba[1]+(Y.getTime()==k.getTime()?" "+this._currentClass:"")+(Y.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!bb||G)&&ba[2]?' title="'+ba[2]+'"':"")+(bc?"":' onclick="DP_jQuery_'+dpuuid+".datepicker._selectDay('#"+a.id+"',"+Y.getMonth()+","+Y.getFullYear()+', this);return false;"')+">"+(bb&&!G?"&#xa0;":bc?'<span class="ui-state-default">'+Y.getDate()+"</span>":'<a class="ui-state-default'+(Y.getTime()==b.getTime()?" ui-state-highlight":"")+(Y.getTime()==k.getTime()?" ui-state-active":"")+(bb?" ui-priority-secondary":"")+'" href="#">'+Y.getDate()+"</a>")+"</td>",Y.setDate(Y.getDate()+1),Y=this._daylightSavingAdjust(Y)}Q+=_+"</tr>"}n++,n>11&&(n=0,o++),Q+="</tbody></table>"+(j?"</div>"+(g[0]>0&&N==g[1]-1?'<div class="ui-datepicker-row-break"></div>':""):""),M+=Q}K+=M}K+=x+($.browser.msie&&parseInt($.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':""),
+a._keyEvent=!1;return K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='<div class="ui-datepicker-title">',m="";if(f||!i)m+='<span class="ui-datepicker-month">'+g[b]+"</span>";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" "+">";for(var p=0;p<12;p++)(!n||p>=d.getMonth())&&(!o||p<=e.getMonth())&&(m+='<option value="'+p+'"'+(p==b?' selected="selected"':"")+">"+h[p]+"</option>");m+="</select>"}k||(l+=m+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+='<span class="ui-datepicker-year">'+c+"</span>";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" "+">";for(;t<=u;t++)a.yearshtml+='<option value="'+t+'"'+(t==c?' selected="selected"':"")+">"+t+"</option>";a.yearshtml+="</select>",l+=a.yearshtml,a.yearshtml=null}}l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?"&#xa0;":"")+m),l+="</div>";return l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&b<c?c:b;e=d&&e>d?d:e;return e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth()));return this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)})},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.8.18",window["DP_jQuery_"+dpuuid]=$})(jQuery);/*
+ * jQuery UI Progressbar 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===b)return this._value();this._setOption("value",a);return this},_setOption:function(b,c){b==="value"&&(this.options.value=c,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;typeof a!="number"&&(a=0);return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var a=this.value(),b=this._percentage();this.oldValue!==a&&(this.oldValue=a,this._trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(b.toFixed(0)+"%"),this.element.attr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Effects 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */jQuery.effects||function(a,b){function l(b){if(!b||typeof b=="number"||a.fx.speeds[b])return!0;if(typeof b=="string"&&!a.effects[b])return!0;return!1}function k(b,c,d,e){typeof b=="object"&&(e=c,d=null,c=b,b=c.effect),a.isFunction(c)&&(e=c,d=null,c={});if(typeof c=="number"||a.fx.speeds[c])e=d,d=c,c={};a.isFunction(d)&&(e=d,d=null),c=c||{},d=d||c.duration,d=a.fx.off?0:typeof d=="number"?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,e=e||c.complete;return[b,c,d,e]}function j(a,b){var c={_:0},d;for(d in b)a[d]!=b[d]&&(c[d]=b[d]);return c}function i(b){var c,d;for(c in b)d=b[c],(d==null||a.isFunction(d)||c in g||/scrollbar/.test(c)||!/color/i.test(c)&&isNaN(parseFloat(d)))&&delete b[c];return b}function h(){var a=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,b={},c,d;if(a&&a.length&&a[0]&&a[a[0]]){var e=a.length;while(e--)c=a[e],typeof a[c]=="string"&&(d=c.replace(/\-(\w)/g,function(a,b){return b.toUpperCase()}),b[d]=a[c])}else for(c in a)typeof a[c]=="string"&&(b[c]=a[c]);return b}function d(b,d){var e;do{e=a.curCSS(b,d);if(e!=""&&e!="transparent"||a.nodeName(b,"body"))break;d="backgroundColor"}while(b=b.parentNode);return c(e)}function c(b){var c;if(b&&b.constructor==Array&&b.length==3)return b;if(c=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(b))return[parseInt(c[1],10),parseInt(c[2],10),parseInt(c[3],10)];if(c=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))return[parseFloat(c[1])*2.55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55];if(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))return[parseInt(c[1],16),parseInt(c[2],16),parseInt(c[3],16)];if(c=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b))return[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)];if(c=/rgba\(0, 0, 0, 0\)/.exec(b))return e.transparent;return e[a.trim(b).toLowerCase()]}a.effects={},a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","borderColor","color","outlineColor"],function(b,e){a.fx.step[e]=function(a){a.colorInit||(a.start=d(a.elem,e),a.end=c(a.end),a.colorInit=!0),a.elem.style[e]="rgb("+Math.max(Math.min(parseInt(a.pos*(a.end[0]-a.start[0])+a.start[0],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[1]-a.start[1])+a.start[1],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[2]-a.start[2])+a.start[2],10),255),0)+")"}});var e={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},f=["add","remove","toggle"],g={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(b,c,d,e){a.isFunction(d)&&(e=d,d=null);return this.queue(function(){var g=a(this),k=g.attr("style")||" ",l=i(h.call(this)),m,n=g.attr("class");a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),m=i(h.call(this)),g.attr("class",n),g.animate(j(l,m),{queue:!1,duration:c,easing:d,complete:function(){a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),typeof g.attr("style")=="object"?(g.attr("style").cssText="",g.attr("style").cssText=k):g.attr("style",k),e&&e.apply(this,arguments),a.dequeue(this)}})})},a.fn.extend({_addClass:a.fn.addClass,addClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{add:b},c,d,e]):this._addClass(b)},_removeClass:a.fn.removeClass,removeClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{remove:b},c,d,e]):this._removeClass(b)},_toggleClass:a.fn.toggleClass,toggleClass:function(c,d,e,f,g){return typeof d=="boolean"||d===b?e?a.effects.animateClass.apply(this,[d?{add:c}:{remove:c},e,f,g]):this._toggleClass(c,d):a.effects.animateClass.apply(this,[{toggle:c},d,e,f])},switchClass:function(b,c,d,e,f){return a.effects.animateClass.apply(this,[{add:c,remove:b},d,e,f])}}),a.extend(a.effects,{version:"1.8.18",save:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.data("ec.storage."+b[c],a[0].style[b[c]])},restore:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.css(b[c],a.data("ec.storage."+b[c]))},setMode:function(a,b){b=="toggle"&&(b=a.is(":hidden")?"show":"hide");return b},getBaseline:function(a,b){var c,d;switch(a[0]){case"top":c=0;break;case"middle":c=.5;break;case"bottom":c=1;break;default:c=a[0]/b.height}switch(a[1]){case"left":d=0;break;case"center":d=.5;break;case"right":d=1;break;default:d=a[1]/b.width}return{x:d,y:c}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var c={width:b.outerWidth(!0),height:b.outerHeight(!0),"float":b.css("float")},d=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e=document.activeElement;b.wrap(d),(b[0]===e||a.contains(b[0],e))&&a(e).focus(),d=b.parent(),b.css("position")=="static"?(d.css({position:"relative"}),b.css({position:"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=b.css(d),isNaN(parseInt(c[d],10))&&(c[d]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"}));return d.css(c).show()},removeWrapper:function(b){var c,d=document.activeElement;if(b.parent().is(".ui-effects-wrapper")){c=b.parent().replaceWith(b),(b[0]===d||a.contains(b[0],d))&&a(d).focus();return c}return b},setTransition:function(b,c,d,e){e=e||{},a.each(c,function(a,c){unit=b.cssUnit(c),unit[0]>0&&(e[c]=unit[0]*d+unit[1])});return e}}),a.fn.extend({effect:function(b,c,d,e){var f=k.apply(this,arguments),g={options:f[1],duration:f[2],callback:f[3]},h=g.options.mode,i=a.effects[b];if(a.fx.off||!i)return h?this[h](g.duration,g.callback):this.each(function(){g.callback&&g.callback.call(this)});return i.call(this,g)},_show:a.fn.show,show:function(a){if(l(a))return this._show.apply(this,arguments);var b=k.apply(this,arguments);b[1].mode="show";return this.effect.apply(this,b)},_hide:a.fn.hide,hide:function(a){if(l(a))return this._hide.apply(this,arguments);var b=k.apply(this,arguments);b[1].mode="hide";return this.effect.apply(this,b)},__toggle:a.fn.toggle,toggle:function(b){if(l(b)||typeof b=="boolean"||a.isFunction(b))return this.__toggle.apply(this,arguments);var c=k.apply(this,arguments);c[1].mode="toggle";return this.effect.apply(this,c)},cssUnit:function(b){var c=this.css(b),d=[];a.each(["em","px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=[parseFloat(c),b])});return d}}),a.easing.jswing=a.easing.swing,a.extend(a.easing,{def:"easeOutQuad",swing:function(b,c,d,e,f){return a.easing[a.easing.def](b,c,d,e,f)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b+c;return-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b+c;return d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b*b+c;return-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b*b*b+c;return d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return b==0?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){if(b==0)return c;if(b==e)return c+d;if((b/=e/2)<1)return d/2*Math.pow(2,10*(b-1))+c;return d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){if((b/=e/2)<1)return-d/2*(Math.sqrt(1-b*b)-1)+c;return d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*b)*Math.sin((b*e-f)*2*Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e/2)==2)return c+d;g||(g=e*.3*1.5);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);if(b<1)return-0.5*h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)+c;return h*Math.pow(2,-10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)*.5+d+c},easeInBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);return e*(c/=f)*c*((g+1)*c-g)+d},easeOutBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);return e*((c=c/f-1)*c*((g+1)*c+g)+1)+d},easeInOutBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);if((c/=f/2)<1)return e/2*c*c*(((g*=1.525)+1)*c-g)+d;return e/2*((c-=2)*c*(((g*=1.525)+1)*c+g)+2)+d},easeInBounce:function(b,c,d,e,f){return e-a.easing.easeOutBounce(b,f-c,0,e,f)+d},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?d*7.5625*b*b+c:b<2/2.75?d*(7.5625*(b-=1.5/2.75)*b+.75)+c:b<2.5/2.75?d*(7.5625*(b-=2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=2.625/2.75)*b+.984375)+c},easeInOutBounce:function(b,c,d,e,f){if(c<f/2)return a.easing.easeInBounce(b,c*2,0,e,f)*.5+d;return a.easing.easeOutBounce(b,c*2-f,0,e,f)*.5+e*.5+d}})}(jQuery);/*
+ * jQuery UI Effects Blind 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.blind=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"vertical";a.effects.save(c,d),c.show();var g=a.effects.createWrapper(c).css({overflow:"hidden"}),h=f=="vertical"?"height":"width",i=f=="vertical"?g.height():g.width();e=="show"&&g.css(h,0);var j={};j[h]=e=="show"?i:0,g.animate(j,b.duration,b.options.easing,function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Bounce 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.bounce=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"effect"),f=b.options.direction||"up",g=b.options.distance||20,h=b.options.times||5,i=b.duration||250;/show|hide/.test(e)&&d.push("opacity"),a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var j=f=="up"||f=="down"?"top":"left",k=f=="up"||f=="left"?"pos":"neg",g=b.options.distance||(j=="top"?c.outerHeight({margin:!0})/3:c.outerWidth({margin:!0})/3);e=="show"&&c.css("opacity",0).css(j,k=="pos"?-g:g),e=="hide"&&(g=g/(h*2)),e!="hide"&&h--;if(e=="show"){var l={opacity:1};l[j]=(k=="pos"?"+=":"-=")+g,c.animate(l,i/2,b.options.easing),g=g/2,h--}for(var m=0;m<h;m++){var n={},p={};n[j]=(k=="pos"?"-=":"+=")+g,p[j]=(k=="pos"?"+=":"-=")+g,c.animate(n,i/2,b.options.easing).animate(p,i/2,b.options.easing),g=e=="hide"?g*2:g/2}if(e=="hide"){var l={opacity:0};l[j]=(k=="pos"?"-=":"+=")+g,c.animate(l,i/2,b.options.easing,function(){c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)})}else{var n={},p={};n[j]=(k=="pos"?"-=":"+=")+g,p[j]=(k=="pos"?"+=":"-=")+g,c.animate(n,i/2,b.options.easing).animate(p,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)})}c.queue("fx",function(){c.dequeue()}),c.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Clip 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.clip=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","height","width"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"vertical";a.effects.save(c,d),c.show();var g=a.effects.createWrapper(c).css({overflow:"hidden"}),h=c[0].tagName=="IMG"?g:c,i={size:f=="vertical"?"height":"width",position:f=="vertical"?"top":"left"},j=f=="vertical"?h.height():h.width();e=="show"&&(h.css(i.size,0),h.css(i.position,j/2));var k={};k[i.size]=e=="show"?j:0,k[i.position]=e=="show"?0:j/2,h.animate(k,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Drop 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.drop=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","opacity"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"left";a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var g=f=="up"||f=="down"?"top":"left",h=f=="up"||f=="left"?"pos":"neg",i=b.options.distance||(g=="top"?c.outerHeight({margin:!0})/2:c.outerWidth({margin:!0})/2);e=="show"&&c.css("opacity",0).css(g,h=="pos"?-i:i);var j={opacity:e=="show"?1:0};j[g]=(e=="show"?h=="pos"?"+=":"-=":h=="pos"?"-=":"+=")+i,c.animate(j,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Explode 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.explode=function(b){return this.queue(function(){var c=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3,d=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=b.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":b.options.mode;var e=a(this).show().css("visibility","hidden"),f=e.offset();f.top-=parseInt(e.css("marginTop"),10)||0,f.left-=parseInt(e.css("marginLeft"),10)||0;var g=e.outerWidth(!0),h=e.outerHeight(!0);for(var i=0;i<c;i++)for(var j=0;j<d;j++)e.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(g/d),top:-i*(h/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/d,height:h/c,left:f.left+j*(g/d)+(b.options.mode=="show"?(j-Math.floor(d/2))*(g/d):0),top:f.top+i*(h/c)+(b.options.mode=="show"?(i-Math.floor(c/2))*(h/c):0),opacity:b.options.mode=="show"?0:1}).animate({left:f.left+j*(g/d)+(b.options.mode=="show"?0:(j-Math.floor(d/2))*(g/d)),top:f.top+i*(h/c)+(b.options.mode=="show"?0:(i-Math.floor(c/2))*(h/c)),opacity:b.options.mode=="show"?1:0},b.duration||500);setTimeout(function(){b.options.mode=="show"?e.css({visibility:"visible"}):e.css({visibility:"visible"}).hide(),b.callback&&b.callback.apply(e[0]),e.dequeue(),a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);/*
+ * jQuery UI Effects Fade 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.fade=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"hide");c.animate({opacity:d},{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Fold 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.fold=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.size||15,g=!!b.options.horizFirst,h=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(c,d),c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),j=e=="show"!=g,k=j?["width","height"]:["height","width"],l=j?[i.width(),i.height()]:[i.height(),i.width()],m=/([0-9]+)%/.exec(f);m&&(f=parseInt(m[1],10)/100*l[e=="hide"?0:1]),e=="show"&&i.css(g?{height:0,width:f}:{height:f,width:0});var n={},p={};n[k[0]]=e=="show"?l[0]:f,p[k[1]]=e=="show"?l[1]:0,i.animate(n,h,b.options.easing).animate(p,h,b.options.easing,function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Highlight 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.highlight=function(b){return this.queue(function(){var c=a(this),d=["backgroundImage","backgroundColor","opacity"],e=a.effects.setMode(c,b.options.mode||"show"),f={backgroundColor:c.css("backgroundColor")};e=="hide"&&(f.opacity=0),a.effects.save(c,d),c.show().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}).animate(f,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),e=="show"&&!a.support.opacity&&this.style.removeAttribute("filter"),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Pulsate 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.pulsate=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"show");times=(b.options.times||5)*2-1,duration=b.duration?b.duration/2:a.fx.speeds._default/2,isVisible=c.is(":visible"),animateTo=0,isVisible||(c.css("opacity",0).show(),animateTo=1),(d=="hide"&&isVisible||d=="show"&&!isVisible)&&times--;for(var e=0;e<times;e++)c.animate({opacity:animateTo},duration,b.options.easing),animateTo=(animateTo+1)%2;c.animate({opacity:animateTo},duration,b.options.easing,function(){animateTo==0&&c.hide(),b.callback&&b.callback.apply(this,arguments)}),c.queue("fx",function(){c.dequeue()}).dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Scale 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.puff=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"hide"),e=parseInt(b.options.percent,10)||150,f=e/100,g={height:c.height(),width:c.width()};a.extend(b.options,{fade:!0,mode:d,percent:d=="hide"?e:100,from:d=="hide"?g:{height:g.height*f,width:g.width*f}}),c.effect("scale",b.options,b.duration,b.callback),c.dequeue()})},a.effects.scale=function(b){return this.queue(function(){var c=a(this),d=a.extend(!0,{},b.options),e=a.effects.setMode(c,b.options.mode||"effect"),f=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:e=="hide"?0:100),g=b.options.direction||"both",h=b.options.origin;e!="effect"&&(d.origin=h||["middle","center"],d.restore=!0);var i={height:c.height(),width:c.width()};c.from=b.options.from||(e=="show"?{height:0,width:0}:i);var j={y:g!="horizontal"?f/100:1,x:g!="vertical"?f/100:1};c.to={height:i.height*j.y,width:i.width*j.x},b.options.fade&&(e=="show"&&(c.from.opacity=0,c.to.opacity=1),e=="hide"&&(c.from.opacity=1,c.to.opacity=0)),d.from=c.from,d.to=c.to,d.mode=e,c.effect("size",d,b.duration,b.callback),c.dequeue()})},a.effects.size=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","width","height","overflow","opacity"],e=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],g=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],i=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],j=a.effects.setMode(c,b.options.mode||"effect"),k=b.options.restore||!1,l=b.options.scale||"both",m=b.options.origin,n={height:c.height(),width:c.width()};c.from=b.options.from||n,c.to=b.options.to||n;if(m){var p=a.effects.getBaseline(m,n);c.from.top=(n.height-c.from.height)*p.y,c.from.left=(n.width-c.from.width)*p.x,c.to.top=(n.height-c.to.height)*p.y,c.to.left=(n.width-c.to.width)*p.x}var q={from:{y:c.from.height/n.height,x:c.from.width/n.width},to:{y:c.to.height/n.height,x:c.to.width/n.width}};if(l=="box"||l=="both")q.from.y!=q.to.y&&(d=d.concat(h),c.from=a.effects.setTransition(c,h,q.from.y,c.from),c.to=a.effects.setTransition(c,h,q.to.y,c.to)),q.from.x!=q.to.x&&(d=d.concat(i),c.from=a.effects.setTransition(c,i,q.from.x,c.from),c.to=a.effects.setTransition(c,i,q.to.x,c.to));(l=="content"||l=="both")&&q.from.y!=q.to.y&&(d=d.concat(g),c.from=a.effects.setTransition(c,g,q.from.y,c.from),c.to=a.effects.setTransition(c,g,q.to.y,c.to)),a.effects.save(c,k?d:e),c.show(),a.effects.createWrapper(c),c.css("overflow","hidden").css(c.from);if(l=="content"||l=="both")h=h.concat(["marginTop","marginBottom"]).concat(g),i=i.concat(["marginLeft","marginRight"]),f=d.concat(h).concat(i),c.find("*[width]").each(function(){child=a(this),k&&a.effects.save(child,f);var c={height:child.height(),width:child.width()};child.from={height:c.height*q.from.y,width:c.width*q.from.x},child.to={height:c.height*q.to.y,width:c.width*q.to.x},q.from.y!=q.to.y&&(child.from=a.effects.setTransition(child,h,q.from.y,child.from),child.to=a.effects.setTransition(child,h,q.to.y,child.to)),q.from.x!=q.to.x&&(child.from=a.effects.setTransition(child,i,q.from.x,child.from),child.to=a.effects.setTransition(child,i,q.to.x,child.to)),child.css(child.from),child.animate(child.to,b.duration,b.options.easing,function(){k&&a.effects.restore(child,f)})});c.animate(c.to,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){c.to.opacity===0&&c.css("opacity",c.from.opacity),j=="hide"&&c.hide(),a.effects.restore(c,k?d:e),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Shake 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.shake=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"effect"),f=b.options.direction||"left",g=b.options.distance||20,h=b.options.times||3,i=b.duration||b.options.duration||140;a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var j=f=="up"||f=="down"?"top":"left",k=f=="up"||f=="left"?"pos":"neg",l={},m={},n={};l[j]=(k=="pos"?"-=":"+=")+g,m[j]=(k=="pos"?"+=":"-=")+g*2,n[j]=(k=="pos"?"-=":"+=")+g*2,c.animate(l,i,b.options.easing);for(var p=1;p<h;p++)c.animate(m,i,b.options.easing).animate(n,i,b.options.easing);c.animate(m,i,b.options.easing).animate(l,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)}),c.queue("fx",function(){c.dequeue()}),c.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Slide 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.slide=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"show"),f=b.options.direction||"left";a.effects.save(c,d),c.show(),a.effects.createWrapper(c).css({overflow:"hidden"});var g=f=="up"||f=="down"?"top":"left",h=f=="up"||f=="left"?"pos":"neg",i=b.options.distance||(g=="top"?c.outerHeight({margin:!0}):c.outerWidth({margin:!0}));e=="show"&&c.css(g,h=="pos"?isNaN(i)?"-"+i:-i:i);var j={};j[g]=(e=="show"?h=="pos"?"+=":"-=":h=="pos"?"-=":"+=")+i,c.animate(j,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Transfer 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);
\ No newline at end of file
diff --git a/htdocs/js/jquery-ui-timepicker-addon.js b/htdocs/js/jquery-ui-timepicker-addon.js
new file mode 100644
index 0000000000..f83839ee48
--- /dev/null
+++ b/htdocs/js/jquery-ui-timepicker-addon.js
@@ -0,0 +1,1326 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 0.9.9
+* Last Modified: 02/05/2012
+* 
+* Copyright 2012 Trent Richardson
+* Dual licensed under the MIT and GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+* 
+* HERES THE CSS:
+* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+* .ui-timepicker-div dl { text-align: left; }
+* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+* .ui-timepicker-div td { font-size: 90%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+*/
+
+(function($) {
+
+$.extend($.ui, { timepicker: { version: "0.9.9" } });
+
+/* Time picker manager.
+   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+   Settings for (groups of) time pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Timepicker() {
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		currentText: 'Now',
+		closeText: 'Done',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		timeOnlyTitle: 'Choose Time',
+		timeText: 'Time',
+		hourText: 'Hour',
+		minuteText: 'Minute',
+		secondText: 'Second',
+		millisecText: 'Millisecond',
+		timezoneText: 'Time Zone'
+	};
+	this._defaults = { // Global defaults for all the datetime picker instances
+		showButtonPanel: true,
+		timeOnly: false,
+		showHour: true,
+		showMinute: true,
+		showSecond: false,
+		showMillisec: false,
+		showTimezone: false,
+		showTime: true,
+		stepHour: 1,
+		stepMinute: 1,
+		stepSecond: 1,
+		stepMillisec: 1,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		timezone: '+0000',
+		hourMin: 0,
+		minuteMin: 0,
+		secondMin: 0,
+		millisecMin: 0,
+		hourMax: 23,
+		minuteMax: 59,
+		secondMax: 59,
+		millisecMax: 999,
+		minDateTime: null,
+		maxDateTime: null,
+		onSelect: null,
+		hourGrid: 0,
+		minuteGrid: 0,
+		secondGrid: 0,
+		millisecGrid: 0,
+		alwaysSetTime: true,
+		separator: ' ',
+		altFieldTimeOnly: true,
+		showTimepicker: true,
+		timezoneIso8609: false,
+		timezoneList: null,
+		addSliderAccess: false,
+		sliderAccessArgs: null
+	};
+	$.extend(this._defaults, this.regional['']);
+};
+
+$.extend(Timepicker.prototype, {
+	$input: null,
+	$altInput: null,
+	$timeObj: null,
+	inst: null,
+	hour_slider: null,
+	minute_slider: null,
+	second_slider: null,
+	millisec_slider: null,
+	timezone_select: null,
+	hour: 0,
+	minute: 0,
+	second: 0,
+	millisec: 0,
+	timezone: '+0000',
+	hourMinOriginal: null,
+	minuteMinOriginal: null,
+	secondMinOriginal: null,
+	millisecMinOriginal: null,
+	hourMaxOriginal: null,
+	minuteMaxOriginal: null,
+	secondMaxOriginal: null,
+	millisecMaxOriginal: null,
+	ampm: '',
+	formattedDate: '',
+	formattedTime: '',
+	formattedDateTime: '',
+	timezoneList: null,
+
+	/* Override the default settings for all instances of the time picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	//########################################################################
+	// Create a new Timepicker instance
+	//########################################################################
+	_newInst: function($input, o) {
+		var tp_inst = new Timepicker(),
+			inlineSettings = {};
+			
+		for (var attrName in this._defaults) {
+			var attrValue = $input.attr('time:' + attrName);
+			if (attrValue) {
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+			beforeShow: function(input, dp_inst) {
+				if ($.isFunction(o.beforeShow))
+					return o.beforeShow(input, dp_inst, tp_inst);
+			},
+			onChangeMonthYear: function(year, month, dp_inst) {
+				// Update the time as well : this prevents the time from disappearing from the $input field.
+				tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onChangeMonthYear))
+					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+			},
+			onClose: function(dateText, dp_inst) {
+				if (tp_inst.timeDefined === true && $input.val() != '')
+					tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onClose))
+					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+			},
+			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+		});
+		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase() });
+		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase() });
+
+		if (tp_inst._defaults.timezoneList === null) {
+			var timezoneList = [];
+			for (var i = -11; i <= 12; i++)
+				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
+			if (tp_inst._defaults.timezoneIso8609)
+				timezoneList = $.map(timezoneList, function(val) {
+					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+				});
+			tp_inst._defaults.timezoneList = timezoneList;
+		}
+
+		tp_inst.hour = tp_inst._defaults.hour;
+		tp_inst.minute = tp_inst._defaults.minute;
+		tp_inst.second = tp_inst._defaults.second;
+		tp_inst.millisec = tp_inst._defaults.millisec;
+		tp_inst.ampm = '';
+		tp_inst.$input = $input;
+
+		if (o.altField)
+			tp_inst.$altInput = $(o.altField)
+				.css({ cursor: 'pointer' })
+				.focus(function(){ $input.trigger("focus"); });
+		
+		if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
+		{
+			tp_inst._defaults.minDate=new Date();
+		}
+		if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0)
+		{
+			tp_inst._defaults.maxDate=new Date();
+		}
+		
+		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
+			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
+			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
+			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
+			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+		return tp_inst;
+	},
+
+	//########################################################################
+	// add our sliders to the calendar
+	//########################################################################
+	_addTimePicker: function(dp_inst) {
+		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+				this.$input.val() + ' ' + this.$altInput.val() : 
+				this.$input.val();
+
+		this.timeDefined = this._parseTime(currDT);
+		this._limitMinMaxDateTime(dp_inst, false);
+		this._injectTimePicker();
+	},
+
+	//########################################################################
+	// parse the time string from input value or _setTime
+	//########################################################################
+	_parseTime: function(timeString, withDate) {
+		var regstr = this._defaults.timeFormat.toString()
+				.replace(/h{1,2}/ig, '(\\d?\\d)')
+				.replace(/m{1,2}/ig, '(\\d?\\d)')
+				.replace(/s{1,2}/ig, '(\\d?\\d)')
+				.replace(/l{1}/ig, '(\\d?\\d?\\d)')
+				.replace(/t{1,2}/ig, this._getPatternAmpm())
+				.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
+				.replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
+			order = this._getFormatPositions(),
+			ampm = '',
+			treg;
+
+		if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+
+		if (withDate || !this._defaults.timeOnly) {
+			// the time should come after x number of characters and a space.
+			// x = at least the length of text specified by the date format
+			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+			// escape special regex characters in the seperator
+			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
+			regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
+		}
+		
+		treg = timeString.match(new RegExp(regstr, 'i'));
+
+		if (treg) {
+			if (order.t !== -1) {
+				if (treg[order.t] === undefined || treg[order.t].length === 0) {
+					ampm = '';
+					this.ampm = '';
+				} else {
+					ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM';
+					this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+				}
+			}
+
+			if (order.h !== -1) {
+				if (ampm == 'AM' && treg[order.h] == '12')
+					this.hour = 0; // 12am = 0 hour
+				else if (ampm == 'PM' && treg[order.h] != '12')
+					this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12
+				else this.hour = Number(treg[order.h]);
+			}
+
+			if (order.m !== -1) this.minute = Number(treg[order.m]);
+			if (order.s !== -1) this.second = Number(treg[order.s]);
+			if (order.l !== -1) this.millisec = Number(treg[order.l]);
+			if (order.z !== -1 && treg[order.z] !== undefined) {
+				var tz = treg[order.z].toUpperCase();
+				switch (tz.length) {
+				case 1:	// Z
+					tz = this._defaults.timezoneIso8609 ? 'Z' : '+0000';
+					break;
+				case 5:	// +hhmm
+					if (this._defaults.timezoneIso8609)
+						tz = tz.substring(1) == '0000'
+						   ? 'Z'
+						   : tz.substring(0, 3) + ':' + tz.substring(3);
+					break;
+				case 6:	// +hh:mm
+					if (!this._defaults.timezoneIso8609)
+						tz = tz == 'Z' || tz.substring(1) == '00:00'
+						   ? '+0000'
+						   : tz.replace(/:/, '');
+					else if (tz.substring(1) == '00:00')
+						tz = 'Z';
+					break;
+				}
+				this.timezone = tz;
+			}
+			
+			return true;
+
+		}
+		return false;
+	},
+
+	//########################################################################
+	// pattern for standard and localized AM/PM markers
+	//########################################################################
+	_getPatternAmpm: function() {
+		var markers = [];
+			o = this._defaults;
+		if (o.amNames)
+			$.merge(markers, o.amNames);
+		if (o.pmNames)
+			$.merge(markers, o.pmNames);
+		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&') });
+		return '(' + markers.join('|') + ')?';
+	},
+
+	//########################################################################
+	// figure out position of time elements.. cause js cant do named captures
+	//########################################################################
+	_getFormatPositions: function() {
+		var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
+
+		if (finds)
+			for (var i = 0; i < finds.length; i++)
+				if (orders[finds[i].toString().charAt(0)] == -1)
+					orders[finds[i].toString().charAt(0)] = i + 1;
+
+		return orders;
+	},
+
+	//########################################################################
+	// generate and inject html for timepicker into ui datepicker
+	//########################################################################
+	_injectTimePicker: function() {
+		var $dp = this.inst.dpDiv,
+			o = this._defaults,
+			tp_inst = this,
+			// Added by Peter Medeiros:
+			// - Figure out what the hour/minute/second max should be based on the step values.
+			// - Example: if stepMinute is 15, then minMax is 45.
+			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
+			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
+			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
+			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
+			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+		// Prevent displaying twice
+		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+			var noDisplay = ' style="display:none;"',
+				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
+						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '></dd>' +
+						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
+				hourGridSize = 0,
+				minuteGridSize = 0,
+				secondGridSize = 0,
+				millisecGridSize = 0,
+				size;
+
+ 			// Hours
+			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '></div>';
+			if (o.showHour && o.hourGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
+					hourGridSize++;
+					var tmph = (o.ampm && h > 12) ? h-12 : h;
+					if (tmph < 10) tmph = '0' + tmph;
+					if (o.ampm) {
+						if (h == 0) tmph = 12 +'a';
+						else if (h < 12) tmph += 'a';
+						else tmph += 'p';
+					}
+					html += '<td>' + tmph + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Minutes
+			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
+					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
+					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
+							((o.showMinute) ? '' : noDisplay) + '></div>';
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
+					minuteGridSize++;
+					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Seconds
+			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
+					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
+					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
+							((o.showSecond) ? '' : noDisplay) + '></div>';
+
+			if (o.showSecond && o.secondGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
+					secondGridSize++;
+					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Milliseconds
+			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
+					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
+					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
+							((o.showMillisec) ? '' : noDisplay) + '></div>';
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
+					millisecGridSize++;
+					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Timezone
+			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
+					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
+							((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+			html += '</dl></div>';
+			$tp = $(html);
+
+				// if we only want time picker...
+			if (o.timeOnly === true) {
+				$tp.prepend(
+					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
+						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+					'</div>');
+				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+			}
+
+			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.hour,
+				min: o.hourMin,
+				max: hourMax,
+				step: o.stepHour,
+				slide: function(event, ui) {
+					tp_inst.hour_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			
+			// Updated by Peter Medeiros:
+			// - Pass in Event and UI instance into slide function
+			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.minute,
+				min: o.minuteMin,
+				max: minMax,
+				step: o.stepMinute,
+				slide: function(event, ui) {
+					tp_inst.minute_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.second,
+				min: o.secondMin,
+				max: secMax,
+				step: o.stepSecond,
+				slide: function(event, ui) {
+					tp_inst.second_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.millisec,
+				min: o.millisecMin,
+				max: millisecMax,
+				step: o.stepMillisec,
+				slide: function(event, ui) {
+					tp_inst.millisec_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
+			$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />")
+						.val(typeof val == "object" ? val.value : val)
+						.text(typeof val == "object" ? val.label : val);
+				})
+			);
+			this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
+			this.timezone_select.change(function() {
+				tp_inst._onTimeChange();
+			});
+
+			// Add grid functionality
+			if (o.showHour && o.hourGrid > 0) {
+				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+				$tp.find(".ui_tpicker_hour table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * hourGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each( function(index) {
+					$(this).click(function() {
+						var h = $(this).html();
+						if(o.ampm)	{
+							var ap = h.substring(2).toLowerCase(),
+								aph = parseInt(h.substring(0,2), 10);
+							if (ap == 'a') {
+								if (aph == 12) h = 0;
+								else h = aph;
+							} else if (aph == 12) h = 12;
+							else h = aph + 12;
+						}
+						tp_inst.hour_slider.slider("option", "value", h);
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / hourGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+				$tp.find(".ui_tpicker_minute table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * minuteGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.minute_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / minuteGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showSecond && o.secondGrid > 0) {
+				$tp.find(".ui_tpicker_second table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * secondGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.second_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / secondGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				$tp.find(".ui_tpicker_millisec table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * millisecGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.millisec_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / millisecGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+			if ($buttonPanel.length) $buttonPanel.before($tp);
+			else $dp.append($tp);
+
+			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+			if (this.inst !== null) {
+				var timeDefined = this.timeDefined;
+				this._onTimeChange();
+				this.timeDefined = timeDefined;
+			}
+
+			//Emulate datepicker onSelect behavior. Call on slidestop.
+			var onSelectDelegate = function() {
+				tp_inst._onSelectHandler();
+			};
+			this.hour_slider.bind('slidestop',onSelectDelegate);
+			this.minute_slider.bind('slidestop',onSelectDelegate);
+			this.second_slider.bind('slidestop',onSelectDelegate);
+			this.millisec_slider.bind('slidestop',onSelectDelegate);
+			
+			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+			if (this._defaults.addSliderAccess){
+				var sliderAccessArgs = this._defaults.sliderAccessArgs;
+				setTimeout(function(){ // fix for inline mode
+					if($tp.find('.ui-slider-access').length == 0){
+						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+						// fix any grids since sliders are shorter
+						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+						if(sliderAccessWidth){
+							$tp.find('table:visible').each(function(){
+								var $g = $(this),
+									oldWidth = $g.outerWidth(),
+									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
+									newWidth = oldWidth - sliderAccessWidth,
+									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
+						
+								$g.css({ width: newWidth, marginLeft: newMarginLeft });
+							});
+						}
+					}
+				},0);
+			}
+			// end slideAccess integration
+			
+		}
+	},
+
+	//########################################################################
+	// This function tries to limit the ability to go outside the
+	// min/max date range
+	//########################################################################
+	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
+		var o = this._defaults,
+			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+		if(!this._defaults.showTimepicker) return; // No time so nothing to check here
+
+		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
+			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
+				this.hourMinOriginal = o.hourMin;
+				this.minuteMinOriginal = o.minuteMin;
+				this.secondMinOriginal = o.secondMin;
+				this.millisecMinOriginal = o.millisecMin;
+			}
+
+			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+				this._defaults.hourMin = minDateTime.getHours();
+				if (this.hour <= this._defaults.hourMin) {
+					this.hour = this._defaults.hourMin;
+					this._defaults.minuteMin = minDateTime.getMinutes();
+					if (this.minute <= this._defaults.minuteMin) {
+						this.minute = this._defaults.minuteMin;
+						this._defaults.secondMin = minDateTime.getSeconds();
+					} else if (this.second <= this._defaults.secondMin){
+						this.second = this._defaults.secondMin;
+						this._defaults.millisecMin = minDateTime.getMilliseconds();
+					} else {
+						if(this.millisec < this._defaults.millisecMin)
+							this.millisec = this._defaults.millisecMin;
+						this._defaults.millisecMin = this.millisecMinOriginal;
+					}
+				} else {
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+				}
+			}else{
+				this._defaults.hourMin = this.hourMinOriginal;
+				this._defaults.minuteMin = this.minuteMinOriginal;
+				this._defaults.secondMin = this.secondMinOriginal;
+				this._defaults.millisecMin = this.millisecMinOriginal;
+			}
+		}
+
+		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
+			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
+				this.hourMaxOriginal = o.hourMax;
+				this.minuteMaxOriginal = o.minuteMax;
+				this.secondMaxOriginal = o.secondMax;
+				this.millisecMaxOriginal = o.millisecMax;
+			}
+
+			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+				this._defaults.hourMax = maxDateTime.getHours();
+				if (this.hour >= this._defaults.hourMax) {
+					this.hour = this._defaults.hourMax;
+					this._defaults.minuteMax = maxDateTime.getMinutes();
+					if (this.minute >= this._defaults.minuteMax) {
+						this.minute = this._defaults.minuteMax;
+						this._defaults.secondMax = maxDateTime.getSeconds();
+					} else if (this.second >= this._defaults.secondMax) {
+						this.second = this._defaults.secondMax;
+						this._defaults.millisecMax = maxDateTime.getMilliseconds();
+					} else {
+						if(this.millisec > this._defaults.millisecMax) this.millisec = this._defaults.millisecMax;
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+					}
+				} else {
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+				}
+			}else{
+				this._defaults.hourMax = this.hourMaxOriginal;
+				this._defaults.minuteMax = this.minuteMaxOriginal;
+				this._defaults.secondMax = this.secondMaxOriginal;
+				this._defaults.millisecMax = this.millisecMaxOriginal;
+			}
+		}
+
+		if(adjustSliders !== undefined && adjustSliders === true){
+			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
+                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
+                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
+				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+
+			if(this.hour_slider)
+				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
+			if(this.minute_slider)
+				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
+			if(this.second_slider)
+				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
+			if(this.millisec_slider)
+				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
+		}
+
+	},
+
+	
+	//########################################################################
+	// when a slider moves, set the internal time...
+	// on time change is also called when the time is updated in the text field
+	//########################################################################
+	_onTimeChange: function() {
+		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+			second = (this.second_slider) ? this.second_slider.slider('value') : false,
+			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+			o = this._defaults;
+
+		if (typeof(hour) == 'object') hour = false;
+		if (typeof(minute) == 'object') minute = false;
+		if (typeof(second) == 'object') second = false;
+		if (typeof(millisec) == 'object') millisec = false;
+		if (typeof(timezone) == 'object') timezone = false;
+
+		if (hour !== false) hour = parseInt(hour,10);
+		if (minute !== false) minute = parseInt(minute,10);
+		if (second !== false) second = parseInt(second,10);
+		if (millisec !== false) millisec = parseInt(millisec,10);
+
+		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+		// If the update was done in the input field, the input field should not be updated.
+		// If the update was done using the sliders, update the input field.
+		var hasChanged = (hour != this.hour || minute != this.minute
+				|| second != this.second || millisec != this.millisec
+				|| (this.ampm.length > 0
+				    && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
+				|| timezone != this.timezone);
+		
+		if (hasChanged) {
+
+			if (hour !== false)this.hour = hour;
+			if (minute !== false) this.minute = minute;
+			if (second !== false) this.second = second;
+			if (millisec !== false) this.millisec = millisec;
+			if (timezone !== false) this.timezone = timezone;
+			
+			if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+			
+			this._limitMinMaxDateTime(this.inst, true);
+		}
+		if (o.ampm) this.ampm = ampm;
+		
+		//this._formatTime();
+		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+		if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
+		this.timeDefined = true;
+		if (hasChanged) this._updateDateTime();
+	},
+    
+	//########################################################################
+	// call custom onSelect. 
+	// bind to sliders slidestop, and grid click.
+	//########################################################################
+	_onSelectHandler: function() {
+		var onSelect = this._defaults.onSelect;
+		var inputEl = this.$input ? this.$input[0] : null;
+		if (onSelect && inputEl) {
+			onSelect.apply(inputEl, [this.formattedDateTime, this]);
+		}
+	},
+
+	//########################################################################
+	// left for any backwards compatibility
+	//########################################################################
+	_formatTime: function(time, format) {
+		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
+		var tmptime = (format || this._defaults.timeFormat).toString();
+
+		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+		
+		if (arguments.length) return tmptime;
+		else this.formattedTime = tmptime;
+	},
+
+	//########################################################################
+	// update our input with the new date time..
+	//########################################################################
+	_updateDateTime: function(dp_inst) {
+		dp_inst = this.inst || dp_inst;
+		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+			formatCfg = $.datepicker._getFormatConfig(dp_inst),
+			timeAvailable = dt !== null && this.timeDefined;
+		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+		var formattedDateTime = this.formattedDate;
+		if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
+			return;
+
+		if (this._defaults.timeOnly === true) {
+			formattedDateTime = this.formattedTime;
+		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+		}
+
+		this.formattedDateTime = formattedDateTime;
+
+		if(!this._defaults.showTimepicker) {
+			this.$input.val(this.formattedDate);
+		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+			this.$altInput.val(this.formattedTime);
+			this.$input.val(this.formattedDate);
+		} else if(this.$altInput) {
+			this.$altInput.val(formattedDateTime);
+			this.$input.val(formattedDateTime);
+		} else {
+			this.$input.val(formattedDateTime);
+		}
+		
+		this.$input.trigger("change");
+	}
+
+});
+
+$.fn.extend({
+	//########################################################################
+	// shorthand just to use timepicker..
+	//########################################################################
+	timepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+
+		return $(this).each(function() {
+			$.fn.datetimepicker.apply($(this), tmp_args);
+		});
+	},
+
+	//########################################################################
+	// extend timepicker to datepicker
+	//########################################################################
+	datetimepicker: function(o) {
+		o = o || {};
+		var $input = this,
+		tmp_args = arguments;
+
+		if (typeof(o) == 'string'){
+			if(o == 'getDate') 
+				return $.fn.datepicker.apply($(this[0]), tmp_args);
+			else 
+				return this.each(function() {
+					var $t = $(this);
+					$t.datepicker.apply($t, tmp_args);
+				});
+		}
+		else
+			return this.each(function() {
+				var $t = $(this);
+				$t.datepicker($.timepicker._newInst($t, o)._defaults);
+			});
+	}
+});
+
+//########################################################################
+// format the time all pretty... 
+// format = string format of the time
+// time = a {}, not a Date() for timezones
+// options = essentially the regional[].. amNames, pmNames, ampm
+//########################################################################
+$.datepicker.formatTime = function(format, time, options) {
+	options = options || {};
+	options = $.extend($.timepicker._defaults, options);
+	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
+	
+	var tmptime = format;
+	var ampmName = options['amNames'][0];
+
+	var hour = parseInt(time.hour, 10);
+	if (options.ampm) {
+		if (hour > 11){
+			ampmName = options['pmNames'][0];
+			if(hour > 12)
+				hour = hour % 12;
+		}
+		if (hour === 0)
+			hour = 12;
+	}
+	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
+		switch (match.toLowerCase()) {
+			case 'hh': return ('0' + hour).slice(-2);
+			case 'h':  return hour;
+			case 'mm': return ('0' + time.minute).slice(-2);
+			case 'm':  return time.minute;
+			case 'ss': return ('0' + time.second).slice(-2);
+			case 's':  return time.second;
+			case 'l':  return ('00' + time.millisec).slice(-3);
+			case 'z':  return time.timezone;
+			case 't': case 'tt':
+				if (options.ampm) {
+					if (match.length == 1)
+						ampmName = ampmName.charAt(0);
+					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+				}
+				return '';
+		}
+	});
+
+	tmptime = $.trim(tmptime);
+	return tmptime;
+}
+
+//########################################################################
+// the bad hack :/ override datepicker so it doesnt close on select
+// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+//########################################################################
+$.datepicker._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+	var inst = this._getInst($(id)[0]),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		tp_inst._limitMinMaxDateTime(inst, true);
+		inst.inline = inst.stay_open = true;
+		//This way the onSelect handler called from calendarpicker get the full dateTime
+		this._base_selectDate(id, dateStr);
+		inst.inline = inst.stay_open = false;
+		this._notifyChange(inst);
+		this._updateDatepicker(inst);
+	}
+	else this._base_selectDate(id, dateStr);
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+$.datepicker._updateDatepicker = function(inst) {
+
+	// don't popup the datepicker if there is another instance already opened
+	var input = inst.input[0];
+	if($.datepicker._curInst &&
+	   $.datepicker._curInst != inst &&
+	   $.datepicker._datepickerShowing &&
+	   $.datepicker._lastInput != input) {
+		return;
+	}
+
+	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+				
+		this._base_updateDatepicker(inst);
+		
+		// Reload the time control when changing something in the input text field.
+		var tp_inst = this._get(inst, 'timepicker');
+		if(tp_inst) tp_inst._addTimePicker(inst);
+	}
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var ampm = tp_inst._defaults.ampm,
+				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+				datetimeChars = tp_inst._defaults.timeFormat.toString()
+								.replace(/[hms]/g, '')
+								.replace(/TT/g, ampm ? 'APM' : '')
+								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+								.replace(/tT/g, ampm ? 'AaPpMm' : '')
+								.replace(/T/g, ampm ? 'AP' : '')
+								.replace(/tt/g, ampm ? 'apm' : '')
+								.replace(/t/g, ampm ? 'ap' : '') +
+								" " +
+								tp_inst._defaults.separator +
+								tp_inst._defaults.timeSuffix +
+								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+								(tp_inst._defaults.amNames.join('')) +
+								(tp_inst._defaults.pmNames.join('')) +
+								dateChars,
+				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+		}
+	}
+	
+	return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+			try {
+				$.datepicker._updateDatepicker(inst);
+			}
+			catch (err) {
+				$.datepicker.log(err);
+			}
+		}
+	}
+
+	return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+	var inst = this._getInst($(id)[0]),
+		$dp = inst.dpDiv;
+	this._base_gotoToday(id);
+	var now = new Date();
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst && tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
+		var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
+		var tzsign = tzoffset > 0 ? '-' : '+';
+		tzoffset = Math.abs(tzoffset);
+		var tzmin = tzoffset % 60;
+		tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
+		if (tp_inst._defaults.timezoneIso8609)
+			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+		tp_inst.timezone_select.val(tzoffset);
+	}
+	this._setTime(inst, now);
+	$( '.ui-datepicker-today', $dp).click(); 
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = false;
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = true;
+		tp_inst._addTimePicker(inst); // Could be disabled on page load
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var defaults = tp_inst._defaults,
+			// calling _setTime with no date sets time to defaults
+			hour = date ? date.getHours() : defaults.hour,
+			minute = date ? date.getMinutes() : defaults.minute,
+			second = date ? date.getSeconds() : defaults.second,
+			millisec = date ? date.getMilliseconds() : defaults.millisec;
+
+		//check if within min/max times..
+		if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) {
+			hour = defaults.hourMin;
+			minute = defaults.minuteMin;
+			second = defaults.secondMin;
+			millisec = defaults.millisecMin;
+		}
+
+		tp_inst.hour = hour;
+		tp_inst.minute = minute;
+		tp_inst.second = second;
+		tp_inst.millisec = millisec;
+
+		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+		tp_inst._onTimeChange();
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst);
+		var tp_date;
+		if (date) {
+			if (typeof date == "string") {
+				tp_inst._parseTime(date, withDate);
+				tp_date = new Date();
+				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			else tp_date = new Date(date.getTime());
+			if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
+			this._setTime(inst, tp_date);
+		}
+	}
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+	var inst = this._getInst(target),
+	tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+	this._updateDatepicker(inst);
+	this._base_setDateDatepicker.apply(this, arguments);
+	this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst, noDefault);
+		var date = this._getDate(inst);
+		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+		return date;
+	}
+	return this._base_getDateDatepicker(target, noDefault);
+};
+
+//#######################################################################################
+// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+// An option in datapicker to ignore extra format characters would be nicer.
+//#######################################################################################
+$.datepicker._base_parseDate = $.datepicker.parseDate;
+$.datepicker.parseDate = function(format, value, settings) {
+	var date;
+	try {
+		date = this._base_parseDate(format, value, settings);
+	} catch (err) {
+		if (err.indexOf(":") >= 0) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+			date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+		} else {
+			// The underlying error was not related to the time
+			throw err;
+		}
+	}
+	return date;
+};
+
+//#######################################################################################
+// override formatDate to set date with time to the input
+//#######################################################################################
+$.datepicker._base_formatDate=$.datepicker._formatDate;
+$.datepicker._formatDate = function(inst, day, month, year){
+	var tp_inst = this._get(inst, 'timepicker');
+	if(tp_inst)
+	{
+		if(day)
+			var b = this._base_formatDate(inst, day, month, year);
+		tp_inst._updateDateTime(inst);	
+		return tp_inst.$input.val();
+	}
+	return this._base_formatDate(inst);
+};
+
+//#######################################################################################
+// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var min,max,onselect;
+		if (typeof name == 'string') { // if min/max was set with the string
+			if (name==='minDate' || name==='minDateTime' )
+				min = value;
+			else if (name==='maxDate' || name==='maxDateTime')
+				max = value;
+			else if (name==='onSelect')
+				onselect=value;
+		} else if (typeof name == 'object') { //if min/max was set with the JSON
+			if(name.minDate)
+				min = name.minDate;
+			else if (name.minDateTime)
+				min = name.minDateTime;
+			else if (name.maxDate)
+				max = name.maxDate;
+			else if (name.maxDateTime)
+				max = name.maxDateTime;
+		}
+		if(min){ //if min was set
+			if(min==0)
+				min=new Date();
+			else
+				min= new Date(min);
+			
+			tp_inst._defaults.minDate = min;
+			tp_inst._defaults.minDateTime = min;
+		} else if (max){ //if max was set
+			if(max==0)
+				max=new Date();
+			else
+				max= new Date(max);
+			tp_inst._defaults.maxDate = max;
+			tp_inst._defaults.maxDateTime = max;
+		}
+		else if (onselect)
+			tp_inst._defaults.onSelect=onselect;
+	}
+	if (value === undefined)
+		return this._base_optionDatepicker(target, name);
+	return this._base_optionDatepicker(target, name, value);
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] === null || props[name] === undefined)
+			target[name] = props[name];
+	return target;
+};
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "0.9.9";
+
+})(jQuery);
+

From eb8b84147cf72198c48b5c17cf18df9858d4a3ab Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 24 Mar 2012 11:29:59 -0400
Subject: [PATCH 04/73] Add download_hardcopy_format_tikz  permission to
 permissionLevels even though tikz capabilities are not yet operational.

---
 conf/global.conf.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 6f6d4dfdf3..83bf75dbf7 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -732,6 +732,7 @@ $authen{ldap_options} = {
 	download_hardcopy_view_errors =>"professor",
 	download_hardcopy_format_pdf => "guest",
 	download_hardcopy_format_tex => "ta",
+	download_hardcopy_format_tikz => "professor", # under_construction
 );
 
 # This is the default permission level given to new students and students with

From 9dfb4b63d2889fa8fd953a0b533ad4485e19ebc8 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 24 Mar 2012 18:56:19 -0400
Subject: [PATCH 05/73] Remove some tr: entries in this translation file

---
 lib/WeBWorK/Localize/en.po | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index 919041b220..1f2b2eb760 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -80,3 +80,6 @@ msgstr "Prev"
 msgid "_GUEST_LOGIN_MESSAGE"
 msgstr "This course supports guest logins. Click %1 to log into this course as a guest."
 
+#
+msgid "_PROBLEM_SET_SUMMARY"
+msgstr "This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."

From ac048c83a82f67cb893470589a511bf68a0e48c1 Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Fri, 23 Mar 2012 20:39:24 -0400
Subject: [PATCH 06/73] ghe3: implemented Datepicker

---
 conf/templates/math3/math3.css                |    8 +-
 conf/templates/math3/system.template          |  114 +-
 htdocs/js/hmwksets_handlers.js                |    8 +-
 .../Instructor/ProblemSetList.pm              | 1076 ++++++++++-------
 lib/WeBWorK/Localize/en.po                    |   11 +-
 5 files changed, 736 insertions(+), 481 deletions(-)

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index 405c94b3ef..1d24caf0f1 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -285,7 +285,6 @@ clear: both;
 
 #loginstatus {
 	color: white;
-	/* position: absolute; */
 	top: -75px;
 	left: 1170px;
 	width: 200px;
@@ -294,7 +293,7 @@ clear: both;
 	padding: 0;
 	margin: 1ex .5em .1ex .1em;
 	font-size: smaller;
-}
+} 
 
 /*Relative Positioning -- a alternate style for the loginstatus which uses relative positioning.  Tested, but was decided that it didn't work great. Feel free to uncomment if you want to try it out.*/
 
@@ -434,6 +433,7 @@ clear: both;
     font-size:100%;
 	float: right;
 	max-width: 40%;
+	min-width: 0;
 	overflow: auto;
 	/*margin-right: -1px;*/
 	background-color: #fff;
@@ -716,7 +716,7 @@ span.gray_button{
 	width: 100%;
 }
 
-/*Styles specifically for the problem viewer*/
+Styles specifically for the problem viewer
 
 #problem_viewer_form{
 	margin-left: 10px;
@@ -758,7 +758,7 @@ span.gray_button{
 	margin-top: 10%;
 	margin-left: 10%;
 	margin-right: 10%;
-}
+}*/
 
 #editor{
 	width: 750px;
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 2bbad2f1f1..91e3d0a424 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -32,6 +32,9 @@
 <!--#if can="output_tabber_CSS"-->
 	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/tabber.css"/>
 <!--#endif-->
+<!--#if can="output_jquery_ui_CSS"-->
+	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/jquery-ui-1.8.18.custom.css"/>
+<!--#endif-->
 <!--#if can="output_JS"-->
 	<!--#output_JS-->
 <!--#endif-->
@@ -93,66 +96,67 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#endif -->
-			<!--#if can="output_problem_body"--> 
-			<!-- ====  print body parts if possible  -->		
-			  <div class="Body" style="background-color:#ffffff">
-			
-				<!--#if can="output_custom_edit_message"-->
-					<!--#output_custom_edit_message-->
-				<!--#endif-->
-				<!--#if can="output_summary"-->
-						<!--#output_summary-->
-				<!--#endif-->
-				
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-				
-				<!--#if can="output_form_start"-->
-					<!--#output_form_start-->
-					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-						<div class="problem">
-							<!--#if can="output_problem_body"-->
-								<!--#output_problem_body-->
-							<!--#endif-->
-							<!--#if can="output_message"-->
-								<!--#output_message-->
+			<!--#else-->
+				 <!--#if can="output_problem_body"--> 
+			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
+					  <div class="Body" style="background-color:#ffffff">
+		
+						<!--#if can="output_custom_edit_message"-->
+							<!--#output_custom_edit_message-->
+						<!--#endif-->
+						<!--#if can="output_summary"-->
+								<!--#output_summary-->
+							</div>
+						<!--#endif-->
+						
+						<!--#if can="output_hidden_info"-->
+							<!--#output_hidden_info-->
+						<!--#endif-->
+						
+						<!--#if can="output_form_start"-->
+							<!--#output_form_start-->
+							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+								<div class="problem">
+									<!--#if can="output_problem_body"-->
+										<!--#output_problem_body-->
+									<!--#endif-->
+									<!--#if can="output_message"-->
+										<!--#output_message-->
+									<!--#endif-->
+									<!--#if can="output_editorLink"-->
+										<!--#output_editorLink-->
+									<!--#endif-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_editorLink"-->
-								<!--#output_editorLink-->
+							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+								<p>
+									<!--#if can="output_checkboxes"-->
+										<!--#output_checkboxes-->
+									<!--#endif-->
+									<!--#if can="output_submit_buttons"-->
+										<!--#output_submit_buttons-->
+									<!--#endif-->
+								</p>
 							<!--#endif-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-						<p>
-							<!--#if can="output_checkboxes"-->
-								<!--#output_checkboxes-->
+							<!--#if can="output_score_summary"-->
+								<div class="scoreSummary">
+									<!--#output_score_summary-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_submit_buttons"-->
-								<!--#output_submit_buttons-->
+							<!--#if can="output_misc"-->
+								<!--#output_misc-->
 							<!--#endif-->
-						</p>
-					<!--#endif-->
-					<!--#if can="output_score_summary"-->
-						<div class="scoreSummary">
-							<!--#output_score_summary-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_misc"-->
-						<!--#output_misc-->
-					<!--#endif-->
-					</form>
-				</div>	  
-			<!-- ====  end printing body parts   -->
-			<!--#else-->
-			<!-- ==== couldn't print body parts so we'll print entire body -->	
-					  <div class="Body" style="background-color:#ffffff">
-					  <!--#body-->
+							</form>
+						<!--#endif-->
 					  </div>
-			<!-- ==== end printing entire body ===>
-			<!--#endif-->
-			
+
+				<!--#else-->
+				<!-- ==== couldn't print body parts so we'll print entire body -->	
+						  <div class="Body" style="background-color:#ffffff">
+						  <!--#body-->
+						  </div>
+				<!--#endif-->
+
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
diff --git a/htdocs/js/hmwksets_handlers.js b/htdocs/js/hmwksets_handlers.js
index 2b9b6b0a6d..647e303880 100644
--- a/htdocs/js/hmwksets_handlers.js
+++ b/htdocs/js/hmwksets_handlers.js
@@ -13,6 +13,8 @@ function hmwksets_add_filter_elements() {
 }
 
 addOnLoadEvent(function() {
-	document.getElementById("filter_select").onchange = hmwksets_add_filter_elements;
-	hmwksets_add_filter_elements();
-});
\ No newline at end of file
+	if(document.getElementById("filter_select") != null){
+		document.getElementById("filter_select").onchange = hmwksets_add_filter_elements;
+	}
+});
+
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index ed52a2d741..0f05d3da9e 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -263,7 +263,7 @@ sub pre_header_initialize {
 		my @setsToScore = ();
 	
 		if ($scope eq "none") { 
-			return "No sets selected for scoring.";
+			return $r->maketext("No sets selected for scoring".".");
 		} elsif ($scope eq "all") {
 			@setsToScore = @{ $r->param("allSetIDs") };
 		} elsif ($scope eq "visible") {
@@ -303,7 +303,7 @@ sub initialize {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	########## set initial values for state fields
@@ -336,12 +336,12 @@ sub initialize {
 	
 	$self->{editMode} = $r->param("editMode") || 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify homework sets.")))
 		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
 	
 	$self->{exportMode} = $r->param("exportMode") || 0;
 
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify set definition files."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify set definition files.")))
 		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
 	
 	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
@@ -372,7 +372,7 @@ sub initialize {
 	$self->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
-			die "Action $actionID not found";
+			die $r->maketext("Action [_1] not found", $actionID);
 		}
 		# Check permissions
 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
@@ -383,20 +383,17 @@ sub initialize {
 			}
 			my %actionParams = $self->getActionParams($actionID);
 			my %tableParams = $self->getTableParams();
-			$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
-			$self->addmessage(
-			                     $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
-			                     CGI::hr()
-			);
+			$self->addmessage(CGI::div({class=>"Message"}, $r->maketext("Results of last action performed").": "));
+			$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
 		} else {
-			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
+			return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to perform this action.")));
 		}
 		
 		
 
 	} else {
 	
-		$self->addgoodmessage("Please select action to be performed.");
+		$self->addgoodmessage($r->maketext("Please select action to be performed."));
 	}
 		
 
@@ -418,7 +415,7 @@ sub body {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	# This table can be consulted when display-ready forms of field names are needed.
@@ -426,7 +423,6 @@ sub body {
 		$setTemplate->FIELDS();
 	
 	@prettyFieldNames{qw(
-		select
 		problems
 		users
 		filename
@@ -439,18 +435,17 @@ sub body {
 		visible
 		enable_reduced_scoring	
 	)} = (
-		"Select",
-		"Edit<br> Problems",
-		"Edit<br> Assigned Users",
-		"Set Definition Filename",
-		"Edit<br> Set Data", 
-		"Set Header", 
-		"Hardcopy Header", 
-		"Open Date", 
-		"Due Date", 
-		"Answer Date", 
-		"Visible",
-		"Reduced Credit<br> Enabled" 
+		$r->maketext("Edit Problems"),
+		$r->maketext("Edit Assigned Users"),
+		$r->maketext("Set Definition Filename"),
+		$r->maketext("Edit Set Data"), 
+		$r->maketext("Set Header"), 
+		$r->maketext("Hardcopy Header"), 
+		$r->maketext("Open Date"), 
+		$r->maketext("Due Date"), 
+		$r->maketext("Answer Date"), 
+		$r->maketext("Visible"),
+		$r->maketext("Reduced Credit Enabled") 
 	);
 	
 
@@ -497,9 +492,14 @@ sub body {
 		@Sets = sort $primarySortSub @Sets;
 	}
 
+	########## print site identifying information
+	
+	print WeBWorK::CGI_labeled_input(-type=>"button", -id=>"show_hide", -input_attr=>{-value=>$r->maketext("Show/Hide Site Description"), -class=>"button_input"});
+	print CGI::p({-id=>"site_description", -style=>"display:none"}, CGI::em($r->maketext("_HMWKSETS_EDITOR_DESCRIPTION")));
+	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form", -id=>"edit_form_id"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -528,10 +528,10 @@ sub body {
 	
 	########## print action forms
 	
-	print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students.")) if $editMode;
+	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the set for ALL students."))) if $editMode;
 
-	print CGI::start_table({});
-	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+	# print CGI::start_table({});
+	print CGI::p($r->maketext("Select an action to perform").":");
 
 	my @formsToShow;
 	if ($editMode) {
@@ -545,52 +545,66 @@ sub body {
 	}
 	
 	my $i = 0;
+	my @divArr = ();
+
 	foreach my $actionID (@formsToShow) {
 		# Check permissions
 		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
 		my $actionForm = "${actionID}_form";
-		my $onChange = "document.problemsetlist.action[$i].checked=true";
+		#my $onChange = "document.problemsetlist.action[$i].checked=true";
+		my $onChange = "";
 		my %actionParams = $self->getActionParams($actionID);
 		
-		print CGI::Tr({-valign=>"top"},
-			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
-			CGI::td({}, $self->$actionForm($onChange, %actionParams))
-		);
+		# print CGI::Tr({-valign=>"top"},
+			# CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			# CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		# );
+		
+		my $extraspace = (ucfirst(WeBWorK::split_cap($actionID)) eq "Filter") ? "" : CGI::br();
 		
+		push @divArr, join("",
+			CGI::h3($r->maketext(ucfirst(WeBWorK::split_cap($actionID)))),
+			CGI::span({-class=>"radio_span"}, WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionID."_id", -label_text=>$r->maketext(ucfirst(WeBWorK::split_cap($actionID))), -input_attr=>{-name=>"action", -value=>$actionID}, -label_attr=>{-class=>"radio_label"})),
+			CGI::br(),
+			$self->$actionForm($onChange, %actionParams),
+			CGI::br(),
+			$extraspace,
+		);
 		$i++;
 	}
 	
-	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all sets',
+	my $divArrRef = \@divArr;
+	
+	print CGI::div({-class=>"tabber"},
+		CGI::div({-class=>"tabbertab"},$divArrRef)
+		);
+	
+	my $selectAll =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_all", -input_attr=>{-name=>'check_all', -value=>$r->maketext('Select all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                           document.problemsetlist.elements[i].checked = true
 	                       }
 	                    }" });
-   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all sets',
+   	my $selectNone =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_none", -input_attr=>{-name=>'check_none', -value=>$r->maketext('Unselect all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                          document.problemsetlist.elements[i].checked = false
 	                       }
 	                    }" });
 	unless ($editMode or $exportMode) {
-		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
-			$selectAll." ". $selectNone
-			)
-		);
+		print $selectAll." ". $selectNone;
 	}
-	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
-		CGI::submit(-value=>"Take Action!"))
-	);
-	print CGI::end_table();
-	
+	print WeBWorK::CGI_labeled_input(-type=>"reset", -id=>"clear_entries", -input_attr=>{-value=>$r->maketext("Clear"), -class=>"button_input"});
+	print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"take_action", -input_attr=>{-value=>$r->maketext("Take Action!"), -class=>"button_input"}).CGI::br().CGI::br();
+
 	########## print table
 	
 	########## first adjust heading if in editMode
-	$prettyFieldNames{set_id} = "Edit All <br> Set Data" if $editMode;
-	$prettyFieldNames{enable_reduced_scoring} = 'Enable Reduced<br>Credit' if $editMode;
+	$prettyFieldNames{set_id} = $r->maketext("Edit All Set Data") if $editMode;
+	$prettyFieldNames{enable_reduced_scoring} = $r->maketext('Enable Reduced Credit') if $editMode;
 	
 	
-	print CGI::p({},"Showing ", scalar @visibleSetIDs, " out of ", scalar @allSetIDs, " sets.");
+	print CGI::p({},$r->maketext("Showing [_1] out of [_2] sets.", scalar @visibleSetIDs, scalar @allSetIDs));
 	
 	$self->printTableHTML(\@Sets, \%prettyFieldNames,
 		editMode => $editMode,
@@ -644,58 +658,43 @@ sub getTableParams {
 
 sub filter_form {
 	my ($self, $onChange, %actionParams) = @_;
-	#return CGI::table({}, CGI::Tr({-valign=>"top"},
-	#	CGI::td({}, 
+	my $r = $self->r;
+
 	return join("", 
-			"Show ",
-			CGI::popup_menu(
-				-name => "action.filter.scope",
-				-values => [qw(all none selected match_ids visible unvisible)],
-				-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
-				-labels => {
-					all => "all sets",
-					none => "no sets",
-					selected => "sets checked below",
-					visible => "sets visible to students",
-					unvisible => "sets hidden from students", 
-					match_ids => "sets with matching set IDs:",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"filter_select",
+				-label_text=>$r->maketext("Show which sets?").": ",
+				-input_attr=>{
+					-name => "action.filter.scope",
+					-values => [qw(all none selected match_ids visible unvisible)],
+					-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
+					-labels => {
+						all => $r->maketext("all sets"),
+						none => $r->maketext("no sets"),
+						selected => $r->maketext("selected sets"),
+						visible => $r->maketext("visible sets"),
+						unvisible => $r->maketext("hidden sets"), 
+						match_ids => $r->maketext("enter matching set IDs below"),
+					},
+					-onchange => $onChange,
+				}
 			),
+			CGI::br(),
 			" ",
-			CGI::textfield(
-				-name => "action.filter.set_ids",
-				-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
-				-width => "50",
-				-onchange => $onChange,
+			CGI::div({-id=>"filter_elements"},
+			WeBWorK::CGI_labeled_input(
+				-type=>"text",
+				-id=>"filter_text",
+				-label_text=>$r->maketext("Match on what? (separate multiple IDs with commas)").": ",
+				-input_attr=>{
+					-name => "action.filter.set_ids",
+					-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
+					-width => "50",
+					-onchange => $onChange,
+				}
+			), CGI::span({-id=>"filter_err_msg", -class=>"ResultsWithError"}, $r->maketext("Please enter in a value to match in the filter field.")),
 			),
-			" (separate multiple IDs with commas)",
-			CGI::br(),
-#			"Open dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.open_date",
-#				-values => [ keys %{ $self->{open_dates} } ],
-#				-default => $actionParams{"action.filter.open_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{open_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Due dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.due_date",
-#				-values => [ keys %{ $self->{due_dates} } ],
-#				-default => $actionParams{"action.filter.due_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{due_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Answer dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.answer_date",
-#				-values => [ keys %{ $self->{answer_dates} } ],
-#				-default => $actionParams{"action.filter.answer_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{answer_dates}) },
-#				-onchange => $onChange,
-#			),
-			
 	);
 }
 
@@ -710,16 +709,18 @@ sub filter_handler {
 	my $result;
 	
 	my $scope = $actionParams->{"action.filter.scope"}->[0];
+	
 	if ($scope eq "all") {
-		$result = "showing all sets";
+		$result = $r->maketext("showing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "none") {
-		$result = "showing no sets";
+		$result = $r->maketext("showing no sets");
 		$self->{visibleSetIDs} = [];
 	} elsif ($scope eq "selected") {
-		$result = "showing selected sets";
+		$result = $r->maketext("showing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	} elsif ($scope eq "match_ids") {
+		#my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		$self->{visibleSetIDs} = \@setIDs;
 	} elsif ($scope eq "match_open_date") {
@@ -748,45 +749,55 @@ sub filter_handler {
 
 sub sort_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 	return join ("",
-		"Primary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.primary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_1",
+			-label_text=>$r->maketext("Sort by").": ",
+			-input_attr=>{
+				-name => "action.sort.primary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" Secondary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.secondary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_2",
+			-label_text=>$r->maketext("Then by").": ",
+			-input_attr=>{
+				-name => "action.sort.secondary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		".",
 	);
 }
 
 sub sort_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 	
 	my $primary = $actionParams->{"action.sort.primary"}->[0];
 	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
@@ -795,52 +806,58 @@ sub sort_handler {
 	$self->{secondarySortField} = $secondary;
 
 	my %names = (
-		set_id		=> "Set Name",
-		set_header	=> "Set Header",
-		hardcopy_header	=> "Hardcopy Header",
-		open_date	=> "Open Date",
-		due_date	=> "Due Date",
-		answer_date	=> "Answer Date",
-		visible	=> "Visibility",
+		set_id		=> $r->maketext("Set Name"),
+		set_header	=> $r->maketext("Set Header"),
+		hardcopy_header	=> $r->maketext("Hardcopy Header"),
+		open_date	=> $r->maketext("Open Date"),
+		due_date	=> $r->maketext("Due Date"),
+		answer_date	=> $r->maketext("Answer Date"),
+		visible	=> $r->maketext("Visibility"),
 	);
 	
-	return "sort by $names{$primary} and then by $names{$secondary}.";
+	return $r->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary});
 }
 
 
 sub edit_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Edit ",
-		CGI::popup_menu(
-			-name => "action.edit.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"edit_select",
+			-label_text=>$r->maketext("Edit which sets?").": ",
+			-input_attr=>{
+				-name => "action.edit.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
 
 sub edit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.edit.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "editing all sets";
+		$result = $r->maketext("editing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = "editing visible sets";
+		$result = $r->maketext("editing visible sets");
 		# leave visibleUserIDs alone
 	} elsif ($scope eq "selected") {
-		$result = "editing selected sets";
+		$result = $r->maketext("editing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{editMode} = 1;
@@ -850,32 +867,42 @@ sub edit_handler {
 
 sub publish_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.publish.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.publish.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.publish.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.publish.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.publish.value"}->[0] || "1",
-			-labels => {
-				0 => "hidden",
-				1 => "visible",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_visibility_select",
+			-label_text=>$r->maketext("Choose visibility of the sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.publish.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Hidden"),
+					1 => $r->maketext("Visible"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" for students.",
 	);
 }
 
@@ -890,22 +917,22 @@ sub publish_handler {
 	my $scope = $actionParams->{"action.publish.scope"}->[0];
 	my $value = $actionParams->{"action.publish.value"}->[0];
 
-	my $verb = $value ? "made visible for" : "hidden from";
+	my $verb = $value ? $r->maketext("made visible for") : $r->maketext("hidden from");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result = CGI::div({class=>"ResultsWithError"},"No change made to any set.");
+		$result = CGI::div({class=>"ResultsWithError"},$r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All sets [_1] all students", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All visible sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All visible sets [_1] all students", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All selected sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All selected sets [_1] all students", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -918,32 +945,42 @@ sub publish_handler {
 }
 sub enable_reduced_scoring_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
-			-labels => {
-				0 => "disable",
-				1 => "enable",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_enable_disable_select",
+			-label_text=>$r->maketext("Enable/Disable reduced scoring for selected sets").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Disable"),
+					1 => $r->maketext("Enable"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" reduced sccoring.",
 	);
 }
 
@@ -958,22 +995,22 @@ sub enable_reduced_scoring_handler {
 	my $scope = $actionParams->{"action.enable_reduced_scoring.scope"}->[0];
 	my $value = $actionParams->{"action.enable_reduced_scoring.value"}->[0];
 
-	my $verb = $value ? "enabled" : "disabled";
+	my $verb = $value ? $r->maketext("enabled") : $r->maketext("disabled");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result =  CGI::div({class=>"ResultsWithError"}, "No change made to any set.");
+		$result =  CGI::div({class=>"ResultsWithError"}, $r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for all sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for all sets", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for visable sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for visable sets", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for selected sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for selected sets", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -987,19 +1024,24 @@ sub enable_reduced_scoring_handler {
 
 sub score_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Score ",
-		CGI::popup_menu(
-			-name => "action.score.scope",
-			-values => [qw(none all selected)],
-			-default => $actionParams{"action.score.scope"}->[0] || "none",
-			-labels => {
-				none => "no sets.",
-				all => "all sets.",
-				selected => "selected sets.",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"score_select",
+			-label_text=>$r->maketext("Score which sets?").": ",
+			-input_attr=>{
+				-name => "action.score.scope",
+				-values => [qw(none all selected)],
+				-default => $actionParams{"action.score.scope"}->[0] || "none",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 	
@@ -1019,7 +1061,7 @@ sub score_handler {
 	
 	if ($scope eq "none") { 
 		@setsToScore = ();
-		return "No sets selected for scoring.";
+		return $r->maketext("No sets selected for scoring");
 	} elsif ($scope eq "all") {
 		@setsToScore = @{ $self->{allSetIDs} };
 	} elsif ($scope eq "visible") {
@@ -1043,23 +1085,26 @@ sub score_handler {
 
 sub delete_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		CGI::div({class=>"ResultsWithError"}, 
-			"Delete ",
-			CGI::popup_menu(
+		CGI::span({-class=>"ResultsWithError"}, CGI::em($r->maketext("Warning: Deletion destroys all user-related data and is not undoable!"))),CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"delete_select",
+			-label_text=>$r->maketext("Delete how many?").": ",
+			-input_attr=>{
 				-name => "action.delete.scope",
 				-values => [qw(none selected)],
 				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
 				-labels => {
-					none => "no sets.",
+					none => $r->maketext("no sets"),
 					#visible => "visible sets.",
-					selected => "selected sets.",
+					selected => $r->maketext("selected sets"),
 				},
 				-onchange => $onChange,
-			),
-			CGI::em(" Deletion destroys all set-related data and is not undoable!"),
-		)
+			}
+		),
 	);
 }
 
@@ -1094,34 +1139,42 @@ sub delete_handler {
 	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
 	
 	my $num = @setIDsToDelete;
-	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num set" .
-	                                           ($num == 1 ? "" : "s")
-	);
+	 return CGI::div({class=>"ResultsWithoutError"},  $r->maketext("deleted [_1] sets", $num) );
 }
 
 sub create_form {
 	my ($self, $onChange, %actionParams) = @_;
-
 	my $r      = $self->r;
 	
-	return "Create a new set named: ", 
-		CGI::textfield(
-			-name => "action.create.name",
-			-value => $actionParams{"action.create.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+	return join("",
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"create_text",
+			-label_text=>$r->maketext("Name the new set").": ",
+			-input_attr=>{
+				-name => "action.create.name",
+				-value => $actionParams{"action.create.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
-		" as ",
-		CGI::popup_menu(
-			-name => "action.create.type",
-			-values => [qw(empty copy)],
-			-default => $actionParams{"action.create.type"}->[0] || "empty",
-			-labels => {
-				empty => "a new empty set.",
-				copy => "a duplicate of the first selected set.",
-			},
-			-onchange => $onChange,
-		);
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"create_select",
+			-label_text=>$r->maketext("Create as what type of set?").": ",
+			-input_attr=>{
+				-name => "action.create.type",
+				-values => [qw(empty copy)],
+				-default => $actionParams{"action.create.type"}->[0] || "empty",
+				-labels => {
+					empty => $r->maketext("a new empty set"),
+					copy => $r->maketext("a duplicate of the first selected set"),
+				},
+				-onchange => $onChange,
+			}
+		),
+	);
 			
 }
 
@@ -1132,8 +1185,8 @@ sub create_handler {
 	my $db     = $r->db;
 	
 	my $newSetID = $actionParams->{"action.create.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: no set name specified!") unless $newSetID =~ /\S/;
-	return CGI::div({class => "ResultsWithError"}, "Set $newSetID exists.  No set created") if $db->existsGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: no set name specified!")) unless $newSetID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Set [_1] exists.  No set created", $newSetID)) if $db->existsGlobalSet($newSetID);
 	my $newSetRecord = $db->newGlobalSet;
 	my $oldSetID = $self->{selectedSetIDs}->[0];
 
@@ -1154,7 +1207,7 @@ sub create_handler {
 		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
 		$db->addGlobalSet($newSetRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless $oldSetID =~ /\S/;
+		return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless $oldSetID =~ /\S/;
 		$newSetRecord = $db->getGlobalSet($oldSetID);
 		$newSetRecord->set_id($newSetID);
 		$db->addGlobalSet($newSetRecord);
@@ -1193,9 +1246,9 @@ sub create_handler {
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 	push @{ $self->{allSetIds} }, $newSetID;
 	
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: [_1]", $@)) if $@;
 	
-	 return CGI::div({class=>"ResultsWithoutError"},"Successfully created new set $newSetID" );
+	 return CGI::div({class=>"ResultsWithoutError"},$r->maketext("Successfully created new set [_1]", $newSetID));
 	
 }
 
@@ -1217,45 +1270,65 @@ sub import_form {
 			);
 	
 	return join(" ",
-		"Import ",
-		CGI::popup_menu(
-			-name => "action.import.number",
-			-values => [ 1, 8 ],
-			-default => $actionParams{"action.import.number"}->[0] || "1",
-			-labels => {
-				1 => "a single set",
-				8 => "multiple sets",
-			},
-			-onchange => "$onChange;$importScript",
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_amt_select",
+			-label_text=>$r->maketext("Import how many sets?").": ",
+			-input_attr=>{
+				-name => "action.import.number",
+				-values => [ 1, 8 ],
+				-default => $actionParams{"action.import.number"}->[0] || "1",
+				-labels => {
+					1 => $r->maketext("a single set"),
+					8 => $r->maketext("multiple sets"),
+				},
+				-onchange => "$onChange;$importScript",
+			}
 		),
-		" from ", # set definition file(s) ",
-		CGI::popup_menu(
-			-name => "action.import.source",
-			-values => [ "", $self->getDefList() ],
-			-labels => { "" => "the following file(s)" },
-			-default => $actionParams{"action.import.source"}->[0] || "",
-			-size => $actionParams{"action.import.number"}->[0] || "1",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_source_select",
+			-label_text=>$r->maketext("Import from where?").": ",
+			-input_attr=>{
+				-name => "action.import.source",
+				-values => [ "", $self->getDefList() ],
+				-labels => { "" => $r->maketext("Enter filenames below") },
+				-default => $actionParams{"action.import.source"}->[0] || "",
+				-size => $actionParams{"action.import.number"}->[0] || "1",
+				-onchange => $onChange,
+			},
+			-label_attr=>{-id=>"import_source_select_label"}
 		),
-		" with set name(s): ",
-		CGI::textfield(
-			-name => "action.import.name",
-			-value => $actionParams{"action.import.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"import_text",
+			-label_text=>$r->maketext("Import sets with names").": ",
+			-input_attr=>{
+				-name => "action.import.name",
+				-value => $actionParams{"action.import.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
+		CGI::br(),
 		($authz->hasPermissions($user, "assign_problem_sets")) 
 			?
-			"assigning this set to " .
-			CGI::popup_menu(
-				-name => "action.import.assign",
-				-value => [qw(user all)],
-				-default => $actionParams{"action.import.assign"}->[0] || "user",
-				-labels => {
-					all => "all current users.",
-					user => "only $user.",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"import_users_select",
+				-label_text=>$r->maketext("Assign this set to which users?").": ",
+				-input_attr=>{
+					-name => "action.import.assign",
+					-value => [qw(all none)],
+					-default => $actionParams{"action.import.assign"}->[0] || "none",
+					-labels => {
+						all => $r->maketext("all users"),
+						none => $r->maketext("no users"),
+					},
+					-onchange => $onChange,
+				}
 			)
 			:
 			""	#user does not have permissions to assign problem sets
@@ -1264,6 +1337,7 @@ sub import_form {
 
 sub import_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my @fileNames = @{ $actionParams->{"action.import.source"} };
 	my $newSetName = $actionParams->{"action.import.name"}->[0];
@@ -1280,28 +1354,29 @@ sub import_handler {
 	my $numSkipped = @$skipped;
 
    return CGI::div(
-		{class=>"ResultsWithoutError"},	
-		$numAdded . " set" . ($numAdded == 1 ? "" : "s") . " added, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped"
-		. " (" . join (", ", @$skipped) . ") "
-	);
+		{class=>"ResultsWithoutError"},	$r->maketext("[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])", $numAdded, $numSkipped, join(", ", @$skipped)));
 }
 
 sub export_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Export ",
-		CGI::popup_menu(
-			-name => "action.export.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.export.scope"}->[0] || "visible",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"export_select",
+			-label_text=>$r->maketext("Export which sets?").": ",
+			-input_attr=>{
+				-name => "action.export.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.export.scope"}->[0] || "visible",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1309,19 +1384,20 @@ sub export_form {
 # this does not actually export any files, rather it sends us to a new page in order to export the files
 sub export_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.export.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "exporting all sets";
+		$result = $r->maketext("exporting all sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
 
 	} elsif ($scope eq "visible") {
-		$result = "exporting visible sets";
+		$result = $r->maketext("exporting visible sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs};
 	} elsif ($scope eq "selected") {
-		$result = "exporting selected sets";
+		$result = $r->maketext("exporting selected sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{exportMode} = 1;
@@ -1331,7 +1407,8 @@ sub export_handler {
 
 sub cancelExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon export";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon export"));
 }
 
 sub cancelExport_handler {
@@ -1349,12 +1426,13 @@ sub cancelExport_handler {
 	}
 	$self->{exportMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
+	return CGI::div({class=>"ResultsWithError"},  $r->maketext("export abandoned"));
 }
 
 sub saveExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Export selected sets.";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Export selected sets"));
 }
 
 sub saveExport_handler {
@@ -1384,17 +1462,14 @@ sub saveExport_handler {
 	
 	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
 
-	return 	CGI::div( {class=>$resultFont},
-	    $numExported . " set" . ($numExported == 1 ? "" : "s") . " exported, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped."
-		. (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")
-		);
+	return 	CGI::div({class=>$resultFont}, $r->maketext("[_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])", $numExported, $numSkipped, (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")));
 
 }
 
 sub cancelEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon changes"));
 }
 
 sub cancelEdit_handler {
@@ -1412,12 +1487,13 @@ sub cancelEdit_handler {
 	}
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes abandoned"));
 }
 
 sub saveEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Save changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Save changes"));
 }
 
 sub saveEdit_handler {
@@ -1446,20 +1522,20 @@ sub saveEdit_handler {
 		my $curr_time = time;
 		my $seconds_per_year = 31_556_926;
 		my $cutoff = $curr_time + $seconds_per_year*10;
-		return CGI::div({class=>'ResultsWithError'}, "Error: open date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->open_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: due date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: due date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->due_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: answer date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->answer_date > $cutoff;
 		
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date)  {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Due date must come after open date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Due date must come after open date in set [_1]", $setID));
 		}
 		if ($Set->due_date > $Set->answer_date) {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Answer date must come after due date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Answer date must come after due date in set [_1]", $setID));
 		}
 		
 		$db->putGlobalSet($Set);
@@ -1475,7 +1551,7 @@ sub saveEdit_handler {
 	
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes saved") );
 }
 
 sub duplicate_form {
@@ -1487,12 +1563,16 @@ sub duplicate_form {
 	return "" unless @visible_sets == 1;
 	
 	return join ("", 
-		"Duplicate this set and name it: ", 
-		CGI::textfield(
-			-name => "action.duplicate.name",
-			-value => $actionParams{"action.duplicate.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"duplicate_text",
+			-label_text=>$r->maketext("Duplicate this set and name it").": ",
+			-input_attr=>{
+				-name => "action.duplicate.name",
+				-value => $actionParams{"action.duplicate.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1504,11 +1584,11 @@ sub duplicate_handler {
 	my $db = $r->db;
 	
 	my $oldSetID = $self->{selectedSetIDs}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless defined($oldSetID) and $oldSetID =~ /\S/;	
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless defined($oldSetID) and $oldSetID =~ /\S/;	
 	my $newSetID = $actionParams->{"action.duplicate.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set name specified!") unless $newSetID =~ /\S/;		
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set name specified!")) unless $newSetID =~ /\S/;		
 	# DBFIXME checking for existence -- don't need to fetch
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: set $newSetID already exists!") if defined $db->getGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: set [_1] already exists!", $newSetID)) if defined $db->getGlobalSet($newSetID);
 
 	my $newSet = $db->getGlobalSet($oldSetID);
 	$newSet->set_id($newSetID);
@@ -1522,9 +1602,9 @@ sub duplicate_handler {
 	
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: [_1]", $@)) if $@;
 	
-	return "SUCCESS";
+	return $r->maketext("Success");
 }
 
 ################################################################################
@@ -1540,22 +1620,26 @@ sub bySetID         { $a->set_id         cmp $b->set_id         }
 #FIXME  eventually we may be able to remove these checks, if we can trust 
 # that the dates are always defined
 # dates which are the empty string '' or undefined  are treated as 0
-sub byOpenDate      { my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
+sub byOpenDate      {
+					  my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
                       return $result unless $@;
                       warn "Open date not correctly defined.";
                       return 0;
 }
-sub byDueDate       { my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
+sub byDueDate       { 
+					  my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
                       return $result unless $@;
                       warn "Due date not correctly defined.";
                       return 0;
 }
-sub byAnswerDate    { my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
+sub byAnswerDate    { 
+					  my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
                       return $result unless $@;
                       warn "Answer date not correctly defined.";
                       return 0;
 }
-sub byVisible     { my $result = eval{$a->visible      cmp $b->visible   };      
+sub byVisible     {   
+					  my $result = eval{$a->visible      cmp $b->visible   };      
                       return $result unless $@;
                       warn "Visibility status not correctly defined.";
                       return 0;
@@ -1595,7 +1679,7 @@ sub importSetsFromDef {
 
 	# FIXME: do we really want everything to fail on one bad file name?
 	foreach my $fileName (@setDefFiles) {
-		die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
+		die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
 			unless -r "$dir/$fileName";
 	}
 
@@ -1661,7 +1745,7 @@ sub importSetsFromDef {
 
 		#create the set
 		eval {$db->addGlobalSet($newSetRecord)};
-		die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
+		die $r->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
 
 		#do we need to add locations to the set_locations table?
 		if ( $restrictIP ne 'No' && $restrictLoc ) {
@@ -1671,18 +1755,13 @@ sub importSetsFromDef {
 					$newSetLocation->set_id( $setName );
 					$newSetLocation->location_id( $restrictLoc );
 					eval {$db->addGlobalSetLocation($newSetLocation)};
-					warn("error adding set location $restrictLoc " .
-					     "for set $setName: $@") if $@;
+					warn($r->maketext("error adding set location [_1] for set [_2]: [_3]", $restrictLoc, $setName, $@)) if $@;
 				} else {
 					# this should never happen.
-					warn("input set location $restrictLoc" .
-					     " already exists for set " . 
-					     "$setName.\n");
+					warn($r->maketext("input set location [_1] already exists for set [_2].", $restrictLoc, $setName)."\n");
 				}
 			} else { 
-				warn("restriction location $restrictLoc " .
-				     "does not exist.  IP restrictions have " .
-				     "been ignored.\n");
+				warn($r->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.", $restrictLoc)."\n");
 				$newSetRecord->restrict_ip('No');
 				$newSetRecord->relax_restrict_ip('No');
 				eval { $db->putGlobalSet($newSetRecord) };
@@ -1725,6 +1804,8 @@ sub readSetDef {
 	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
+	
+	my $r = $self->r;
 
 	if ($fileName =~ m|^set([.\w-]+)\.def$|) {
 		$setName = $1;
@@ -1817,7 +1898,7 @@ sub readSetDef {
 			} elsif ($item eq 'problemList') {
 				last;
 			} else {
-				warn "readSetDef error, can't read the line: ||$line||";
+				warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
 			}
 		}
 
@@ -1827,7 +1908,7 @@ sub readSetDef {
 		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
 	
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronological order.";
+			warn $r->maketext("The open date: [_1], due date: [_2], and answer date: [_3] must be defined and in chronological order.", $openDate, $dueDate, $answerDate);
 		}
 
 		# Check header file names
@@ -1844,26 +1925,21 @@ sub readSetDef {
 		# check that the values for hideWork and hideScore are valid
 		if ( $hideScore ne 'N' && $hideScore ne 'Y' && 
 		     $hideScore ne 'BeforeAnswerDate' ) {
-			warn("The value $hideScore for the hideScore option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScore)."\n");
 			$hideScore = 'N';
 		}
 		if ( $hideWork ne 'N' && $hideWork ne 'Y' && 
 		     $hideWork ne 'BeforeAnswerDate' ) {
-			warn("The value $hideWork for the hideWork option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.", $hideWork)."\n");
 			$hideWork = 'N';
 		}
 		if ( $timeCap ne '0' && $timeCap ne '1' ) {
-			warn("The value $timeCap for the capTimeLimit option " .
-			     "is not valid; it will be replaced with '0'.\n");
+			warn($r->maketext("The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.", $timeCap)."\n");
 			$timeCap = '0';
 		}
 		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
 		     $restrictIP ne 'RestrictTo' ) {
-			warn("The value $restrictIP for the restrictIP " .
-			     "option is not valid; it will be replaced " . 
-			     "with 'No'.\n");
+			warn($r->maketext("The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.", $restrictIP)."\n");
 			$restrictIP = 'No';
 			$restrictLoc = '';
 			$relaxRestrictIP = 'No';
@@ -1871,9 +1947,7 @@ sub readSetDef {
 		if ( $relaxRestrictIP ne 'No' && 
 		     $relaxRestrictIP ne 'AfterAnswerDate' &&
 		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
-			warn("The value $relaxRestrictIP for the " .
-			     "relaxRestrictIP option is not valid; it will " . 
-			     "be replaced with 'No'.\n");
+			warn($r->maketext("The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.", $relaxRestrictIP)."\n");
 			$relaxRestrictIP = 'No';
 		}
 		# to verify that restrictLoc is valid requires a database
@@ -1943,7 +2017,7 @@ sub readSetDef {
 		 $relaxRestrictIP,
 		);
 	} else {
-		warn "Can't open file $filePath\n";
+		warn $r->maketext("Can't open file [_1]", $filePath)."\n";
 	}
 }
 
@@ -1964,14 +2038,14 @@ SET:	foreach my $set (keys %filenames) {
 		# files can be exported to sub directories but not parent directories
 		if ($fileName =~ /\.\./) {
 			push @skipped, $set;
-			$reason{$set} = "Illegal filename contains '..'";
+			$reason{$set} = $r->maketext("Illegal filename contains '..'");
 			next SET;
 		}
 
 		my $setRecord = $db->getGlobalSet($set);
 		unless (defined $setRecord) {
 			push @skipped, $set;
-			$reason{$set} = "No record found.";
+			$reason{$set} = $r->maketext("No record found.");
 			next SET;
 		}
 		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
@@ -1979,7 +2053,7 @@ SET:	foreach my $set (keys %filenames) {
 		# back up existing file
 		if(-e $filePath) {
 			rename($filePath, "$filePath.bak") or 
-				$reason{$set} = "Existing file $filePath could not be backed up and was lost.";
+				$reason{$set} = $r->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
 		}
 		
 		my $openDate     = $self->formatDateTime($setRecord->open_date);
@@ -1995,7 +2069,7 @@ SET:	foreach my $set (keys %filenames) {
 			my $problemRecord = $db->getGlobalProblem($set, $prob); # checked
 			unless (defined $problemRecord) {
 				push @skipped, $set;
-				$reason{$set} = "No record found for problem $prob.";
+				$reason{$set} = $r->maketext("No record found for problem [_1].", $prob);
 				next SET;
 			}
 			my $source_file   = $problemRecord->source_file();
@@ -2065,7 +2139,7 @@ EOF
 		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
 		eval {
 			local *SETDEF;
-			open SETDEF, ">$filePath" or die "Failed to open $filePath";
+			open SETDEF, ">$filePath" or die $r->maketext("Failed to open [_1]", $filePath);
 			print SETDEF $fileContents;
 			close SETDEF;
 		};
@@ -2088,7 +2162,7 @@ EOF
 ################################################################################
 
 sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
+	my ($self, $fieldName, $value, $properties, $dateTimeScripts) = @_;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
@@ -2101,16 +2175,130 @@ sub fieldEditHTML {
 	}
 	
 	if ($type eq "number" or $type eq "text") {
-		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+		my $id = $fieldName."_id";
+		my $out = CGI::input({type=>"text", name=>$fieldName, id=>$id, value=>"", size=>$size});
+		my $content = "";
+		my $bareName = "";
+		my $timezone = substr($value, -3);
+		
+		if(index($fieldName, ".open_date") != -1){
+			my @temp = split(/.open_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.open_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testopenDate = new Date(dateText);
+            var testdueDate = new Date(dueDateTextBox.val());
+            if (testopenDate > testdueDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var open = \$(this).datetimepicker('getDate');
+		var open_obj = new Date(open.getTime());
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'minDate', open_obj);
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".due_date") != -1){
+			my @temp = split(/.due_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.due_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+		var openDateTextBox = \$('#$bareName\\\\.open_date_id');
+        var answersDateTextBox = \$('#$bareName\\\\.answer_date_id');
+
+        if (openDateTextBox.val() != '') {
+            var testopenDate = new Date(openDateTextBox.val());
+			var testdueDate = new Date(dateText);
+            if (testopenDate > testdueDate)
+                openDateTextBox.val(dateText);
+        }
+        else {
+            openDateTextBox.val(dateText);
+        }
+
+		if (answersDateTextBox.val() != '') {
+			var testdueDate = new Date(dateText);
+			var testanswersDate = new Date(answersDateTextBox.val());
+			if(testdueDate > testanswersDate)
+				answersDateTextBox.val(dateText);
+		}
+		else {
+			answersDateTextBox.val(dateText);
+		}
+    },
+    onSelect: function (selectedDateTime){
+        var due = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.open_date_id').datetimepicker('option', 'maxDate', new Date(due.getTime()));
+		\$('#$bareName\\\\.answer_date_id').datetimepicker('option', 'minDate', new Date(due.getTime()));
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".answer_date") != -1){
+			my @temp = split(/.answer_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.answer_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testdueDate = new Date(dueDateTextBox.val());
+            var testanswersDate = new Date(dateText);
+            if (testdueDate > testanswersDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var answers = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'maxDate', new Date(answers.getTime()));
+    }
+});
+CONTENT
+		}
+		
+		push @$dateTimeScripts, $content;
+		return $out;
 	}
 	
 	if ($type eq "filelist") {
-		return CGI::popup_menu({
-			name => $fieldName,
-			value => [ sort keys %$headerFiles ],
-			labels => $headerFiles,
-			default => $value || 0,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName,
+				value => [ sort keys %$headerFiles ],
+				labels => $headerFiles,
+				default => $value || 0,
+			}
+		),
 	}
 
 	if ($type eq "enumerable") {
@@ -2128,12 +2316,17 @@ sub fieldEditHTML {
 			$value = $synonyms->{"*"};
 		}
 		
-		return CGI::popup_menu({
-			name => $fieldName, 
-			values => [keys %$items],
-			default => $value,
-			labels => $items,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName, 
+				values => [keys %$items],
+				default => $value,
+				labels => $items,
+			}
+		),
 	}
 	
 	if ($type eq "checked") {
@@ -2141,11 +2334,16 @@ sub fieldEditHTML {
 		# FIXME: kludge (R)
 		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
 		# in which case the hidden field overrides the parameter with a 0
-		return CGI::checkbox(
-			-name => $fieldName,
-			-checked => $value,
-			-label => "",
-			-value => 1
+		return WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				-name => $fieldName,
+				-checked => $value,
+				-label => "",
+				-value => 1
+			}
 		) . CGI::hidden(
 			-name => $fieldName,
 			-value => 0
@@ -2168,8 +2366,8 @@ sub recordEditHTML {
 	my $exportMode = $options{exportMode};
 	my $setSelected = $options{setSelected};
 
-	my $visibleClass = $Set->visible ? "visible" : "hidden";
-	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? 'Reduced Credit Enabled' : 'Reduced Credit Disabled';
+	my $visibleClass = $Set->visible ? $r->maketext("visible") : $r->maketext("hidden");
+	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? $r->maketext('Reduced Credit Enabled') : $r->maketext('Reduced Credit Disabled');
 
 	my $users = $db->countSetUsers($Set->set_id);
 	my $totalUsers = $self->{totalUsers};
@@ -2199,26 +2397,39 @@ sub recordEditHTML {
 					: CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
 	$fakeRecord{filename} = CGI::input({-name => "set.$set_id", -value=>"set$set_id.def", -size=>60});
 					
-		
+	
 	# Select
 	if ($editMode) {
 		# column not there
 	} else {
 		# selection checkbox
-		push @tableCells, CGI::checkbox(
-			-name => "selected_sets",
-			-value => $set_id,
-			-checked => $setSelected,
-			-label => "",
+		# Set ID
+		my $label = "";
+		if ($editMode) {
+			$label = CGI::a({href=>$problemListURL}, "$set_id");
+		} else {		
+			$label = CGI::font({class=>$visibleClass}, $set_id . $imageLink);
+		}
+		
+		push @tableCells, WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$set_id."_id",
+			-label_text=>$label,
+			-input_attr=>$setSelected ?
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-checked => "checked",
+				-class => "table_checkbox",
+			}
+			:
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-class => "table_checkbox",
+			}
 		);
 	}
-	
-	# Set ID
-	if ($editMode) {
-		push @tableCells, CGI::a({href=>$problemListURL}, "$set_id");
-	} else {		
-	push @tableCells, CGI::font({class=>$visibleClass}, $set_id . $imageLink);
-	}
 
 	# Problems link
 	if ($editMode) {
@@ -2249,6 +2460,10 @@ sub recordEditHTML {
 	# make a hash out of this so we can test membership easily
 	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
 	
+	my @chooseDateTimeScripts = ();
+	
+	push @chooseDateTimeScripts, "addOnLoadEvent(function() {";
+
 	# Set Fields
 	foreach my $field (@fieldsToShow) {
 		next unless exists $nonkeyfields{$field};
@@ -2258,15 +2473,20 @@ sub recordEditHTML {
 		$properties{access} = "readonly" unless $editMode;
 		$fieldValue = $self->formatDateTime($fieldValue) if $field =~ /_date/;
 		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /visible/ and not $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enable_reduced_scoring/ and not $editMode;
-		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /visible/ and not $editMode;
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enable_reduced_scoring/ and not $editMode;
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties, \@chooseDateTimeScripts));
 		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
-
+	
+	push @chooseDateTimeScripts, "});";
+	
 	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
+	
+	my $out = CGI::Tr({}, CGI::td({}, \@tableCells));
+	my $scripts = CGI::start_script({-type=>"text/javascript"}).(join("", @chooseDateTimeScripts)).CGI::end_script();
 
-	return CGI::Tr({}, CGI::td({}, \@tableCells));
+	return $out.$scripts;
 }
 
 sub printTableHTML {
@@ -2316,22 +2536,25 @@ sub printTableHTML {
 	
 	@headers = sort @headers;
 	my %headers = map { $_ => $_ } @headers;
-	$headers{""} = "Use System Default";
+	$headers{""} = $r->maketext("Use System Default");
 	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
 
 
 	my @tableHeadings = map { $fieldNames{$_} } @realFieldNames;
+	shift @tableHeadings;
 	
 	# prepend selection checkbox? only if we're NOT editing!
 #	unshift @tableHeadings, "Select", "Set", "Problems" unless $editMode;
 
 	# print the table
 	if ($editMode or $exportMode) {
-		print CGI::start_table({});
+		print CGI::start_table({-id=>"set_table_id", -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	} else {
-		print CGI::start_table({-border=>1});
+		print CGI::start_table({-id=>"set_table_id", -border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	}
 	
+	print CGI::caption($r->maketext("Set List"));
+	
 	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
 	
 
@@ -2352,10 +2575,41 @@ sub printTableHTML {
 	##########################################
 	
 	print CGI::p(
-                      CGI::i("No sets shown.  Choose one of the options above to list the sets in the course.")
+                      CGI::i($r->maketext("No sets shown.  Choose one of the options above to list the sets in the course."))
 	) unless @Sets;
 }
 
+# output_JS subroutine
+
+# outputs all of the Javascript required for this page
+
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-1.8.18.custom.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-timepicker-addon.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/form_checker_hmwksets.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/hmwksets_handlers.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/show_hide.js"}), CGI::end_script();
+	return "";
+}
+
+# Just tells template to output the stylesheet for Tabber
+sub output_tabber_CSS{
+	return "";
+}
+
+#Tells template to output stylesheet for Jquery-UI
+sub output_jquery_ui_CSS{
+	return "";
+}
+
 1;
 
 =head1 AUTHOR
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index 1f2b2eb760..818f0501ce 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -1,8 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: WeBWorK Online Homework System\n"
@@ -18,7 +13,7 @@ msgstr ""
 
 #
 msgid "_REDUCED_CREDIT_MESSAGE_1"
-msgstr "This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3 % of the original."
+msgstr "tr: This assignment has a Reduced Credit Period that begins %1 and ends on the due date, %2.  During this period all additional work done counts %3\% of the original."
 
 #
 msgid "_REQUEST_ERROR"
@@ -50,7 +45,7 @@ msgstr "Prev"
 
 #
 msgid "navProbListGrey"
-msgstr "Up"
+msgstr "tr: Up"
 
 #
 msgid "navNextGrey"
@@ -62,7 +57,7 @@ msgstr "This is the classlist editor page, where you can view and edit the recor
 
 #
 msgid "_REDUCED_CREDIT_MESSAGE_2"
-msgstr "This assignment had a Reduced Credit Period that began %1 andended on the due date, %2.  During that period all additional work done counted %3 % of the original."
+msgstr "tr: This assignment had a Reduced Credit Period that began %1 andended on the due date, %2.  During that period all additional work done counted %3\% of the original."
 
 #
 msgid "_LOGIN_MESSAGE"

From 2d6a84cfe1b8efb21158e3337c2985c1618c8884 Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Fri, 23 Mar 2012 20:44:14 -0400
Subject: [PATCH 07/73] ghe3: implemented Datepicker (commit2)

---
 htdocs/css/jquery-ui-1.8.18.custom.css   |  573 ++++++++++
 htdocs/js/jquery-1.7.1.min.js            |    4 +
 htdocs/js/jquery-ui-1.8.18.custom.min.js |  356 ++++++
 htdocs/js/jquery-ui-timepicker-addon.js  | 1326 ++++++++++++++++++++++
 4 files changed, 2259 insertions(+)
 create mode 100644 htdocs/css/jquery-ui-1.8.18.custom.css
 create mode 100644 htdocs/js/jquery-1.7.1.min.js
 create mode 100644 htdocs/js/jquery-ui-1.8.18.custom.min.js
 create mode 100644 htdocs/js/jquery-ui-timepicker-addon.js

diff --git a/htdocs/css/jquery-ui-1.8.18.custom.css b/htdocs/css/jquery-ui-1.8.18.custom.css
new file mode 100644
index 0000000000..97e1dd84a8
--- /dev/null
+++ b/htdocs/css/jquery-ui-1.8.18.custom.css
@@ -0,0 +1,573 @@
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:after { clear: both; }
+.ui-helper-clearfix { zoom: 1; }
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.18
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: hidden; *overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+/*
+ * jQuery UI Slider 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+ * jQuery UI Datepicker 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+
+/* css for timepicker */
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 85px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
\ No newline at end of file
diff --git a/htdocs/js/jquery-1.7.1.min.js b/htdocs/js/jquery-1.7.1.min.js
new file mode 100644
index 0000000000..ee0233703d
--- /dev/null
+++ b/htdocs/js/jquery-1.7.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.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 contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.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|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={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,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/htdocs/js/jquery-ui-1.8.18.custom.min.js b/htdocs/js/jquery-ui-1.8.18.custom.min.js
new file mode 100644
index 0000000000..f00a62f133
--- /dev/null
+++ b/htdocs/js/jquery-ui-1.8.18.custom.min.js
@@ -0,0 +1,356 @@
+/*!
+ * jQuery UI 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */(function(a,b){function d(b){return!a(b).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}function c(b,c){var e=b.nodeName.toLowerCase();if("area"===e){var f=b.parentNode,g=f.name,h;if(!b.href||!g||f.nodeName.toLowerCase()!=="map")return!1;h=a("img[usemap=#"+g+"]")[0];return!!h&&d(h)}return(/input|select|textarea|button|object/.test(e)?!b.disabled:"a"==e?b.href||c:c)&&d(b)}a.ui=a.ui||{};a.ui.version||(a.extend(a.ui,{version:"1.8.18",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}}),a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(b,c){return typeof b=="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus(),c&&c.call(d)},b)}):this._focus.apply(this,arguments)},scrollParent:function(){var b;a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?b=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):b=this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!b.length?a(document):b},zIndex:function(c){if(c!==b)return this.css("zIndex",c);if(this.length){var d=a(this[0]),e,f;while(d.length&&d[0]!==document){e=d.css("position");if(e==="absolute"||e==="relative"||e==="fixed"){f=parseInt(d.css("zIndex"),10);if(!isNaN(f)&&f!==0)return f}d=d.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),a.each(["Width","Height"],function(c,d){function h(b,c,d,f){a.each(e,function(){c-=parseFloat(a.curCSS(b,"padding"+this,!0))||0,d&&(c-=parseFloat(a.curCSS(b,"border"+this+"Width",!0))||0),f&&(c-=parseFloat(a.curCSS(b,"margin"+this,!0))||0)});return c}var e=d==="Width"?["Left","Right"]:["Top","Bottom"],f=d.toLowerCase(),g={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+d]=function(c){if(c===b)return g["inner"+d].call(this);return this.each(function(){a(this).css(f,h(this,c)+"px")})},a.fn["outer"+d]=function(b,c){if(typeof b!="number")return g["outer"+d].call(this,b);return this.each(function(){a(this).css(f,h(this,b,!0,c)+"px")})}}),a.extend(a.expr[":"],{data:function(b,c,d){return!!a.data(b,d[3])},focusable:function(b){return c(b,!isNaN(a.attr(b,"tabindex")))},tabbable:function(b){var d=a.attr(b,"tabindex"),e=isNaN(d);return(e||d>=0)&&c(b,!e)}}),a(function(){var b=document.body,c=b.appendChild(c=document.createElement("div"));c.offsetHeight,a.extend(c.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),a.support.minHeight=c.offsetHeight===100,a.support.selectstart="onselectstart"in c,b.removeChild(c).style.display="none"}),a.extend(a.ui,{plugin:{add:function(b,c,d){var e=a.ui[b].prototype;for(var f in d)e.plugins[f]=e.plugins[f]||[],e.plugins[f].push([c,d[f]])},call:function(a,b,c){var d=a.plugins[b];if(!!d&&!!a.element[0].parentNode)for(var e=0;e<d.length;e++)a.options[d[e][0]]&&d[e][1].apply(a.element,c)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(b,c){if(a(b).css("overflow")==="hidden")return!1;var d=c&&c==="left"?"scrollLeft":"scrollTop",e=!1;if(b[d]>0)return!0;b[d]=1,e=b[d]>0,b[d]=0;return e},isOverAxis:function(a,b,c){return a>b&&a<b+c},isOver:function(b,c,d,e,f,g){return a.ui.isOverAxis(b,d,f)&&a.ui.isOverAxis(c,e,g)}}))})(jQuery);/*!
+ * jQuery UI Widget 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */(function(a,b){if(a.cleanData){var c=a.cleanData;a.cleanData=function(b){for(var d=0,e;(e=b[d])!=null;d++)try{a(e).triggerHandler("remove")}catch(f){}c(b)}}else{var d=a.fn.remove;a.fn.remove=function(b,c){return this.each(function(){c||(!b||a.filter(b,[this]).length)&&a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(b){}});return d.call(a(this),b,c)})}}a.widget=function(b,c,d){var e=b.split(".")[0],f;b=b.split(".")[1],f=e+"-"+b,d||(d=c,c=a.Widget),a.expr[":"][f]=function(c){return!!a.data(c,b)},a[e]=a[e]||{},a[e][b]=function(a,b){arguments.length&&this._createWidget(a,b)};var g=new c;g.options=a.extend(!0,{},g.options),a[e][b].prototype=a.extend(!0,g,{namespace:e,widgetName:b,widgetEventPrefix:a[e][b].prototype.widgetEventPrefix||b,widgetBaseClass:f},d),a.widget.bridge(b,a[e][b])},a.widget.bridge=function(c,d){a.fn[c]=function(e){var f=typeof e=="string",g=Array.prototype.slice.call(arguments,1),h=this;e=!f&&g.length?a.extend.apply(null,[!0,e].concat(g)):e;if(f&&e.charAt(0)==="_")return h;f?this.each(function(){var d=a.data(this,c),f=d&&a.isFunction(d[e])?d[e].apply(d,g):d;if(f!==d&&f!==b){h=f;return!1}}):this.each(function(){var b=a.data(this,c);b?b.option(e||{})._init():a.data(this,c,new d(e,this))});return h}},a.Widget=function(a,b){arguments.length&&this._createWidget(a,b)},a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:!1},_createWidget:function(b,c){a.data(c,this.widgetName,this),this.element=a(c),this.options=a.extend(!0,{},this.options,this._getCreateOptions(),b);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()}),this._create(),this._trigger("create"),this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName),this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+"ui-state-disabled")},widget:function(){return this.element},option:function(c,d){var e=c;if(arguments.length===0)return a.extend({},this.options);if(typeof c=="string"){if(d===b)return this.options[c];e={},e[c]=d}this._setOptions(e);return this},_setOptions:function(b){var c=this;a.each(b,function(a,b){c._setOption(a,b)});return this},_setOption:function(a,b){this.options[a]=b,a==="disabled"&&this.widget()[b?"addClass":"removeClass"](this.widgetBaseClass+"-disabled"+" "+"ui-state-disabled").attr("aria-disabled",b);return this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_trigger:function(b,c,d){var e,f,g=this.options[b];d=d||{},c=a.Event(c),c.type=(b===this.widgetEventPrefix?b:this.widgetEventPrefix+b).toLowerCase(),c.target=this.element[0],f=c.originalEvent;if(f)for(e in f)e in c||(c[e]=f[e]);this.element.trigger(c,d);return!(a.isFunction(g)&&g.call(this.element[0],c,d)===!1||c.isDefaultPrevented())}}})(jQuery);/*!
+ * jQuery UI Mouse 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */(function(a,b){var c=!1;a(document).mouseup(function(a){c=!1}),a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(a){return b._mouseDown(a)}).bind("click."+this.widgetName,function(c){if(!0===a.data(c.target,b.widgetName+".preventClickEvent")){a.removeData(c.target,b.widgetName+".preventClickEvent"),c.stopImmediatePropagation();return!1}}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(b){if(!c){this._mouseStarted&&this._mouseUp(b),this._mouseDownEvent=b;var d=this,e=b.which==1,f=typeof this.options.cancel=="string"&&b.target.nodeName?a(b.target).closest(this.options.cancel).length:!1;if(!e||f||!this._mouseCapture(b))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=this._mouseStart(b)!==!1;if(!this._mouseStarted){b.preventDefault();return!0}}!0===a.data(b.target,this.widgetName+".preventClickEvent")&&a.removeData(b.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(a){return d._mouseMove(a)},this._mouseUpDelegate=function(a){return d._mouseUp(a)},a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),b.preventDefault(),c=!0;return!0}},_mouseMove:function(b){if(a.browser.msie&&!(document.documentMode>=9)&&!b.button)return this._mouseUp(b);if(this._mouseStarted){this._mouseDrag(b);return b.preventDefault()}this._mouseDistanceMet(b)&&this._mouseDelayMet(b)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,b)!==!1,this._mouseStarted?this._mouseDrag(b):this._mouseUp(b));return!this._mouseStarted},_mouseUp:function(b){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,b.target==this._mouseDownEvent.target&&a.data(b.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(b));return!1},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(a){return this.mouseDelayMet},_mouseStart:function(a){},_mouseDrag:function(a){},_mouseStop:function(a){},_mouseCapture:function(a){return!0}})})(jQuery);/*
+ * jQuery UI Position 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */(function(a,b){a.ui=a.ui||{};var c=/left|center|right/,d=/top|center|bottom/,e="center",f={},g=a.fn.position,h=a.fn.offset;a.fn.position=function(b){if(!b||!b.of)return g.apply(this,arguments);b=a.extend({},b);var h=a(b.of),i=h[0],j=(b.collision||"flip").split(" "),k=b.offset?b.offset.split(" "):[0,0],l,m,n;i.nodeType===9?(l=h.width(),m=h.height(),n={top:0,left:0}):i.setTimeout?(l=h.width(),m=h.height(),n={top:h.scrollTop(),left:h.scrollLeft()}):i.preventDefault?(b.at="left top",l=m=0,n={top:b.of.pageY,left:b.of.pageX}):(l=h.outerWidth(),m=h.outerHeight(),n=h.offset()),a.each(["my","at"],function(){var a=(b[this]||"").split(" ");a.length===1&&(a=c.test(a[0])?a.concat([e]):d.test(a[0])?[e].concat(a):[e,e]),a[0]=c.test(a[0])?a[0]:e,a[1]=d.test(a[1])?a[1]:e,b[this]=a}),j.length===1&&(j[1]=j[0]),k[0]=parseInt(k[0],10)||0,k.length===1&&(k[1]=k[0]),k[1]=parseInt(k[1],10)||0,b.at[0]==="right"?n.left+=l:b.at[0]===e&&(n.left+=l/2),b.at[1]==="bottom"?n.top+=m:b.at[1]===e&&(n.top+=m/2),n.left+=k[0],n.top+=k[1];return this.each(function(){var c=a(this),d=c.outerWidth(),g=c.outerHeight(),h=parseInt(a.curCSS(this,"marginLeft",!0))||0,i=parseInt(a.curCSS(this,"marginTop",!0))||0,o=d+h+(parseInt(a.curCSS(this,"marginRight",!0))||0),p=g+i+(parseInt(a.curCSS(this,"marginBottom",!0))||0),q=a.extend({},n),r;b.my[0]==="right"?q.left-=d:b.my[0]===e&&(q.left-=d/2),b.my[1]==="bottom"?q.top-=g:b.my[1]===e&&(q.top-=g/2),f.fractions||(q.left=Math.round(q.left),q.top=Math.round(q.top)),r={left:q.left-h,top:q.top-i},a.each(["left","top"],function(c,e){a.ui.position[j[c]]&&a.ui.position[j[c]][e](q,{targetWidth:l,targetHeight:m,elemWidth:d,elemHeight:g,collisionPosition:r,collisionWidth:o,collisionHeight:p,offset:k,my:b.my,at:b.at})}),a.fn.bgiframe&&c.bgiframe(),c.offset(a.extend(q,{using:b.using}))})},a.ui.position={fit:{left:function(b,c){var d=a(window),e=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft();b.left=e>0?b.left-e:Math.max(b.left-c.collisionPosition.left,b.left)},top:function(b,c){var d=a(window),e=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=e>0?b.top-e:Math.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c.at[0]!==e){var d=a(window),f=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft(),g=c.my[0]==="left"?-c.elemWidth:c.my[0]==="right"?c.elemWidth:0,h=c.at[0]==="left"?c.targetWidth:-c.targetWidth,i=-2*c.offset[0];b.left+=c.collisionPosition.left<0?g+h+i:f>0?g+h+i:0}},top:function(b,c){if(c.at[1]!==e){var d=a(window),f=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop(),g=c.my[1]==="top"?-c.elemHeight:c.my[1]==="bottom"?c.elemHeight:0,h=c.at[1]==="top"?c.targetHeight:-c.targetHeight,i=-2*c.offset[1];b.top+=c.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}}},a.offset.setOffset||(a.offset.setOffset=function(b,c){/static/.test(a.curCSS(b,"position"))&&(b.style.position="relative");var d=a(b),e=d.offset(),f=parseInt(a.curCSS(b,"top",!0),10)||0,g=parseInt(a.curCSS(b,"left",!0),10)||0,h={top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.call(b,h):d.css(h)},a.fn.offset=function(b){var c=this[0];if(!c||!c.ownerDocument)return null;if(b)return this.each(function(){a.offset.setOffset(this,b)});return h.call(this)}),function(){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d,e,g,h,i;d=document.createElement(b?"div":"body"),g={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=g[j];d.appendChild(c),e=b||document.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText="position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;",h=a(c).offset(function(a,b){return b}).offset(),d.innerHTML="",e.removeChild(d),i=h.top+h.left+(b?2e3:0),f.fractions=i>21&&i<22}()})(jQuery);/*
+ * jQuery UI Draggable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1},_create:function(){this.options.helper=="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},destroy:function(){if(!!this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy();return this}},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is(".ui-resizable-handle"))return!1;this.handle=this._getHandle(b);if(!this.handle)return!1;c.iframeFix&&a(c.iframeFix===!0?"iframe":c.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(a(this).offset()).appendTo("body")});return!0},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b),this._cacheHelperProportions(),a.ui.ddmanager&&(a.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt),c.containment&&this._setContainment();if(this._trigger("start",b)===!1){this._clear();return!1}this._cacheHelperProportions(),a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.helper.addClass("ui-draggable-dragging"),this._mouseDrag(b,!0),a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,b);return!0},_mouseDrag:function(b,c){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute");if(!c){var d=this._uiHash();if(this._trigger("drag",b,d)===!1){this._mouseUp({});return!1}this.position=d.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,b);return!1},_mouseStop:function(b){var c=!1;a.ui.ddmanager&&!this.options.dropBehaviour&&(c=a.ui.ddmanager.drop(this,b)),this.dropped&&(c=this.dropped,this.dropped=!1);if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return!1;if(this.options.revert=="invalid"&&!c||this.options.revert=="valid"&&c||this.options.revert===!0||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,c)){var d=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){d._trigger("stop",b)!==!1&&d._clear()})}else this._trigger("stop",b)!==!1&&this._clear();return!1},_mouseUp:function(b){this.options.iframeFix===!0&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,b);return a.ui.mouse.prototype._mouseUp.call(this,b)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?!0:!1;a(this.options.handle,this.element).find("*").andSelf().each(function(){this==b.target&&(c=!0)});return c},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b])):c.helper=="clone"?this.element.clone().removeAttr("id"):this.element;d.parents("body").length||d.appendTo(c.appendTo=="parent"?this.element[0].parentNode:c.appendTo),d[0]!=this.element[0]&&!/(fixed|absolute)/.test(d.css("position"))&&d.css("position","absolute");return d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[b.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,b.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(b.containment=="document"?0:a(window).scrollLeft())+a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(b.containment=="document"?0:a(window).scrollTop())+(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)&&b.containment.constructor!=Array){var c=a(b.containment),d=c[0];if(!d)return;var e=c.offset(),f=a(d).css("overflow")!="hidden";this.containment=[(parseInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft"),10)||0),(parseInt(a(d).css("borderTopWidth"),10)||0)+(parseInt(a(d).css("paddingTop"),10)||0),(f?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(f?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(a(d).css("borderTopWidth"),10)||0)-(parseInt(a(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=c}else b.containment.constructor==Array&&(this.containment=b.containment)},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName),f=b.pageX,g=b.pageY;if(this.originalPosition){var h;if(this.containment){if(this.relative_container){var i=this.relative_container.offset();h=[this.containment[0]+i.left,this.containment[1]+i.top,this.containment[2]+i.left,this.containment[3]+i.top]}else h=this.containment;b.pageX-this.offset.click.left<h[0]&&(f=h[0]+this.offset.click.left),b.pageY-this.offset.click.top<h[1]&&(g=h[1]+this.offset.click.top),b.pageX-this.offset.click.left>h[2]&&(f=h[2]+this.offset.click.left),b.pageY-this.offset.click.top>h[3]&&(g=h[3]+this.offset.click.top)}if(c.grid){var j=c.grid[1]?this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1]:this.originalPageY;g=h?j-this.offset.click.top<h[1]||j-this.offset.click.top>h[3]?j-this.offset.click.top<h[1]?j+c.grid[1]:j-c.grid[1]:j:j;var k=c.grid[0]?this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0]:this.originalPageX;f=h?k-this.offset.click.left<h[0]||k-this.offset.click.left>h[2]?k-this.offset.click.left<h[0]?k+c.grid[0]:k-c.grid[0]:k:k}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(b,c,d){d=d||this._uiHash(),a.ui.plugin.call(this,b,[c,d]),b=="drag"&&(this.positionAbs=this._convertPositionTo("absolute"));return a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(a){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),a.extend(a.ui.draggable,{version:"1.8.18"}),a.ui.plugin.add("draggable","connectToSortable",{start:function(b,c){var d=a(this).data("draggable"),e=d.options,f=a.extend({},c,{item:d.element});d.sortables=[],a(e.connectToSortable).each(function(){var c=a.data(this,"sortable");c&&!c.options.disabled&&(d.sortables.push({instance:c,shouldRevert:c.options.revert}),c.refreshPositions(),c._trigger("activate",b,f))})},stop:function(b,c){var d=a(this).data("draggable"),e=a.extend({},c,{item:d.element});a.each(d.sortables,function(){this.instance.isOver?(this.instance.isOver=0,d.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(b),this.instance.options.helper=this.instance.options._helper,d.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",b,e))})},drag:function(b,c){var d=a(this).data("draggable"),e=this,f=function(b){var c=this.offset.click.top,d=this.offset.click.left,e=this.positionAbs.top,f=this.positionAbs.left,g=b.height,h=b.width,i=b.top,j=b.left;return a.ui.isOver(e+c,f+d,i,j,g,h)};a.each(d.sortables,function(f){this.instance.positionAbs=d.positionAbs,this.instance.helperProportions=d.helperProportions,this.instance.offset.click=d.offset.click,this.instance._intersectsWith(this.instance.containerCache)?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=a(e).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return c.helper[0]},b.target=this.instance.currentItem[0],this.instance._mouseCapture(b,!0),this.instance._mouseStart(b,!0,!0),this.instance.offset.click.top=d.offset.click.top,this.instance.offset.click.left=d.offset.click.left,this.instance.offset.parent.left-=d.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=d.offset.parent.top-this.instance.offset.parent.top,d._trigger("toSortable",b),d.dropped=this.instance.element,d.currentItem=d.element,this.instance.fromOutside=d),this.instance.currentItem&&this.instance._mouseDrag(b)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",b,this.instance._uiHash(this.instance)),this.instance._mouseStop(b,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),d._trigger("fromSortable",b),d.dropped=!1)})}}),a.ui.plugin.add("draggable","cursor",{start:function(b,c){var d=a("body"),e=a(this).data("draggable").options;d.css("cursor")&&(e._cursor=d.css("cursor")),d.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;d._cursor&&a("body").css("cursor",d._cursor)}}),a.ui.plugin.add("draggable","opacity",{start:function(b,c){var d=a(c.helper),e=a(this).data("draggable").options;d.css("opacity")&&(e._opacity=d.css("opacity")),d.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;d._opacity&&a(c.helper).css("opacity",d._opacity)}}),a.ui.plugin.add("draggable","scroll",{start:function(b,c){var d=a(this).data("draggable");d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML"&&(d.overflowOffset=d.scrollParent.offset())},drag:function(b,c){var d=a(this).data("draggable"),e=d.options,f=!1;if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!="x")d.overflowOffset.top+d.scrollParent[0].offsetHeight-b.pageY<e.scrollSensitivity?d.scrollParent[0].scrollTop=f=d.scrollParent[0].scrollTop+e.scrollSpeed:b.pageY-d.overflowOffset.top<e.scrollSensitivity&&(d.scrollParent[0].scrollTop=f=d.scrollParent[0].scrollTop-e.scrollSpeed);if(!e.axis||e.axis!="y")d.overflowOffset.left+d.scrollParent[0].offsetWidth-b.pageX<e.scrollSensitivity?d.scrollParent[0].scrollLeft=f=d.scrollParent[0].scrollLeft+e.scrollSpeed:b.pageX-d.overflowOffset.left<e.scrollSensitivity&&(d.scrollParent[0].scrollLeft=f=d.scrollParent[0].scrollLeft-e.scrollSpeed)}else{if(!e.axis||e.axis!="x")b.pageY-a(document).scrollTop()<e.scrollSensitivity?f=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<e.scrollSensitivity&&(f=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed));if(!e.axis||e.axis!="y")b.pageX-a(document).scrollLeft()<e.scrollSensitivity?f=a(document).scrollLeft(a(document).scrollLeft()-e.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<e.scrollSensitivity&&(f=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed))}f!==!1&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(d,b)}}),a.ui.plugin.add("draggable","snap",{start:function(b,c){var d=a(this).data("draggable"),e=d.options;d.snapElements=[],a(e.snap.constructor!=String?e.snap.items||":data(draggable)":e.snap).each(function(){var b=a(this),c=b.offset();this!=d.element[0]&&d.snapElements.push({item:this,width:b.outerWidth(),height:b.outerHeight(),top:c.top,left:c.left})})},drag:function(b,c){var d=a(this).data("draggable"),e=d.options,f=e.snapTolerance,g=c.offset.left,h=g+d.helperProportions.width,i=c.offset.top,j=i+d.helperProportions.height;for(var k=d.snapElements.length-1;k>=0;k--){var l=d.snapElements[k].left,m=l+d.snapElements[k].width,n=d.snapElements[k].top,o=n+d.snapElements[k].height;if(!(l-f<g&&g<m+f&&n-f<i&&i<o+f||l-f<g&&g<m+f&&n-f<j&&j<o+f||l-f<h&&h<m+f&&n-f<i&&i<o+f||l-f<h&&h<m+f&&n-f<j&&j<o+f)){d.snapElements[k].snapping&&d.options.snap.release&&d.options.snap.release.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snapping=!1;continue}if(e.snapMode!="inner"){var p=Math.abs(n-j)<=f,q=Math.abs(o-i)<=f,r=Math.abs(l-h)<=f,s=Math.abs(m-g)<=f;p&&(c.position.top=d._convertPositionTo("relative",{top:n-d.helperProportions.height,left:0}).top-d.margins.top),q&&(c.position.top=d._convertPositionTo("relative",{top:o,left:0}).top-d.margins.top),r&&(c.position.left=d._convertPositionTo("relative",{top:0,left:l-d.helperProportions.width}).left-d.margins.left),s&&(c.position.left=d._convertPositionTo("relative",{top:0,left:m}).left-d.margins.left)}var t=p||q||r||s;if(e.snapMode!="outer"){var p=Math.abs(n-i)<=f,q=Math.abs(o-j)<=f,r=Math.abs(l-g)<=f,s=Math.abs(m-h)<=f;p&&(c.position.top=d._convertPositionTo("relative",{top:n,left:0}).top-d.margins.top),q&&(c.position.top=d._convertPositionTo("relative",{top:o-d.helperProportions.height,left:0}).top-d.margins.top),r&&(c.position.left=d._convertPositionTo("relative",{top:0,left:l}).left-d.margins.left),s&&(c.position.left=d._convertPositionTo("relative",{top:0,left:m-d.helperProportions.width}).left-d.margins.left)}!d.snapElements[k].snapping&&(p||q||r||s||t)&&d.options.snap.snap&&d.options.snap.snap.call(d.element,b,a.extend(d._uiHash(),{snapItem:d.snapElements[k].item})),d.snapElements[k].snapping=p||q||r||s||t}}}),a.ui.plugin.add("draggable","stack",{start:function(b,c){var d=a(this).data("draggable").options,e=a.makeArray(a(d.stack)).sort(function(b,c){return(parseInt(a(b).css("zIndex"),10)||0)-(parseInt(a(c).css("zIndex"),10)||0)});if(!!e.length){var f=parseInt(e[0].style.zIndex)||0;a(e).each(function(a){this.style.zIndex=f+a}),this[0].style.zIndex=f+e.length}}}),a.ui.plugin.add("draggable","zIndex",{start:function(b,c){var d=a(c.helper),e=a(this).data("draggable").options;d.css("zIndex")&&(e._zIndex=d.css("zIndex")),d.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;d._zIndex&&a(c.helper).css("zIndex",d._zIndex)}})})(jQuery);/*
+ * jQuery UI Droppable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */(function(a,b){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect"},_create:function(){var b=this.options,c=b.accept;this.isover=0,this.isout=1,this.accept=a.isFunction(c)?c:function(a){return a.is(c)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},a.ui.ddmanager.droppables[b.scope]=a.ui.ddmanager.droppables[b.scope]||[],a.ui.ddmanager.droppables[b.scope].push(this),b.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];for(var c=0;c<b.length;c++)b[c]==this&&b.splice(c,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(b,c){b=="accept"&&(this.accept=a.isFunction(c)?c:function(a){return a.is(c)}),a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),c&&this._trigger("activate",b,this.ui(c))},_deactivate:function(b){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),c&&this._trigger("deactivate",b,this.ui(c))},_over:function(b){var c=a.ui.ddmanager.current;!!c&&(c.currentItem||c.element)[0]!=this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",b,this.ui(c)))},_out:function(b){var c=a.ui.ddmanager.current;!!c&&(c.currentItem||c.element)[0]!=this.element[0]&&this.accept.call(this.element[0],c.currentItem||c.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",b,this.ui(c)))},_drop:function(b,c){var d=c||a.ui.ddmanager.current;if(!d||(d.currentItem||d.element)[0]==this.element[0])return!1;var e=!1;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var b=a.data(this,"droppable");if(b.options.greedy&&!b.options.disabled&&b.options.scope==d.options.scope&&b.accept.call(b.element[0],d.currentItem||d.element)&&a.ui.intersect(d,a.extend(b,{offset:b.element.offset()}),b.options.tolerance)){e=!0;return!1}});if(e)return!1;if(this.accept.call(this.element[0],d.currentItem||d.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",b,this.ui(d));return this.element}return!1},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}}),a.extend(a.ui.droppable,{version:"1.8.18"}),a.ui.intersect=function(b,c,d){if(!c.offset)return!1;var e=(b.positionAbs||b.position.absolute).left,f=e+b.helperProportions.width,g=(b.positionAbs||b.position.absolute).top,h=g+b.helperProportions.height,i=c.offset.left,j=i+c.proportions.width,k=c.offset.top,l=k+c.proportions.height;switch(d){case"fit":return i<=e&&f<=j&&k<=g&&h<=l;case"intersect":return i<e+b.helperProportions.width/2&&f-b.helperProportions.width/2<j&&k<g+b.helperProportions.height/2&&h-b.helperProportions.height/2<l;case"pointer":var m=(b.positionAbs||b.position.absolute).left+(b.clickOffset||b.offset.click).left,n=(b.positionAbs||b.position.absolute).top+(b.clickOffset||b.offset.click).top,o=a.ui.isOver(n,m,k,i,c.proportions.height,c.proportions.width);return o;case"touch":return(g>=k&&g<=l||h>=k&&h<=l||g<k&&h>l)&&(e>=i&&e<=j||f>=i&&f<=j||e<i&&f>j);default:return!1}},a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(b,c){var d=a.ui.ddmanager.droppables[b.options.scope]||[],e=c?c.type:null,f=(b.currentItem||b.element).find(":data(droppable)").andSelf();droppablesLoop:for(var g=0;g<d.length;g++){if(d[g].options.disabled||b&&!d[g].accept.call(d[g].element[0],b.currentItem||b.element))continue;for(var h=0;h<f.length;h++)if(f[h]==d[g].element[0]){d[g].proportions.height=0;continue droppablesLoop}d[g].visible=d[g].element.css("display")!="none";if(!d[g].visible)continue;e=="mousedown"&&d[g]._activate.call(d[g],c),d[g].offset=d[g].element.offset(),d[g].proportions={width:d[g].element[0].offsetWidth,height:d[g].element[0].offsetHeight}}},drop:function(b,c){var d=!1;a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){!this.options||(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)&&(d=this._drop.call(this,c)||d),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],b.currentItem||b.element)&&(this.isout=1,this.isover=0,this._deactivate.call(this,c)))});return d},dragStart:function(b,c){b.element.parents(":not(body,html)").bind("scroll.droppable",function(){b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)})},drag:function(b,c){b.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(b,c),a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var d=a.ui.intersect(b,this,this.options.tolerance),e=!d&&this.isover==1?"isout":d&&this.isover==0?"isover":null;if(!e)return;var f;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");g.length&&(f=a.data(g[0],"droppable"),f.greedyChild=e=="isover"?1:0)}f&&e=="isover"&&(f.isover=0,f.isout=1,f._out.call(f,c)),this[e]=1,this[e=="isout"?"isover":"isout"]=0,this[e=="isover"?"_over":"_out"].call(this,c),f&&e=="isout"&&(f.isout=0,f.isover=1,f._over.call(f,c))}})},dragStop:function(b,c){b.element.parents(":not(body,html)").unbind("scroll.droppable"),b.options.refreshPositions||a.ui.ddmanager.prepareOffsets(b,c)}}})(jQuery);/*
+ * jQuery UI Resizable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1e3},_create:function(){var b=this,c=this.options;this.element.addClass("ui-resizable"),a.extend(this,{_aspectRatio:!!c.aspectRatio,aspectRatio:c.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:c.helper||c.ghost||c.animate?c.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("resizable",this.element.data("resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=c.handles||(a(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor==String){this.handles=="all"&&(this.handles="n,e,s,w,se,sw,ne,nw");var d=this.handles.split(",");this.handles={};for(var e=0;e<d.length;e++){var f=a.trim(d[e]),g="ui-resizable-"+f,h=a('<div class="ui-resizable-handle '+g+'"></div>');/sw|se|ne|nw/.test(f)&&h.css({zIndex:++c.zIndex}),"se"==f&&h.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[f]=".ui-resizable-"+f,this.element.append(h)}}this._renderAxis=function(b){b=b||this.element;for(var c in this.handles){this.handles[c].constructor==String&&(this.handles[c]=a(this.handles[c],this.element).show());if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var d=a(this.handles[c],this.element),e=0;e=/sw|ne|nw|se|n|s/.test(c)?d.outerHeight():d.outerWidth();var f=["padding",/ne|nw|n/.test(c)?"Top":/se|sw|s/.test(c)?"Bottom":/^e$/.test(c)?"Right":"Left"].join("");b.css(f,e),this._proportionallyResize()}if(!a(this.handles[c]).length)continue}},this._renderAxis(this.element),this._handles=a(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){if(!b.resizing){if(this.className)var a=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=a&&a[1]?a[1]:"se"}}),c.autoHide&&(this._handles.hide(),a(this.element).addClass("ui-resizable-autohide").hover(function(){c.disabled||(a(this).removeClass("ui-resizable-autohide"),b._handles.show())},function(){c.disabled||b.resizing||(a(this).addClass("ui-resizable-autohide"),b._handles.hide())})),this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(b){a(b).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var c=this.element;c.after(this.originalElement.css({position:c.css("position"),width:c.outerWidth(),height:c.outerHeight(),top:c.css("top"),left:c.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle),b(this.originalElement);return this},_mouseCapture:function(b){var c=!1;for(var d in this.handles)a(this.handles[d])[0]==b.target&&(c=!0);return!this.options.disabled&&c},_mouseStart:function(b){var d=this.options,e=this.element.position(),f=this.element;this.resizing=!0,this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()},(f.is(".ui-draggable")||/absolute/.test(f.css("position")))&&f.css({position:"absolute",top:e.top,left:e.left}),this._renderProxy();var g=c(this.helper.css("left")),h=c(this.helper.css("top"));d.containment&&(g+=a(d.containment).scrollLeft()||0,h+=a(d.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:g,top:h},this.size=this._helper?{width:f.outerWidth(),height:f.outerHeight()}:{width:f.width(),height:f.height()},this.originalSize=this._helper?{width:f.outerWidth(),height:f.outerHeight()}:{width:f.width(),height:f.height()},this.originalPosition={left:g,top:h},this.sizeDiff={width:f.outerWidth()-f.width(),height:f.outerHeight()-f.height()},this.originalMousePosition={left:b.pageX,top:b.pageY},this.aspectRatio=typeof d.aspectRatio=="number"?d.aspectRatio:this.originalSize.width/this.originalSize.height||1;var i=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",i=="auto"?this.axis+"-resize":i),f.addClass("ui-resizable-resizing"),this._propagate("start",b);return!0},_mouseDrag:function(b){var c=this.helper,d=this.options,e={},f=this,g=this.originalMousePosition,h=this.axis,i=b.pageX-g.left||0,j=b.pageY-g.top||0,k=this._change[h];if(!k)return!1;var l=k.apply(this,[b,i,j]),m=a.browser.msie&&a.browser.version<7,n=this.sizeDiff;this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)l=this._updateRatio(l,b);l=this._respectSize(l,b),this._propagate("resize",b),c.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"}),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),this._updateCache(l),this._trigger("resize",b,this.ui());return!1},_mouseStop:function(b){this.resizing=!1;var c=this.options,d=this;if(this._helper){var e=this._proportionallyResizeElements,f=e.length&&/textarea/i.test(e[0].nodeName),g=f&&a.ui.hasScroll(e[0],"left")?0:d.sizeDiff.height,h=f?0:d.sizeDiff.width,i={width:d.helper.width()-h,height:d.helper.height()-g},j=parseInt(d.element.css("left"),10)+(d.position.left-d.originalPosition.left)||null,k=parseInt(d.element.css("top"),10)+(d.position.top-d.originalPosition.top)||null;c.animate||this.element.css(a.extend(i,{top:k,left:j})),d.helper.height(d.size.height),d.helper.width(d.size.width),this._helper&&!c.animate&&this._proportionallyResize()}a("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",b),this._helper&&this.helper.remove();return!1},_updateVirtualBoundaries:function(a){var b=this.options,c,e,f,g,h;h={minWidth:d(b.minWidth)?b.minWidth:0,maxWidth:d(b.maxWidth)?b.maxWidth:Infinity,minHeight:d(b.minHeight)?b.minHeight:0,maxHeight:d(b.maxHeight)?b.maxHeight:Infinity};if(this._aspectRatio||a)c=h.minHeight*this.aspectRatio,f=h.minWidth/this.aspectRatio,e=h.maxHeight*this.aspectRatio,g=h.maxWidth/this.aspectRatio,c>h.minWidth&&(h.minWidth=c),f>h.minHeight&&(h.minHeight=f),e<h.maxWidth&&(h.maxWidth=e),g<h.maxHeight&&(h.maxHeight=g);this._vBoundaries=h},_updateCache:function(a){var b=this.options;this.offset=this.helper.offset(),d(a.left)&&(this.position.left=a.left),d(a.top)&&(this.position.top=a.top),d(a.height)&&(this.size.height=a.height),d(a.width)&&(this.size.width=a.width)},_updateRatio:function(a,b){var c=this.options,e=this.position,f=this.size,g=this.axis;d(a.height)?a.width=a.height*this.aspectRatio:d(a.width)&&(a.height=a.width/this.aspectRatio),g=="sw"&&(a.left=e.left+(f.width-a.width),a.top=null),g=="nw"&&(a.top=e.top+(f.height-a.height),a.left=e.left+(f.width-a.width));return a},_respectSize:function(a,b){var c=this.helper,e=this._vBoundaries,f=this._aspectRatio||b.shiftKey,g=this.axis,h=d(a.width)&&e.maxWidth&&e.maxWidth<a.width,i=d(a.height)&&e.maxHeight&&e.maxHeight<a.height,j=d(a.width)&&e.minWidth&&e.minWidth>a.width,k=d(a.height)&&e.minHeight&&e.minHeight>a.height;j&&(a.width=e.minWidth),k&&(a.height=e.minHeight),h&&(a.width=e.maxWidth),i&&(a.height=e.maxHeight);var l=this.originalPosition.left+this.originalSize.width,m=this.position.top+this.size.height,n=/sw|nw|w/.test(g),o=/nw|ne|n/.test(g);j&&n&&(a.left=l-e.minWidth),h&&n&&(a.left=l-e.maxWidth),k&&o&&(a.top=m-e.minHeight),i&&o&&(a.top=m-e.maxHeight);var p=!a.width&&!a.height;p&&!a.left&&a.top?a.top=null:p&&!a.top&&a.left&&(a.left=null);return a},_proportionallyResize:function(){var b=this.options;if(!!this._proportionallyResizeElements.length){var c=this.helper||this.element;for(var d=0;d<this._proportionallyResizeElements.length;d++){var e=this._proportionallyResizeElements[d];if(!this.borderDif){var f=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],g=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];this.borderDif=a.map(f,function(a,b){var c=parseInt(a,10)||0,d=parseInt(g[b],10)||0;return c+d})}if(a.browser.msie&&(!!a(c).is(":hidden")||!!a(c).parents(":hidden").length))continue;e.css({height:c.height()-this.borderDif[0]-this.borderDif[2]||0,width:c.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var b=this.element,c=this.options;this.elementOffset=b.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var d=a.browser.msie&&a.browser.version<7,e=d?1:0,f=d?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+f,height:this.element.outerHeight()+f,position:"absolute",left:this.elementOffset.left-e+"px",top:this.elementOffset.top-e+"px",zIndex:++c.zIndex}),this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(a,b,c){return{width:this.originalSize.width+b}},w:function(a,b,c){var d=this.options,e=this.originalSize,f=this.originalPosition;return{left:f.left+b,width:e.width-b}},n:function(a,b,c){var d=this.options,e=this.originalSize,f=this.originalPosition;return{top:f.top+c,height:e.height-c}},s:function(a,b,c){return{height:this.originalSize.height+c}},se:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},sw:function(b,c,d){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,c,d]))},ne:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,c,d]))},nw:function(b,c,d){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,c,d]))}},_propagate:function(b,c){a.ui.plugin.call(this,b,[c,this.ui()]),b!="resize"&&this._trigger(b,c,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),a.extend(a.ui.resizable,{version:"1.8.18"}),a.ui.plugin.add("resizable","alsoResize",{start:function(b,c){var d=a(this).data("resizable"),e=d.options,f=function(b){a(b).each(function(){var b=a(this);b.data("resizable-alsoresize",{width:parseInt(b.width(),10),height:parseInt(b.height(),10),left:parseInt(b.css("left"),10),top:parseInt(b.css("top"),10)})})};typeof e.alsoResize=="object"&&!e.alsoResize.parentNode?e.alsoResize.length?(e.alsoResize=e.alsoResize[0],f(e.alsoResize)):a.each(e.alsoResize,function(a){f(a)}):f(e.alsoResize)},resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.originalSize,g=d.originalPosition,h={height:d.size.height-f.height||0,width:d.size.width-f.width||0,top:d.position.top-g.top||0,left:d.position.left-g.left||0},i=function(b,d){a(b).each(function(){var b=a(this),e=a(this).data("resizable-alsoresize"),f={},g=d&&d.length?d:b.parents(c.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(g,function(a,b){var c=(e[b]||0)+(h[b]||0);c&&c>=0&&(f[b]=c||null)}),b.css(f)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?a.each(e.alsoResize,function(a,b){i(a,b)}):i(e.alsoResize)},stop:function(b,c){a(this).removeData("resizable-alsoresize")}}),a.ui.plugin.add("resizable","animate",{stop:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d._proportionallyResizeElements,g=f.length&&/textarea/i.test(f[0].nodeName),h=g&&a.ui.hasScroll(f[0],"left")?0:d.sizeDiff.height,i=g?0:d.sizeDiff.width,j={width:d.size.width-i,height:d.size.height-h},k=parseInt(d.element.css("left"),10)+(d.position.left-d.originalPosition.left)||null,l=parseInt(d.element.css("top"),10)+(d.position.top-d.originalPosition.top)||null;d.element.animate(a.extend(j,l&&k?{top:l,left:k}:{}),{duration:e.animateDuration,easing:e.animateEasing,step:function(){var c={width:parseInt(d.element.css("width"),10),height:parseInt(d.element.css("height"),10),top:parseInt(d.element.css("top"),10),left:parseInt(d.element.css("left"),10)};f&&f.length&&a(f[0]).css({width:c.width,height:c.height}),d._updateCache(c),d._propagate("resize",b)}})}}),a.ui.plugin.add("resizable","containment",{start:function(b,d){var e=a(this).data("resizable"),f=e.options,g=e.element,h=f.containment,i=h instanceof a?h.get(0):/parent/.test(h)?g.parent().get(0):h;if(!!i){e.containerElement=a(i);if(/document/.test(h)||h==document)e.containerOffset={left:0,top:0},e.containerPosition={left:0,top:0},e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight};else{var j=a(i),k=[];a(["Top","Right","Left","Bottom"]).each(function(a,b){k[a]=c(j.css("padding"+b))}),e.containerOffset=j.offset(),e.containerPosition=j.position(),e.containerSize={height:j.innerHeight()-k[3],width:j.innerWidth()-k[1]};var l=e.containerOffset,m=e.containerSize.height,n=e.containerSize.width,o=a.ui.hasScroll(i,"left")?i.scrollWidth:n,p=a.ui.hasScroll(i)?i.scrollHeight:m;e.parentData={element:i,left:l.left,top:l.top,width:o,height:p}}}},resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.containerSize,g=d.containerOffset,h=d.size,i=d.position,j=d._aspectRatio||b.shiftKey,k={top:0,left:0},l=d.containerElement;l[0]!=document&&/static/.test(l.css("position"))&&(k=g),i.left<(d._helper?g.left:0)&&(d.size.width=d.size.width+(d._helper?d.position.left-g.left:d.position.left-k.left),j&&(d.size.height=d.size.width/e.aspectRatio),d.position.left=e.helper?g.left:0),i.top<(d._helper?g.top:0)&&(d.size.height=d.size.height+(d._helper?d.position.top-g.top:d.position.top),j&&(d.size.width=d.size.height*e.aspectRatio),d.position.top=d._helper?g.top:0),d.offset.left=d.parentData.left+d.position.left,d.offset.top=d.parentData.top+d.position.top;var m=Math.abs((d._helper?d.offset.left-k.left:d.offset.left-k.left)+d.sizeDiff.width),n=Math.abs((d._helper?d.offset.top-k.top:d.offset.top-g.top)+d.sizeDiff.height),o=d.containerElement.get(0)==d.element.parent().get(0),p=/relative|absolute/.test(d.containerElement.css("position"));o&&p&&(m-=d.parentData.left),m+d.size.width>=d.parentData.width&&(d.size.width=d.parentData.width-m,j&&(d.size.height=d.size.width/d.aspectRatio)),n+d.size.height>=d.parentData.height&&(d.size.height=d.parentData.height-n,j&&(d.size.width=d.size.height*d.aspectRatio))},stop:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.position,g=d.containerOffset,h=d.containerPosition,i=d.containerElement,j=a(d.helper),k=j.offset(),l=j.outerWidth()-d.sizeDiff.width,m=j.outerHeight()-d.sizeDiff.height;d._helper&&!e.animate&&/relative/.test(i.css("position"))&&a(this).css({left:k.left-h.left-g.left,width:l,height:m}),d._helper&&!e.animate&&/static/.test(i.css("position"))&&a(this).css({left:k.left-h.left-g.left,width:l,height:m})}}),a.ui.plugin.add("resizable","ghost",{start:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.size;d.ghost=d.originalElement.clone(),d.ghost.css({opacity:.25,display:"block",position:"relative",height:f.height,width:f.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof e.ghost=="string"?e.ghost:""),d.ghost.appendTo(d.helper)},resize:function(b,c){var d=a(this).data("resizable"),e=d.options;d.ghost&&d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})},stop:function(b,c){var d=a(this).data("resizable"),e=d.options;d.ghost&&d.helper&&d.helper.get(0).removeChild(d.ghost.get(0))}}),a.ui.plugin.add("resizable","grid",{resize:function(b,c){var d=a(this).data("resizable"),e=d.options,f=d.size,g=d.originalSize,h=d.originalPosition,i=d.axis,j=e._aspectRatio||b.shiftKey;e.grid=typeof e.grid=="number"?[e.grid,e.grid]:e.grid;var k=Math.round((f.width-g.width)/(e.grid[0]||1))*(e.grid[0]||1),l=Math.round((f.height-g.height)/(e.grid[1]||1))*(e.grid[1]||1);/^(se|s|e)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l):/^(ne)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l,d.position.top=h.top-l):/^(sw)$/.test(i)?(d.size.width=g.width+k,d.size.height=g.height+l,d.position.left=h.left-k):(d.size.width=g.width+k,d.size.height=g.height+l,d.position.top=h.top-l,d.position.left=h.left-k)}});var c=function(a){return parseInt(a,10)||0},d=function(a){return!isNaN(parseInt(a,10))}})(jQuery);/*
+ * jQuery UI Selectable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch"},_create:function(){var b=this;this.element.addClass("ui-selectable"),this.dragged=!1;var c;this.refresh=function(){c=a(b.options.filter,b.element[0]),c.addClass("ui-selectee"),c.each(function(){var b=a(this),c=b.offset();a.data(this,"selectable-item",{element:this,$element:b,left:c.left,top:c.top,right:c.left+b.outerWidth(),bottom:c.top+b.outerHeight(),startselected:!1,selected:b.hasClass("ui-selected"),selecting:b.hasClass("ui-selecting"),unselecting:b.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=c.addClass("ui-selectee"),this._mouseInit(),this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable"),this._mouseDestroy();return this},_mouseStart:function(b){var c=this;this.opos=[b.pageX,b.pageY];if(!this.options.disabled){var d=this.options;this.selectees=a(d.filter,this.element[0]),this._trigger("start",b),a(d.appendTo).append(this.helper),this.helper.css({left:b.clientX,top:b.clientY,width:0,height:0}),d.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var d=a.data(this,"selectable-item");d.startselected=!0,!b.metaKey&&!b.ctrlKey&&(d.$element.removeClass("ui-selected"),d.selected=!1,d.$element.addClass("ui-unselecting"),d.unselecting=!0,c._trigger("unselecting",b,{unselecting:d.element}))}),a(b.target).parents().andSelf().each(function(){var d=a.data(this,"selectable-item");if(d){var e=!b.metaKey&&!b.ctrlKey||!d.$element.hasClass("ui-selected");d.$element.removeClass(e?"ui-unselecting":"ui-selected").addClass(e?"ui-selecting":"ui-unselecting"),d.unselecting=!e,d.selecting=e,d.selected=e,e?c._trigger("selecting",b,{selecting:d.element}):c._trigger("unselecting",b,{unselecting:d.element});return!1}})}},_mouseDrag:function(b){var c=this;this.dragged=!0;if(!this.options.disabled){var d=this.options,e=this.opos[0],f=this.opos[1],g=b.pageX,h=b.pageY;if(e>g){var i=g;g=e,e=i}if(f>h){var i=h;h=f,f=i}this.helper.css({left:e,top:f,width:g-e,height:h-f}),this.selectees.each(function(){var i=a.data(this,"selectable-item");if(!!i&&i.element!=c.element[0]){var j=!1;d.tolerance=="touch"?j=!(i.left>g||i.right<e||i.top>h||i.bottom<f):d.tolerance=="fit"&&(j=i.left>e&&i.right<g&&i.top>f&&i.bottom<h),j?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,c._trigger("selecting",b,{selecting:i.element}))):(i.selecting&&((b.metaKey||b.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),c._trigger("unselecting",b,{unselecting:i.element}))),i.selected&&!b.metaKey&&!b.ctrlKey&&!i.startselected&&(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,c._trigger("unselecting",b,{unselecting:i.element})))}});return!1}},_mouseStop:function(b){var c=this;this.dragged=!1;var d=this.options;a(".ui-unselecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-unselecting"),d.unselecting=!1,d.startselected=!1,c._trigger("unselected",b,{unselected:d.element})}),a(".ui-selecting",this.element[0]).each(function(){var d=a.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected"),d.selecting=!1,d.selected=!0,d.startselected=!0,c._trigger("selected",b,{selected:d.element})}),this._trigger("stop",b),this.helper.remove();return!1}}),a.extend(a.ui.selectable,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Sortable 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var a=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},destroy:function(){a.Widget.prototype.destroy.call(this),this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--)this.items[b].item.removeData(this.widgetName+"-item");return this},_setOption:function(b,c){b==="disabled"?(this.options[b]=c,this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")):a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(b,c){var d=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(b);var e=null,f=this,g=a(b.target).parents().each(function(){if(a.data(this,d.widgetName+"-item")==f){e=a(this);return!1}});a.data(b.target,d.widgetName+"-item")==f&&(e=a(b.target));if(!e)return!1;if(this.options.handle&&!c){var h=!1;a(this.options.handle,e).find("*").andSelf().each(function(){this==b.target&&(h=!0)});if(!h)return!1}this.currentItem=e,this._removeCurrentsFromItems();return!0},_mouseStart:function(b,c,d){var e=this.options,f=this;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(b),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this._generatePosition(b),this.originalPageX=b.pageX,this.originalPageY=b.pageY,e.cursorAt&&this._adjustOffsetFromHelper(e.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),e.containment&&this._setContainment(),e.cursor&&(a("body").css("cursor")&&(this._storedCursor=a("body").css("cursor")),a("body").css("cursor",e.cursor)),e.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",e.opacity)),e.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",e.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",b,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!d)for(var g=this.containers.length-1;g>=0;g--)this.containers[g]._trigger("activate",b,f._uiHash(this));a.ui.ddmanager&&(a.ui.ddmanager.current=this),a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(b);return!0},_mouseDrag:function(b){this.position=this._generatePosition(b),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var c=this.options,d=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-b.pageY<c.scrollSensitivity?this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop+c.scrollSpeed:b.pageY-this.overflowOffset.top<c.scrollSensitivity&&(this.scrollParent[0].scrollTop=d=this.scrollParent[0].scrollTop-c.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-b.pageX<c.scrollSensitivity?this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft+c.scrollSpeed:b.pageX-this.overflowOffset.left<c.scrollSensitivity&&(this.scrollParent[0].scrollLeft=d=this.scrollParent[0].scrollLeft-c.scrollSpeed)):(b.pageY-a(document).scrollTop()<c.scrollSensitivity?d=a(document).scrollTop(a(document).scrollTop()-c.scrollSpeed):a(window).height()-(b.pageY-a(document).scrollTop())<c.scrollSensitivity&&(d=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed)),b.pageX-a(document).scrollLeft()<c.scrollSensitivity?d=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed):a(window).width()-(b.pageX-a(document).scrollLeft())<c.scrollSensitivity&&(d=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed))),d!==!1&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,b)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var e=this.items.length-1;e>=0;e--){var f=this.items[e],g=f.item[0],h=this._intersectsWithPointer(f);if(!h)continue;if(g!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=g&&!a.ui.contains(this.placeholder[0],g)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],g):!0)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(f))this._rearrange(b,f);else break;this._trigger("change",b,this._uiHash());break}}this._contactContainers(b),a.ui.ddmanager&&a.ui.ddmanager.drag(this,b),this._trigger("sort",b,this._uiHash()),this.lastPositionAbs=this.positionAbs;return!1},_mouseStop:function(b,c){if(!!b){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,b);if(this.options.revert){var d=this,e=d.placeholder.offset();d.reverting=!0,a(this.helper).animate({left:e.left-this.offset.parent.left-d.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-d.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){d._clear(b)})}else this._clear(b,c);return!1}},cancel:function(){var b=this;if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("deactivate",null,b._uiHash(this)),this.containers[c].containerCache.over&&(this.containers[c]._trigger("out",null,b._uiHash(this)),this.containers[c].containerCache.over=0)}this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),a.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem));return this},serialize:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},a(c).each(function(){var c=(a(b.item||this).attr(b.attribute||"id")||"").match(b.expression||/(.+)[-=_](.+)/);c&&d.push((b.key||c[1]+"[]")+"="+(b.key&&b.expression?c[1]:c[2]))}),!d.length&&b.key&&d.push(b.key+"=");return d.join("&")},toArray:function(b){var c=this._getItemsAsjQuery(b&&b.connected),d=[];b=b||{},c.each(function(){d.push(a(b.item||this).attr(b.attribute||"id")||"")});return d},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,d=this.positionAbs.top,e=d+this.helperProportions.height,f=a.left,g=f+a.width,h=a.top,i=h+a.height,j=this.offset.click.top,k=this.offset.click.left,l=d+j>h&&d+j<i&&b+k>f&&b+k<g;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?l:f<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<g&&h<d+this.helperProportions.height/2&&e-this.helperProportions.height/2<i},_intersectsWithPointer:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left,b.width),e=c&&d,f=this._getDragVerticalDirection(),g=this._getDragHorizontalDirection();if(!e)return!1;return this.floating?g&&g=="right"||f=="down"?2:1:f&&(f=="down"?2:1)},_intersectsWithSides:function(b){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,b.top+b.height/2,b.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,b.left+b.width/2,b.width),e=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();return this.floating&&f?f=="right"&&d||f=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a),this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(b){var c=this,d=[],e=[],f=this._connectWith();if(f&&b)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&e.push([a.isFunction(j.options.items)?j.options.items.call(j.element):a(j.options.items,j.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),j])}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var g=e.length-1;g>=0;g--)e[g][0].each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:function(){var a=this.currentItem.find(":data("+this.widgetName+"-item)");for(var b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(b){this.items=[],this.containers=[this];var c=this.items,d=this,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]],f=this._connectWith();if(f&&this.ready)for(var g=f.length-1;g>=0;g--){var h=a(f[g]);for(var i=h.length-1;i>=0;i--){var j=a.data(h[i],this.widgetName);j&&j!=this&&!j.options.disabled&&(e.push([a.isFunction(j.options.items)?j.options.items.call(j.element[0],b,{item:this.currentItem}):a(j.options.items,j.element),j]),this.containers.push(j))}}for(var g=e.length-1;g>=0;g--){var k=e[g][1],l=e[g][0];for(var i=0,m=l.length;i<m;i++){var n=a(l[i]);n.data(this.widgetName+"-item",k),c.push({item:n,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var c=this.items.length-1;c>=0;c--){var d=this.items[c];if(d.instance!=this.currentContainer&&this.currentContainer&&d.item[0]!=this.currentItem[0])continue;var e=this.options.toleranceElement?a(this.options.toleranceElement,d.item):d.item;b||(d.width=e.outerWidth(),d.height=e.outerHeight());var f=e.offset();d.left=f.left,d.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var c=this.containers.length-1;c>=0;c--){var f=this.containers[c].element.offset();this.containers[c].containerCache.left=f.left,this.containers[c].containerCache.top=f.top,this.containers[c].containerCache.width=this.containers[c].element.outerWidth(),this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(b){var c=b||this,d=c.options;if(!d.placeholder||d.placeholder.constructor==String){var e=d.placeholder;d.placeholder={element:function(){var b=a(document.createElement(c.currentItem[0].nodeName)).addClass(e||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];e||(b.style.visibility="hidden");return b},update:function(a,b){if(!e||!!d.forcePlaceholderSize)b.height()||b.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10)),b.width()||b.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||0,10))}}}c.placeholder=a(d.placeholder.element.call(c.element,c.currentItem)),c.currentItem.after(c.placeholder),d.placeholder.update(c,c.placeholder)},_contactContainers:function(b){var c=null,d=null;for(var e=this.containers.length-1;e>=0;e--){if(a.ui.contains(this.currentItem[0],this.containers[e].element[0]))continue;if(this._intersectsWith(this.containers[e].containerCache)){if(c&&a.ui.contains(this.containers[e].element[0],c.element[0]))continue;c=this.containers[e],d=e}else this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",b,this._uiHash(this)),this.containers[e].containerCache.over=0)}if(!!c)if(this.containers.length===1)this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1;else if(this.currentContainer!=this.containers[d]){var f=1e4,g=null,h=this.positionAbs[this.containers[d].floating?"left":"top"];for(var i=this.items.length-1;i>=0;i--){if(!a.ui.contains(this.containers[d].element[0],this.items[i].item[0]))continue;var j=this.items[i][this.containers[d].floating?"left":"top"];Math.abs(j-h)<f&&(f=Math.abs(j-h),g=this.items[i])}if(!g&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[d],g?this._rearrange(b,g,null,!0):this._rearrange(b,null,this.containers[d].element,!0),this._trigger("change",b,this._uiHash()),this.containers[d]._trigger("change",b,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[d]._trigger("over",b,this._uiHash(this)),this.containers[d].containerCache.over=1}},_createHelper:function(b){var c=this.options,d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[b,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]),d[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(d[0].style.width==""||c.forceHelperSize)&&d.width(this.currentItem.width()),(d[0].style.height==""||c.forceHelperSize)&&d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(b){typeof b=="string"&&(b=b.split(" ")),a.isArray(b)&&(b={left:+b[0],top:+b[1]||0}),"left"in b&&(this.offset.click.left=b.left+this.margins.left),"right"in b&&(this.offset.click.left=this.helperProportions.width-b.right+this.margins.left),"top"in b&&(this.offset.click.top=b.top+this.margins.top),"bottom"in b&&(this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])&&(b.left+=this.scrollParent.scrollLeft(),b.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)b={top:0,left:0};return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var b=this.options;b.containment=="parent"&&(b.containment=this.helper[0].parentNode);if(b.containment=="document"||b.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(b.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(b.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(b.containment)){var c=a(b.containment)[0],d=a(b.containment).offset(),e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(b,c){c||(c=this.position);var d=b=="absolute"?1:-1,e=this.options,f=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=/(html|body)/i.test(f[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():g?0:f.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:f.scrollLeft())*d)}},_generatePosition:function(b){var c=this.options,d=this.cssPosition=="absolute"&&(this.scrollParent[0]==document||!a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(d[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var f=b.pageX,g=b.pageY;if(this.originalPosition){this.containment&&(b.pageX-this.offset.click.left<this.containment[0]&&(f=this.containment[0]+this.offset.click.left),b.pageY-this.offset.click.top<this.containment[1]&&(g=this.containment[1]+this.offset.click.top),b.pageX-this.offset.click.left>this.containment[2]&&(f=this.containment[2]+this.offset.click.left),b.pageY-this.offset.click.top>this.containment[3]&&(g=this.containment[3]+this.offset.click.top));if(c.grid){var h=this.originalPageY+Math.round((g-this.originalPageY)/c.grid[1])*c.grid[1];g=this.containment?h-this.offset.click.top<this.containment[1]||h-this.offset.click.top>this.containment[3]?h-this.offset.click.top<this.containment[1]?h+c.grid[1]:h-c.grid[1]:h:h;var i=this.originalPageX+Math.round((f-this.originalPageX)/c.grid[0])*c.grid[0];f=this.containment?i-this.offset.click.left<this.containment[0]||i-this.offset.click.left>this.containment[2]?i-this.offset.click.left<this.containment[0]?i+c.grid[0]:i-c.grid[0]:i:i}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:d.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:d.scrollLeft())}},_rearrange:function(a,b,c,d){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var e=this,f=this.counter;window.setTimeout(function(){f==e.counter&&e.refreshPositions(!d)},0)},_clear:function(b,c){this.reverting=!1;var d=[],e=this;!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var f in this._storedCSS)if(this._storedCSS[f]=="auto"||this._storedCSS[f]=="static")this._storedCSS[f]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&d.push(function(a){this._trigger("receive",a,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c&&d.push(function(a){this._trigger("update",a,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||d.push(function(a){this._trigger("remove",a,this._uiHash())});for(var f=this.containers.length-1;f>=0;f--)a.ui.contains(this.containers[f].element[0],this.currentItem[0])&&!c&&(d.push(function(a){return function(b){a._trigger("receive",b,this._uiHash(this))}}.call(this,this.containers[f])),d.push(function(a){return function(b){a._trigger("update",b,this._uiHash(this))}}.call(this,this.containers[f])))}for(var f=this.containers.length-1;f>=0;f--)c||d.push(function(a){return function(b){a._trigger("deactivate",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over&&(d.push(function(a){return function(b){a._trigger("out",b,this._uiHash(this))}}.call(this,this.containers[f])),this.containers[f].containerCache.over=0);this._storedCursor&&a("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",b,this._uiHash());for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}return!1}c||this._trigger("beforeStop",b,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!c){for(var f=0;f<d.length;f++)d[f].call(this,b);this._trigger("stop",b,this._uiHash())}this.fromOutside=!1;return!0},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(b){var c=b||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:b?b.element:null}}}),a.extend(a.ui.sortable,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Accordion 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:!0,clearStyle:!1,collapsible:!1,event:"click",fillSpace:!1,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:!1,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var b=this,c=b.options;b.running=0,b.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix"),b.headers=b.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){c.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){c.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){c.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){c.disabled||a(this).removeClass("ui-state-focus")}),b.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");if(c.navigation){var d=b.element.find("a").filter(c.navigationFilter).eq(0);if(d.length){var e=d.closest(".ui-accordion-header");e.length?b.active=e:b.active=d.closest(".ui-accordion-content").prev()}}b.active=b._findActive(b.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top"),b.active.next().addClass("ui-accordion-content-active"),b._createIcons(),b.resize(),b.element.attr("role","tablist"),b.headers.attr("role","tab").bind("keydown.accordion",function(a){return b._keydown(a)}).next().attr("role","tabpanel"),b.headers.not(b.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide(),b.active.length?b.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):b.headers.eq(0).attr("tabIndex",0),a.browser.safari||b.headers.find("a").attr("tabIndex",-1),c.event&&b.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(a){b._clickHandler.call(b,a,this),a.preventDefault()})},_createIcons:function(){var b=this.options;b.icons&&(a("<span></span>").addClass("ui-icon "+b.icons.header).prependTo(this.headers),this.active.children(".ui-icon").toggleClass(b.icons.header).toggleClass(b.icons.headerSelected),this.element.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.children(".ui-icon").remove(),this.element.removeClass("ui-accordion-icons")},destroy:function(){var b=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex"),this.headers.find("a").removeAttr("tabIndex"),this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");(b.autoHeight||b.fillHeight)&&c.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b=="active"&&this.activate(c),b=="icons"&&(this._destroyIcons(),c&&this._createIcons()),b=="disabled"&&this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(b){if(!(this.options.disabled||b.altKey||b.ctrlKey)){var c=a.ui.keyCode,d=this.headers.length,e=this.headers.index(b.target),f=!1;switch(b.keyCode){case c.RIGHT:case c.DOWN:f=this.headers[(e+1)%d];break;case c.LEFT:case c.UP:f=this.headers[(e-1+d)%d];break;case c.SPACE:case c.ENTER:this._clickHandler({target:b.target},b.target),b.preventDefault()}if(f){a(b.target).attr("tabIndex",-1),a(f).attr("tabIndex",0),f.focus();return!1}return!0}},resize:function(){var b=this.options,c;if(b.fillSpace){if(a.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height(),a.browser.msie&&this.element.parent().css("overflow",d),this.headers.each(function(){c-=a(this).outerHeight(!0)}),this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")}else b.autoHeight&&(c=0,this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c));return this},activate:function(a){this.options.active=a;var b=this._findActive(a)[0];this._clickHandler({target:b},b);return this},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===!1?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(b,c){var d=this.options;if(!d.disabled){if(!b.target){if(!d.collapsible)return;this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),this.active.next().addClass("ui-accordion-content-active");var e=this.active.next(),f={options:d,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:e},g=this.active=a([]);this._toggle(g,e,f);return}var h=a(b.currentTarget||c),i=h[0]===this.active[0];d.active=d.collapsible&&i?!1:this.headers.index(h);if(this.running||!d.collapsible&&i)return;var j=this.active,g=h.next(),e=this.active.next(),f={options:d,newHeader:i&&d.collapsible?a([]):h,oldHeader:this.active,newContent:i&&d.collapsible?a([]):g,oldContent:e},k=this.headers.index(this.active[0])>this.headers.index(h[0]);this.active=i?a([]):h,this._toggle(g,e,f,i,k),j.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header),i||(h.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected),h.next().addClass("ui-accordion-content-active"));return}},_toggle:function(b,c,d,e,f){var g=this,h=g.options;g.toShow=b,g.toHide=c,g.data=d;var i=function(){if(!!g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data),g.running=c.size()===0?b.size():c.size();if(h.animated){var j={};h.collapsible&&e?j={toShow:a([]),toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace}:j={toShow:b,toHide:c,complete:i,down:f,autoHeight:h.autoHeight||h.fillSpace},h.proxied||(h.proxied=h.animated),h.proxiedDuration||(h.proxiedDuration=h.duration),h.animated=a.isFunction(h.proxied)?h.proxied(j):h.proxied,h.duration=a.isFunction(h.proxiedDuration)?h.proxiedDuration(j):h.proxiedDuration;var k=a.ui.accordion.animations,l=h.duration,m=h.animated;m&&!k[m]&&!a.easing[m]&&(m="slide"),k[m]||(k[m]=function(a){this.slide(a,{easing:m,duration:l||700})}),k[m](j)}else h.collapsible&&e?b.toggle():(c.hide(),b.show()),i(!0);c.prev().attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).blur(),b.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;this.running||(this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""}),this.toHide.removeClass("ui-accordion-content-active"),this.toHide.length&&(this.toHide.parent()[0].className=this.toHide.parent()[0].className),this._trigger("change",null,this.data))}}),a.extend(a.ui.accordion,{version:"1.8.18",animations:{slide:function(b,c){b=a.extend({easing:"swing",duration:300},b,c);if(!b.toHide.size())b.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},b);else{if(!b.toShow.size()){b.toHide.animate({height:"hide",paddingTop:"hide",paddingBottom:"hide"},b);return}var d=b.toShow.css("overflow"),e=0,f={},g={},h=["height","paddingTop","paddingBottom"],i,j=b.toShow;i=j[0].style.width,j.width(j.parent().width()-parseFloat(j.css("paddingLeft"))-parseFloat(j.css("paddingRight"))-(parseFloat(j.css("borderLeftWidth"))||0)-(parseFloat(j.css("borderRightWidth"))||0)),a.each(h,function(c,d){g[d]="hide";var e=(""+a.css(b.toShow[0],d)).match(/^([\d+-.]+)(.*)$/);f[d]={value:e[1],unit:e[2]||"px"}}),b.toShow.css({height:0,overflow:"hidden"}).show(),b.toHide.filter(":hidden").each(b.complete).end().filter(":visible").animate(g,{step:function(a,c){c.prop=="height"&&(e=c.end-c.start===0?0:(c.now-c.start)/(c.end-c.start)),b.toShow[0].style[c.prop]=e*f[c.prop].value+f[c.prop].unit},duration:b.duration,easing:b.easing,complete:function(){b.autoHeight||b.toShow.css("height",""),b.toShow.css({width:i,overflow:d}),b.complete()}})}},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1e3:200})}}})})(jQuery);/*
+ * jQuery UI Autocomplete 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */(function(a,b){var c=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var b=this,c=this.element[0].ownerDocument,d;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!b.options.disabled&&!b.element.propAttr("readOnly")){d=!1;var e=a.ui.keyCode;switch(c.keyCode){case e.PAGE_UP:b._move("previousPage",c);break;case e.PAGE_DOWN:b._move("nextPage",c);break;case e.UP:b._move("previous",c),c.preventDefault();break;case e.DOWN:b._move("next",c),c.preventDefault();break;case e.ENTER:case e.NUMPAD_ENTER:b.menu.active&&(d=!0,c.preventDefault());case e.TAB:if(!b.menu.active)return;b.menu.select(c);break;case e.ESCAPE:b.element.val(b.term),b.close(c);break;default:clearTimeout(b.searching),b.searching=setTimeout(function(){b.term!=b.element.val()&&(b.selectedItem=null,b.search(null,c))},b.options.delay)}}}).bind("keypress.autocomplete",function(a){d&&(d=!1,a.preventDefault())}).bind("focus.autocomplete",function(){b.options.disabled||(b.selectedItem=null,b.previous=b.element.val())}).bind("blur.autocomplete",function(a){b.options.disabled||(clearTimeout(b.searching),b.closing=setTimeout(function(){b.close(a),b._change(a)},150))}),this._initSource(),this.response=function(){return b._response.apply(b,arguments)},this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",c)[0]).mousedown(function(c){var d=b.menu.element[0];a(c.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(c){c.target!==b.element[0]&&c.target!==d&&!a.ui.contains(d,c.target)&&b.close()})},1),setTimeout(function(){clearTimeout(b.closing)},13)}).menu({focus:function(a,c){var d=c.item.data("item.autocomplete");!1!==b._trigger("focus",a,{item:d})&&/^key/.test(a.originalEvent.type)&&b.element.val(d.value)},selected:function(a,d){var e=d.item.data("item.autocomplete"),f=b.previous;b.element[0]!==c.activeElement&&(b.element.focus(),b.previous=f,setTimeout(function(){b.previous=f,b.selectedItem=e},1)),!1!==b._trigger("select",a,{item:e})&&b.element.val(e.value),b.term=b.element.val(),b.close(a),b.selectedItem=e},blur:function(a,c){b.menu.element.is(":visible")&&b.element.val()!==b.term&&b.element.val(b.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu"),a.fn.bgiframe&&this.menu.element.bgiframe(),b.beforeunloadHandler=function(){b.element.removeAttr("autocomplete")},a(window).bind("beforeunload",b.beforeunloadHandler)},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup"),this.menu.element.remove(),a(window).unbind("beforeunload",this.beforeunloadHandler),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments),b==="source"&&this._initSource(),b==="appendTo"&&this.menu.element.appendTo(a(c||"body",this.element[0].ownerDocument)[0]),b==="disabled"&&c&&this.xhr&&this.xhr.abort()},_initSource:function(){var b=this,d,e;a.isArray(this.options.source)?(d=this.options.source,this.source=function(b,c){c(a.ui.autocomplete.filter(d,b.term))}):typeof this.options.source=="string"?(e=this.options.source,this.source=function(d,f){b.xhr&&b.xhr.abort(),b.xhr=a.ajax({url:e,data:d,dataType:"json",context:{autocompleteRequest:++c},success:function(a,b){this.autocompleteRequest===c&&f(a)},error:function(){this.autocompleteRequest===c&&f([])}})}):this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val(),this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==!1)return this._search(a)},_search:function(a){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.source({term:a},this.response)},_response:function(a){!this.options.disabled&&a&&a.length?(a=this._normalize(a),this._suggest(a),this._trigger("open")):this.close(),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.deactivate(),this._trigger("close",a))},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(b){if(b.length&&b[0].label&&b[0].value)return b;return a.map(b,function(b){if(typeof b=="string")return{label:b,value:b};return a.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(b){var c=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(c,b),this.menu.deactivate(),this.menu.refresh(),c.show(),this._resizeMenu(),c.position(a.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(b,c){var d=this;a.each(c,function(a,c){d._renderItem(b,c)})},_renderItem:function(b,c){return a("<li></li>").data("item.autocomplete",c).append(a("<a></a>").text(c.label)).appendTo(b)},_move:function(a,b){if(!this.menu.element.is(":visible"))this.search(null,b);else{if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term),this.menu.deactivate();return}this.menu[a](b)}},widget:function(){return this.menu.element}}),a.extend(a.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},filter:function(b,c){var d=new RegExp(a.ui.autocomplete.escapeRegex(c),"i");return a.grep(b,function(a){return d.test(a.label||a.value||a)})}})})(jQuery),function(a){a.widget("ui.menu",{_create:function(){var b=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){!a(c.target).closest(".ui-menu-item a").length||(c.preventDefault(),b.select(c))}),this.refresh()},refresh:function(){var b=this,c=this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem");c.children("a").addClass("ui-corner-all").attr("tabindex",-1).mouseenter(function(c){b.activate(c,a(this).parent())}).mouseleave(function(){b.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var c=b.offset().top-this.element.offset().top,d=this.element.scrollTop(),e=this.element.height();c<0?this.element.scrollTop(d+c):c>=e&&this.element.scrollTop(d+c-e+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end(),this._trigger("focus",a,{item:b})},deactivate:function(){!this.active||(this.active.children("a").removeClass("ui-state-hover").removeAttr("id"),this._trigger("blur"),this.active=null)},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(!this.active)this.activate(c,this.element.children(b));else{var d=this.active[a+"All"](".ui-menu-item").eq(0);d.length?this.activate(c,d):this.activate(c,this.element.children(b))}},nextPage:function(b){if(this.hasScroll()){if(!this.active||this.last()){this.activate(b,this.element.children(".ui-menu-item:first"));return}var c=this.active.offset().top,d=this.element.height(),e=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c-d+a(this).height();return b<10&&b>-10});e.length||(e=this.element.children(".ui-menu-item:last")),this.activate(b,e)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(b){if(this.hasScroll()){if(!this.active||this.first()){this.activate(b,this.element.children(".ui-menu-item:last"));return}var c=this.active.offset().top,d=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var b=a(this).offset().top-c+d-a(this).height();return b<10&&b>-10}),result.length||(result=this.element.children(".ui-menu-item:first")),this.activate(b,result)}else this.activate(b,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(a){this._trigger("selected",a,{item:this.active})}})}(jQuery);/*
+ * jQuery UI Button 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){var c,d,e,f,g="ui-button ui-widget ui-state-default ui-corner-all",h="ui-state-hover ui-state-active ",i="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",j=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},k=function(b){var c=b.name,d=b.form,e=a([]);c&&(d?e=a(d).find("[name='"+c+"']"):e=a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form}));return e};a.widget("ui.button",{options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",j),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.propAttr("disabled"):this.element.propAttr("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var b=this,h=this.options,i=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(i?"":" ui-state-active"),m="ui-state-focus";h.label===null&&(h.label=this.buttonElement.html()),this.buttonElement.addClass(g).attr("role","button").bind("mouseenter.button",function(){h.disabled||(a(this).addClass("ui-state-hover"),this===c&&a(this).addClass("ui-state-active"))}).bind("mouseleave.button",function(){h.disabled||a(this).removeClass(l)}).bind("click.button",function(a){h.disabled&&(a.preventDefault(),a.stopImmediatePropagation())}),this.element.bind("focus.button",function(){b.buttonElement.addClass(m)}).bind("blur.button",function(){b.buttonElement.removeClass(m)}),i&&(this.element.bind("change.button",function(){f||b.refresh()}),this.buttonElement.bind("mousedown.button",function(a){h.disabled||(f=!1,d=a.pageX,e=a.pageY)}).bind("mouseup.button",function(a){!h.disabled&&(d!==a.pageX||e!==a.pageY)&&(f=!0)})),this.type==="checkbox"?this.buttonElement.bind("click.button",function(){if(h.disabled||f)return!1;a(this).toggleClass("ui-state-active"),b.buttonElement.attr("aria-pressed",b.element[0].checked)}):this.type==="radio"?this.buttonElement.bind("click.button",function(){if(h.disabled||f)return!1;a(this).addClass("ui-state-active"),b.buttonElement.attr("aria-pressed","true");var c=b.element[0];k(c).not(c).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown.button",function(){if(h.disabled)return!1;a(this).addClass("ui-state-active"),c=this,a(document).one("mouseup",function(){c=null})}).bind("mouseup.button",function(){if(h.disabled)return!1;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(b){if(h.disabled)return!1;(b.keyCode==a.ui.keyCode.SPACE||b.keyCode==a.ui.keyCode.ENTER)&&a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(b){b.keyCode===a.ui.keyCode.SPACE&&a(this).click()})),this._setOption("disabled",h.disabled),this._resetButton()},_determineButtonType:function(){this.element.is(":checkbox")?this.type="checkbox":this.element.is(":radio")?this.type="radio":this.element.is("input")?this.type="input":this.type="button";if(this.type==="checkbox"||this.type==="radio"){var a=this.element.parents().filter(":last"),b="label[for='"+this.element.attr("id")+"']";this.buttonElement=a.find(b),this.buttonElement.length||(a=a.length?a.siblings():this.element.siblings(),this.buttonElement=a.filter(b),this.buttonElement.length||(this.buttonElement=a.find(b))),this.element.addClass("ui-helper-hidden-accessible");var c=this.element.is(":checked");c&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.attr("aria-pressed",c)}else this.buttonElement=this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(g+" "+h+" "+i).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title"),a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);b==="disabled"?c?this.element.propAttr("disabled",!0):this.element.propAttr("disabled",!1):this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b),this.type==="radio"?k(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass(i),c=a("<span></span>",this.element[0].ownerDocument).addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary,f=[];d.primary||d.secondary?(this.options.text&&f.push("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary")),d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>"),d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>"),this.options.text||(f.push(e?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||b.attr("title",c))):f.push("ui-button-text-only"),b.addClass(f.join(" "))}}}),a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c),a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(b?"ui-corner-left":"ui-corner-right").end().end()},destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy"),a.Widget.prototype.destroy.call(this)}})})(jQuery);/*
+ * jQuery UI Dialog 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */(function(a,b){var c="ui-dialog ui-widget ui-widget-content ui-corner-all ",d={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},e={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},f=a.attrFn||{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0,click:!0};a.widget("ui.dialog",{options:{autoOpen:!0,buttons:{},closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",collision:"fit",using:function(b){var c=a(this).css(b).offset().top;c<0&&a(this).css("top",b.top-c)}},resizable:!0,show:null,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTitle=this.element.attr("title"),typeof this.originalTitle!="string"&&(this.originalTitle=""),this.options.title=this.options.title||this.originalTitle;var b=this,d=b.options,e=d.title||"&#160;",f=a.ui.dialog.getTitleId(b.element),g=(b.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass(c+d.dialogClass).css({zIndex:d.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(c){d.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode===a.ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(a){b.moveToTop(!1,a)}),h=b.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g),i=(b.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),j=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){j.addClass("ui-state-hover")},function(){j.removeClass("ui-state-hover")}).focus(function(){j.addClass("ui-state-focus")}).blur(function(){j.removeClass("ui-state-focus")}).click(function(a){b.close(a);return!1}).appendTo(i),k=(b.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(d.closeText).appendTo(j),l=a("<span></span>").addClass("ui-dialog-title").attr("id",f).html(e).prependTo(i);a.isFunction(d.beforeclose)&&!a.isFunction(d.beforeClose)&&(d.beforeClose=d.beforeclose),i.find("*").add(i).disableSelection(),d.draggable&&a.fn.draggable&&b._makeDraggable(),d.resizable&&a.fn.resizable&&b._makeResizable(),b._createButtons(d.buttons),b._isOpen=!1,a.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy(),a.uiDialog.hide(),a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"),a.uiDialog.remove(),a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(b){var c=this,d,e;if(!1!==c._trigger("beforeClose",b)){c.overlay&&c.overlay.destroy(),c.uiDialog.unbind("keypress.ui-dialog"),c._isOpen=!1,c.options.hide?c.uiDialog.hide(c.options.hide,function(){c._trigger("close",b)}):(c.uiDialog.hide(),c._trigger("close",b)),a.ui.dialog.overlay.resize(),c.options.modal&&(d=0,a(".ui-dialog").each(function(){this!==c.uiDialog[0]&&(e=a(this).css("z-index"),isNaN(e)||(d=Math.max(d,e)))}),a.ui.dialog.maxZ=d);return c}},isOpen:function(){return this._isOpen},moveToTop:function(b,c){var d=this,e=d.options,f;if(e.modal&&!b||!e.stack&&!e.modal)return d._trigger("focus",c);e.zIndex>a.ui.dialog.maxZ&&(a.ui.dialog.maxZ=e.zIndex),d.overlay&&(a.ui.dialog.maxZ+=1,d.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)),f={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()},a.ui.dialog.maxZ+=1,d.uiDialog.css("z-index",a.ui.dialog.maxZ),d.element.attr(f),d._trigger("focus",c);return d},open:function(){if(!this._isOpen){var b=this,c=b.options,d=b.uiDialog;b.overlay=c.modal?new a.ui.dialog.overlay(b):null,b._size(),b._position(c.position),d.show(c.show),b.moveToTop(!0),c.modal&&d.bind("keydown.ui-dialog",function(b){if(b.keyCode===a.ui.keyCode.TAB){var c=a(":tabbable",this),d=c.filter(":first"),e=c.filter(":last");if(b.target===e[0]&&!b.shiftKey){d.focus(1);return!1}if(b.target===d[0]&&b.shiftKey){e.focus(1);return!1}}}),a(b.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus(),b._isOpen=!0,b._trigger("open");return b}},_createButtons:function(b){var c=this,d=!1,e=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);c.uiDialog.find(".ui-dialog-buttonpane").remove(),typeof b=="object"&&b!==null&&a.each(b,function(){return!(d=!0)}),d&&(a.each(b,function(b,d){d=a.isFunction(d)?{click:d,text:b}:d;var e=a('<button type="button"></button>').click(function(){d.click.apply(c.element[0],arguments)}).appendTo(g);a.each(d,function(a,b){a!=="click"&&(a in f?e[a](b):e.attr(a,b))}),a.fn.button&&e.button()}),e.appendTo(c.uiDialog))},_makeDraggable:function(){function f(a){return{position:a.position,offset:a.offset}}var b=this,c=b.options,d=a(document),e;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(d,g){e=c.height==="auto"?"auto":a(this).height(),a(this).height(a(this).height()).addClass("ui-dialog-dragging"),b._trigger("dragStart",d,f(g))},drag:function(a,c){b._trigger("drag",a,f(c))},stop:function(g,h){c.position=[h.position.left-d.scrollLeft(),h.position.top-d.scrollTop()],a(this).removeClass("ui-dialog-dragging").height(e),b._trigger("dragStop",g,f(h)),a.ui.dialog.overlay.resize()}})},_makeResizable:function(c){function h(a){return{originalPosition:a.originalPosition,originalSize:a.originalSize,position:a.position,size:a.size}}c=c===b?this.options.resizable:c;var d=this,e=d.options,f=d.uiDialog.css("position"),g=typeof c=="string"?c:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:g,start:function(b,c){a(this).addClass("ui-dialog-resizing"),d._trigger("resizeStart",b,h(c))},resize:function(a,b){d._trigger("resize",a,h(b))},stop:function(b,c){a(this).removeClass("ui-dialog-resizing"),e.height=a(this).height(),e.width=a(this).width(),d._trigger("resizeStop",b,h(c)),a.ui.dialog.overlay.resize()}}).css("position",f).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(b){var c=[],d=[0,0],e;if(b){if(typeof b=="string"||typeof b=="object"&&"0"in b)c=b.split?b.split(" "):[b[0],b[1]],c.length===1&&(c[1]=c[0]),a.each(["left","top"],function(a,b){+c[a]===c[a]&&(d[a]=c[a],c[a]=b)}),b={my:c.join(" "),at:c.join(" "),offset:d.join(" ")};b=a.extend({},a.ui.dialog.prototype.options.position,b)}else b=a.ui.dialog.prototype.options.position;e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},b)),e||this.uiDialog.hide()},_setOptions:function(b){var c=this,f={},g=!1;a.each(b,function(a,b){c._setOption(a,b),a in d&&(g=!0),a in e&&(f[a]=b)}),g&&this._size(),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",f)},_setOption:function(b,d){var e=this,f=e.uiDialog;switch(b){case"beforeclose":b="beforeClose";break;case"buttons":e._createButtons(d);break;case"closeText":e.uiDialogTitlebarCloseText.text(""+d);break;case"dialogClass":f.removeClass(e.options.dialogClass).addClass(c+d);break;case"disabled":d?f.addClass("ui-dialog-disabled"):f.removeClass("ui-dialog-disabled");break;case"draggable":var g=f.is(":data(draggable)");g&&!d&&f.draggable("destroy"),!g&&d&&e._makeDraggable();break;case"position":e._position(d);break;case"resizable":var h=f.is(":data(resizable)");h&&!d&&f.resizable("destroy"),h&&typeof d=="string"&&f.resizable("option","handles",d),!h&&d!==!1&&e._makeResizable(d);break;case"title":a(".ui-dialog-title",e.uiDialogTitlebar).html(""+(d||"&#160;"))}a.Widget.prototype._setOption.apply(e,arguments)},_size:function(){var b=this.options,c,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0}),b.minWidth>b.width&&(b.width=b.minWidth),c=this.uiDialog.css({height:"auto",width:b.width}).height(),d=Math.max(0,b.minHeight-c);if(b.height==="auto")if(a.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();var f=this.element.css("height","auto").height();e||this.uiDialog.hide(),this.element.height(Math.max(f,d))}else this.element.height(Math.max(b.height-c,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}}),a.extend(a.ui.dialog,{version:"1.8.18",uuid:0,maxZ:0,getTitleId:function(a){var b=a.attr("id");b||(this.uuid+=1,b=this.uuid);return"ui-dialog-title-"+b},overlay:function(b){this.$el=a.ui.dialog.overlay.create(b)}}),a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(b){this.instances.length===0&&(setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return!1})},1),a(document).bind("keydown.dialog-overlay",function(c){b.options.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode===a.ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}),a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize));var c=(this.oldInstances.pop()||a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});a.fn.bgiframe&&c.bgiframe(),this.instances.push(c);return c},destroy:function(b){var c=a.inArray(b,this.instances);c!=-1&&this.oldInstances.push(this.instances.splice(c,1)[0]),this.instances.length===0&&a([document,window]).unbind(".dialog-overlay"),b.remove();var d=0;a.each(this.instances,function(){d=Math.max(d,this.css("z-index"))}),this.maxZ=d},height:function(){var b,c;if(a.browser.msie&&a.browser.version<7){b=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight),c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return b<c?a(window).height()+"px":b+"px"}return a(document).height()+"px"},width:function(){var b,c;if(a.browser.msie){b=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth),c=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return b<c?a(window).width()+"px":b+"px"}return a(document).width()+"px"},resize:function(){var b=a([]);a.each(a.ui.dialog.overlay.instances,function(){b=b.add(this)}),b.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}}),a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);/*
+ * jQuery UI Slider 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */(function(a,b){var c=5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var b=this,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",g=d.values&&d.values.length||1,h=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":"")),this.range=a([]),d.range&&(d.range===!0&&(d.values||(d.values=[this._valueMin(),this._valueMin()]),d.values.length&&d.values.length!==2&&(d.values=[d.values[0],d.values[0]])),this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range==="min"||d.range==="max"?" ui-slider-range-"+d.range:"")));for(var i=e.length;i<g;i+=1)h.push(f);this.handles=e.add(a(h.join("")).appendTo(b.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(a){a.preventDefault()}).hover(function(){d.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){d.disabled?a(this).blur():(a(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),a(this).addClass("ui-state-focus"))}).blur(function(){a(this).removeClass("ui-state-focus")}),this.handles.each(function(b){a(this).data("index.ui-slider-handle",b)}),this.handles.keydown(function(d){var e=a(this).data("index.ui-slider-handle"),f,g,h,i;if(!b.options.disabled){switch(d.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:d.preventDefault();if(!b._keySliding){b._keySliding=!0,a(this).addClass("ui-state-active"),f=b._start(d,e);if(f===!1)return}}i=b.options.step,b.options.values&&b.options.values.length?g=h=b.values(e):g=h=b.value();switch(d.keyCode){case a.ui.keyCode.HOME:h=b._valueMin();break;case a.ui.keyCode.END:h=b._valueMax();break;case a.ui.keyCode.PAGE_UP:h=b._trimAlignValue(g+(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.PAGE_DOWN:h=b._trimAlignValue(g-(b._valueMax()-b._valueMin())/c);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(g===b._valueMax())return;h=b._trimAlignValue(g+i);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(g===b._valueMin())return;h=b._trimAlignValue(g-i)}b._slide(d,e,h)}}).keyup(function(c){var d=a(this).data("index.ui-slider-handle");b._keySliding&&(b._keySliding=!1,b._stop(c,d),b._change(c,d),a(this).removeClass("ui-state-active"))}),this._refreshValue(),this._animateOff=!1},destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider"),this._mouseDestroy();return this},_mouseCapture:function(b){var c=this.options,d,e,f,g,h,i,j,k,l;if(c.disabled)return!1;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),d={x:b.pageX,y:b.pageY},e=this._normValueFromMouse(d),f=this._valueMax()-this._valueMin()+1,h=this,this.handles.each(function(b){var c=Math.abs(e-h.values(b));f>c&&(f=c,g=a(this),i=b)}),c.range===!0&&this.values(1)===c.min&&(i+=1,g=a(this.handles[i])),j=this._start(b,i);if(j===!1)return!1;this._mouseSliding=!0,h._handleIndex=i,g.addClass("ui-state-active").focus(),k=g.offset(),l=!a(b.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:b.pageX-k.left-g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,e),this._animateOff=!0;return!0},_mouseStart:function(a){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);this._slide(a,this._handleIndex,c);return!1},_mouseStop:function(a){this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1;return!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;this.orientation==="horizontal"?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),d<0&&(d=0),this.orientation==="vertical"&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e;return this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values());return this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),this.options.values.length===2&&this.options.range===!0&&(b===0&&c>d||b===1&&c<d)&&(c=d),c!==this.values(b)&&(e=this.values(),e[b]=c,f=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e}),d=this.values(b?0:1),f!==!1&&this.values(b,c,!0))):c!==this.value()&&(f=this._trigger("slide",a,{handle:this.handles[b],value:c}),f!==!1&&this.value(c))},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("change",a,c)}},value:function(a){if(arguments.length)this.options.value=this._trimAlignValue(a),this._refreshValue(),this._change(null,0);else return this._value()},values:function(b,c){var d,e,f;if(arguments.length>1)this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),this._change(null,b);else{if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();d=this.options.values,e=arguments[0];for(f=0;f<d.length;f+=1)d[f]=this._trimAlignValue(e[f]),this._change(null,f);this._refreshValue()}},_setOption:function(b,c){var d,e=0;a.isArray(this.options.values)&&(e=this.options.values.length),a.Widget.prototype._setOption.apply(this,arguments);switch(b){case"disabled":c?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.propAttr("disabled",!0),this.element.addClass("ui-disabled")):(this.handles.propAttr("disabled",!1),this.element.removeClass("ui-disabled"));break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(d=0;d<e;d+=1)this._change(null,d);this._animateOff=!1}},_value:function(){var a=this.options.value;a=this._trimAlignValue(a);return a},_values:function(a){var b,c,d;if(arguments.length){b=this.options.values[a],b=this._trimAlignValue(b);return b}c=this.options.values.slice();for(d=0;d<c.length;d+=1)c[d]=this._trimAlignValue(c[d]);return c},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;Math.abs(c)*2>=b&&(d+=c>0?b:-b);return parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var b=this.options.range,c=this.options,d=this,e=this._animateOff?!1:c.animate,f,g={},h,i,j,k;this.options.values&&this.options.values.length?this.handles.each(function(b,i){f=(d.values(b)-d._valueMin())/(d._valueMax()-d._valueMin())*100,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",a(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range===!0&&(d.orientation==="horizontal"?(b===0&&d.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b===0&&d.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=f}):(i=this.value(),j=this._valueMin(),k=this._valueMax(),f=k!==j?(i-j)/(k-j)*100:0,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},c.animate),b==="max"&&this.orientation==="horizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,duration:c.animate}),b==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b==="max"&&this.orientation==="vertical"&&this.range[e?"animate":"css"]({height:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Tabs 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */(function(a,b){function f(){return++d}function e(){return++c}var c=0,d=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(!0)},_setOption:function(a,b){if(a=="selected"){if(this.options.collapsible&&b==this.options.selected)return;this.select(b)}else this.options[a]=b,this._tabify()},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=a(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0].style.removeAttribute("filter")}var d=this,e=this.options,f=/^#.+/;this.list=this.element.find("ol,ul").eq(0),this.lis=a(" > li:has(a[href])",this.list),this.anchors=this.lis.map(function(){return a("a",this)[0]}),this.panels=a([]),this.anchors.each(function(b,c){var g=a(c).attr("href"),h=g.split("#")[0],i;h&&(h===location.toString().split("#")[0]||(i=a("base")[0])&&h===i.href)&&(g=c.hash,c.href=g);if(f.test(g))d.panels=d.panels.add(d.element.find(d._sanitizeSelector(g)));else if(g&&g!=="#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*$/,""));var j=d._tabId(c);c.href="#"+j;var k=d.element.find("#"+j);k.length||(k=a(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("destroy.tabs",!0)),d.panels=d.panels.add(k)}else e.disabled.push(b)}),c?(this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top"),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e.selected===b?(location.hash&&this.anchors.each(function(a,b){if(b.hash==location.hash){e.selected=a;return!1}}),typeof e.selected!="number"&&e.cookie&&(e.selected=parseInt(d._cookie(),10)),typeof e.selected!="number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=e.selected||(this.lis.length?0:-1)):e.selected===null&&(e.selected=-1),e.selected=e.selected>=0&&this.anchors[e.selected]||e.selected<0?e.selected:0,e.disabled=a.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selected,e.disabled)!=-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected ui-state-active"),e.selected>=0&&this.anchors.length&&(d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.element.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.selected],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.anchors).unbind(".tabs"),d.lis=d.anchors=d.panels=null})):e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e.selected,e.cookie);for(var g=0,h;h=this.lis[g];g++)a(h)[a.inArray(g,e.disabled)!=-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");e.cache===!1&&this.anchors.removeData("cache.tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=="mouseover"){var i=function(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui-state-"+a)},j=function(a,b){b.removeClass("ui-state-"+a)};this.lis.bind("mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.tabs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",function(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=e.fx[0],l=e.fx[1]):k=l=e.fx);var n=l?function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-tabs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show",null,d._ui(b,c[0]))},o=k?function(a,b){b.animate(k,k.duration||"normal",function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var b=this,c=a(b).closest("li"),f=d.panels.filter(":not(.ui-tabs-hide)"),g=d.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-selected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-state-processing")||d.panels.filter(":animated").length||d._trigger("select",null,d._ui(this,g[0]))===!1){this.blur();return!1}e.selected=d.anchors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected")){e.selected=-1,e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur();return!1}if(!f.length){e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur();return!1}}e.cookie&&d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs",function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifier.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(){return!1})},_getIndex:function(a){typeof a=="string"&&(a=this.anchors.index(this.anchors.filter("[href$="+a+"]")));return a},destroy:function(){var b=this.options;this.abort(),this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each(function(){var b=a.data(this,"href.tabs");b&&(this.href=b);var c=a(this).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeData(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-state-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie(null,b.cookie);return this},add:function(c,d,e){e===b&&(e=this.anchors.length);var f=this,g=this.options,h=a(g.tabTemplate.replace(/#\{href\}/g,c).replace(/#\{label\}/g,d)),i=c.indexOf("#")?this._tabId(a("a",h)[0]):c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destroy.tabs",!0);var j=f.element.find("#"+i);j.length||(j=a(g.panelTemplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"),e>=this.lis.length?(h.appendTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.lis[e]),j.insertBefore(this.panels[e])),g.disabled=a.map(g.disabled,function(a,b){return a>=e?++a:a}),this._tabify(),this.anchors.length==1&&(g.selected=0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass("ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,this._ui(this.anchors[e],this.panels[e]));return this},remove:function(b){b=this._getIndex(b);var c=this.options,d=this.lis.eq(b).remove(),e=this.panels.eq(b).remove();d.hasClass("ui-tabs-selected")&&this.anchors.length>1&&this.select(b+(b+1<this.anchors.length?1:-1)),c.disabled=a.map(a.grep(c.disabled,function(a,c){return a!=b}),function(a,c){return a>=b?--a:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0]));return this},enable:function(b){b=this._getIndex(b);var c=this.options;if(a.inArray(b,c.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled"),c.disabled=a.grep(c.disabled,function(a,c){return a!=b}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(a){a=this._getIndex(a);var b=this,c=this.options;a!=c.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a])));return this},select:function(a){a=this._getIndex(a);if(a==-1)if(this.options.collapsible&&this.options.selected!=-1)a=this.options.selected;else return this;this.anchors.eq(a).trigger(this.options.event+".tabs");return this},load:function(b){b=this._getIndex(b);var c=this,d=this.options,e=this.anchors.eq(b)[0],f=a.data(e,"load.tabs");this.abort();if(!f||this.element.queue("tabs").length!==0&&a.data(e,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(d.spinner){var g=a("span",e);g.data("label.tabs",g.html()).html(d.spinner)}this.xhr=a.ajax(a.extend({},d.ajaxOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}})),c.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cleanup();return this},url:function(a,b){this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}}),a.extend(a.ui.tabs,{version:"1.8.18"}),a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(a,b){var c=this,d=this.options,e=c._rotate||(c._rotate=function(b){clearTimeout(c.rotation),c.rotation=setTimeout(function(){var a=d.selected;c.select(++a<c.anchors.length?a:0)},a),b&&b.stopPropagation()}),f=c._unrotate||(c._unrotate=b?function(a){t=d.selected,e()}:function(a){a.clientX&&c.rotate(null)});a?(this.element.bind("tabsshow",e),this.anchors.bind(d.event+".tabs",f),e()):(clearTimeout(c.rotation),this.element.unbind("tabsshow",e),this.anchors.unbind(d.event+".tabs",f),delete this._rotate,delete this._unrotate);return this}})})(jQuery);/*
+ * jQuery UI Datepicker 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */(function($,undefined){function isArray(a){return a&&($.browser.safari&&typeof a=="object"&&a.length||a.constructor&&a.constructor.toString().match(/\Array\(\)/))}function extendRemove(a,b){$.extend(a,b);for(var c in b)if(b[c]==null||b[c]==undefined)a[c]=b[c];return a}function bindHover(a){var b="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return a.bind("mouseout",function(a){var c=$(a.target).closest(b);!c.length||c.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(c){var d=$(c.target).closest(b);!$.datepicker._isDisabledDatepicker(instActive.inline?a.parent()[0]:instActive.input[0])&&!!d.length&&(d.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),d.addClass("ui-state-hover"),d.hasClass("ui-datepicker-prev")&&d.addClass("ui-datepicker-prev-hover"),d.hasClass("ui-datepicker-next")&&d.addClass("ui-datepicker-next-hover"))})}function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}$.extend($.ui,{datepicker:{version:"1.8.18"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){extendRemove(this._defaults,a||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(a,b){var c=a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:c,input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:b?bindHover($('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')):this.dpDiv}},_connectDatepicker:function(a,b){var c=$(a);b.append=$([]),b.trigger=$([]);c.hasClass(this.markerClassName)||(this._attachments(c,b),c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),this._autoSize(b),$.data(a,PROP_NAME,b),b.settings.disabled&&this._disableDatepicker(a))},_attachments:function(a,b){var c=this._get(b,"appendText"),d=this._get(b,"isRTL");b.append&&b.append.remove(),c&&(b.append=$('<span class="'+this._appendClass+'">'+c+"</span>"),a[d?"before":"after"](b.append)),a.unbind("focus",this._showDatepicker),b.trigger&&b.trigger.remove();var e=this._get(b,"showOn");(e=="focus"||e=="both")&&a.focus(this._showDatepicker);if(e=="button"||e=="both"){var f=this._get(b,"buttonText"),g=this._get(b,"buttonImage");b.trigger=$(this._get(b,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:g,alt:f,title:f}):$('<button type="button"></button>').addClass(this._triggerClass).html(g==""?f:$("<img/>").attr({src:g,alt:f,title:f}))),a[d?"before":"after"](b.trigger),b.trigger.click(function(){$.datepicker._datepickerShowing&&$.datepicker._lastInput==a[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=a[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(a[0])):$.datepicker._showDatepicker(a[0]);return!1})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var d=function(a){var b=0,c=0;for(var d=0;d<a.length;d++)a[d].length>b&&(b=a[d].length,c=d);return c};b.setMonth(d(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort"))),b.setDate(d(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=$(a);c.hasClass(this.markerClassName)||(c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(a,c,d){b.settings[c]=d}).bind("getData.datepicker",function(a,c){return this._get(b,c)}),$.data(a,PROP_NAME,b),this._setDate(b,this._getDefaultDate(b),!0),this._updateDatepicker(b),this._updateAlternate(b),b.settings.disabled&&this._disableDatepicker(a),b.dpDiv.css("display","block"))},_dialogDatepicker:function(a,b,c,d,e){var f=this._dialogInst;if(!f){this.uuid+=1;var g="dp"+this.uuid;this._dialogInput=$('<input type="text" id="'+g+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),f=this._dialogInst=this._newInst(this._dialogInput,!1),f.settings={},$.data(this._dialogInput[0],PROP_NAME,f)}extendRemove(f.settings,d||{}),b=b&&b.constructor==Date?this._formatDate(f,b):b,this._dialogInput.val(b),this._pos=e?e.length?e:[e.pageX,e.pageY]:null;if(!this._pos){var h=document.documentElement.clientWidth,i=document.documentElement.clientHeight,j=document.documentElement.scrollLeft||document.body.scrollLeft,k=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[h/2-100+j,i/2-150+k]}this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),f.settings.onSelect=c,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,f);return this},_destroyDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();$.removeData(a,PROP_NAME),d=="input"?(c.append.remove(),c.trigger.remove(),b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(d=="div"||d=="span")&&b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!1,c.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().removeClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b})}},_disableDatepicker:function(a){var b=$(a),c=$.data(a,PROP_NAME);if(!!b.hasClass(this.markerClassName)){var d=a.nodeName.toLowerCase();if(d=="input")a.disabled=!0,c.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(d=="div"||d=="span"){var e=b.children("."+this._inlineClass);e.children().addClass("ui-state-disabled"),e.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=$.map(this._disabledInputs,function(b){return b==a?null:b}),this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return!1;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return!0;return!1},_getInst:function(a){try{return $.data(a,PROP_NAME)}catch(b){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(a,b,c){var d=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?$.extend({},$.datepicker._defaults):d?b=="all"?$.extend({},d.settings):this._get(d,b):null;var e=b||{};typeof b=="string"&&(e={},e[b]=c);if(d){this._curInst==d&&this._hideDatepicker();var f=this._getDateDatepicker(a,!0),g=this._getMinMaxDate(d,"min"),h=this._getMinMaxDate(d,"max");extendRemove(d.settings,e),g!==null&&e.dateFormat!==undefined&&e.minDate===undefined&&(d.settings.minDate=this._formatDate(d,g)),h!==null&&e.dateFormat!==undefined&&e.maxDate===undefined&&(d.settings.maxDate=this._formatDate(d,h)),this._attachments($(a),d),this._autoSize(d),this._setDate(d,f),this._updateAlternate(d),this._updateDatepicker(d)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){var b=this._getInst(a);b&&this._updateDatepicker(b)},_setDateDatepicker:function(a,b){var c=this._getInst(a);c&&(this._setDate(c,b),this._updateDatepicker(c),this._updateAlternate(c))},_getDateDatepicker:function(a,b){var c=this._getInst(a);c&&!c.inline&&this._setDateFromField(c,b);return c?this._getDate(c):null},_doKeyDown:function(a){var b=$.datepicker._getInst(a.target),c=!0,d=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=!0;if($.datepicker._datepickerShowing)switch(a.keyCode){case 9:$.datepicker._hideDatepicker(),c=!1;break;case 13:var e=$("td."+$.datepicker._dayOverClass+":not(."+$.datepicker._currentClass+")",b.dpDiv);e[0]&&$.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,e[0]);var f=$.datepicker._get(b,"onSelect");if(f){var g=$.datepicker._formatDate(b);f.apply(b.input?b.input[0]:null,[g,b])}else $.datepicker._hideDatepicker();return!1;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 35:(a.ctrlKey||a.metaKey)&&$.datepicker._clearDate(a.target),c=a.ctrlKey||a.metaKey;break;case 36:(a.ctrlKey||a.metaKey)&&$.datepicker._gotoToday(a.target),c=a.ctrlKey||a.metaKey;break;case 37:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?1:-1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?-$.datepicker._get(b,"stepBigMonths"):-$.datepicker._get(b,"stepMonths"),"M");break;case 38:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,-7,"D"),c=a.ctrlKey||a.metaKey;break;case 39:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,d?-1:1,"D"),c=a.ctrlKey||a.metaKey,a.originalEvent.altKey&&$.datepicker._adjustDate(a.target,a.ctrlKey?+$.datepicker._get(b,"stepBigMonths"):+$.datepicker._get(b,"stepMonths"),"M");break;case 40:(a.ctrlKey||a.metaKey)&&$.datepicker._adjustDate(a.target,7,"D"),c=a.ctrlKey||a.metaKey;break;default:c=!1}else a.keyCode==36&&a.ctrlKey?$.datepicker._showDatepicker(this):c=!1;c&&(a.preventDefault(),a.stopPropagation())},_doKeyPress:function(a){var b=$.datepicker._getInst(a.target);if($.datepicker._get(b,"constrainInput")){var c=$.datepicker._possibleChars($.datepicker._get(b,"dateFormat")),d=String.fromCharCode(a.charCode==undefined?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||d<" "||!c||c.indexOf(d)>-1}},_doKeyUp:function(a){var b=$.datepicker._getInst(a.target);if(b.input.val()!=b.lastVal)try{var c=$.datepicker.parseDate($.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,$.datepicker._getFormatConfig(b));c&&($.datepicker._setDateFromField(b),$.datepicker._updateAlternate(b),$.datepicker._updateDatepicker(b))}catch(a){$.datepicker.log(a)}return!0},_showDatepicker:function(a){a=a.target||a,a.nodeName.toLowerCase()!="input"&&(a=$("input",a.parentNode)[0]);if(!$.datepicker._isDisabledDatepicker(a)&&$.datepicker._lastInput!=a){var b=$.datepicker._getInst(a);$.datepicker._curInst&&$.datepicker._curInst!=b&&($.datepicker._curInst.dpDiv.stop(!0,!0),b&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var c=$.datepicker._get(b,"beforeShow"),d=c?c.apply(a,[a,b]):{};if(d===!1)return;extendRemove(b.settings,d),b.lastVal=null,$.datepicker._lastInput=a,$.datepicker._setDateFromField(b),$.datepicker._inDialog&&(a.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(a),$.datepicker._pos[1]+=a.offsetHeight);var e=!1;$(a).parents().each(function(){e|=$(this).css("position")=="fixed";return!e}),e&&$.browser.opera&&($.datepicker._pos[0]-=document.documentElement.scrollLeft,$.datepicker._pos[1]-=document.documentElement.scrollTop);var f={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,b.dpDiv.empty(),b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(b),f=$.datepicker._checkOffset(b,f,e),b.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":e?"fixed":"absolute",display:"none",left:f.left+"px",top:f.top+"px"});if(!b.inline){var g=$.datepicker._get(b,"showAnim"),h=$.datepicker._get(b,"duration"),i=function(){var a=b.dpDiv.find("iframe.ui-datepicker-cover");if(!!a.length){var c=$.datepicker._getBorders(b.dpDiv);a.css({left:-c[0],top:-c[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex($(a).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&$.effects[g]?b.dpDiv.show(g,$.datepicker._get(b,"showOptions"),h,i):b.dpDiv[g||"show"](g?h:null,i),(!g||!h)&&i(),b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus(),$.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this;b.maxRows=4;var c=$.datepicker._getBorders(a.dpDiv);instActive=a,a.dpDiv.empty().append(this._generateHTML(a));var d=a.dpDiv.find("iframe.ui-datepicker-cover");!d.length||d.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}),a.dpDiv.find("."+this._dayOverClass+" a").mouseover();var e=this._getNumberOfMonths(a),f=e[1],g=17;a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),f>1&&a.dpDiv.addClass("ui-datepicker-multi-"+f).css("width",g*f+"em"),a.dpDiv[(e[0]!=1||e[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),a==$.datepicker._curInst&&$.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var h=a.yearshtml;setTimeout(function(){h===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml),h=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(a){return{thin:1,medium:2,thick:3}[a]||a};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var d=a.dpDiv.outerWidth(),e=a.dpDiv.outerHeight(),f=a.input?a.input.outerWidth():0,g=a.input?a.input.outerHeight():0,h=document.documentElement.clientWidth+$(document).scrollLeft(),i=document.documentElement.clientHeight+$(document).scrollTop();b.left-=this._get(a,"isRTL")?d-f:0,b.left-=c&&b.left==a.input.offset().left?$(document).scrollLeft():0,b.top-=c&&b.top==a.input.offset().top+g?$(document).scrollTop():0,b.left-=Math.min(b.left,b.left+d>h&&h>d?Math.abs(b.left+d-h):0),b.top-=Math.min(b.top,b.top+e>i&&i>e?Math.abs(e+g):0);return b},_findPos:function(a){var b=this._getInst(a),c=this._get(b,"isRTL");while(a&&(a.type=="hidden"||a.nodeType!=1||$.expr.filters.hidden(a)))a=a[c?"previousSibling":"nextSibling"];var d=$(a).offset();return[d.left,d.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=$.data(a,PROP_NAME))&&this._datepickerShowing){var c=this._get(b,"showAnim"),d=this._get(b,"duration"),e=this,f=function(){$.datepicker._tidyDialog(b),e._curInst=null};$.effects&&$.effects[c]?b.dpDiv.hide(c,$.datepicker._get(b,"showOptions"),d,f):b.dpDiv[c=="slideDown"?"slideUp":c=="fadeIn"?"fadeOut":"hide"](c?d:null,f),c||f(),this._datepickerShowing=!1;var g=this._get(b,"onClose");g&&g.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(!!$.datepicker._curInst){var b=$(a.target),c=$.datepicker._getInst(b[0]);(b[0].id!=$.datepicker._mainDivId&&b.parents("#"+$.datepicker._mainDivId).length==0&&!b.hasClass($.datepicker.markerClassName)&&!b.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||b.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=c)&&$.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){var d=$(a),e=this._getInst(d[0]);this._isDisabledDatepicker(d[0])||(this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c),this._updateDatepicker(e))},_gotoToday:function(a){var b=$(a),c=this._getInst(b[0]);if(this._get(c,"gotoCurrent")&&c.currentDay)c.selectedDay=c.currentDay,c.drawMonth=c.selectedMonth=c.currentMonth,c.drawYear=c.selectedYear=c.currentYear;else{var d=new Date;c.selectedDay=d.getDate(),c.drawMonth=c.selectedMonth=d.getMonth(),c.drawYear=c.selectedYear=d.getFullYear()}this._notifyChange(c),this._adjustDate(b)},_selectMonthYear:function(a,b,c){var d=$(a),e=this._getInst(d[0]);e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10),this._notifyChange(e),this._adjustDate(d)},_selectDay:function(a,b,c,d){var e=$(a);if(!$(d).hasClass(this._unselectableClass)&&!this._isDisabledDatepicker(e[0])){var f=this._getInst(e[0]);f.selectedDay=f.currentDay=$("a",d).html(),f.selectedMonth=f.currentMonth=b,f.selectedYear=f.currentYear=c,this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){var b=$(a),c=this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(a,b){var c=$(a),d=this._getInst(c[0]);b=b!=null?b:this._formatDate(d),d.input&&d.input.val(b),this._updateAlternate(d);var e=this._get(d,"onSelect");e?e.apply(d.input?d.input[0]:null,[b,d]):d.input&&d.input.trigger("change"),d.inline?this._updateDatepicker(d):(this._hideDatepicker(),this._lastInput=d.input[0],typeof d.input[0]!="object"&&d.input.focus(),this._lastInput=null)},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),d=this._getDate(a),e=this.formatDate(c,d,this._getFormatConfig(a));$(b).each(function(){$(this).val(e)})}},noWeekends:function(a){var b=a.getDay();return[b>0&&b<6,""]},iso8601Week:function(a){var b=new Date(a.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();b.setMonth(0),b.setDate(1);return Math.floor(Math.round((c-b)/864e5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var d=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;d=typeof d!="string"?d:(new Date).getFullYear()%100+parseInt(d,10);var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,g=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,h=(c?c.monthNames:null)||this._defaults.monthNames,i=-1,j=-1,k=-1,l=-1,m=!1,n=function(b){var c=s+1<a.length&&a.charAt(s+1)==b;c&&s++;return c},o=function(a){var c=n(a),d=a=="@"?14:a=="!"?20:a=="y"&&c?4:a=="o"?3:2,e=new RegExp("^\\d{1,"+d+"}"),f=b.substring(r).match(e);if(!f)throw"Missing number at position "+r;r+=f[0].length;return parseInt(f[0],10)},p=function(a,c,d){var e=$.map(n(a)?d:c,function(a,b){return[[b,a]]}).sort(function(a,b){return-(a[1].length-b[1].length)}),f=-1;$.each(e,function(a,c){var d=c[1];if(b.substr(r,d.length).toLowerCase()==d.toLowerCase()){f=c[0],r+=d.length;return!1}});if(f!=-1)return f+1;throw"Unknown name at position "+r},q=function(){if(b.charAt(r)!=a.charAt(s))throw"Unexpected literal at position "+r;r++},r=0;for(var s=0;s<a.length;s++)if(m)a.charAt(s)=="'"&&!n("'")?m=!1:q();else switch(a.charAt(s)){case"d":k=o("d");break;case"D":p("D",e,f);break;case"o":l=o("o");break;case"m":j=o("m");break;case"M":j=p("M",g,h);break;case"y":i=o("y");break;case"@":var t=new Date(o("@"));i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"!":var t=new Date((o("!")-this._ticksTo1970)/1e4);i=t.getFullYear(),j=t.getMonth()+1,k=t.getDate();break;case"'":n("'")?q():m=!0;break;default:q()}if(r<b.length)throw"Extra/unparsed characters found in date: "+b.substring(r);i==-1?i=(new Date).getFullYear():i<100&&(i+=(new Date).getFullYear()-(new Date).getFullYear()%100+(i<=d?0:-100));if(l>-1){j=1,k=l;for(;;){var u=this._getDaysInMonth(i,j-1);if(k<=u)break;j++,k-=u}}var t=this._daylightSavingAdjust(new Date(i,j-1,k));if(t.getFullYear()!=i||t.getMonth()+1!=j||t.getDate()!=k)throw"Invalid date";return t},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(a,b,c){if(!b)return"";var d=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,e=(c?c.dayNames:null)||this._defaults.dayNames,f=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,h=function(b){var c=m+1<a.length&&a.charAt(m+1)==b;c&&m++;return c},i=function(a,b,c){var d=""+b;if(h(a))while(d.length<c)d="0"+d;return d},j=function(a,b,c,d){return h(a)?d[b]:c[b]},k="",l=!1;if(b)for(var m=0;m<a.length;m++)if(l)a.charAt(m)=="'"&&!h("'")?l=!1:k+=a.charAt(m);else switch(a.charAt(m)){case"d":k+=i("d",b.getDate(),2);break;case"D":k+=j("D",b.getDay(),d,e);break;case"o":k+=i("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":k+=i("m",b.getMonth()+1,2);break;case"M":k+=j("M",b.getMonth(),f,g);break;case"y":k+=h("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":k+=b.getTime();break;case"!":k+=b.getTime()*1e4+this._ticksTo1970;break;case"'":h("'")?k+="'":l=!0;break;default:k+=a.charAt(m)}return k},_possibleChars:function(a){var b="",c=!1,d=function(b){var c=e+1<a.length&&a.charAt(e+1)==b;c&&e++;return c};for(var e=0;e<a.length;e++)if(c)a.charAt(e)=="'"&&!d("'")?c=!1:b+=a.charAt(e);else switch(a.charAt(e)){case"d":case"m":case"y":case"@":b+="0123456789";break;case"D":case"M":return null;case"'":d("'")?b+="'":c=!0;break;default:b+=a.charAt(e)}return b},_get:function(a,b){return a.settings[b]!==undefined?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),d=a.lastVal=a.input?a.input.val():null,e,f;e=f=this._getDefaultDate(a);var g=this._getFormatConfig(a);try{e=this.parseDate(c,d,g)||f}catch(h){this.log(h),d=b?"":d}a.selectedDay=e.getDate(),a.drawMonth=a.selectedMonth=e.getMonth(),a.drawYear=a.selectedYear=e.getFullYear(),a.currentDay=d?e.getDate():0,a.currentMonth=d?e.getMonth():0,a.currentYear=d?e.getFullYear():0,this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var d=function(a){var b=new Date;b.setDate(b.getDate()+a);return b},e=function(b){try{return $.datepicker.parseDate($.datepicker._get(a,"dateFormat"),b,$.datepicker._getFormatConfig(a))}catch(c){}var d=(b.toLowerCase().match(/^c/)?$.datepicker._getDate(a):null)||new Date,e=d.getFullYear(),f=d.getMonth(),g=d.getDate(),h=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,i=h.exec(b);while(i){switch(i[2]||"d"){case"d":case"D":g+=parseInt(i[1],10);break;case"w":case"W":g+=parseInt(i[1],10)*7;break;case"m":case"M":f+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f));break;case"y":case"Y":e+=parseInt(i[1],10),g=Math.min(g,$.datepicker._getDaysInMonth(e,f))}i=h.exec(b)}return new Date(e,f,g)},f=b==null||b===""?c:typeof b=="string"?e(b):typeof b=="number"?isNaN(b)?c:d(b):new Date(b.getTime());f=f&&f.toString()=="Invalid Date"?c:f,f&&(f.setHours(0),f.setMinutes(0),f.setSeconds(0),f.setMilliseconds(0));return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var d=!b,e=a.selectedMonth,f=a.selectedYear,g=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=g.getDate(),a.drawMonth=a.selectedMonth=a.currentMonth=g.getMonth(),a.drawYear=a.selectedYear=a.currentYear=g.getFullYear(),(e!=a.selectedMonth||f!=a.selectedYear)&&!c&&this._notifyChange(a),this._adjustInstDate(a),a.input&&a.input.val(d?"":this._formatDate(a))},_getDate:function(a){var b=!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return b},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),d=this._get(a,"showButtonPanel"),e=this._get(a,"hideIfNoPrevNext"),f=this._get(a,"navigationAsDateFormat"),g=this._getNumberOfMonths(a),h=this._get(a,"showCurrentAtPos"),i=this._get(a,"stepMonths"),j=g[0]!=1||g[1]!=1,k=this._daylightSavingAdjust(a.currentDay?new Date(a.currentYear,a.currentMonth,a.currentDay):new Date(9999,9,9)),l=this._getMinMaxDate(a,"min"),m=this._getMinMaxDate(a,"max"),n=a.drawMonth-h,o=a.drawYear;n<0&&(n+=12,o--);if(m){var p=this._daylightSavingAdjust(new Date(m.getFullYear(),m.getMonth()-g[0]*g[1]+1,m.getDate()));p=l&&p<l?l:p;while(this._daylightSavingAdjust(new Date(o,n,1))>p)n--,n<0&&(n=11,o--)}a.drawMonth=n,a.drawYear=o;var q=this._get(a,"prevText");q=f?this.formatDate(q,this._daylightSavingAdjust(new Date(o,n-i,1)),this._getFormatConfig(a)):q;var r=this._canAdjustMonth(a,-1,o,n)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', -"+i+", 'M');\""+' title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>":e?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+q+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+q+"</span></a>",s=this._get(a,"nextText");s=f?this.formatDate(s,this._daylightSavingAdjust(new Date(o,n+i,1)),this._getFormatConfig(a)):s;var t=this._canAdjustMonth(a,1,o,n)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+a.id+"', +"+i+", 'M');\""+' title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":e?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>",u=this._get(a,"currentText"),v=this._get(a,"gotoCurrent")&&a.currentDay?k:b;u=f?this.formatDate(u,v,this._getFormatConfig(a)):u;var w=a.inline?"":'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+dpuuid+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>",x=d?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?w:"")+(this._isInRange(a,v)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._gotoToday('#"+a.id+"');\""+">"+u+"</button>":"")+(c?"":w)+"</div>":"",y=parseInt(this._get(a,"firstDay"),10);y=isNaN(y)?0:y;var z=this._get(a,"showWeek"),A=this._get(a,"dayNames"),B=this._get(a,"dayNamesShort"),C=this._get(a,"dayNamesMin"),D=this._get(a,"monthNames"),E=this._get(a,"monthNamesShort"),F=this._get(a,"beforeShowDay"),G=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths"),I=this._get(a,"calculateWeek")||this.iso8601Week,J=this._getDefaultDate(a),K="";for(var L=0;L<g[0];L++){var M="";this.maxRows=4;for(var N=0;N<g[1];N++){var O=this._daylightSavingAdjust(new Date(o,n,a.selectedDay)),P=" ui-corner-all",Q="";if(j){Q+='<div class="ui-datepicker-group';if(g[1]>1)switch(N){case 0:Q+=" ui-datepicker-group-first",P=" ui-corner-"+(c?"right":"left");break;case g[1]-1:Q+=" ui-datepicker-group-last",P=" ui-corner-"+(c?"left":"right");break;default:Q+=" ui-datepicker-group-middle",P=""}Q+='">'}Q+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+P+'">'+(/all|left/.test(P)&&L==0?c?t:r:"")+(/all|right/.test(P)&&L==0?c?r:t:"")+this._generateMonthYearHeader(a,n,o,l,m,L>0||N>0,D,E)+'</div><table class="ui-datepicker-calendar"><thead>'+"<tr>";var R=z?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(var S=0;S<7;S++){var T=(S+y)%7;R+="<th"+((S+y+6)%7>=5?' class="ui-datepicker-week-end"':"")+">"+'<span title="'+A[T]+'">'+C[T]+"</span></th>"}Q+=R+"</tr></thead><tbody>";var U=this._getDaysInMonth(o,n);o==a.selectedYear&&n==a.selectedMonth&&(a.selectedDay=Math.min(a.selectedDay,U));var V=(this._getFirstDayOfMonth(o,n)-y+7)%7,W=Math.ceil((V+U)/7),X=j?this.maxRows>W?this.maxRows:W:W;this.maxRows=X;var Y=this._daylightSavingAdjust(new Date(o,n,1-V));for(var Z=0;Z<X;Z++){Q+="<tr>";var _=z?'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(Y)+"</td>":"";for(var S=0;S<7;S++){var ba=F?F.apply(a.input?a.input[0]:null,[Y]):[!0,""],bb=Y.getMonth()!=n,bc=bb&&!H||!ba[0]||l&&Y<l||m&&Y>m;_+='<td class="'+((S+y+6)%7>=5?" ui-datepicker-week-end":"")+(bb?" ui-datepicker-other-month":"")+(Y.getTime()==O.getTime()&&n==a.selectedMonth&&a._keyEvent||J.getTime()==Y.getTime()&&J.getTime()==O.getTime()?" "+this._dayOverClass:"")+(bc?" "+this._unselectableClass+" ui-state-disabled":"")+(bb&&!G?"":" "+ba[1]+(Y.getTime()==k.getTime()?" "+this._currentClass:"")+(Y.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!bb||G)&&ba[2]?' title="'+ba[2]+'"':"")+(bc?"":' onclick="DP_jQuery_'+dpuuid+".datepicker._selectDay('#"+a.id+"',"+Y.getMonth()+","+Y.getFullYear()+', this);return false;"')+">"+(bb&&!G?"&#xa0;":bc?'<span class="ui-state-default">'+Y.getDate()+"</span>":'<a class="ui-state-default'+(Y.getTime()==b.getTime()?" ui-state-highlight":"")+(Y.getTime()==k.getTime()?" ui-state-active":"")+(bb?" ui-priority-secondary":"")+'" href="#">'+Y.getDate()+"</a>")+"</td>",Y.setDate(Y.getDate()+1),Y=this._daylightSavingAdjust(Y)}Q+=_+"</tr>"}n++,n>11&&(n=0,o++),Q+="</tbody></table>"+(j?"</div>"+(g[0]>0&&N==g[1]-1?'<div class="ui-datepicker-row-break"></div>':""):""),M+=Q}K+=M}K+=x+($.browser.msie&&parseInt($.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':""),
+a._keyEvent=!1;return K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='<div class="ui-datepicker-title">',m="";if(f||!i)m+='<span class="ui-datepicker-month">'+g[b]+"</span>";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" "+">";for(var p=0;p<12;p++)(!n||p>=d.getMonth())&&(!o||p<=e.getMonth())&&(m+='<option value="'+p+'"'+(p==b?' selected="selected"':"")+">"+h[p]+"</option>");m+="</select>"}k||(l+=m+(f||!i||!j?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+='<span class="ui-datepicker-year">'+c+"</span>";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" "+">";for(;t<=u;t++)a.yearshtml+='<option value="'+t+'"'+(t==c?' selected="selected"':"")+">"+t+"</option>";a.yearshtml+="</select>",l+=a.yearshtml,a.yearshtml=null}}l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?"&#xa0;":"")+m),l+="</div>";return l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&b<c?c:b;e=d&&e>d?d:e;return e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth()));return this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return $.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)})},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.8.18",window["DP_jQuery_"+dpuuid]=$})(jQuery);/*
+ * jQuery UI Progressbar 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */(function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===b)return this._value();this._setOption("value",a);return this},_setOption:function(b,c){b==="value"&&(this.options.value=c,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;typeof a!="number"&&(a=0);return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var a=this.value(),b=this._percentage();this.oldValue!==a&&(this.oldValue=a,this._trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(b.toFixed(0)+"%"),this.element.attr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.18"})})(jQuery);/*
+ * jQuery UI Effects 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */jQuery.effects||function(a,b){function l(b){if(!b||typeof b=="number"||a.fx.speeds[b])return!0;if(typeof b=="string"&&!a.effects[b])return!0;return!1}function k(b,c,d,e){typeof b=="object"&&(e=c,d=null,c=b,b=c.effect),a.isFunction(c)&&(e=c,d=null,c={});if(typeof c=="number"||a.fx.speeds[c])e=d,d=c,c={};a.isFunction(d)&&(e=d,d=null),c=c||{},d=d||c.duration,d=a.fx.off?0:typeof d=="number"?d:d in a.fx.speeds?a.fx.speeds[d]:a.fx.speeds._default,e=e||c.complete;return[b,c,d,e]}function j(a,b){var c={_:0},d;for(d in b)a[d]!=b[d]&&(c[d]=b[d]);return c}function i(b){var c,d;for(c in b)d=b[c],(d==null||a.isFunction(d)||c in g||/scrollbar/.test(c)||!/color/i.test(c)&&isNaN(parseFloat(d)))&&delete b[c];return b}function h(){var a=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,b={},c,d;if(a&&a.length&&a[0]&&a[a[0]]){var e=a.length;while(e--)c=a[e],typeof a[c]=="string"&&(d=c.replace(/\-(\w)/g,function(a,b){return b.toUpperCase()}),b[d]=a[c])}else for(c in a)typeof a[c]=="string"&&(b[c]=a[c]);return b}function d(b,d){var e;do{e=a.curCSS(b,d);if(e!=""&&e!="transparent"||a.nodeName(b,"body"))break;d="backgroundColor"}while(b=b.parentNode);return c(e)}function c(b){var c;if(b&&b.constructor==Array&&b.length==3)return b;if(c=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(b))return[parseInt(c[1],10),parseInt(c[2],10),parseInt(c[3],10)];if(c=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(b))return[parseFloat(c[1])*2.55,parseFloat(c[2])*2.55,parseFloat(c[3])*2.55];if(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(b))return[parseInt(c[1],16),parseInt(c[2],16),parseInt(c[3],16)];if(c=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(b))return[parseInt(c[1]+c[1],16),parseInt(c[2]+c[2],16),parseInt(c[3]+c[3],16)];if(c=/rgba\(0, 0, 0, 0\)/.exec(b))return e.transparent;return e[a.trim(b).toLowerCase()]}a.effects={},a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","borderColor","color","outlineColor"],function(b,e){a.fx.step[e]=function(a){a.colorInit||(a.start=d(a.elem,e),a.end=c(a.end),a.colorInit=!0),a.elem.style[e]="rgb("+Math.max(Math.min(parseInt(a.pos*(a.end[0]-a.start[0])+a.start[0],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[1]-a.start[1])+a.start[1],10),255),0)+","+Math.max(Math.min(parseInt(a.pos*(a.end[2]-a.start[2])+a.start[2],10),255),0)+")"}});var e={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},f=["add","remove","toggle"],g={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(b,c,d,e){a.isFunction(d)&&(e=d,d=null);return this.queue(function(){var g=a(this),k=g.attr("style")||" ",l=i(h.call(this)),m,n=g.attr("class");a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),m=i(h.call(this)),g.attr("class",n),g.animate(j(l,m),{queue:!1,duration:c,easing:d,complete:function(){a.each(f,function(a,c){b[c]&&g[c+"Class"](b[c])}),typeof g.attr("style")=="object"?(g.attr("style").cssText="",g.attr("style").cssText=k):g.attr("style",k),e&&e.apply(this,arguments),a.dequeue(this)}})})},a.fn.extend({_addClass:a.fn.addClass,addClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{add:b},c,d,e]):this._addClass(b)},_removeClass:a.fn.removeClass,removeClass:function(b,c,d,e){return c?a.effects.animateClass.apply(this,[{remove:b},c,d,e]):this._removeClass(b)},_toggleClass:a.fn.toggleClass,toggleClass:function(c,d,e,f,g){return typeof d=="boolean"||d===b?e?a.effects.animateClass.apply(this,[d?{add:c}:{remove:c},e,f,g]):this._toggleClass(c,d):a.effects.animateClass.apply(this,[{toggle:c},d,e,f])},switchClass:function(b,c,d,e,f){return a.effects.animateClass.apply(this,[{add:c,remove:b},d,e,f])}}),a.extend(a.effects,{version:"1.8.18",save:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.data("ec.storage."+b[c],a[0].style[b[c]])},restore:function(a,b){for(var c=0;c<b.length;c++)b[c]!==null&&a.css(b[c],a.data("ec.storage."+b[c]))},setMode:function(a,b){b=="toggle"&&(b=a.is(":hidden")?"show":"hide");return b},getBaseline:function(a,b){var c,d;switch(a[0]){case"top":c=0;break;case"middle":c=.5;break;case"bottom":c=1;break;default:c=a[0]/b.height}switch(a[1]){case"left":d=0;break;case"center":d=.5;break;case"right":d=1;break;default:d=a[1]/b.width}return{x:d,y:c}},createWrapper:function(b){if(b.parent().is(".ui-effects-wrapper"))return b.parent();var c={width:b.outerWidth(!0),height:b.outerHeight(!0),"float":b.css("float")},d=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e=document.activeElement;b.wrap(d),(b[0]===e||a.contains(b[0],e))&&a(e).focus(),d=b.parent(),b.css("position")=="static"?(d.css({position:"relative"}),b.css({position:"relative"})):(a.extend(c,{position:b.css("position"),zIndex:b.css("z-index")}),a.each(["top","left","bottom","right"],function(a,d){c[d]=b.css(d),isNaN(parseInt(c[d],10))&&(c[d]="auto")}),b.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"}));return d.css(c).show()},removeWrapper:function(b){var c,d=document.activeElement;if(b.parent().is(".ui-effects-wrapper")){c=b.parent().replaceWith(b),(b[0]===d||a.contains(b[0],d))&&a(d).focus();return c}return b},setTransition:function(b,c,d,e){e=e||{},a.each(c,function(a,c){unit=b.cssUnit(c),unit[0]>0&&(e[c]=unit[0]*d+unit[1])});return e}}),a.fn.extend({effect:function(b,c,d,e){var f=k.apply(this,arguments),g={options:f[1],duration:f[2],callback:f[3]},h=g.options.mode,i=a.effects[b];if(a.fx.off||!i)return h?this[h](g.duration,g.callback):this.each(function(){g.callback&&g.callback.call(this)});return i.call(this,g)},_show:a.fn.show,show:function(a){if(l(a))return this._show.apply(this,arguments);var b=k.apply(this,arguments);b[1].mode="show";return this.effect.apply(this,b)},_hide:a.fn.hide,hide:function(a){if(l(a))return this._hide.apply(this,arguments);var b=k.apply(this,arguments);b[1].mode="hide";return this.effect.apply(this,b)},__toggle:a.fn.toggle,toggle:function(b){if(l(b)||typeof b=="boolean"||a.isFunction(b))return this.__toggle.apply(this,arguments);var c=k.apply(this,arguments);c[1].mode="toggle";return this.effect.apply(this,c)},cssUnit:function(b){var c=this.css(b),d=[];a.each(["em","px","%","pt"],function(a,b){c.indexOf(b)>0&&(d=[parseFloat(c),b])});return d}}),a.easing.jswing=a.easing.swing,a.extend(a.easing,{def:"easeOutQuad",swing:function(b,c,d,e,f){return a.easing[a.easing.def](b,c,d,e,f)},easeInQuad:function(a,b,c,d,e){return d*(b/=e)*b+c},easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c},easeInOutQuad:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b+c;return-d/2*(--b*(b-2)-1)+c},easeInCubic:function(a,b,c,d,e){return d*(b/=e)*b*b+c},easeOutCubic:function(a,b,c,d,e){return d*((b=b/e-1)*b*b+1)+c},easeInOutCubic:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b+c;return d/2*((b-=2)*b*b+2)+c},easeInQuart:function(a,b,c,d,e){return d*(b/=e)*b*b*b+c},easeOutQuart:function(a,b,c,d,e){return-d*((b=b/e-1)*b*b*b-1)+c},easeInOutQuart:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b*b+c;return-d/2*((b-=2)*b*b*b-2)+c},easeInQuint:function(a,b,c,d,e){return d*(b/=e)*b*b*b*b+c},easeOutQuint:function(a,b,c,d,e){return d*((b=b/e-1)*b*b*b*b+1)+c},easeInOutQuint:function(a,b,c,d,e){if((b/=e/2)<1)return d/2*b*b*b*b*b+c;return d/2*((b-=2)*b*b*b*b+2)+c},easeInSine:function(a,b,c,d,e){return-d*Math.cos(b/e*(Math.PI/2))+d+c},easeOutSine:function(a,b,c,d,e){return d*Math.sin(b/e*(Math.PI/2))+c},easeInOutSine:function(a,b,c,d,e){return-d/2*(Math.cos(Math.PI*b/e)-1)+c},easeInExpo:function(a,b,c,d,e){return b==0?c:d*Math.pow(2,10*(b/e-1))+c},easeOutExpo:function(a,b,c,d,e){return b==e?c+d:d*(-Math.pow(2,-10*b/e)+1)+c},easeInOutExpo:function(a,b,c,d,e){if(b==0)return c;if(b==e)return c+d;if((b/=e/2)<1)return d/2*Math.pow(2,10*(b-1))+c;return d/2*(-Math.pow(2,-10*--b)+2)+c},easeInCirc:function(a,b,c,d,e){return-d*(Math.sqrt(1-(b/=e)*b)-1)+c},easeOutCirc:function(a,b,c,d,e){return d*Math.sqrt(1-(b=b/e-1)*b)+c},easeInOutCirc:function(a,b,c,d,e){if((b/=e/2)<1)return-d/2*(Math.sqrt(1-b*b)-1)+c;return d/2*(Math.sqrt(1-(b-=2)*b)+1)+c},easeInElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g))+c},easeOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e)==1)return c+d;g||(g=e*.3);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*b)*Math.sin((b*e-f)*2*Math.PI/g)+d+c},easeInOutElastic:function(a,b,c,d,e){var f=1.70158,g=0,h=d;if(b==0)return c;if((b/=e/2)==2)return c+d;g||(g=e*.3*1.5);if(h<Math.abs(d)){h=d;var f=g/4}else var f=g/(2*Math.PI)*Math.asin(d/h);if(b<1)return-0.5*h*Math.pow(2,10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)+c;return h*Math.pow(2,-10*(b-=1))*Math.sin((b*e-f)*2*Math.PI/g)*.5+d+c},easeInBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);return e*(c/=f)*c*((g+1)*c-g)+d},easeOutBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);return e*((c=c/f-1)*c*((g+1)*c+g)+1)+d},easeInOutBack:function(a,c,d,e,f,g){g==b&&(g=1.70158);if((c/=f/2)<1)return e/2*c*c*(((g*=1.525)+1)*c-g)+d;return e/2*((c-=2)*c*(((g*=1.525)+1)*c+g)+2)+d},easeInBounce:function(b,c,d,e,f){return e-a.easing.easeOutBounce(b,f-c,0,e,f)+d},easeOutBounce:function(a,b,c,d,e){return(b/=e)<1/2.75?d*7.5625*b*b+c:b<2/2.75?d*(7.5625*(b-=1.5/2.75)*b+.75)+c:b<2.5/2.75?d*(7.5625*(b-=2.25/2.75)*b+.9375)+c:d*(7.5625*(b-=2.625/2.75)*b+.984375)+c},easeInOutBounce:function(b,c,d,e,f){if(c<f/2)return a.easing.easeInBounce(b,c*2,0,e,f)*.5+d;return a.easing.easeOutBounce(b,c*2-f,0,e,f)*.5+e*.5+d}})}(jQuery);/*
+ * jQuery UI Effects Blind 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.blind=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"vertical";a.effects.save(c,d),c.show();var g=a.effects.createWrapper(c).css({overflow:"hidden"}),h=f=="vertical"?"height":"width",i=f=="vertical"?g.height():g.width();e=="show"&&g.css(h,0);var j={};j[h]=e=="show"?i:0,g.animate(j,b.duration,b.options.easing,function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Bounce 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.bounce=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"effect"),f=b.options.direction||"up",g=b.options.distance||20,h=b.options.times||5,i=b.duration||250;/show|hide/.test(e)&&d.push("opacity"),a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var j=f=="up"||f=="down"?"top":"left",k=f=="up"||f=="left"?"pos":"neg",g=b.options.distance||(j=="top"?c.outerHeight({margin:!0})/3:c.outerWidth({margin:!0})/3);e=="show"&&c.css("opacity",0).css(j,k=="pos"?-g:g),e=="hide"&&(g=g/(h*2)),e!="hide"&&h--;if(e=="show"){var l={opacity:1};l[j]=(k=="pos"?"+=":"-=")+g,c.animate(l,i/2,b.options.easing),g=g/2,h--}for(var m=0;m<h;m++){var n={},p={};n[j]=(k=="pos"?"-=":"+=")+g,p[j]=(k=="pos"?"+=":"-=")+g,c.animate(n,i/2,b.options.easing).animate(p,i/2,b.options.easing),g=e=="hide"?g*2:g/2}if(e=="hide"){var l={opacity:0};l[j]=(k=="pos"?"-=":"+=")+g,c.animate(l,i/2,b.options.easing,function(){c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)})}else{var n={},p={};n[j]=(k=="pos"?"-=":"+=")+g,p[j]=(k=="pos"?"+=":"-=")+g,c.animate(n,i/2,b.options.easing).animate(p,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)})}c.queue("fx",function(){c.dequeue()}),c.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Clip 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.clip=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","height","width"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"vertical";a.effects.save(c,d),c.show();var g=a.effects.createWrapper(c).css({overflow:"hidden"}),h=c[0].tagName=="IMG"?g:c,i={size:f=="vertical"?"height":"width",position:f=="vertical"?"top":"left"},j=f=="vertical"?h.height():h.width();e=="show"&&(h.css(i.size,0),h.css(i.position,j/2));var k={};k[i.size]=e=="show"?j:0,k[i.position]=e=="show"?0:j/2,h.animate(k,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Drop 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.drop=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","opacity"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.direction||"left";a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var g=f=="up"||f=="down"?"top":"left",h=f=="up"||f=="left"?"pos":"neg",i=b.options.distance||(g=="top"?c.outerHeight({margin:!0})/2:c.outerWidth({margin:!0})/2);e=="show"&&c.css("opacity",0).css(g,h=="pos"?-i:i);var j={opacity:e=="show"?1:0};j[g]=(e=="show"?h=="pos"?"+=":"-=":h=="pos"?"-=":"+=")+i,c.animate(j,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Explode 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.explode=function(b){return this.queue(function(){var c=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3,d=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=b.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":b.options.mode;var e=a(this).show().css("visibility","hidden"),f=e.offset();f.top-=parseInt(e.css("marginTop"),10)||0,f.left-=parseInt(e.css("marginLeft"),10)||0;var g=e.outerWidth(!0),h=e.outerHeight(!0);for(var i=0;i<c;i++)for(var j=0;j<d;j++)e.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(g/d),top:-i*(h/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/d,height:h/c,left:f.left+j*(g/d)+(b.options.mode=="show"?(j-Math.floor(d/2))*(g/d):0),top:f.top+i*(h/c)+(b.options.mode=="show"?(i-Math.floor(c/2))*(h/c):0),opacity:b.options.mode=="show"?0:1}).animate({left:f.left+j*(g/d)+(b.options.mode=="show"?0:(j-Math.floor(d/2))*(g/d)),top:f.top+i*(h/c)+(b.options.mode=="show"?0:(i-Math.floor(c/2))*(h/c)),opacity:b.options.mode=="show"?1:0},b.duration||500);setTimeout(function(){b.options.mode=="show"?e.css({visibility:"visible"}):e.css({visibility:"visible"}).hide(),b.callback&&b.callback.apply(e[0]),e.dequeue(),a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);/*
+ * jQuery UI Effects Fade 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.fade=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"hide");c.animate({opacity:d},{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Fold 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.fold=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"hide"),f=b.options.size||15,g=!!b.options.horizFirst,h=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(c,d),c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),j=e=="show"!=g,k=j?["width","height"]:["height","width"],l=j?[i.width(),i.height()]:[i.height(),i.width()],m=/([0-9]+)%/.exec(f);m&&(f=parseInt(m[1],10)/100*l[e=="hide"?0:1]),e=="show"&&i.css(g?{height:0,width:f}:{height:f,width:0});var n={},p={};n[k[0]]=e=="show"?l[0]:f,p[k[1]]=e=="show"?l[1]:0,i.animate(n,h,b.options.easing).animate(p,h,b.options.easing,function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Highlight 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.highlight=function(b){return this.queue(function(){var c=a(this),d=["backgroundImage","backgroundColor","opacity"],e=a.effects.setMode(c,b.options.mode||"show"),f={backgroundColor:c.css("backgroundColor")};e=="hide"&&(f.opacity=0),a.effects.save(c,d),c.show().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}).animate(f,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),e=="show"&&!a.support.opacity&&this.style.removeAttribute("filter"),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Pulsate 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.pulsate=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"show");times=(b.options.times||5)*2-1,duration=b.duration?b.duration/2:a.fx.speeds._default/2,isVisible=c.is(":visible"),animateTo=0,isVisible||(c.css("opacity",0).show(),animateTo=1),(d=="hide"&&isVisible||d=="show"&&!isVisible)&&times--;for(var e=0;e<times;e++)c.animate({opacity:animateTo},duration,b.options.easing),animateTo=(animateTo+1)%2;c.animate({opacity:animateTo},duration,b.options.easing,function(){animateTo==0&&c.hide(),b.callback&&b.callback.apply(this,arguments)}),c.queue("fx",function(){c.dequeue()}).dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Scale 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.puff=function(b){return this.queue(function(){var c=a(this),d=a.effects.setMode(c,b.options.mode||"hide"),e=parseInt(b.options.percent,10)||150,f=e/100,g={height:c.height(),width:c.width()};a.extend(b.options,{fade:!0,mode:d,percent:d=="hide"?e:100,from:d=="hide"?g:{height:g.height*f,width:g.width*f}}),c.effect("scale",b.options,b.duration,b.callback),c.dequeue()})},a.effects.scale=function(b){return this.queue(function(){var c=a(this),d=a.extend(!0,{},b.options),e=a.effects.setMode(c,b.options.mode||"effect"),f=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:e=="hide"?0:100),g=b.options.direction||"both",h=b.options.origin;e!="effect"&&(d.origin=h||["middle","center"],d.restore=!0);var i={height:c.height(),width:c.width()};c.from=b.options.from||(e=="show"?{height:0,width:0}:i);var j={y:g!="horizontal"?f/100:1,x:g!="vertical"?f/100:1};c.to={height:i.height*j.y,width:i.width*j.x},b.options.fade&&(e=="show"&&(c.from.opacity=0,c.to.opacity=1),e=="hide"&&(c.from.opacity=1,c.to.opacity=0)),d.from=c.from,d.to=c.to,d.mode=e,c.effect("size",d,b.duration,b.callback),c.dequeue()})},a.effects.size=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right","width","height","overflow","opacity"],e=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],g=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],i=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],j=a.effects.setMode(c,b.options.mode||"effect"),k=b.options.restore||!1,l=b.options.scale||"both",m=b.options.origin,n={height:c.height(),width:c.width()};c.from=b.options.from||n,c.to=b.options.to||n;if(m){var p=a.effects.getBaseline(m,n);c.from.top=(n.height-c.from.height)*p.y,c.from.left=(n.width-c.from.width)*p.x,c.to.top=(n.height-c.to.height)*p.y,c.to.left=(n.width-c.to.width)*p.x}var q={from:{y:c.from.height/n.height,x:c.from.width/n.width},to:{y:c.to.height/n.height,x:c.to.width/n.width}};if(l=="box"||l=="both")q.from.y!=q.to.y&&(d=d.concat(h),c.from=a.effects.setTransition(c,h,q.from.y,c.from),c.to=a.effects.setTransition(c,h,q.to.y,c.to)),q.from.x!=q.to.x&&(d=d.concat(i),c.from=a.effects.setTransition(c,i,q.from.x,c.from),c.to=a.effects.setTransition(c,i,q.to.x,c.to));(l=="content"||l=="both")&&q.from.y!=q.to.y&&(d=d.concat(g),c.from=a.effects.setTransition(c,g,q.from.y,c.from),c.to=a.effects.setTransition(c,g,q.to.y,c.to)),a.effects.save(c,k?d:e),c.show(),a.effects.createWrapper(c),c.css("overflow","hidden").css(c.from);if(l=="content"||l=="both")h=h.concat(["marginTop","marginBottom"]).concat(g),i=i.concat(["marginLeft","marginRight"]),f=d.concat(h).concat(i),c.find("*[width]").each(function(){child=a(this),k&&a.effects.save(child,f);var c={height:child.height(),width:child.width()};child.from={height:c.height*q.from.y,width:c.width*q.from.x},child.to={height:c.height*q.to.y,width:c.width*q.to.x},q.from.y!=q.to.y&&(child.from=a.effects.setTransition(child,h,q.from.y,child.from),child.to=a.effects.setTransition(child,h,q.to.y,child.to)),q.from.x!=q.to.x&&(child.from=a.effects.setTransition(child,i,q.from.x,child.from),child.to=a.effects.setTransition(child,i,q.to.x,child.to)),child.css(child.from),child.animate(child.to,b.duration,b.options.easing,function(){k&&a.effects.restore(child,f)})});c.animate(c.to,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){c.to.opacity===0&&c.css("opacity",c.from.opacity),j=="hide"&&c.hide(),a.effects.restore(c,k?d:e),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Shake 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.shake=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"effect"),f=b.options.direction||"left",g=b.options.distance||20,h=b.options.times||3,i=b.duration||b.options.duration||140;a.effects.save(c,d),c.show(),a.effects.createWrapper(c);var j=f=="up"||f=="down"?"top":"left",k=f=="up"||f=="left"?"pos":"neg",l={},m={},n={};l[j]=(k=="pos"?"-=":"+=")+g,m[j]=(k=="pos"?"+=":"-=")+g*2,n[j]=(k=="pos"?"-=":"+=")+g*2,c.animate(l,i,b.options.easing);for(var p=1;p<h;p++)c.animate(m,i,b.options.easing).animate(n,i,b.options.easing);c.animate(m,i,b.options.easing).animate(l,i/2,b.options.easing,function(){a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments)}),c.queue("fx",function(){c.dequeue()}),c.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Slide 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.slide=function(b){return this.queue(function(){var c=a(this),d=["position","top","bottom","left","right"],e=a.effects.setMode(c,b.options.mode||"show"),f=b.options.direction||"left";a.effects.save(c,d),c.show(),a.effects.createWrapper(c).css({overflow:"hidden"});var g=f=="up"||f=="down"?"top":"left",h=f=="up"||f=="left"?"pos":"neg",i=b.options.distance||(g=="top"?c.outerHeight({margin:!0}):c.outerWidth({margin:!0}));e=="show"&&c.css(g,h=="pos"?isNaN(i)?"-"+i:-i:i);var j={};j[g]=(e=="show"?h=="pos"?"+=":"-=":h=="pos"?"-=":"+=")+i,c.animate(j,{queue:!1,duration:b.duration,easing:b.options.easing,complete:function(){e=="hide"&&c.hide(),a.effects.restore(c,d),a.effects.removeWrapper(c),b.callback&&b.callback.apply(this,arguments),c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Transfer 1.8.18
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */(function(a,b){a.effects.transfer=function(b){return this.queue(function(){var c=a(this),d=a(b.options.to),e=d.offset(),f={top:e.top,left:e.left,height:d.innerHeight(),width:d.innerWidth()},g=c.offset(),h=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:g.top,left:g.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(f,b.duration,b.options.easing,function(){h.remove(),b.callback&&b.callback.apply(c[0],arguments),c.dequeue()})})}})(jQuery);
\ No newline at end of file
diff --git a/htdocs/js/jquery-ui-timepicker-addon.js b/htdocs/js/jquery-ui-timepicker-addon.js
new file mode 100644
index 0000000000..f83839ee48
--- /dev/null
+++ b/htdocs/js/jquery-ui-timepicker-addon.js
@@ -0,0 +1,1326 @@
+/*
+* jQuery timepicker addon
+* By: Trent Richardson [http://trentrichardson.com]
+* Version 0.9.9
+* Last Modified: 02/05/2012
+* 
+* Copyright 2012 Trent Richardson
+* Dual licensed under the MIT and GPL licenses.
+* http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
+* http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
+* 
+* HERES THE CSS:
+* .ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+* .ui-timepicker-div dl { text-align: left; }
+* .ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+* .ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+* .ui-timepicker-div td { font-size: 90%; }
+* .ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+*/
+
+(function($) {
+
+$.extend($.ui, { timepicker: { version: "0.9.9" } });
+
+/* Time picker manager.
+   Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+   Settings for (groups of) time pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Timepicker() {
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		currentText: 'Now',
+		closeText: 'Done',
+		ampm: false,
+		amNames: ['AM', 'A'],
+		pmNames: ['PM', 'P'],
+		timeFormat: 'hh:mm tt',
+		timeSuffix: '',
+		timeOnlyTitle: 'Choose Time',
+		timeText: 'Time',
+		hourText: 'Hour',
+		minuteText: 'Minute',
+		secondText: 'Second',
+		millisecText: 'Millisecond',
+		timezoneText: 'Time Zone'
+	};
+	this._defaults = { // Global defaults for all the datetime picker instances
+		showButtonPanel: true,
+		timeOnly: false,
+		showHour: true,
+		showMinute: true,
+		showSecond: false,
+		showMillisec: false,
+		showTimezone: false,
+		showTime: true,
+		stepHour: 1,
+		stepMinute: 1,
+		stepSecond: 1,
+		stepMillisec: 1,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		timezone: '+0000',
+		hourMin: 0,
+		minuteMin: 0,
+		secondMin: 0,
+		millisecMin: 0,
+		hourMax: 23,
+		minuteMax: 59,
+		secondMax: 59,
+		millisecMax: 999,
+		minDateTime: null,
+		maxDateTime: null,
+		onSelect: null,
+		hourGrid: 0,
+		minuteGrid: 0,
+		secondGrid: 0,
+		millisecGrid: 0,
+		alwaysSetTime: true,
+		separator: ' ',
+		altFieldTimeOnly: true,
+		showTimepicker: true,
+		timezoneIso8609: false,
+		timezoneList: null,
+		addSliderAccess: false,
+		sliderAccessArgs: null
+	};
+	$.extend(this._defaults, this.regional['']);
+};
+
+$.extend(Timepicker.prototype, {
+	$input: null,
+	$altInput: null,
+	$timeObj: null,
+	inst: null,
+	hour_slider: null,
+	minute_slider: null,
+	second_slider: null,
+	millisec_slider: null,
+	timezone_select: null,
+	hour: 0,
+	minute: 0,
+	second: 0,
+	millisec: 0,
+	timezone: '+0000',
+	hourMinOriginal: null,
+	minuteMinOriginal: null,
+	secondMinOriginal: null,
+	millisecMinOriginal: null,
+	hourMaxOriginal: null,
+	minuteMaxOriginal: null,
+	secondMaxOriginal: null,
+	millisecMaxOriginal: null,
+	ampm: '',
+	formattedDate: '',
+	formattedTime: '',
+	formattedDateTime: '',
+	timezoneList: null,
+
+	/* Override the default settings for all instances of the time picker.
+	   @param  settings  object - the new settings to use as defaults (anonymous object)
+	   @return the manager object */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	//########################################################################
+	// Create a new Timepicker instance
+	//########################################################################
+	_newInst: function($input, o) {
+		var tp_inst = new Timepicker(),
+			inlineSettings = {};
+			
+		for (var attrName in this._defaults) {
+			var attrValue = $input.attr('time:' + attrName);
+			if (attrValue) {
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, {
+			beforeShow: function(input, dp_inst) {
+				if ($.isFunction(o.beforeShow))
+					return o.beforeShow(input, dp_inst, tp_inst);
+			},
+			onChangeMonthYear: function(year, month, dp_inst) {
+				// Update the time as well : this prevents the time from disappearing from the $input field.
+				tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onChangeMonthYear))
+					o.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+			},
+			onClose: function(dateText, dp_inst) {
+				if (tp_inst.timeDefined === true && $input.val() != '')
+					tp_inst._updateDateTime(dp_inst);
+				if ($.isFunction(o.onClose))
+					o.onClose.call($input[0], dateText, dp_inst, tp_inst);
+			},
+			timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+		});
+		tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) { return val.toUpperCase() });
+		tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) { return val.toUpperCase() });
+
+		if (tp_inst._defaults.timezoneList === null) {
+			var timezoneList = [];
+			for (var i = -11; i <= 12; i++)
+				timezoneList.push((i >= 0 ? '+' : '-') + ('0' + Math.abs(i).toString()).slice(-2) + '00');
+			if (tp_inst._defaults.timezoneIso8609)
+				timezoneList = $.map(timezoneList, function(val) {
+					return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
+				});
+			tp_inst._defaults.timezoneList = timezoneList;
+		}
+
+		tp_inst.hour = tp_inst._defaults.hour;
+		tp_inst.minute = tp_inst._defaults.minute;
+		tp_inst.second = tp_inst._defaults.second;
+		tp_inst.millisec = tp_inst._defaults.millisec;
+		tp_inst.ampm = '';
+		tp_inst.$input = $input;
+
+		if (o.altField)
+			tp_inst.$altInput = $(o.altField)
+				.css({ cursor: 'pointer' })
+				.focus(function(){ $input.trigger("focus"); });
+		
+		if(tp_inst._defaults.minDate==0 || tp_inst._defaults.minDateTime==0)
+		{
+			tp_inst._defaults.minDate=new Date();
+		}
+		if(tp_inst._defaults.maxDate==0 || tp_inst._defaults.maxDateTime==0)
+		{
+			tp_inst._defaults.maxDate=new Date();
+		}
+		
+		// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+		if(tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date)
+			tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+		if(tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date)
+			tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+		if(tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date)
+			tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+		if(tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date)
+			tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+		return tp_inst;
+	},
+
+	//########################################################################
+	// add our sliders to the calendar
+	//########################################################################
+	_addTimePicker: function(dp_inst) {
+		var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ?
+				this.$input.val() + ' ' + this.$altInput.val() : 
+				this.$input.val();
+
+		this.timeDefined = this._parseTime(currDT);
+		this._limitMinMaxDateTime(dp_inst, false);
+		this._injectTimePicker();
+	},
+
+	//########################################################################
+	// parse the time string from input value or _setTime
+	//########################################################################
+	_parseTime: function(timeString, withDate) {
+		var regstr = this._defaults.timeFormat.toString()
+				.replace(/h{1,2}/ig, '(\\d?\\d)')
+				.replace(/m{1,2}/ig, '(\\d?\\d)')
+				.replace(/s{1,2}/ig, '(\\d?\\d)')
+				.replace(/l{1}/ig, '(\\d?\\d?\\d)')
+				.replace(/t{1,2}/ig, this._getPatternAmpm())
+				.replace(/z{1}/ig, '(z|[-+]\\d\\d:?\\d\\d)?')
+				.replace(/\s/g, '\\s?') + this._defaults.timeSuffix + '$',
+			order = this._getFormatPositions(),
+			ampm = '',
+			treg;
+
+		if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+
+		if (withDate || !this._defaults.timeOnly) {
+			// the time should come after x number of characters and a space.
+			// x = at least the length of text specified by the date format
+			var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+			// escape special regex characters in the seperator
+			var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g");
+			regstr = '^.{' + dp_dateFormat.length + ',}?' + this._defaults.separator.replace(specials, "\\$&") + regstr;
+		}
+		
+		treg = timeString.match(new RegExp(regstr, 'i'));
+
+		if (treg) {
+			if (order.t !== -1) {
+				if (treg[order.t] === undefined || treg[order.t].length === 0) {
+					ampm = '';
+					this.ampm = '';
+				} else {
+					ampm = $.inArray(treg[order.t].toUpperCase(), this.amNames) !== -1 ? 'AM' : 'PM';
+					this.ampm = this._defaults[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
+				}
+			}
+
+			if (order.h !== -1) {
+				if (ampm == 'AM' && treg[order.h] == '12')
+					this.hour = 0; // 12am = 0 hour
+				else if (ampm == 'PM' && treg[order.h] != '12')
+					this.hour = (parseFloat(treg[order.h]) + 12).toFixed(0); // 12pm = 12 hour, any other pm = hour + 12
+				else this.hour = Number(treg[order.h]);
+			}
+
+			if (order.m !== -1) this.minute = Number(treg[order.m]);
+			if (order.s !== -1) this.second = Number(treg[order.s]);
+			if (order.l !== -1) this.millisec = Number(treg[order.l]);
+			if (order.z !== -1 && treg[order.z] !== undefined) {
+				var tz = treg[order.z].toUpperCase();
+				switch (tz.length) {
+				case 1:	// Z
+					tz = this._defaults.timezoneIso8609 ? 'Z' : '+0000';
+					break;
+				case 5:	// +hhmm
+					if (this._defaults.timezoneIso8609)
+						tz = tz.substring(1) == '0000'
+						   ? 'Z'
+						   : tz.substring(0, 3) + ':' + tz.substring(3);
+					break;
+				case 6:	// +hh:mm
+					if (!this._defaults.timezoneIso8609)
+						tz = tz == 'Z' || tz.substring(1) == '00:00'
+						   ? '+0000'
+						   : tz.replace(/:/, '');
+					else if (tz.substring(1) == '00:00')
+						tz = 'Z';
+					break;
+				}
+				this.timezone = tz;
+			}
+			
+			return true;
+
+		}
+		return false;
+	},
+
+	//########################################################################
+	// pattern for standard and localized AM/PM markers
+	//########################################################################
+	_getPatternAmpm: function() {
+		var markers = [];
+			o = this._defaults;
+		if (o.amNames)
+			$.merge(markers, o.amNames);
+		if (o.pmNames)
+			$.merge(markers, o.pmNames);
+		markers = $.map(markers, function(val) { return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&') });
+		return '(' + markers.join('|') + ')?';
+	},
+
+	//########################################################################
+	// figure out position of time elements.. cause js cant do named captures
+	//########################################################################
+	_getFormatPositions: function() {
+		var finds = this._defaults.timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z)/g),
+			orders = { h: -1, m: -1, s: -1, l: -1, t: -1, z: -1 };
+
+		if (finds)
+			for (var i = 0; i < finds.length; i++)
+				if (orders[finds[i].toString().charAt(0)] == -1)
+					orders[finds[i].toString().charAt(0)] = i + 1;
+
+		return orders;
+	},
+
+	//########################################################################
+	// generate and inject html for timepicker into ui datepicker
+	//########################################################################
+	_injectTimePicker: function() {
+		var $dp = this.inst.dpDiv,
+			o = this._defaults,
+			tp_inst = this,
+			// Added by Peter Medeiros:
+			// - Figure out what the hour/minute/second max should be based on the step values.
+			// - Example: if stepMinute is 15, then minMax is 45.
+			hourMax = parseInt((o.hourMax - ((o.hourMax - o.hourMin) % o.stepHour)) ,10),
+			minMax  = parseInt((o.minuteMax - ((o.minuteMax - o.minuteMin) % o.stepMinute)) ,10),
+			secMax  = parseInt((o.secondMax - ((o.secondMax - o.secondMin) % o.stepSecond)) ,10),
+			millisecMax  = parseInt((o.millisecMax - ((o.millisecMax - o.millisecMin) % o.stepMillisec)) ,10),
+			dp_id = this.inst.id.toString().replace(/([^A-Za-z0-9_])/g, '');
+
+		// Prevent displaying twice
+		//if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
+		if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0 && o.showTimepicker) {
+			var noDisplay = ' style="display:none;"',
+				html =	'<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '"><dl>' +
+						'<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' +
+						'<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '"' +
+						((o.showTime) ? '' : noDisplay) + '></dd>' +
+						'<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '>' + o.hourText + '</dt>',
+				hourGridSize = 0,
+				minuteGridSize = 0,
+				secondGridSize = 0,
+				millisecGridSize = 0,
+				size;
+
+ 			// Hours
+			html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + '"' +
+						((o.showHour) ? '' : noDisplay) + '></div>';
+			if (o.showHour && o.hourGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var h = o.hourMin; h <= hourMax; h += parseInt(o.hourGrid,10)) {
+					hourGridSize++;
+					var tmph = (o.ampm && h > 12) ? h-12 : h;
+					if (tmph < 10) tmph = '0' + tmph;
+					if (o.ampm) {
+						if (h == 0) tmph = 12 +'a';
+						else if (h < 12) tmph += 'a';
+						else tmph += 'p';
+					}
+					html += '<td>' + tmph + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Minutes
+			html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '"' +
+					((o.showMinute) ? '' : noDisplay) + '>' + o.minuteText + '</dt>'+
+					'<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + '"' +
+							((o.showMinute) ? '' : noDisplay) + '></div>';
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+				for (var m = o.minuteMin; m <= minMax; m += parseInt(o.minuteGrid,10)) {
+					minuteGridSize++;
+					html += '<td>' + ((m < 10) ? '0' : '') + m + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Seconds
+			html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '"' +
+					((o.showSecond) ? '' : noDisplay) + '>' + o.secondText + '</dt>'+
+					'<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + '"'+
+							((o.showSecond) ? '' : noDisplay) + '></div>';
+
+			if (o.showSecond && o.secondGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var s = o.secondMin; s <= secMax; s += parseInt(o.secondGrid,10)) {
+					secondGridSize++;
+					html += '<td>' + ((s < 10) ? '0' : '') + s + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Milliseconds
+			html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '"' +
+					((o.showMillisec) ? '' : noDisplay) + '>' + o.millisecText + '</dt>'+
+					'<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + '"'+
+							((o.showMillisec) ? '' : noDisplay) + '></div>';
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				html += '<div style="padding-left: 1px"><table><tr>';
+
+				for (var l = o.millisecMin; l <= millisecMax; l += parseInt(o.millisecGrid,10)) {
+					millisecGridSize++;
+					html += '<td>' + ((l < 10) ? '0' : '') + l + '</td>';
+				}
+
+				html += '</tr></table></div>';
+			}
+			html += '</dd>';
+
+			// Timezone
+			html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '"' +
+					((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
+			html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '"'	+
+							((o.showTimezone) ? '' : noDisplay) + '></dd>';
+
+			html += '</dl></div>';
+			$tp = $(html);
+
+				// if we only want time picker...
+			if (o.timeOnly === true) {
+				$tp.prepend(
+					'<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' +
+						'<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' +
+					'</div>');
+				$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+			}
+
+			this.hour_slider = $tp.find('#ui_tpicker_hour_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.hour,
+				min: o.hourMin,
+				max: hourMax,
+				step: o.stepHour,
+				slide: function(event, ui) {
+					tp_inst.hour_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			
+			// Updated by Peter Medeiros:
+			// - Pass in Event and UI instance into slide function
+			this.minute_slider = $tp.find('#ui_tpicker_minute_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.minute,
+				min: o.minuteMin,
+				max: minMax,
+				step: o.stepMinute,
+				slide: function(event, ui) {
+					tp_inst.minute_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.second_slider = $tp.find('#ui_tpicker_second_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.second,
+				min: o.secondMin,
+				max: secMax,
+				step: o.stepSecond,
+				slide: function(event, ui) {
+					tp_inst.second_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.millisec_slider = $tp.find('#ui_tpicker_millisec_'+ dp_id).slider({
+				orientation: "horizontal",
+				value: this.millisec,
+				min: o.millisecMin,
+				max: millisecMax,
+				step: o.stepMillisec,
+				slide: function(event, ui) {
+					tp_inst.millisec_slider.slider( "option", "value", ui.value);
+					tp_inst._onTimeChange();
+				}
+			});
+
+			this.timezone_select = $tp.find('#ui_tpicker_timezone_'+ dp_id).append('<select></select>').find("select");
+			$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function(val, idx) {
+					return $("<option />")
+						.val(typeof val == "object" ? val.value : val)
+						.text(typeof val == "object" ? val.label : val);
+				})
+			);
+			this.timezone_select.val((typeof this.timezone != "undefined" && this.timezone != null && this.timezone != "") ? this.timezone : o.timezone);
+			this.timezone_select.change(function() {
+				tp_inst._onTimeChange();
+			});
+
+			// Add grid functionality
+			if (o.showHour && o.hourGrid > 0) {
+				size = 100 * hourGridSize * o.hourGrid / (hourMax - o.hourMin);
+
+				$tp.find(".ui_tpicker_hour table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * hourGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each( function(index) {
+					$(this).click(function() {
+						var h = $(this).html();
+						if(o.ampm)	{
+							var ap = h.substring(2).toLowerCase(),
+								aph = parseInt(h.substring(0,2), 10);
+							if (ap == 'a') {
+								if (aph == 12) h = 0;
+								else h = aph;
+							} else if (aph == 12) h = 12;
+							else h = aph + 12;
+						}
+						tp_inst.hour_slider.slider("option", "value", h);
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / hourGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMinute && o.minuteGrid > 0) {
+				size = 100 * minuteGridSize * o.minuteGrid / (minMax - o.minuteMin);
+				$tp.find(".ui_tpicker_minute table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * minuteGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.minute_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / minuteGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showSecond && o.secondGrid > 0) {
+				$tp.find(".ui_tpicker_second table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * secondGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.second_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / secondGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			if (o.showMillisec && o.millisecGrid > 0) {
+				$tp.find(".ui_tpicker_millisec table").css({
+					width: size + "%",
+					marginLeft: (size / (-2 * millisecGridSize)) + "%",
+					borderCollapse: 'collapse'
+				}).find("td").each(function(index) {
+					$(this).click(function() {
+						tp_inst.millisec_slider.slider("option", "value", $(this).html());
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+					}).css({
+						cursor: 'pointer',
+						width: (100 / millisecGridSize) + '%',
+						textAlign: 'center',
+						overflow: 'hidden'
+					});
+				});
+			}
+
+			var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+			if ($buttonPanel.length) $buttonPanel.before($tp);
+			else $dp.append($tp);
+
+			this.$timeObj = $tp.find('#ui_tpicker_time_'+ dp_id);
+
+			if (this.inst !== null) {
+				var timeDefined = this.timeDefined;
+				this._onTimeChange();
+				this.timeDefined = timeDefined;
+			}
+
+			//Emulate datepicker onSelect behavior. Call on slidestop.
+			var onSelectDelegate = function() {
+				tp_inst._onSelectHandler();
+			};
+			this.hour_slider.bind('slidestop',onSelectDelegate);
+			this.minute_slider.bind('slidestop',onSelectDelegate);
+			this.second_slider.bind('slidestop',onSelectDelegate);
+			this.millisec_slider.bind('slidestop',onSelectDelegate);
+			
+			// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+			if (this._defaults.addSliderAccess){
+				var sliderAccessArgs = this._defaults.sliderAccessArgs;
+				setTimeout(function(){ // fix for inline mode
+					if($tp.find('.ui-slider-access').length == 0){
+						$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+						// fix any grids since sliders are shorter
+						var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+						if(sliderAccessWidth){
+							$tp.find('table:visible').each(function(){
+								var $g = $(this),
+									oldWidth = $g.outerWidth(),
+									oldMarginLeft = $g.css('marginLeft').toString().replace('%',''),
+									newWidth = oldWidth - sliderAccessWidth,
+									newMarginLeft = ((oldMarginLeft * newWidth)/oldWidth) + '%';
+						
+								$g.css({ width: newWidth, marginLeft: newMarginLeft });
+							});
+						}
+					}
+				},0);
+			}
+			// end slideAccess integration
+			
+		}
+	},
+
+	//########################################################################
+	// This function tries to limit the ability to go outside the
+	// min/max date range
+	//########################################################################
+	_limitMinMaxDateTime: function(dp_inst, adjustSliders){
+		var o = this._defaults,
+			dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+		if(!this._defaults.showTimepicker) return; // No time so nothing to check here
+
+		if($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date){
+			var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+				minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null){
+				this.hourMinOriginal = o.hourMin;
+				this.minuteMinOriginal = o.minuteMin;
+				this.secondMinOriginal = o.secondMin;
+				this.millisecMinOriginal = o.millisecMin;
+			}
+
+			if(dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
+				this._defaults.hourMin = minDateTime.getHours();
+				if (this.hour <= this._defaults.hourMin) {
+					this.hour = this._defaults.hourMin;
+					this._defaults.minuteMin = minDateTime.getMinutes();
+					if (this.minute <= this._defaults.minuteMin) {
+						this.minute = this._defaults.minuteMin;
+						this._defaults.secondMin = minDateTime.getSeconds();
+					} else if (this.second <= this._defaults.secondMin){
+						this.second = this._defaults.secondMin;
+						this._defaults.millisecMin = minDateTime.getMilliseconds();
+					} else {
+						if(this.millisec < this._defaults.millisecMin)
+							this.millisec = this._defaults.millisecMin;
+						this._defaults.millisecMin = this.millisecMinOriginal;
+					}
+				} else {
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+				}
+			}else{
+				this._defaults.hourMin = this.hourMinOriginal;
+				this._defaults.minuteMin = this.minuteMinOriginal;
+				this._defaults.secondMin = this.secondMinOriginal;
+				this._defaults.millisecMin = this.millisecMinOriginal;
+			}
+		}
+
+		if($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date){
+			var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+				maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+			if(this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null){
+				this.hourMaxOriginal = o.hourMax;
+				this.minuteMaxOriginal = o.minuteMax;
+				this.secondMaxOriginal = o.secondMax;
+				this.millisecMaxOriginal = o.millisecMax;
+			}
+
+			if(dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()){
+				this._defaults.hourMax = maxDateTime.getHours();
+				if (this.hour >= this._defaults.hourMax) {
+					this.hour = this._defaults.hourMax;
+					this._defaults.minuteMax = maxDateTime.getMinutes();
+					if (this.minute >= this._defaults.minuteMax) {
+						this.minute = this._defaults.minuteMax;
+						this._defaults.secondMax = maxDateTime.getSeconds();
+					} else if (this.second >= this._defaults.secondMax) {
+						this.second = this._defaults.secondMax;
+						this._defaults.millisecMax = maxDateTime.getMilliseconds();
+					} else {
+						if(this.millisec > this._defaults.millisecMax) this.millisec = this._defaults.millisecMax;
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+					}
+				} else {
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+				}
+			}else{
+				this._defaults.hourMax = this.hourMaxOriginal;
+				this._defaults.minuteMax = this.minuteMaxOriginal;
+				this._defaults.secondMax = this.secondMaxOriginal;
+				this._defaults.millisecMax = this.millisecMaxOriginal;
+			}
+		}
+
+		if(adjustSliders !== undefined && adjustSliders === true){
+			var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)) ,10),
+                minMax  = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)) ,10),
+                secMax  = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)) ,10),
+				millisecMax  = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)) ,10);
+
+			if(this.hour_slider)
+				this.hour_slider.slider("option", { min: this._defaults.hourMin, max: hourMax }).slider('value', this.hour);
+			if(this.minute_slider)
+				this.minute_slider.slider("option", { min: this._defaults.minuteMin, max: minMax }).slider('value', this.minute);
+			if(this.second_slider)
+				this.second_slider.slider("option", { min: this._defaults.secondMin, max: secMax }).slider('value', this.second);
+			if(this.millisec_slider)
+				this.millisec_slider.slider("option", { min: this._defaults.millisecMin, max: millisecMax }).slider('value', this.millisec);
+		}
+
+	},
+
+	
+	//########################################################################
+	// when a slider moves, set the internal time...
+	// on time change is also called when the time is updated in the text field
+	//########################################################################
+	_onTimeChange: function() {
+		var hour   = (this.hour_slider) ? this.hour_slider.slider('value') : false,
+			minute = (this.minute_slider) ? this.minute_slider.slider('value') : false,
+			second = (this.second_slider) ? this.second_slider.slider('value') : false,
+			millisec = (this.millisec_slider) ? this.millisec_slider.slider('value') : false,
+			timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+			o = this._defaults;
+
+		if (typeof(hour) == 'object') hour = false;
+		if (typeof(minute) == 'object') minute = false;
+		if (typeof(second) == 'object') second = false;
+		if (typeof(millisec) == 'object') millisec = false;
+		if (typeof(timezone) == 'object') timezone = false;
+
+		if (hour !== false) hour = parseInt(hour,10);
+		if (minute !== false) minute = parseInt(minute,10);
+		if (second !== false) second = parseInt(second,10);
+		if (millisec !== false) millisec = parseInt(millisec,10);
+
+		var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+		// If the update was done in the input field, the input field should not be updated.
+		// If the update was done using the sliders, update the input field.
+		var hasChanged = (hour != this.hour || minute != this.minute
+				|| second != this.second || millisec != this.millisec
+				|| (this.ampm.length > 0
+				    && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1))
+				|| timezone != this.timezone);
+		
+		if (hasChanged) {
+
+			if (hour !== false)this.hour = hour;
+			if (minute !== false) this.minute = minute;
+			if (second !== false) this.second = second;
+			if (millisec !== false) this.millisec = millisec;
+			if (timezone !== false) this.timezone = timezone;
+			
+			if (!this.inst) this.inst = $.datepicker._getInst(this.$input[0]);
+			
+			this._limitMinMaxDateTime(this.inst, true);
+		}
+		if (o.ampm) this.ampm = ampm;
+		
+		//this._formatTime();
+		this.formattedTime = $.datepicker.formatTime(this._defaults.timeFormat, this, this._defaults);
+		if (this.$timeObj) this.$timeObj.text(this.formattedTime + o.timeSuffix);
+		this.timeDefined = true;
+		if (hasChanged) this._updateDateTime();
+	},
+    
+	//########################################################################
+	// call custom onSelect. 
+	// bind to sliders slidestop, and grid click.
+	//########################################################################
+	_onSelectHandler: function() {
+		var onSelect = this._defaults.onSelect;
+		var inputEl = this.$input ? this.$input[0] : null;
+		if (onSelect && inputEl) {
+			onSelect.apply(inputEl, [this.formattedDateTime, this]);
+		}
+	},
+
+	//########################################################################
+	// left for any backwards compatibility
+	//########################################################################
+	_formatTime: function(time, format) {
+		time = time || { hour: this.hour, minute: this.minute, second: this.second, millisec: this.millisec, ampm: this.ampm, timezone: this.timezone };
+		var tmptime = (format || this._defaults.timeFormat).toString();
+
+		tmptime = $.datepicker.formatTime(tmptime, time, this._defaults);
+		
+		if (arguments.length) return tmptime;
+		else this.formattedTime = tmptime;
+	},
+
+	//########################################################################
+	// update our input with the new date time..
+	//########################################################################
+	_updateDateTime: function(dp_inst) {
+		dp_inst = this.inst || dp_inst;
+		var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+			dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+			formatCfg = $.datepicker._getFormatConfig(dp_inst),
+			timeAvailable = dt !== null && this.timeDefined;
+		this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+		var formattedDateTime = this.formattedDate;
+		if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0))
+			return;
+
+		if (this._defaults.timeOnly === true) {
+			formattedDateTime = this.formattedTime;
+		} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
+			formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+		}
+
+		this.formattedDateTime = formattedDateTime;
+
+		if(!this._defaults.showTimepicker) {
+			this.$input.val(this.formattedDate);
+		} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
+			this.$altInput.val(this.formattedTime);
+			this.$input.val(this.formattedDate);
+		} else if(this.$altInput) {
+			this.$altInput.val(formattedDateTime);
+			this.$input.val(formattedDateTime);
+		} else {
+			this.$input.val(formattedDateTime);
+		}
+		
+		this.$input.trigger("change");
+	}
+
+});
+
+$.fn.extend({
+	//########################################################################
+	// shorthand just to use timepicker..
+	//########################################################################
+	timepicker: function(o) {
+		o = o || {};
+		var tmp_args = arguments;
+
+		if (typeof o == 'object') tmp_args[0] = $.extend(o, { timeOnly: true });
+
+		return $(this).each(function() {
+			$.fn.datetimepicker.apply($(this), tmp_args);
+		});
+	},
+
+	//########################################################################
+	// extend timepicker to datepicker
+	//########################################################################
+	datetimepicker: function(o) {
+		o = o || {};
+		var $input = this,
+		tmp_args = arguments;
+
+		if (typeof(o) == 'string'){
+			if(o == 'getDate') 
+				return $.fn.datepicker.apply($(this[0]), tmp_args);
+			else 
+				return this.each(function() {
+					var $t = $(this);
+					$t.datepicker.apply($t, tmp_args);
+				});
+		}
+		else
+			return this.each(function() {
+				var $t = $(this);
+				$t.datepicker($.timepicker._newInst($t, o)._defaults);
+			});
+	}
+});
+
+//########################################################################
+// format the time all pretty... 
+// format = string format of the time
+// time = a {}, not a Date() for timezones
+// options = essentially the regional[].. amNames, pmNames, ampm
+//########################################################################
+$.datepicker.formatTime = function(format, time, options) {
+	options = options || {};
+	options = $.extend($.timepicker._defaults, options);
+	time = $.extend({hour:0, minute:0, second:0, millisec:0, timezone:'+0000'}, time);
+	
+	var tmptime = format;
+	var ampmName = options['amNames'][0];
+
+	var hour = parseInt(time.hour, 10);
+	if (options.ampm) {
+		if (hour > 11){
+			ampmName = options['pmNames'][0];
+			if(hour > 12)
+				hour = hour % 12;
+		}
+		if (hour === 0)
+			hour = 12;
+	}
+	tmptime = tmptime.replace(/(?:hh?|mm?|ss?|[tT]{1,2}|[lz])/g, function(match) {
+		switch (match.toLowerCase()) {
+			case 'hh': return ('0' + hour).slice(-2);
+			case 'h':  return hour;
+			case 'mm': return ('0' + time.minute).slice(-2);
+			case 'm':  return time.minute;
+			case 'ss': return ('0' + time.second).slice(-2);
+			case 's':  return time.second;
+			case 'l':  return ('00' + time.millisec).slice(-3);
+			case 'z':  return time.timezone;
+			case 't': case 'tt':
+				if (options.ampm) {
+					if (match.length == 1)
+						ampmName = ampmName.charAt(0);
+					return match.charAt(0) == 'T' ? ampmName.toUpperCase() : ampmName.toLowerCase();
+				}
+				return '';
+		}
+	});
+
+	tmptime = $.trim(tmptime);
+	return tmptime;
+}
+
+//########################################################################
+// the bad hack :/ override datepicker so it doesnt close on select
+// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+//########################################################################
+$.datepicker._base_selectDate = $.datepicker._selectDate;
+$.datepicker._selectDate = function (id, dateStr) {
+	var inst = this._getInst($(id)[0]),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		tp_inst._limitMinMaxDateTime(inst, true);
+		inst.inline = inst.stay_open = true;
+		//This way the onSelect handler called from calendarpicker get the full dateTime
+		this._base_selectDate(id, dateStr);
+		inst.inline = inst.stay_open = false;
+		this._notifyChange(inst);
+		this._updateDatepicker(inst);
+	}
+	else this._base_selectDate(id, dateStr);
+};
+
+//#############################################################################################
+// second bad hack :/ override datepicker so it triggers an event when changing the input field
+// and does not redraw the datepicker on every selectDate event
+//#############################################################################################
+$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+$.datepicker._updateDatepicker = function(inst) {
+
+	// don't popup the datepicker if there is another instance already opened
+	var input = inst.input[0];
+	if($.datepicker._curInst &&
+	   $.datepicker._curInst != inst &&
+	   $.datepicker._datepickerShowing &&
+	   $.datepicker._lastInput != input) {
+		return;
+	}
+
+	if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+				
+		this._base_updateDatepicker(inst);
+		
+		// Reload the time control when changing something in the input text field.
+		var tp_inst = this._get(inst, 'timepicker');
+		if(tp_inst) tp_inst._addTimePicker(inst);
+	}
+};
+
+//#######################################################################################
+// third bad hack :/ override datepicker so it allows spaces and colon in the input field
+//#######################################################################################
+$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+$.datepicker._doKeyPress = function(event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if ($.datepicker._get(inst, 'constrainInput')) {
+			var ampm = tp_inst._defaults.ampm,
+				dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+				datetimeChars = tp_inst._defaults.timeFormat.toString()
+								.replace(/[hms]/g, '')
+								.replace(/TT/g, ampm ? 'APM' : '')
+								.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+								.replace(/tT/g, ampm ? 'AaPpMm' : '')
+								.replace(/T/g, ampm ? 'AP' : '')
+								.replace(/tt/g, ampm ? 'apm' : '')
+								.replace(/t/g, ampm ? 'ap' : '') +
+								" " +
+								tp_inst._defaults.separator +
+								tp_inst._defaults.timeSuffix +
+								(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') +
+								(tp_inst._defaults.amNames.join('')) +
+								(tp_inst._defaults.pmNames.join('')) +
+								dateChars,
+				chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+			return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+		}
+	}
+	
+	return $.datepicker._base_doKeyPress(event);
+};
+
+//#######################################################################################
+// Override key up event to sync manual input changes.
+//#######################################################################################
+$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+$.datepicker._doKeyUp = function (event) {
+	var inst = $.datepicker._getInst(event.target),
+		tp_inst = $.datepicker._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
+			try {
+				$.datepicker._updateDatepicker(inst);
+			}
+			catch (err) {
+				$.datepicker.log(err);
+			}
+		}
+	}
+
+	return $.datepicker._base_doKeyUp(event);
+};
+
+//#######################################################################################
+// override "Today" button to also grab the time.
+//#######################################################################################
+$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+$.datepicker._gotoToday = function(id) {
+	var inst = this._getInst($(id)[0]),
+		$dp = inst.dpDiv;
+	this._base_gotoToday(id);
+	var now = new Date();
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst && tp_inst._defaults.showTimezone && tp_inst.timezone_select) {
+		var tzoffset = now.getTimezoneOffset(); // If +0100, returns -60
+		var tzsign = tzoffset > 0 ? '-' : '+';
+		tzoffset = Math.abs(tzoffset);
+		var tzmin = tzoffset % 60;
+		tzoffset = tzsign + ('0' + (tzoffset - tzmin) / 60).slice(-2) + ('0' + tzmin).slice(-2);
+		if (tp_inst._defaults.timezoneIso8609)
+			tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
+		tp_inst.timezone_select.val(tzoffset);
+	}
+	this._setTime(inst, now);
+	$( '.ui-datepicker-today', $dp).click(); 
+};
+
+//#######################################################################################
+// Disable & enable the Time in the datetimepicker
+//#######################################################################################
+$.datepicker._disableTimepickerDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = false;
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+$.datepicker._enableTimepickerDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+	tp_inst = this._get(inst, 'timepicker');
+	$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+	if (tp_inst) {
+		tp_inst._defaults.showTimepicker = true;
+		tp_inst._addTimePicker(inst); // Could be disabled on page load
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create our own set time function
+//#######################################################################################
+$.datepicker._setTime = function(inst, date) {
+	var tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var defaults = tp_inst._defaults,
+			// calling _setTime with no date sets time to defaults
+			hour = date ? date.getHours() : defaults.hour,
+			minute = date ? date.getMinutes() : defaults.minute,
+			second = date ? date.getSeconds() : defaults.second,
+			millisec = date ? date.getMilliseconds() : defaults.millisec;
+
+		//check if within min/max times..
+		if ((hour < defaults.hourMin || hour > defaults.hourMax) || (minute < defaults.minuteMin || minute > defaults.minuteMax) || (second < defaults.secondMin || second > defaults.secondMax) || (millisec < defaults.millisecMin || millisec > defaults.millisecMax)) {
+			hour = defaults.hourMin;
+			minute = defaults.minuteMin;
+			second = defaults.secondMin;
+			millisec = defaults.millisecMin;
+		}
+
+		tp_inst.hour = hour;
+		tp_inst.minute = minute;
+		tp_inst.second = second;
+		tp_inst.millisec = millisec;
+
+		if (tp_inst.hour_slider) tp_inst.hour_slider.slider('value', hour);
+		if (tp_inst.minute_slider) tp_inst.minute_slider.slider('value', minute);
+		if (tp_inst.second_slider) tp_inst.second_slider.slider('value', second);
+		if (tp_inst.millisec_slider) tp_inst.millisec_slider.slider('value', millisec);
+
+		tp_inst._onTimeChange();
+		tp_inst._updateDateTime(inst);
+	}
+};
+
+//#######################################################################################
+// Create new public method to set only time, callable as $().datepicker('setTime', date)
+//#######################################################################################
+$.datepicker._setTimeDatepicker = function(target, date, withDate) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst);
+		var tp_date;
+		if (date) {
+			if (typeof date == "string") {
+				tp_inst._parseTime(date, withDate);
+				tp_date = new Date();
+				tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+			}
+			else tp_date = new Date(date.getTime());
+			if (tp_date.toString() == 'Invalid Date') tp_date = undefined;
+			this._setTime(inst, tp_date);
+		}
+	}
+
+};
+
+//#######################################################################################
+// override setDate() to allow setting time too within Date object
+//#######################################################################################
+$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+$.datepicker._setDateDatepicker = function(target, date) {
+	var inst = this._getInst(target),
+	tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
+
+	this._updateDatepicker(inst);
+	this._base_setDateDatepicker.apply(this, arguments);
+	this._setTimeDatepicker(target, tp_date, true);
+};
+
+//#######################################################################################
+// override getDate() to allow getting time too within Date object
+//#######################################################################################
+$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+$.datepicker._getDateDatepicker = function(target, noDefault) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+
+	if (tp_inst) {
+		this._setDateFromField(inst, noDefault);
+		var date = this._getDate(inst);
+		if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+		return date;
+	}
+	return this._base_getDateDatepicker(target, noDefault);
+};
+
+//#######################################################################################
+// override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+// An option in datapicker to ignore extra format characters would be nicer.
+//#######################################################################################
+$.datepicker._base_parseDate = $.datepicker.parseDate;
+$.datepicker.parseDate = function(format, value, settings) {
+	var date;
+	try {
+		date = this._base_parseDate(format, value, settings);
+	} catch (err) {
+		if (err.indexOf(":") >= 0) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+			date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
+		} else {
+			// The underlying error was not related to the time
+			throw err;
+		}
+	}
+	return date;
+};
+
+//#######################################################################################
+// override formatDate to set date with time to the input
+//#######################################################################################
+$.datepicker._base_formatDate=$.datepicker._formatDate;
+$.datepicker._formatDate = function(inst, day, month, year){
+	var tp_inst = this._get(inst, 'timepicker');
+	if(tp_inst)
+	{
+		if(day)
+			var b = this._base_formatDate(inst, day, month, year);
+		tp_inst._updateDateTime(inst);	
+		return tp_inst.$input.val();
+	}
+	return this._base_formatDate(inst);
+};
+
+//#######################################################################################
+// override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+//#######################################################################################
+$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+$.datepicker._optionDatepicker = function(target, name, value) {
+	var inst = this._getInst(target),
+		tp_inst = this._get(inst, 'timepicker');
+	if (tp_inst) {
+		var min,max,onselect;
+		if (typeof name == 'string') { // if min/max was set with the string
+			if (name==='minDate' || name==='minDateTime' )
+				min = value;
+			else if (name==='maxDate' || name==='maxDateTime')
+				max = value;
+			else if (name==='onSelect')
+				onselect=value;
+		} else if (typeof name == 'object') { //if min/max was set with the JSON
+			if(name.minDate)
+				min = name.minDate;
+			else if (name.minDateTime)
+				min = name.minDateTime;
+			else if (name.maxDate)
+				max = name.maxDate;
+			else if (name.maxDateTime)
+				max = name.maxDateTime;
+		}
+		if(min){ //if min was set
+			if(min==0)
+				min=new Date();
+			else
+				min= new Date(min);
+			
+			tp_inst._defaults.minDate = min;
+			tp_inst._defaults.minDateTime = min;
+		} else if (max){ //if max was set
+			if(max==0)
+				max=new Date();
+			else
+				max= new Date(max);
+			tp_inst._defaults.maxDate = max;
+			tp_inst._defaults.maxDateTime = max;
+		}
+		else if (onselect)
+			tp_inst._defaults.onSelect=onselect;
+	}
+	if (value === undefined)
+		return this._base_optionDatepicker(target, name);
+	return this._base_optionDatepicker(target, name, value);
+};
+
+//#######################################################################################
+// jQuery extend now ignores nulls!
+//#######################################################################################
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] === null || props[name] === undefined)
+			target[name] = props[name];
+	return target;
+};
+
+$.timepicker = new Timepicker(); // singleton instance
+$.timepicker.version = "0.9.9";
+
+})(jQuery);
+

From 10bc017f76e49b6d3c8b6477ae3f7d7edec10235 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 24 Mar 2012 14:13:24 -0400
Subject: [PATCH 08/73] Align ghe3's math3 templates with the changes in master

---
 conf/templates/math3/math3.css       |   6 +-
 conf/templates/math3/system.template | 111 +++++++++++++--------------
 2 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index 1d24caf0f1..1220807061 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -293,7 +293,7 @@ clear: both;
 	padding: 0;
 	margin: 1ex .5em .1ex .1em;
 	font-size: smaller;
-} 
+}
 
 /*Relative Positioning -- a alternate style for the loginstatus which uses relative positioning.  Tested, but was decided that it didn't work great. Feel free to uncomment if you want to try it out.*/
 
@@ -716,7 +716,7 @@ span.gray_button{
 	width: 100%;
 }
 
-Styles specifically for the problem viewer
+/*Styles specifically for the problem viewer*/
 
 #problem_viewer_form{
 	margin-left: 10px;
@@ -758,7 +758,7 @@ Styles specifically for the problem viewer
 	margin-top: 10%;
 	margin-left: 10%;
 	margin-right: 10%;
-}*/
+}
 
 #editor{
 	width: 750px;
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 91e3d0a424..715dd931f9 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -96,67 +96,66 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#else-->
-				 <!--#if can="output_problem_body"--> 
-			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
-					  <div class="Body" style="background-color:#ffffff">
-		
-						<!--#if can="output_custom_edit_message"-->
-							<!--#output_custom_edit_message-->
-						<!--#endif-->
-						<!--#if can="output_summary"-->
-								<!--#output_summary-->
-							</div>
-						<!--#endif-->
-						
-						<!--#if can="output_hidden_info"-->
-							<!--#output_hidden_info-->
-						<!--#endif-->
-						
-						<!--#if can="output_form_start"-->
-							<!--#output_form_start-->
-							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-								<div class="problem">
-									<!--#if can="output_problem_body"-->
-										<!--#output_problem_body-->
-									<!--#endif-->
-									<!--#if can="output_message"-->
-										<!--#output_message-->
-									<!--#endif-->
-									<!--#if can="output_editorLink"-->
-										<!--#output_editorLink-->
-									<!--#endif-->
-								</div>
+			<!--#endif -->
+			<!--#if can="output_problem_body"--> 
+			<!-- ====  print body parts if possible  -->		
+			  <div class="Body" style="background-color:#ffffff">
+			
+				<!--#if can="output_custom_edit_message"-->
+					<!--#output_custom_edit_message-->
+				<!--#endif-->
+				<!--#if can="output_summary"-->
+						<!--#output_summary-->
+				<!--#endif-->
+				
+				<!--#if can="output_hidden_info"-->
+					<!--#output_hidden_info-->
+				<!--#endif-->
+				
+				<!--#if can="output_form_start"-->
+					<!--#output_form_start-->
+					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+						<div class="problem">
+							<!--#if can="output_problem_body"-->
+								<!--#output_problem_body-->
 							<!--#endif-->
-							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-								<p>
-									<!--#if can="output_checkboxes"-->
-										<!--#output_checkboxes-->
-									<!--#endif-->
-									<!--#if can="output_submit_buttons"-->
-										<!--#output_submit_buttons-->
-									<!--#endif-->
-								</p>
+							<!--#if can="output_message"-->
+								<!--#output_message-->
 							<!--#endif-->
-							<!--#if can="output_score_summary"-->
-								<div class="scoreSummary">
-									<!--#output_score_summary-->
-								</div>
+							<!--#if can="output_editorLink"-->
+								<!--#output_editorLink-->
 							<!--#endif-->
-							<!--#if can="output_misc"-->
-								<!--#output_misc-->
+						</div>
+					<!--#endif-->
+					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+						<p>
+							<!--#if can="output_checkboxes"-->
+								<!--#output_checkboxes-->
 							<!--#endif-->
-							</form>
-						<!--#endif-->
+							<!--#if can="output_submit_buttons"-->
+								<!--#output_submit_buttons-->
+							<!--#endif-->
+						</p>
+					<!--#endif-->
+					<!--#if can="output_score_summary"-->
+						<div class="scoreSummary">
+							<!--#output_score_summary-->
+						</div>
+					<!--#endif-->
+					<!--#if can="output_misc"-->
+						<!--#output_misc-->
+					<!--#endif-->
+					</form>
+				</div>	  
+			<!-- ====  end printing body parts   -->
+			<!--#else-->
+			<!-- ==== couldn't print body parts so we'll print entire body -->	
+					  <div class="Body" style="background-color:#ffffff">
+					  <!--#body-->
 					  </div>
-
-				<!--#else-->
-				<!-- ==== couldn't print body parts so we'll print entire body -->	
-						  <div class="Body" style="background-color:#ffffff">
-						  <!--#body-->
-						  </div>
-				<!--#endif-->
-
+			<!-- ==== end printing entire body ===>
+			<!--#endif-->
+			
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->

From a3bd035d78635ae2fc05f207314968fd3fc36796 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 24 Mar 2012 14:16:24 -0400
Subject: [PATCH 09/73] update to use instructor_set_list2 instead of
 instructor_set_list  (fixing problem where ghe3's updates were to
 ProblemSetList.pm and not to ProblemSetList2.pm

---
 .../Instructor/ProblemSetList2.pm             | 142 +++++++++++++++++-
 1 file changed, 134 insertions(+), 8 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm
index 74e53d7415..5e3644fa36 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList2.pm
@@ -499,7 +499,7 @@ sub body {
 	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form", -id=>"edit_form_id"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -2162,7 +2162,7 @@ EOF
 ################################################################################
 
 sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
+	my ($self, $fieldName, $value, $properties, $dateTimeScripts) = @_;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
@@ -2175,7 +2175,116 @@ sub fieldEditHTML {
 	}
 	
 	if ($type eq "number" or $type eq "text") {
-		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+		my $id = $fieldName."_id";
+		my $out = CGI::input({type=>"text", name=>$fieldName, id=>$id, value=>"", size=>$size});
+		my $content = "";
+		my $bareName = "";
+		my $timezone = substr($value, -3);
+		
+		if(index($fieldName, ".open_date") != -1){
+			my @temp = split(/.open_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.open_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testopenDate = new Date(dateText);
+            var testdueDate = new Date(dueDateTextBox.val());
+            if (testopenDate > testdueDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var open = \$(this).datetimepicker('getDate');
+		var open_obj = new Date(open.getTime());
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'minDate', open_obj);
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".due_date") != -1){
+			my @temp = split(/.due_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.due_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+		var openDateTextBox = \$('#$bareName\\\\.open_date_id');
+        var answersDateTextBox = \$('#$bareName\\\\.answer_date_id');
+
+        if (openDateTextBox.val() != '') {
+            var testopenDate = new Date(openDateTextBox.val());
+			var testdueDate = new Date(dateText);
+            if (testopenDate > testdueDate)
+                openDateTextBox.val(dateText);
+        }
+        else {
+            openDateTextBox.val(dateText);
+        }
+
+		if (answersDateTextBox.val() != '') {
+			var testdueDate = new Date(dateText);
+			var testanswersDate = new Date(answersDateTextBox.val());
+			if(testdueDate > testanswersDate)
+				answersDateTextBox.val(dateText);
+		}
+		else {
+			answersDateTextBox.val(dateText);
+		}
+    },
+    onSelect: function (selectedDateTime){
+        var due = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.open_date_id').datetimepicker('option', 'maxDate', new Date(due.getTime()));
+		\$('#$bareName\\\\.answer_date_id').datetimepicker('option', 'minDate', new Date(due.getTime()));
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".answer_date") != -1){
+			my @temp = split(/.answer_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.answer_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testdueDate = new Date(dueDateTextBox.val());
+            var testanswersDate = new Date(dateText);
+            if (testdueDate > testanswersDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var answers = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'maxDate', new Date(answers.getTime()));
+    }
+});
+CONTENT
+		}
+		
+		push @$dateTimeScripts, $content;
+		return $out;
 	}
 	
 	if ($type eq "filelist") {
@@ -2351,6 +2460,10 @@ sub recordEditHTML {
 	# make a hash out of this so we can test membership easily
 	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
 	
+	my @chooseDateTimeScripts = ();
+	
+	push @chooseDateTimeScripts, "addOnLoadEvent(function() {";
+
 	# Set Fields
 	foreach my $field (@fieldsToShow) {
 		next unless exists $nonkeyfields{$field};
@@ -2362,13 +2475,18 @@ sub recordEditHTML {
 		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
 		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /visible/ and not $editMode;
 		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enable_reduced_scoring/ and not $editMode;
-		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties, \@chooseDateTimeScripts));
 		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
-
+	
+	push @chooseDateTimeScripts, "});";
+	
 	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
+	
+	my $out = CGI::Tr({}, CGI::td({}, \@tableCells));
+	my $scripts = CGI::start_script({-type=>"text/javascript"}).(join("", @chooseDateTimeScripts)).CGI::end_script();
 
-	return CGI::Tr({}, CGI::td({}, \@tableCells));
+	return $out.$scripts;
 }
 
 sub printTableHTML {
@@ -2430,9 +2548,9 @@ sub printTableHTML {
 
 	# print the table
 	if ($editMode or $exportMode) {
-		print CGI::start_table({-class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
+		print CGI::start_table({-id=>"set_table_id", -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	} else {
-		print CGI::start_table({-border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
+		print CGI::start_table({-id=>"set_table_id", -border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	}
 	
 	print CGI::caption($r->maketext("Set List"));
@@ -2471,6 +2589,9 @@ sub output_JS{
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-1.8.18.custom.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-timepicker-addon.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/form_checker_hmwksets.js"}), CGI::end_script();
@@ -2484,6 +2605,11 @@ sub output_tabber_CSS{
 	return "";
 }
 
+#Tells template to output stylesheet for Jquery-UI
+sub output_jquery_ui_CSS{
+	return "";
+}
+
 1;
 
 =head1 AUTHOR

From 77a4278e7c408a0806a7ae3dd0bb60c1b6eee111 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 24 Mar 2012 14:19:24 -0400
Subject: [PATCH 10/73] Restore ProblemSetList.pm to master copy.  ghe3's
 changes have been transferred to ProblemSetList2.pm

---
 .../Instructor/ProblemSetList.pm              | 1076 +++++++----------
 1 file changed, 411 insertions(+), 665 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index 0f05d3da9e..ed52a2d741 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -263,7 +263,7 @@ sub pre_header_initialize {
 		my @setsToScore = ();
 	
 		if ($scope eq "none") { 
-			return $r->maketext("No sets selected for scoring".".");
+			return "No sets selected for scoring.";
 		} elsif ($scope eq "all") {
 			@setsToScore = @{ $r->param("allSetIDs") };
 		} elsif ($scope eq "visible") {
@@ -303,7 +303,7 @@ sub initialize {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	########## set initial values for state fields
@@ -336,12 +336,12 @@ sub initialize {
 	
 	$self->{editMode} = $r->param("editMode") || 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify homework sets.")))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets."))
 		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
 	
 	$self->{exportMode} = $r->param("exportMode") || 0;
 
-	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify set definition files.")))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify set definition files."))
 		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
 	
 	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
@@ -372,7 +372,7 @@ sub initialize {
 	$self->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
-			die $r->maketext("Action [_1] not found", $actionID);
+			die "Action $actionID not found";
 		}
 		# Check permissions
 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
@@ -383,17 +383,20 @@ sub initialize {
 			}
 			my %actionParams = $self->getActionParams($actionID);
 			my %tableParams = $self->getTableParams();
-			$self->addmessage(CGI::div({class=>"Message"}, $r->maketext("Results of last action performed").": "));
-			$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
+			$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
+			$self->addmessage(
+			                     $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
+			                     CGI::hr()
+			);
 		} else {
-			return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to perform this action.")));
+			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
 		}
 		
 		
 
 	} else {
 	
-		$self->addgoodmessage($r->maketext("Please select action to be performed."));
+		$self->addgoodmessage("Please select action to be performed.");
 	}
 		
 
@@ -415,7 +418,7 @@ sub body {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	# This table can be consulted when display-ready forms of field names are needed.
@@ -423,6 +426,7 @@ sub body {
 		$setTemplate->FIELDS();
 	
 	@prettyFieldNames{qw(
+		select
 		problems
 		users
 		filename
@@ -435,17 +439,18 @@ sub body {
 		visible
 		enable_reduced_scoring	
 	)} = (
-		$r->maketext("Edit Problems"),
-		$r->maketext("Edit Assigned Users"),
-		$r->maketext("Set Definition Filename"),
-		$r->maketext("Edit Set Data"), 
-		$r->maketext("Set Header"), 
-		$r->maketext("Hardcopy Header"), 
-		$r->maketext("Open Date"), 
-		$r->maketext("Due Date"), 
-		$r->maketext("Answer Date"), 
-		$r->maketext("Visible"),
-		$r->maketext("Reduced Credit Enabled") 
+		"Select",
+		"Edit<br> Problems",
+		"Edit<br> Assigned Users",
+		"Set Definition Filename",
+		"Edit<br> Set Data", 
+		"Set Header", 
+		"Hardcopy Header", 
+		"Open Date", 
+		"Due Date", 
+		"Answer Date", 
+		"Visible",
+		"Reduced Credit<br> Enabled" 
 	);
 	
 
@@ -492,14 +497,9 @@ sub body {
 		@Sets = sort $primarySortSub @Sets;
 	}
 
-	########## print site identifying information
-	
-	print WeBWorK::CGI_labeled_input(-type=>"button", -id=>"show_hide", -input_attr=>{-value=>$r->maketext("Show/Hide Site Description"), -class=>"button_input"});
-	print CGI::p({-id=>"site_description", -style=>"display:none"}, CGI::em($r->maketext("_HMWKSETS_EDITOR_DESCRIPTION")));
-	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form", -id=>"edit_form_id"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -528,10 +528,10 @@ sub body {
 	
 	########## print action forms
 	
-	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the set for ALL students."))) if $editMode;
+	print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students.")) if $editMode;
 
-	# print CGI::start_table({});
-	print CGI::p($r->maketext("Select an action to perform").":");
+	print CGI::start_table({});
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
 
 	my @formsToShow;
 	if ($editMode) {
@@ -545,66 +545,52 @@ sub body {
 	}
 	
 	my $i = 0;
-	my @divArr = ();
-
 	foreach my $actionID (@formsToShow) {
 		# Check permissions
 		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
 		my $actionForm = "${actionID}_form";
-		#my $onChange = "document.problemsetlist.action[$i].checked=true";
-		my $onChange = "";
+		my $onChange = "document.problemsetlist.action[$i].checked=true";
 		my %actionParams = $self->getActionParams($actionID);
 		
-		# print CGI::Tr({-valign=>"top"},
-			# CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
-			# CGI::td({}, $self->$actionForm($onChange, %actionParams))
-		# );
-		
-		my $extraspace = (ucfirst(WeBWorK::split_cap($actionID)) eq "Filter") ? "" : CGI::br();
-		
-		push @divArr, join("",
-			CGI::h3($r->maketext(ucfirst(WeBWorK::split_cap($actionID)))),
-			CGI::span({-class=>"radio_span"}, WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionID."_id", -label_text=>$r->maketext(ucfirst(WeBWorK::split_cap($actionID))), -input_attr=>{-name=>"action", -value=>$actionID}, -label_attr=>{-class=>"radio_label"})),
-			CGI::br(),
-			$self->$actionForm($onChange, %actionParams),
-			CGI::br(),
-			$extraspace,
+		print CGI::Tr({-valign=>"top"},
+			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			CGI::td({}, $self->$actionForm($onChange, %actionParams))
 		);
+		
 		$i++;
 	}
 	
-	my $divArrRef = \@divArr;
-	
-	print CGI::div({-class=>"tabber"},
-		CGI::div({-class=>"tabbertab"},$divArrRef)
-		);
-	
-	my $selectAll =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_all", -input_attr=>{-name=>'check_all', -value=>$r->maketext('Select all sets'),
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all sets',
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                           document.problemsetlist.elements[i].checked = true
 	                       }
 	                    }" });
-   	my $selectNone =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_none", -input_attr=>{-name=>'check_none', -value=>$r->maketext('Unselect all sets'),
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all sets',
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                          document.problemsetlist.elements[i].checked = false
 	                       }
 	                    }" });
 	unless ($editMode or $exportMode) {
-		print $selectAll." ". $selectNone;
+		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+			$selectAll." ". $selectNone
+			)
+		);
 	}
-	print WeBWorK::CGI_labeled_input(-type=>"reset", -id=>"clear_entries", -input_attr=>{-value=>$r->maketext("Clear"), -class=>"button_input"});
-	print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"take_action", -input_attr=>{-value=>$r->maketext("Take Action!"), -class=>"button_input"}).CGI::br().CGI::br();
-
+	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
+		CGI::submit(-value=>"Take Action!"))
+	);
+	print CGI::end_table();
+	
 	########## print table
 	
 	########## first adjust heading if in editMode
-	$prettyFieldNames{set_id} = $r->maketext("Edit All Set Data") if $editMode;
-	$prettyFieldNames{enable_reduced_scoring} = $r->maketext('Enable Reduced Credit') if $editMode;
+	$prettyFieldNames{set_id} = "Edit All <br> Set Data" if $editMode;
+	$prettyFieldNames{enable_reduced_scoring} = 'Enable Reduced<br>Credit' if $editMode;
 	
 	
-	print CGI::p({},$r->maketext("Showing [_1] out of [_2] sets.", scalar @visibleSetIDs, scalar @allSetIDs));
+	print CGI::p({},"Showing ", scalar @visibleSetIDs, " out of ", scalar @allSetIDs, " sets.");
 	
 	$self->printTableHTML(\@Sets, \%prettyFieldNames,
 		editMode => $editMode,
@@ -658,43 +644,58 @@ sub getTableParams {
 
 sub filter_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
-
+	#return CGI::table({}, CGI::Tr({-valign=>"top"},
+	#	CGI::td({}, 
 	return join("", 
-			WeBWorK::CGI_labeled_input(
-				-type=>"select",
-				-id=>"filter_select",
-				-label_text=>$r->maketext("Show which sets?").": ",
-				-input_attr=>{
-					-name => "action.filter.scope",
-					-values => [qw(all none selected match_ids visible unvisible)],
-					-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
-					-labels => {
-						all => $r->maketext("all sets"),
-						none => $r->maketext("no sets"),
-						selected => $r->maketext("selected sets"),
-						visible => $r->maketext("visible sets"),
-						unvisible => $r->maketext("hidden sets"), 
-						match_ids => $r->maketext("enter matching set IDs below"),
-					},
-					-onchange => $onChange,
-				}
+			"Show ",
+			CGI::popup_menu(
+				-name => "action.filter.scope",
+				-values => [qw(all none selected match_ids visible unvisible)],
+				-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
+				-labels => {
+					all => "all sets",
+					none => "no sets",
+					selected => "sets checked below",
+					visible => "sets visible to students",
+					unvisible => "sets hidden from students", 
+					match_ids => "sets with matching set IDs:",
+				},
+				-onchange => $onChange,
 			),
-			CGI::br(),
 			" ",
-			CGI::div({-id=>"filter_elements"},
-			WeBWorK::CGI_labeled_input(
-				-type=>"text",
-				-id=>"filter_text",
-				-label_text=>$r->maketext("Match on what? (separate multiple IDs with commas)").": ",
-				-input_attr=>{
-					-name => "action.filter.set_ids",
-					-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
-					-width => "50",
-					-onchange => $onChange,
-				}
-			), CGI::span({-id=>"filter_err_msg", -class=>"ResultsWithError"}, $r->maketext("Please enter in a value to match in the filter field.")),
+			CGI::textfield(
+				-name => "action.filter.set_ids",
+				-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
+				-width => "50",
+				-onchange => $onChange,
 			),
+			" (separate multiple IDs with commas)",
+			CGI::br(),
+#			"Open dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.open_date",
+#				-values => [ keys %{ $self->{open_dates} } ],
+#				-default => $actionParams{"action.filter.open_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{open_dates}) },
+#				-onchange => $onChange,
+#			),
+#			" Due dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.due_date",
+#				-values => [ keys %{ $self->{due_dates} } ],
+#				-default => $actionParams{"action.filter.due_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{due_dates}) },
+#				-onchange => $onChange,
+#			),
+#			" Answer dates: ",
+#			CGI::popup_menu(
+#				-name => "action.filter.answer_date",
+#				-values => [ keys %{ $self->{answer_dates} } ],
+#				-default => $actionParams{"action.filter.answer_date"}->[0] || "",
+#				-labels => { $self->menuLabels($self->{answer_dates}) },
+#				-onchange => $onChange,
+#			),
+			
 	);
 }
 
@@ -709,18 +710,16 @@ sub filter_handler {
 	my $result;
 	
 	my $scope = $actionParams->{"action.filter.scope"}->[0];
-	
 	if ($scope eq "all") {
-		$result = $r->maketext("showing all sets");
+		$result = "showing all sets";
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "none") {
-		$result = $r->maketext("showing no sets");
+		$result = "showing no sets";
 		$self->{visibleSetIDs} = [];
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("showing selected sets");
+		$result = "showing selected sets";
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	} elsif ($scope eq "match_ids") {
-		#my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		$self->{visibleSetIDs} = \@setIDs;
 	} elsif ($scope eq "match_open_date") {
@@ -749,55 +748,45 @@ sub filter_handler {
 
 sub sort_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 	return join ("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"sort_select_1",
-			-label_text=>$r->maketext("Sort by").": ",
-			-input_attr=>{
-				-name => "action.sort.primary",
-				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-				-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
-				-labels => {
-					set_id		=> $r->maketext("Set Name"),
-					set_header 	=> $r->maketext("Set Header"),
-					hardcopy_header	=> $r->maketext("Hardcopy Header"),
-					open_date	=> $r->maketext("Open Date"),
-					due_date	=> $r->maketext("Due Date"),
-					answer_date	=> $r->maketext("Answer Date"),
-					visible	=> $r->maketext("Visibility"),
-				},
-				-onchange => $onChange,
-			}
+		"Primary sort: ",
+		CGI::popup_menu(
+			-name => "action.sort.primary",
+			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+			-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
+			-labels => {
+				set_id		=> "Set Name",
+				set_header 	=> "Set Header",
+				hardcopy_header	=> "Hardcopy Header",
+				open_date	=> "Open Date",
+				due_date	=> "Due Date",
+				answer_date	=> "Answer Date",
+				visible	=> "Visibility",
+			},
+			-onchange => $onChange,
 		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"sort_select_2",
-			-label_text=>$r->maketext("Then by").": ",
-			-input_attr=>{
-				-name => "action.sort.secondary",
-				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-				-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
-				-labels => {
-					set_id		=> $r->maketext("Set Name"),
-					set_header 	=> $r->maketext("Set Header"),
-					hardcopy_header	=> $r->maketext("Hardcopy Header"),
-					open_date	=> $r->maketext("Open Date"),
-					due_date	=> $r->maketext("Due Date"),
-					answer_date	=> $r->maketext("Answer Date"),
-					visible	=> $r->maketext("Visibility"),
-				},
-				-onchange => $onChange,
-			}
+		" Secondary sort: ",
+		CGI::popup_menu(
+			-name => "action.sort.secondary",
+			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+			-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
+			-labels => {
+				set_id		=> "Set Name",
+				set_header 	=> "Set Header",
+				hardcopy_header	=> "Hardcopy Header",
+				open_date	=> "Open Date",
+				due_date	=> "Due Date",
+				answer_date	=> "Answer Date",
+				visible	=> "Visibility",
+			},
+			-onchange => $onChange,
 		),
+		".",
 	);
 }
 
 sub sort_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
 	
 	my $primary = $actionParams->{"action.sort.primary"}->[0];
 	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
@@ -806,58 +795,52 @@ sub sort_handler {
 	$self->{secondarySortField} = $secondary;
 
 	my %names = (
-		set_id		=> $r->maketext("Set Name"),
-		set_header	=> $r->maketext("Set Header"),
-		hardcopy_header	=> $r->maketext("Hardcopy Header"),
-		open_date	=> $r->maketext("Open Date"),
-		due_date	=> $r->maketext("Due Date"),
-		answer_date	=> $r->maketext("Answer Date"),
-		visible	=> $r->maketext("Visibility"),
+		set_id		=> "Set Name",
+		set_header	=> "Set Header",
+		hardcopy_header	=> "Hardcopy Header",
+		open_date	=> "Open Date",
+		due_date	=> "Due Date",
+		answer_date	=> "Answer Date",
+		visible	=> "Visibility",
 	);
 	
-	return $r->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary});
+	return "sort by $names{$primary} and then by $names{$secondary}.";
 }
 
 
 sub edit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"edit_select",
-			-label_text=>$r->maketext("Edit which sets?").": ",
-			-input_attr=>{
-				-name => "action.edit.scope",
-				-values => [qw(all visible selected)],
-				-default => $actionParams{"action.edit.scope"}->[0] || "selected",
-				-labels => {
-					all => $r->maketext("all sets"),
-					visible => $r->maketext("visible sets"),
-					selected => $r->maketext("selected sets"),
-				},
-				-onchange => $onChange,
-			}
+		"Edit ",
+		CGI::popup_menu(
+			-name => "action.edit.scope",
+			-values => [qw(all visible selected)],
+			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+			-labels => {
+				all => "all sets",
+				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
 		),
 	);
 }
 
 sub edit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.edit.scope"}->[0];
 	if ($scope eq "all") {
-		$result = $r->maketext("editing all sets");
+		$result = "editing all sets";
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = $r->maketext("editing visible sets");
+		$result = "editing visible sets";
 		# leave visibleUserIDs alone
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("editing selected sets");
+		$result = "editing selected sets";
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{editMode} = 1;
@@ -867,42 +850,32 @@ sub edit_handler {
 
 sub publish_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join ("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"publish_filter_select",
-			-label_text=>$r->maketext("Choose which sets to be affected").": ",
-			-input_attr=>{
-				-name => "action.publish.scope",
-				-values => [ qw(none all selected) ],
-				-default => $actionParams{"action.publish.scope"}->[0] || "selected",
-				-labels => {
-					none => $r->maketext("no sets"),
-					all => $r->maketext("all sets"),
-#					visible => "visible sets",
-					selected => $r->maketext("selected sets"),
-				},
-				-onchange => $onChange,
-			}
+		"Make ",
+		CGI::popup_menu(
+			-name => "action.publish.scope",
+			-values => [ qw(none all selected) ],
+			-default => $actionParams{"action.publish.scope"}->[0] || "selected",
+			-labels => {
+				none => "",
+				all => "all sets",
+#				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
 		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"publish_visibility_select",
-			-label_text=>$r->maketext("Choose visibility of the sets to be affected").": ",
-			-input_attr=>{
-				-name => "action.publish.value",
-				-values => [ 0, 1 ],
-				-default => $actionParams{"action.publish.value"}->[0] || "1",
-				-labels => {
-					0 => $r->maketext("Hidden"),
-					1 => $r->maketext("Visible"),
-				},
-				-onchange => $onChange,
-			}
+		CGI::popup_menu(
+			-name => "action.publish.value",
+			-values => [ 0, 1 ],
+			-default => $actionParams{"action.publish.value"}->[0] || "1",
+			-labels => {
+				0 => "hidden",
+				1 => "visible",
+			},
+			-onchange => $onChange,
 		),
+		" for students.",
 	);
 }
 
@@ -917,22 +890,22 @@ sub publish_handler {
 	my $scope = $actionParams->{"action.publish.scope"}->[0];
 	my $value = $actionParams->{"action.publish.value"}->[0];
 
-	my $verb = $value ? $r->maketext("made visible for") : $r->maketext("hidden from");
+	my $verb = $value ? "made visible for" : "hidden from";
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result = CGI::div({class=>"ResultsWithError"},$r->maketext("No change made to any set"));
+		$result = CGI::div({class=>"ResultsWithError"},"No change made to any set.");
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All sets [_1] all students", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"All sets $verb all students.");
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All visible sets [_1] all students", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"All visible sets $verb all students.");
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All selected sets [_1] all students", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"All selected sets $verb all students.");
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -945,42 +918,32 @@ sub publish_handler {
 }
 sub enable_reduced_scoring_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join ("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"reduced_scoring_filter_select",
-			-label_text=>$r->maketext("Choose which sets to be affected").": ",
-			-input_attr=>{
-				-name => "action.enable_reduced_scoring.scope",
-				-values => [ qw(none all selected) ],
-				-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
-				-labels => {
-					none => $r->maketext("no sets"),
-					all => $r->maketext("all sets"),
-#					visible => "visible sets",
-					selected => $r->maketext("selected sets"),
-				},
-				-onchange => $onChange,
-			}
+		"Make ",
+		CGI::popup_menu(
+			-name => "action.enable_reduced_scoring.scope",
+			-values => [ qw(none all selected) ],
+			-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
+			-labels => {
+				none => "",
+				all => "all sets",
+#				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
 		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"reduced_scoring_enable_disable_select",
-			-label_text=>$r->maketext("Enable/Disable reduced scoring for selected sets").": ",
-			-input_attr=>{
-				-name => "action.enable_reduced_scoring.value",
-				-values => [ 0, 1 ],
-				-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
-				-labels => {
-					0 => $r->maketext("Disable"),
-					1 => $r->maketext("Enable"),
-				},
-				-onchange => $onChange,
-			}
+		CGI::popup_menu(
+			-name => "action.enable_reduced_scoring.value",
+			-values => [ 0, 1 ],
+			-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
+			-labels => {
+				0 => "disable",
+				1 => "enable",
+			},
+			-onchange => $onChange,
 		),
+		" reduced sccoring.",
 	);
 }
 
@@ -995,22 +958,22 @@ sub enable_reduced_scoring_handler {
 	my $scope = $actionParams->{"action.enable_reduced_scoring.scope"}->[0];
 	my $value = $actionParams->{"action.enable_reduced_scoring.value"}->[0];
 
-	my $verb = $value ? $r->maketext("enabled") : $r->maketext("disabled");
+	my $verb = $value ? "enabled" : "disabled";
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result =  CGI::div({class=>"ResultsWithError"}, $r->maketext("No change made to any set"));
+		$result =  CGI::div({class=>"ResultsWithError"}, "No change made to any set.");
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for all sets", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for all sets.");
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for visable sets", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for visable sets.");
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for selected sets", $verb));
+		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for selected sets.");
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -1024,24 +987,19 @@ sub enable_reduced_scoring_handler {
 
 sub score_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join ("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"score_select",
-			-label_text=>$r->maketext("Score which sets?").": ",
-			-input_attr=>{
-				-name => "action.score.scope",
-				-values => [qw(none all selected)],
-				-default => $actionParams{"action.score.scope"}->[0] || "none",
-				-labels => {
-					none => $r->maketext("no sets"),
-					all => $r->maketext("all sets"),
-					selected => $r->maketext("selected sets"),
-				},
-				-onchange => $onChange,
-			}
+		"Score ",
+		CGI::popup_menu(
+			-name => "action.score.scope",
+			-values => [qw(none all selected)],
+			-default => $actionParams{"action.score.scope"}->[0] || "none",
+			-labels => {
+				none => "no sets.",
+				all => "all sets.",
+				selected => "selected sets.",
+			},
+			-onchange => $onChange,
 		),
 	);
 	
@@ -1061,7 +1019,7 @@ sub score_handler {
 	
 	if ($scope eq "none") { 
 		@setsToScore = ();
-		return $r->maketext("No sets selected for scoring");
+		return "No sets selected for scoring.";
 	} elsif ($scope eq "all") {
 		@setsToScore = @{ $self->{allSetIDs} };
 	} elsif ($scope eq "visible") {
@@ -1085,26 +1043,23 @@ sub score_handler {
 
 sub delete_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join("",
-		CGI::span({-class=>"ResultsWithError"}, CGI::em($r->maketext("Warning: Deletion destroys all user-related data and is not undoable!"))),CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"delete_select",
-			-label_text=>$r->maketext("Delete how many?").": ",
-			-input_attr=>{
+		CGI::div({class=>"ResultsWithError"}, 
+			"Delete ",
+			CGI::popup_menu(
 				-name => "action.delete.scope",
 				-values => [qw(none selected)],
 				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
 				-labels => {
-					none => $r->maketext("no sets"),
+					none => "no sets.",
 					#visible => "visible sets.",
-					selected => $r->maketext("selected sets"),
+					selected => "selected sets.",
 				},
 				-onchange => $onChange,
-			}
-		),
+			),
+			CGI::em(" Deletion destroys all set-related data and is not undoable!"),
+		)
 	);
 }
 
@@ -1139,42 +1094,34 @@ sub delete_handler {
 	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
 	
 	my $num = @setIDsToDelete;
-	 return CGI::div({class=>"ResultsWithoutError"},  $r->maketext("deleted [_1] sets", $num) );
+	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num set" .
+	                                           ($num == 1 ? "" : "s")
+	);
 }
 
 sub create_form {
 	my ($self, $onChange, %actionParams) = @_;
+
 	my $r      = $self->r;
 	
-	return join("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"text",
-			-id=>"create_text",
-			-label_text=>$r->maketext("Name the new set").": ",
-			-input_attr=>{
-				-name => "action.create.name",
-				-value => $actionParams{"action.create.name"}->[0] || "",
-				-width => "50",
-				-onchange => $onChange,
-			}
+	return "Create a new set named: ", 
+		CGI::textfield(
+			-name => "action.create.name",
+			-value => $actionParams{"action.create.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
 		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"create_select",
-			-label_text=>$r->maketext("Create as what type of set?").": ",
-			-input_attr=>{
-				-name => "action.create.type",
-				-values => [qw(empty copy)],
-				-default => $actionParams{"action.create.type"}->[0] || "empty",
-				-labels => {
-					empty => $r->maketext("a new empty set"),
-					copy => $r->maketext("a duplicate of the first selected set"),
-				},
-				-onchange => $onChange,
-			}
-		),
-	);
+		" as ",
+		CGI::popup_menu(
+			-name => "action.create.type",
+			-values => [qw(empty copy)],
+			-default => $actionParams{"action.create.type"}->[0] || "empty",
+			-labels => {
+				empty => "a new empty set.",
+				copy => "a duplicate of the first selected set.",
+			},
+			-onchange => $onChange,
+		);
 			
 }
 
@@ -1185,8 +1132,8 @@ sub create_handler {
 	my $db     = $r->db;
 	
 	my $newSetID = $actionParams->{"action.create.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: no set name specified!")) unless $newSetID =~ /\S/;
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Set [_1] exists.  No set created", $newSetID)) if $db->existsGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: no set name specified!") unless $newSetID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, "Set $newSetID exists.  No set created") if $db->existsGlobalSet($newSetID);
 	my $newSetRecord = $db->newGlobalSet;
 	my $oldSetID = $self->{selectedSetIDs}->[0];
 
@@ -1207,7 +1154,7 @@ sub create_handler {
 		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
 		$db->addGlobalSet($newSetRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless $oldSetID =~ /\S/;
+		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless $oldSetID =~ /\S/;
 		$newSetRecord = $db->getGlobalSet($oldSetID);
 		$newSetRecord->set_id($newSetID);
 		$db->addGlobalSet($newSetRecord);
@@ -1246,9 +1193,9 @@ sub create_handler {
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 	push @{ $self->{allSetIds} }, $newSetID;
 	
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: [_1]", $@)) if $@;
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: $@") if $@;
 	
-	 return CGI::div({class=>"ResultsWithoutError"},$r->maketext("Successfully created new set [_1]", $newSetID));
+	 return CGI::div({class=>"ResultsWithoutError"},"Successfully created new set $newSetID" );
 	
 }
 
@@ -1270,65 +1217,45 @@ sub import_form {
 			);
 	
 	return join(" ",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"import_amt_select",
-			-label_text=>$r->maketext("Import how many sets?").": ",
-			-input_attr=>{
-				-name => "action.import.number",
-				-values => [ 1, 8 ],
-				-default => $actionParams{"action.import.number"}->[0] || "1",
-				-labels => {
-					1 => $r->maketext("a single set"),
-					8 => $r->maketext("multiple sets"),
-				},
-				-onchange => "$onChange;$importScript",
-			}
-		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"import_source_select",
-			-label_text=>$r->maketext("Import from where?").": ",
-			-input_attr=>{
-				-name => "action.import.source",
-				-values => [ "", $self->getDefList() ],
-				-labels => { "" => $r->maketext("Enter filenames below") },
-				-default => $actionParams{"action.import.source"}->[0] || "",
-				-size => $actionParams{"action.import.number"}->[0] || "1",
-				-onchange => $onChange,
+		"Import ",
+		CGI::popup_menu(
+			-name => "action.import.number",
+			-values => [ 1, 8 ],
+			-default => $actionParams{"action.import.number"}->[0] || "1",
+			-labels => {
+				1 => "a single set",
+				8 => "multiple sets",
 			},
-			-label_attr=>{-id=>"import_source_select_label"}
+			-onchange => "$onChange;$importScript",
 		),
-		CGI::br(),
-		WeBWorK::CGI_labeled_input(
-			-type=>"text",
-			-id=>"import_text",
-			-label_text=>$r->maketext("Import sets with names").": ",
-			-input_attr=>{
-				-name => "action.import.name",
-				-value => $actionParams{"action.import.name"}->[0] || "",
-				-width => "50",
-				-onchange => $onChange,
-			}
+		" from ", # set definition file(s) ",
+		CGI::popup_menu(
+			-name => "action.import.source",
+			-values => [ "", $self->getDefList() ],
+			-labels => { "" => "the following file(s)" },
+			-default => $actionParams{"action.import.source"}->[0] || "",
+			-size => $actionParams{"action.import.number"}->[0] || "1",
+			-onchange => $onChange,
+		),
+		" with set name(s): ",
+		CGI::textfield(
+			-name => "action.import.name",
+			-value => $actionParams{"action.import.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
 		),
-		CGI::br(),
 		($authz->hasPermissions($user, "assign_problem_sets")) 
 			?
-			WeBWorK::CGI_labeled_input(
-				-type=>"select",
-				-id=>"import_users_select",
-				-label_text=>$r->maketext("Assign this set to which users?").": ",
-				-input_attr=>{
-					-name => "action.import.assign",
-					-value => [qw(all none)],
-					-default => $actionParams{"action.import.assign"}->[0] || "none",
-					-labels => {
-						all => $r->maketext("all users"),
-						none => $r->maketext("no users"),
-					},
-					-onchange => $onChange,
-				}
+			"assigning this set to " .
+			CGI::popup_menu(
+				-name => "action.import.assign",
+				-value => [qw(user all)],
+				-default => $actionParams{"action.import.assign"}->[0] || "user",
+				-labels => {
+					all => "all current users.",
+					user => "only $user.",
+				},
+				-onchange => $onChange,
 			)
 			:
 			""	#user does not have permissions to assign problem sets
@@ -1337,7 +1264,6 @@ sub import_form {
 
 sub import_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
 
 	my @fileNames = @{ $actionParams->{"action.import.source"} };
 	my $newSetName = $actionParams->{"action.import.name"}->[0];
@@ -1354,29 +1280,28 @@ sub import_handler {
 	my $numSkipped = @$skipped;
 
    return CGI::div(
-		{class=>"ResultsWithoutError"},	$r->maketext("[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])", $numAdded, $numSkipped, join(", ", @$skipped)));
+		{class=>"ResultsWithoutError"},	
+		$numAdded . " set" . ($numAdded == 1 ? "" : "s") . " added, "
+		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped"
+		. " (" . join (", ", @$skipped) . ") "
+	);
 }
 
 sub export_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
 
 	return join("",
-		WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>"export_select",
-			-label_text=>$r->maketext("Export which sets?").": ",
-			-input_attr=>{
-				-name => "action.export.scope",
-				-values => [qw(all visible selected)],
-				-default => $actionParams{"action.export.scope"}->[0] || "visible",
-				-labels => {
-					all => $r->maketext("all sets"),
-					visible => $r->maketext("visible sets"),
-					selected => $r->maketext("selected sets"),
-				},
-				-onchange => $onChange,
-			}
+		"Export ",
+		CGI::popup_menu(
+			-name => "action.export.scope",
+			-values => [qw(all visible selected)],
+			-default => $actionParams{"action.export.scope"}->[0] || "visible",
+			-labels => {
+				all => "all sets",
+				visible => "visible sets",
+				selected => "selected sets",
+			},
+			-onchange => $onChange,
 		),
 	);
 }
@@ -1384,20 +1309,19 @@ sub export_form {
 # this does not actually export any files, rather it sends us to a new page in order to export the files
 sub export_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
-	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.export.scope"}->[0];
 	if ($scope eq "all") {
-		$result = $r->maketext("exporting all sets");
+		$result = "exporting all sets";
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
 
 	} elsif ($scope eq "visible") {
-		$result = $r->maketext("exporting visible sets");
+		$result = "exporting visible sets";
 		$self->{selectedSetIDs} = $self->{visibleSetIDs};
 	} elsif ($scope eq "selected") {
-		$result = $r->maketext("exporting selected sets");
+		$result = "exporting selected sets";
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{exportMode} = 1;
@@ -1407,8 +1331,7 @@ sub export_handler {
 
 sub cancelExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Abandon export"));
+	return "Abandon export";
 }
 
 sub cancelExport_handler {
@@ -1426,13 +1349,12 @@ sub cancelExport_handler {
 	}
 	$self->{exportMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"},  $r->maketext("export abandoned"));
+	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
 }
 
 sub saveExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Export selected sets"));
+	return "Export selected sets.";
 }
 
 sub saveExport_handler {
@@ -1462,14 +1384,17 @@ sub saveExport_handler {
 	
 	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
 
-	return 	CGI::div({class=>$resultFont}, $r->maketext("[_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])", $numExported, $numSkipped, (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")));
+	return 	CGI::div( {class=>$resultFont},
+	    $numExported . " set" . ($numExported == 1 ? "" : "s") . " exported, "
+		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped."
+		. (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")
+		);
 
 }
 
 sub cancelEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Abandon changes"));
+	return "Abandon changes";
 }
 
 sub cancelEdit_handler {
@@ -1487,13 +1412,12 @@ sub cancelEdit_handler {
 	}
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes abandoned"));
+	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
 }
 
 sub saveEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	my $r = $self->r;
-	return CGI::span($r->maketext("Save changes"));
+	return "Save changes";
 }
 
 sub saveEdit_handler {
@@ -1522,20 +1446,20 @@ sub saveEdit_handler {
 		my $curr_time = time;
 		my $seconds_per_year = 31_556_926;
 		my $cutoff = $curr_time + $seconds_per_year*10;
-		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
+		return CGI::div({class=>'ResultsWithError'}, "Error: open date cannot be more than 10 years from now in set $setID")
 			if $Set->open_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: due date cannot be more than 10 years from now in set [_1]", $setID))
+		return CGI::div({class=>'ResultsWithError'}, "Error: due date cannot be more than 10 years from now in set $setID")
 			if $Set->due_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
+		return CGI::div({class=>'ResultsWithError'}, "Error: answer date cannot be more than 10 years from now in set $setID")
 			if $Set->answer_date > $cutoff;
 		
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date)  {
-			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Due date must come after open date in set [_1]", $setID));
+			return CGI::div({class=>'ResultsWithError'}, "Error: Due date must come after open date in set $setID");
 		}
 		if ($Set->due_date > $Set->answer_date) {
-			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Answer date must come after due date in set [_1]", $setID));
+			return CGI::div({class=>'ResultsWithError'}, "Error: Answer date must come after due date in set $setID");
 		}
 		
 		$db->putGlobalSet($Set);
@@ -1551,7 +1475,7 @@ sub saveEdit_handler {
 	
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes saved") );
+	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
 }
 
 sub duplicate_form {
@@ -1563,16 +1487,12 @@ sub duplicate_form {
 	return "" unless @visible_sets == 1;
 	
 	return join ("", 
-		WeBWorK::CGI_labeled_input(
-			-type=>"text",
-			-id=>"duplicate_text",
-			-label_text=>$r->maketext("Duplicate this set and name it").": ",
-			-input_attr=>{
-				-name => "action.duplicate.name",
-				-value => $actionParams{"action.duplicate.name"}->[0] || "",
-				-width => "50",
-				-onchange => $onChange,
-			}
+		"Duplicate this set and name it: ", 
+		CGI::textfield(
+			-name => "action.duplicate.name",
+			-value => $actionParams{"action.duplicate.name"}->[0] || "",
+			-width => "50",
+			-onchange => $onChange,
 		),
 	);
 }
@@ -1584,11 +1504,11 @@ sub duplicate_handler {
 	my $db = $r->db;
 	
 	my $oldSetID = $self->{selectedSetIDs}->[0];
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless defined($oldSetID) and $oldSetID =~ /\S/;	
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless defined($oldSetID) and $oldSetID =~ /\S/;	
 	my $newSetID = $actionParams->{"action.duplicate.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set name specified!")) unless $newSetID =~ /\S/;		
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set name specified!") unless $newSetID =~ /\S/;		
 	# DBFIXME checking for existence -- don't need to fetch
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: set [_1] already exists!", $newSetID)) if defined $db->getGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: set $newSetID already exists!") if defined $db->getGlobalSet($newSetID);
 
 	my $newSet = $db->getGlobalSet($oldSetID);
 	$newSet->set_id($newSetID);
@@ -1602,9 +1522,9 @@ sub duplicate_handler {
 	
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 
-	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: [_1]", $@)) if $@;
+	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: $@") if $@;
 	
-	return $r->maketext("Success");
+	return "SUCCESS";
 }
 
 ################################################################################
@@ -1620,26 +1540,22 @@ sub bySetID         { $a->set_id         cmp $b->set_id         }
 #FIXME  eventually we may be able to remove these checks, if we can trust 
 # that the dates are always defined
 # dates which are the empty string '' or undefined  are treated as 0
-sub byOpenDate      {
-					  my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
+sub byOpenDate      { my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
                       return $result unless $@;
                       warn "Open date not correctly defined.";
                       return 0;
 }
-sub byDueDate       { 
-					  my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
+sub byDueDate       { my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
                       return $result unless $@;
                       warn "Due date not correctly defined.";
                       return 0;
 }
-sub byAnswerDate    { 
-					  my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
+sub byAnswerDate    { my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
                       return $result unless $@;
                       warn "Answer date not correctly defined.";
                       return 0;
 }
-sub byVisible     {   
-					  my $result = eval{$a->visible      cmp $b->visible   };      
+sub byVisible     { my $result = eval{$a->visible      cmp $b->visible   };      
                       return $result unless $@;
                       warn "Visibility status not correctly defined.";
                       return 0;
@@ -1679,7 +1595,7 @@ sub importSetsFromDef {
 
 	# FIXME: do we really want everything to fail on one bad file name?
 	foreach my $fileName (@setDefFiles) {
-		die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
+		die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
 			unless -r "$dir/$fileName";
 	}
 
@@ -1745,7 +1661,7 @@ sub importSetsFromDef {
 
 		#create the set
 		eval {$db->addGlobalSet($newSetRecord)};
-		die $r->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
+		die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
 
 		#do we need to add locations to the set_locations table?
 		if ( $restrictIP ne 'No' && $restrictLoc ) {
@@ -1755,13 +1671,18 @@ sub importSetsFromDef {
 					$newSetLocation->set_id( $setName );
 					$newSetLocation->location_id( $restrictLoc );
 					eval {$db->addGlobalSetLocation($newSetLocation)};
-					warn($r->maketext("error adding set location [_1] for set [_2]: [_3]", $restrictLoc, $setName, $@)) if $@;
+					warn("error adding set location $restrictLoc " .
+					     "for set $setName: $@") if $@;
 				} else {
 					# this should never happen.
-					warn($r->maketext("input set location [_1] already exists for set [_2].", $restrictLoc, $setName)."\n");
+					warn("input set location $restrictLoc" .
+					     " already exists for set " . 
+					     "$setName.\n");
 				}
 			} else { 
-				warn($r->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.", $restrictLoc)."\n");
+				warn("restriction location $restrictLoc " .
+				     "does not exist.  IP restrictions have " .
+				     "been ignored.\n");
 				$newSetRecord->restrict_ip('No');
 				$newSetRecord->relax_restrict_ip('No');
 				eval { $db->putGlobalSet($newSetRecord) };
@@ -1804,8 +1725,6 @@ sub readSetDef {
 	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
-	
-	my $r = $self->r;
 
 	if ($fileName =~ m|^set([.\w-]+)\.def$|) {
 		$setName = $1;
@@ -1898,7 +1817,7 @@ sub readSetDef {
 			} elsif ($item eq 'problemList') {
 				last;
 			} else {
-				warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
+				warn "readSetDef error, can't read the line: ||$line||";
 			}
 		}
 
@@ -1908,7 +1827,7 @@ sub readSetDef {
 		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
 	
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn $r->maketext("The open date: [_1], due date: [_2], and answer date: [_3] must be defined and in chronological order.", $openDate, $dueDate, $answerDate);
+			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronological order.";
 		}
 
 		# Check header file names
@@ -1925,21 +1844,26 @@ sub readSetDef {
 		# check that the values for hideWork and hideScore are valid
 		if ( $hideScore ne 'N' && $hideScore ne 'Y' && 
 		     $hideScore ne 'BeforeAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScore)."\n");
+			warn("The value $hideScore for the hideScore option " .
+			     "is not valid; it will be replaced with 'N'.\n");
 			$hideScore = 'N';
 		}
 		if ( $hideWork ne 'N' && $hideWork ne 'Y' && 
 		     $hideWork ne 'BeforeAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.", $hideWork)."\n");
+			warn("The value $hideWork for the hideWork option " .
+			     "is not valid; it will be replaced with 'N'.\n");
 			$hideWork = 'N';
 		}
 		if ( $timeCap ne '0' && $timeCap ne '1' ) {
-			warn($r->maketext("The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.", $timeCap)."\n");
+			warn("The value $timeCap for the capTimeLimit option " .
+			     "is not valid; it will be replaced with '0'.\n");
 			$timeCap = '0';
 		}
 		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
 		     $restrictIP ne 'RestrictTo' ) {
-			warn($r->maketext("The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.", $restrictIP)."\n");
+			warn("The value $restrictIP for the restrictIP " .
+			     "option is not valid; it will be replaced " . 
+			     "with 'No'.\n");
 			$restrictIP = 'No';
 			$restrictLoc = '';
 			$relaxRestrictIP = 'No';
@@ -1947,7 +1871,9 @@ sub readSetDef {
 		if ( $relaxRestrictIP ne 'No' && 
 		     $relaxRestrictIP ne 'AfterAnswerDate' &&
 		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
-			warn($r->maketext("The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.", $relaxRestrictIP)."\n");
+			warn("The value $relaxRestrictIP for the " .
+			     "relaxRestrictIP option is not valid; it will " . 
+			     "be replaced with 'No'.\n");
 			$relaxRestrictIP = 'No';
 		}
 		# to verify that restrictLoc is valid requires a database
@@ -2017,7 +1943,7 @@ sub readSetDef {
 		 $relaxRestrictIP,
 		);
 	} else {
-		warn $r->maketext("Can't open file [_1]", $filePath)."\n";
+		warn "Can't open file $filePath\n";
 	}
 }
 
@@ -2038,14 +1964,14 @@ SET:	foreach my $set (keys %filenames) {
 		# files can be exported to sub directories but not parent directories
 		if ($fileName =~ /\.\./) {
 			push @skipped, $set;
-			$reason{$set} = $r->maketext("Illegal filename contains '..'");
+			$reason{$set} = "Illegal filename contains '..'";
 			next SET;
 		}
 
 		my $setRecord = $db->getGlobalSet($set);
 		unless (defined $setRecord) {
 			push @skipped, $set;
-			$reason{$set} = $r->maketext("No record found.");
+			$reason{$set} = "No record found.";
 			next SET;
 		}
 		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
@@ -2053,7 +1979,7 @@ SET:	foreach my $set (keys %filenames) {
 		# back up existing file
 		if(-e $filePath) {
 			rename($filePath, "$filePath.bak") or 
-				$reason{$set} = $r->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
+				$reason{$set} = "Existing file $filePath could not be backed up and was lost.";
 		}
 		
 		my $openDate     = $self->formatDateTime($setRecord->open_date);
@@ -2069,7 +1995,7 @@ SET:	foreach my $set (keys %filenames) {
 			my $problemRecord = $db->getGlobalProblem($set, $prob); # checked
 			unless (defined $problemRecord) {
 				push @skipped, $set;
-				$reason{$set} = $r->maketext("No record found for problem [_1].", $prob);
+				$reason{$set} = "No record found for problem $prob.";
 				next SET;
 			}
 			my $source_file   = $problemRecord->source_file();
@@ -2139,7 +2065,7 @@ EOF
 		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
 		eval {
 			local *SETDEF;
-			open SETDEF, ">$filePath" or die $r->maketext("Failed to open [_1]", $filePath);
+			open SETDEF, ">$filePath" or die "Failed to open $filePath";
 			print SETDEF $fileContents;
 			close SETDEF;
 		};
@@ -2162,7 +2088,7 @@ EOF
 ################################################################################
 
 sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties, $dateTimeScripts) = @_;
+	my ($self, $fieldName, $value, $properties) = @_;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
@@ -2175,130 +2101,16 @@ sub fieldEditHTML {
 	}
 	
 	if ($type eq "number" or $type eq "text") {
-		my $id = $fieldName."_id";
-		my $out = CGI::input({type=>"text", name=>$fieldName, id=>$id, value=>"", size=>$size});
-		my $content = "";
-		my $bareName = "";
-		my $timezone = substr($value, -3);
-		
-		if(index($fieldName, ".open_date") != -1){
-			my @temp = split(/.open_date/, $fieldName);
-			$bareName = $temp[0];
-			$bareName =~ s/\./\\\\\./g;
-			$content = <<"CONTENT";
-\$('#$bareName\\\\.open_date_id').datetimepicker({
-	ampm: true,
-	timeFormat: 'hh:mmtt',
-	timeSuffix: ' $timezone',
-	separator: ' at ',
-    onClose: function(dateText, inst) {
-        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
-        if (dueDateTextBox.val() != '') {
-            var testopenDate = new Date(dateText);
-            var testdueDate = new Date(dueDateTextBox.val());
-            if (testopenDate > testdueDate)
-                dueDateTextBox.val(dateText);
-        }
-        else {
-            dueDateTextBox.val(dateText);
-        }
-    },
-    onSelect: function (selectedDateTime){
-        var open = \$(this).datetimepicker('getDate');
-		var open_obj = new Date(open.getTime());
-        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'minDate', open_obj);
-    }
-});
-CONTENT
-		}
-		elsif(index($fieldName, ".due_date") != -1){
-			my @temp = split(/.due_date/, $fieldName);
-			$bareName = $temp[0];
-			$bareName =~ s/\./\\\\\./g;
-			$content = <<"CONTENT";
-\$('#$bareName\\\\.due_date_id').datetimepicker({
-	ampm: true,
-	timeFormat: 'hh:mmtt',
-	timeSuffix: ' $timezone',
-	separator: ' at ',
-    onClose: function(dateText, inst) {
-		var openDateTextBox = \$('#$bareName\\\\.open_date_id');
-        var answersDateTextBox = \$('#$bareName\\\\.answer_date_id');
-
-        if (openDateTextBox.val() != '') {
-            var testopenDate = new Date(openDateTextBox.val());
-			var testdueDate = new Date(dateText);
-            if (testopenDate > testdueDate)
-                openDateTextBox.val(dateText);
-        }
-        else {
-            openDateTextBox.val(dateText);
-        }
-
-		if (answersDateTextBox.val() != '') {
-			var testdueDate = new Date(dateText);
-			var testanswersDate = new Date(answersDateTextBox.val());
-			if(testdueDate > testanswersDate)
-				answersDateTextBox.val(dateText);
-		}
-		else {
-			answersDateTextBox.val(dateText);
-		}
-    },
-    onSelect: function (selectedDateTime){
-        var due = \$(this).datetimepicker('getDate');
-        \$('#$bareName\\\\.open_date_id').datetimepicker('option', 'maxDate', new Date(due.getTime()));
-		\$('#$bareName\\\\.answer_date_id').datetimepicker('option', 'minDate', new Date(due.getTime()));
-    }
-});
-CONTENT
-		}
-		elsif(index($fieldName, ".answer_date") != -1){
-			my @temp = split(/.answer_date/, $fieldName);
-			$bareName = $temp[0];
-			$bareName =~ s/\./\\\\\./g;
-			$content = <<"CONTENT";
-\$('#$bareName\\\\.answer_date_id').datetimepicker({
-	ampm: true,
-	timeFormat: 'hh:mmtt',
-	timeSuffix: ' $timezone',
-	separator: ' at ',
-    onClose: function(dateText, inst) {
-        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
-        if (dueDateTextBox.val() != '') {
-            var testdueDate = new Date(dueDateTextBox.val());
-            var testanswersDate = new Date(dateText);
-            if (testdueDate > testanswersDate)
-                dueDateTextBox.val(dateText);
-        }
-        else {
-            dueDateTextBox.val(dateText);
-        }
-    },
-    onSelect: function (selectedDateTime){
-        var answers = \$(this).datetimepicker('getDate');
-        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'maxDate', new Date(answers.getTime()));
-    }
-});
-CONTENT
-		}
-		
-		push @$dateTimeScripts, $content;
-		return $out;
+		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
 	}
 	
 	if ($type eq "filelist") {
-		return WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>$fieldName."_id",
-			-label_text=>ucfirst($fieldName),
-			-input_attr=>{
-				name => $fieldName,
-				value => [ sort keys %$headerFiles ],
-				labels => $headerFiles,
-				default => $value || 0,
-			}
-		),
+		return CGI::popup_menu({
+			name => $fieldName,
+			value => [ sort keys %$headerFiles ],
+			labels => $headerFiles,
+			default => $value || 0,
+		});
 	}
 
 	if ($type eq "enumerable") {
@@ -2316,17 +2128,12 @@ CONTENT
 			$value = $synonyms->{"*"};
 		}
 		
-		return WeBWorK::CGI_labeled_input(
-			-type=>"select",
-			-id=>$fieldName."_id",
-			-label_text=>ucfirst($fieldName),
-			-input_attr=>{
-				name => $fieldName, 
-				values => [keys %$items],
-				default => $value,
-				labels => $items,
-			}
-		),
+		return CGI::popup_menu({
+			name => $fieldName, 
+			values => [keys %$items],
+			default => $value,
+			labels => $items,
+		});
 	}
 	
 	if ($type eq "checked") {
@@ -2334,16 +2141,11 @@ CONTENT
 		# FIXME: kludge (R)
 		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
 		# in which case the hidden field overrides the parameter with a 0
-		return WeBWorK::CGI_labeled_input(
-			-type=>"checkbox",
-			-id=>$fieldName."_id",
-			-label_text=>ucfirst($fieldName),
-			-input_attr=>{
-				-name => $fieldName,
-				-checked => $value,
-				-label => "",
-				-value => 1
-			}
+		return CGI::checkbox(
+			-name => $fieldName,
+			-checked => $value,
+			-label => "",
+			-value => 1
 		) . CGI::hidden(
 			-name => $fieldName,
 			-value => 0
@@ -2366,8 +2168,8 @@ sub recordEditHTML {
 	my $exportMode = $options{exportMode};
 	my $setSelected = $options{setSelected};
 
-	my $visibleClass = $Set->visible ? $r->maketext("visible") : $r->maketext("hidden");
-	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? $r->maketext('Reduced Credit Enabled') : $r->maketext('Reduced Credit Disabled');
+	my $visibleClass = $Set->visible ? "visible" : "hidden";
+	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? 'Reduced Credit Enabled' : 'Reduced Credit Disabled';
 
 	my $users = $db->countSetUsers($Set->set_id);
 	my $totalUsers = $self->{totalUsers};
@@ -2397,39 +2199,26 @@ sub recordEditHTML {
 					: CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
 	$fakeRecord{filename} = CGI::input({-name => "set.$set_id", -value=>"set$set_id.def", -size=>60});
 					
-	
+		
 	# Select
 	if ($editMode) {
 		# column not there
 	} else {
 		# selection checkbox
-		# Set ID
-		my $label = "";
-		if ($editMode) {
-			$label = CGI::a({href=>$problemListURL}, "$set_id");
-		} else {		
-			$label = CGI::font({class=>$visibleClass}, $set_id . $imageLink);
-		}
-		
-		push @tableCells, WeBWorK::CGI_labeled_input(
-			-type=>"checkbox",
-			-id=>$set_id."_id",
-			-label_text=>$label,
-			-input_attr=>$setSelected ?
-			{
-				-name => "selected_sets",
-				-value => $set_id,
-				-checked => "checked",
-				-class => "table_checkbox",
-			}
-			:
-			{
-				-name => "selected_sets",
-				-value => $set_id,
-				-class => "table_checkbox",
-			}
+		push @tableCells, CGI::checkbox(
+			-name => "selected_sets",
+			-value => $set_id,
+			-checked => $setSelected,
+			-label => "",
 		);
 	}
+	
+	# Set ID
+	if ($editMode) {
+		push @tableCells, CGI::a({href=>$problemListURL}, "$set_id");
+	} else {		
+	push @tableCells, CGI::font({class=>$visibleClass}, $set_id . $imageLink);
+	}
 
 	# Problems link
 	if ($editMode) {
@@ -2460,10 +2249,6 @@ sub recordEditHTML {
 	# make a hash out of this so we can test membership easily
 	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
 	
-	my @chooseDateTimeScripts = ();
-	
-	push @chooseDateTimeScripts, "addOnLoadEvent(function() {";
-
 	# Set Fields
 	foreach my $field (@fieldsToShow) {
 		next unless exists $nonkeyfields{$field};
@@ -2473,20 +2258,15 @@ sub recordEditHTML {
 		$properties{access} = "readonly" unless $editMode;
 		$fieldValue = $self->formatDateTime($fieldValue) if $field =~ /_date/;
 		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
-		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /visible/ and not $editMode;
-		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enable_reduced_scoring/ and not $editMode;
-		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties, \@chooseDateTimeScripts));
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /visible/ and not $editMode;
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enable_reduced_scoring/ and not $editMode;
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
-	
-	push @chooseDateTimeScripts, "});";
-	
+
 	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
-	
-	my $out = CGI::Tr({}, CGI::td({}, \@tableCells));
-	my $scripts = CGI::start_script({-type=>"text/javascript"}).(join("", @chooseDateTimeScripts)).CGI::end_script();
 
-	return $out.$scripts;
+	return CGI::Tr({}, CGI::td({}, \@tableCells));
 }
 
 sub printTableHTML {
@@ -2536,25 +2316,22 @@ sub printTableHTML {
 	
 	@headers = sort @headers;
 	my %headers = map { $_ => $_ } @headers;
-	$headers{""} = $r->maketext("Use System Default");
+	$headers{""} = "Use System Default";
 	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
 
 
 	my @tableHeadings = map { $fieldNames{$_} } @realFieldNames;
-	shift @tableHeadings;
 	
 	# prepend selection checkbox? only if we're NOT editing!
 #	unshift @tableHeadings, "Select", "Set", "Problems" unless $editMode;
 
 	# print the table
 	if ($editMode or $exportMode) {
-		print CGI::start_table({-id=>"set_table_id", -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
+		print CGI::start_table({});
 	} else {
-		print CGI::start_table({-id=>"set_table_id", -border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
+		print CGI::start_table({-border=>1});
 	}
 	
-	print CGI::caption($r->maketext("Set List"));
-	
 	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
 	
 
@@ -2575,41 +2352,10 @@ sub printTableHTML {
 	##########################################
 	
 	print CGI::p(
-                      CGI::i($r->maketext("No sets shown.  Choose one of the options above to list the sets in the course."))
+                      CGI::i("No sets shown.  Choose one of the options above to list the sets in the course.")
 	) unless @Sets;
 }
 
-# output_JS subroutine
-
-# outputs all of the Javascript required for this page
-
-sub output_JS{
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $site_url = $ce->{webworkURLs}->{htdocs};
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-1.8.18.custom.min.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-timepicker-addon.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/form_checker_hmwksets.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/hmwksets_handlers.js"}), CGI::end_script();
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/show_hide.js"}), CGI::end_script();
-	return "";
-}
-
-# Just tells template to output the stylesheet for Tabber
-sub output_tabber_CSS{
-	return "";
-}
-
-#Tells template to output stylesheet for Jquery-UI
-sub output_jquery_ui_CSS{
-	return "";
-}
-
 1;
 
 =head1 AUTHOR

From 1fcc1e3f4380eb4f351aebd560d219a054e2de9c Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Wed, 14 Mar 2012 22:18:33 -0400
Subject: [PATCH 11/73] Bring checkProblems up to point where it can
 authenticate for webservices.

Next task is to combine it with Test::Harness to check library problems
---
 clients/checkProblem.pl  | 481 +++++++++------------------------------
 clients/renderProblem.pl |   4 +-
 2 files changed, 106 insertions(+), 379 deletions(-)

diff --git a/clients/checkProblem.pl b/clients/checkProblem.pl
index 5a60b6cee6..89c4d0acef 100755
--- a/clients/checkProblem.pl
+++ b/clients/checkProblem.pl
@@ -65,12 +65,12 @@ =head1 NAME
  #use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile above
  # use constant  DISPLAY_COMMAND  => "open -a 'Google Chrome' ";
    use constant DISPLAY_COMMAND => " less ";   # display tempoutputfile with less
- ############################################################
+
  
  my $use_site;
- $use_site = 'test_webwork';    # select a rendering site 
+ #$use_site = 'test_webwork';    # select a rendering site 
  #$use_site = 'local';           # select a rendering site 
- #$use_site = 'rochester_test';  # select a rendering site 
+ $use_site = 'hosted2';  # select a rendering site 
  
  
  ############################################################
@@ -112,19 +112,21 @@ =head1 NAME
 #     result. A different name can be used but the course must exist on the server.
 
 
-our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+our $UNIT_TESTS_ON             = 1;
+
+our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE, %credentials);
 if ($use_site eq 'local') {
-# the rest can work!!
+	# the rest can work!!
 	$XML_URL      =  'http://localhost:80';
 	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
 	$XML_PASSWORD     =  'xmlwebwork';
 	$XML_COURSE       =  'daemon_course';
-} elsif ($use_site eq 'rochester_test') {  
+} elsif ($use_site eq 'hosted2') {  
 	
-	$XML_URL      =  'http://128.151.231.2';
-	$FORM_ACTION_URL  =  'http://128.151.231.2/webwork2/html2xml';
+	$XML_URL      =  'https://hosted2.webwork.rochester.edu';
+	$FORM_ACTION_URL  =  'https://hosted2.webwork.rochester.edu/webwork2/html2xml';
  	$XML_PASSWORD     = 'xmlwebwork';
- 	$XML_COURSE       = 'daemon_course';
+ 	$XML_COURSE       = 'gage_course';
 	
 } elsif ($use_site eq 'test_webwork') {
 
@@ -141,6 +143,50 @@ =head1 NAME
 
 
 
+####################################################
+# get credentials
+####################################################
+
+
+my $credential_path;
+my @path_list = ('.ww_credentials', '/Users/gage/.ww_credentials', '/Users/gage/ww_session_credentials');
+foreach my $path (@path_list) {
+	if (-r "$path" ) {
+		$credential_path = $path;
+		last;
+	}
+}
+unless ( $credential_path ) {
+	die <<EOF;
+Can't find path for credentials. Looked in @path_list.
+Place a credential file containing the following information at one of the locations above.
+%credentials = (
+        userID          => "my login name for the webwork course",
+        password        => "my password ",
+        courseID        => "the name of the webwork course",
+);
+1;
+---------------------------------------------------------
+EOF
+}
+
+eval{require $credential_path};
+if ($@  or not defined %credentials) {
+
+print STDERR <<EOF;
+
+The credentials file should contain this:
+%credentials = (
+        userID          => "my login name for the webwork course",
+        password        => "my password ",
+        courseID        => "the name of the webwork course",
+);
+1;
+EOF
+die;
+}
+
+
 
 our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
 
@@ -150,35 +196,68 @@ =head1 NAME
 ##################################################
 
 
-
-our $xmlrpc_client = new WebworkClient;
-
 ##################################################
 # input/output section
 ##################################################
 
 
-$xmlrpc_client->url($XML_URL);
-$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
-$xmlrpc_client->{displayMode}   = DISPLAYMODE();
-$xmlrpc_client->{user}          = 'xmluser';
-$xmlrpc_client->{password}      = $XML_PASSWORD;
-$xmlrpc_client->{course}        = $XML_COURSE;
+# filter mode  main code
+
+
+############################################
+# Build client
+############################################
+our $xmlrpc_client = new WebworkClient (
+	url                    => $XML_URL,
+	form_action_url        => $FORM_ACTION_URL,
+	displayMode            => DISPLAYMODE(),
+	site_password          =>  $credentials{site_password},
+	courseID               =>  $credentials{courseID},
+	userID                 =>  $credentials{userID},
+	session_key            =>  $credentials{session_key},
+);
+ 
+ 
+ my $input = { 
+		userID      	=> $credentials{userID}||'',
+		session_key	 	=> $credentials{session_key}||'',
+		courseID   		=> $credentials{courseID}||'',
+		courseName   	=> $credentials{courseID}||'',
+		password     	=> $credentials{password}||'',	
+		site_password   => $credentials{site_password}||'',
+ };
+
 
 our $source = '';
+our $filePath = '';
+our $rh_result;
+# {
+# 	local($/);
+# 	$source   = <>; #slurp standard input
+# 	#print $source;  # return input to BBedit
+#  $xmlrpc_client->encodeSource($source);
+# }
 our $output;
 our $return_string;
+
 if (@ARGV) {
 	local(*FH);
 	open(FH, ">>".LOG_FILE()) || die "Can't open log file ". LOG_FILE();
-	$source = (defined $ARGV[0]) ? `cat $ARGV[0]` : '' ;
+	{
+		local($/);
+		$filePath = $ARGV[0];
+		$source   = <>; #slurp standard input
+		#print $source;  # return input to BBedit
+	}	
     $xmlrpc_client->encodeSource($source);
-	if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+    
+    
+	if ( $xmlrpc_client->xmlrpcCall('renderProblem', $input) )    {
 	        $output = $xmlrpc_client->{output};
 		if (defined($output->{flags}->{error_flag}) and $output->{flags}->{error_flag} ) {
-			$return_string = "0\t $ARGV[0] has errors\n";
+			$return_string = "0\t $filePath has errors\n";
 		} elsif (defined($output->{errors}) and $output->{errors} ){
-			$return_string = "0\t $ARGV[0] has syntax errors\n";
+			$return_string = "0\t $filePath has syntax errors\n";
 		} else {
 			# 
 			if (defined($output->{flags}->{DEBUG_messages}) ) {
@@ -203,16 +282,16 @@ =head1 NAME
 			$return_string = "0\t ".$return_string."\n" if $return_string;   # add a 0 if there was an warning or debug message.
 		}
 		unless ($return_string) {
-			$return_string = "1\t $ARGV[0] is ok\n";
+			$return_string = "1\t $filePath is ok\n";
 		}
 	} else {
 		
-		$return_string = "0\t $ARGV[0] has undetermined errors -- could not be read perhaps?\n";
+		$return_string = "0\t $filePath has undetermined errors -- could not be read perhaps?\n";
 	}
 	print FH $return_string;
 	close(FH);
 } else {
-    print "0 $ARGV[0]  something went wrong -- could not render file\n";
+    print "0 $filePath  something went wrong -- could not render file\n";
 	print STDERR "Useage: ./checkProblem.pl    [file_name]\n";
 	print STDERR "For example: ./checkProblem.pl    input.txt\n";
 	print STDERR "Output is sent to the log file: ",LOG_FILE();
@@ -220,358 +299,6 @@ =head1 NAME
 }
 
 
-##################################################
-# XMLRPC client -- 
-# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
-# and has been included in WebworkClient.pm
-##################################################
 
-# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
-# 
-# use Crypt::SSLeay;  # needed for https
-# use XMLRPC::Lite;
-# use MIME::Base64 qw( encode_base64 decode_base64);
-# 
-# use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
-# use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
-# use constant  REQUEST_URI      => 'mod_xmlrpc';
-# 
-# sub new {
-# 	my $self = {
-# 		output   		=> '',
-# 		encodedSource 	=> '',
-# 		url             => '',
-# 		password        => '',
-# 		course          => '',
-# 		displayMode     => '',
-# 		inputs_ref      => {		 AnSwEr0001 => '',
-# 				 					 AnSwEr0002 => '',
-# 				 					 AnSwEr0003 => '',
-# 		},
-# 	};
-# 
-# 	bless $self;
-# }
-# 
-# 
-# our $result;
-# 
-# ##################################################
-# # Utilities -- 
-# #    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
-# ##################################################
-# 
-# sub xmlrpcCall {
-# 	my $self        = shift;
-# 	my $command     = shift;
-# 	$command        = 'listLibraries' unless $command;
-# 
-# 	  my $requestResult = TRANSPORT_METHOD
-# 			-> proxy($self->{url}.'/'.REQUEST_URI);
-#      
-# 	  my $input = $self->setInputTable();
-# 	  local( $result);
-# 	  # use eval to catch errors
-# 	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
-# 	  if ($@) {
-# 	  	print STDERR "There were a lot of errors for $command\n" ;
-# 	  	print STDERR "Errors: \n $@\n End Errors\n" ;
-# 	  	return 0 #failure
-# 	  }
-# 	  	  
-# 	  unless (ref($result) and $result->fault) {    	
-# 	  	my $rh_result = $result->result();
-# 	    #print STDERR pretty_print_rh($rh_result);
-# 		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
-# 		return 1; # success
-# 
-# 	  } else {
-# 		$self->{output} = 'Error from server: '. join( ",\n ",
-# 		  $result->faultcode,
-# 		  $result->faultstring);
-# 		return 0; #failure
-# 	  }
-# }
-#   
-# sub encodeSource {
-# 	my $self = shift;
-# 	my $source = shift;
-# 	$self->{encodedSource} =encode_base64($source);
-# }
-# sub url {
-# 	my $self = shift;
-# 	my $new_url = shift;
-# 	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
-# 	$self->{url};
-# }
-# sub pretty_print {    # provides html output -- NOT a method
-#     my $r_input = shift;
-#     my $level = shift;
-#     $level = 4 unless defined($level);
-#     $level--;
-#     return '' unless $level > 0;  # only print three levels of hashes (safety feature)
-#     my $out = '';
-#     if ( not ref($r_input) ) {
-#     	$out = $r_input if defined $r_input;    # not a reference
-#     	$out =~ s/</&lt;/g  ;  # protect for HTML output
-#     } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
-# 	    local($^W) = 0;
-# 	    
-# 		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
-# 		
-# 		
-# 		foreach my $key ( sort ( keys %$r_input )) {
-# 			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
-# 		}
-# 		$out .="</table>";
-# 	} elsif (ref($r_input) eq 'ARRAY' ) {
-# 		my @array = @$r_input;
-# 		$out .= "( " ;
-# 		while (@array) {
-# 			$out .= pretty_print(shift @array, $level) . " , ";
-# 		}
-# 		$out .= " )";
-# 	} elsif (ref($r_input) eq 'CODE') {
-# 		$out = "$r_input";
-# 	} else {
-# 		$out = $r_input;
-# 		$out =~ s/</&lt;/g; # protect for HTML output
-# 	}
-# 	
-# 	return $out." ";
-# }
-# 
-# sub setInputTable_for_listLib {
-# 	my $self = shift;
-# 	my $out = {
-# 		pw          =>   $self->{password},
-# 		set         =>   'set0',
-# 		library_name =>  'Library',
-# 		command      =>  'all',
-# 	};
-# 
-# 	$out;
-# }
-# sub setInputTable {
-# 	my $self = shift;
-# 	my $out = {
-# 		pw          =>   $self->{password},
-# 		library_name =>  'Library',
-# 		command      =>  'renderProblem',
-# 		answer_form_submitted   => 1,
-# 		course                  => $self->{course},
-# 		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
-# 		                                ExprWithImplicitExpand AnswerEvaluator
-# 		                                AnswerEvaluatorMaker 
-# 		)],
-# 		mode                    => $self->{displayMode},
-# 		modules_to_evaluate     => [ qw( 
-# Exporter
-# DynaLoader								
-# GD
-# WWPlot
-# Fun
-# Circle
-# Label								
-# PGrandom
-# Units
-# Hermite
-# List								
-# Match
-# Multiple
-# Select							
-# AlgParser
-# AnswerHash							
-# Fraction
-# VectorField							
-# Complex1
-# Complex							
-# MatrixReal1 Matrix							
-# Distributions
-# Regression
-# 
-# 		)], 
-# 		envir                   => $self->environment(),
-# 		problem_state           => {
-# 		
-# 			num_of_correct_ans  => 0,
-# 			num_of_incorrect_ans => 4,
-# 			recorded_score       => 1.0,
-# 		},
-# 		source                   => $self->{encodedSource},  #base64 encoded
-# 		
-# 		
-# 		
-# 	};
-# 
-# 	$out;
-# }
-# 
-# sub environment {
-# 	my $self = shift;
-# 	my $envir = {
-# 		answerDate  => '4014438528',
-# 		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
-# 		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
-# 		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
-# 		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
-# 		cgiDirectory=>'Not defined',
-# 		cgiURL => 'Not defined',
-# 		classDirectory=> 'Not defined',
-# 		courseName=>'Not defined',
-# 		courseScriptsDirectory=>'not defined',
-# 		displayMode=>$self->{displayMode},
-# 		dueDate=> '4014438528',
-# 		effectivePermissionLevel => 10,
-# 		externalGif2EpsPath=>'not defined',
-# 		externalPng2EpsPath=>'not defined',
-# 		externalTTHPath=>'/usr/local/bin/tth',
-# 		fileName=>'set0/prob1a.pg',
-# 		formattedAnswerDate=>'6/19/00',
-# 		formattedDueDate=>'6/19/00',
-# 		formattedOpenDate=>'6/19/00',
-# 		functAbsTolDefault=> 0.0000001,
-# 		functLLimitDefault=>0,
-# 		functMaxConstantOfIntegration=> 1000000000000.0,
-# 		functNumOfPoints=> 5,
-# 		functRelPercentTolDefault=> 0.000001,
-# 		functULimitDefault=>1,
-# 		functVarDefault=> 'x',
-# 		functZeroLevelDefault=> 0.000001,
-# 		functZeroLevelTolDefault=>0.000001,
-# 		htmlDirectory =>'not defined',
-# 		htmlURL =>'not defined',
-# 		inputs_ref => $self->{inputs_ref},
-# 		macroDirectory=>'not defined',
-# 		numAbsTolDefault=>0.0000001,
-# 		numFormatDefault=>'%0.13g',
-# 		numOfAttempts=> 0,
-# 		numRelPercentTolDefault => 0.0001,
-# 		numZeroLevelDefault =>0.000001,
-# 		numZeroLevelTolDefault =>0.000001,
-# 		openDate=> '3014438528',
-# 		permissionLevel =>10,
-# 		PRINT_FILE_NAMES_FOR => [ 'gage'],
-# 		probFileName => 'set0/prob1a.pg',
-# 		problemSeed  => 1234,
-# 		problemValue =>1,
-# 		probNum => 13,
-# 		psvn => 54321,
-# 		psvn=> 54321,
-# 		questionNumber => 1,
-# 		scriptDirectory => 'Not defined',
-# 		sectionName => 'Gage',
-# 		sectionNumber => 1,
-# 		sessionKey=> 'Not defined',
-# 		setNumber =>'not defined',
-# 		studentLogin =>'gage',
-# 		studentName => 'Mike Gage',
-# 		tempDirectory => 'not defined',
-# 		templateDirectory=>'not defined',
-# 		tempURL=>'not defined',
-# 		webworkDocsURL => 'not defined',
-# 		
-# 		showHints => 1,               # extra options -- usually passed from the input form
-# 		showSolutions => 1,
-# 		
-# 	};
-# 	$envir;
-# };
-# 
-# sub formatAnswerRow {
-# 	my $self = shift;
-# 	my $rh_answer = shift;
-# 	my $problemNumber = shift;
-# 	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
-# 	my $correctAnswer = $rh_answer->{correct_ans}||'';
-# 	my $ans_message   = $rh_answer->{ans_message}||'';
-# 	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
-# 	my $row = qq{
-# 		<tr>
-# 		    <td>
-# 				Prob: $problemNumber
-# 			</td>
-# 			<td>
-# 				$answerString
-# 			</td>
-# 			<td>
-# 			    $score
-# 			</td>
-# 			<td>
-# 				Correct answer is $correctAnswer
-# 			</td>
-# 			<td>
-# 				<i>$ans_message</i>
-# 			</td>
-# 		</tr>\n
-# 	};
-# 	$row;
-# }
-# 	
-# sub formatRenderedProblem {
-# 	my $self 			  = shift;
-# 	my $rh_result         = $self->{output};  # wrap problem in formats
-# 	my $problemText       = decode_base64($rh_result->{text});
-# 	my $rh_answers        = $rh_result->{answers};
-# 	my $encodedSource     = $self->{encodedSource}||'foobar';
-# 	my $warnings          = '';
-# 	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
-# 		$warnings = "<div style=\"background-color:pink\">
-# 		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
-# 	}
-# 	#warn "keys: ", join(" | ", sort keys %{$rh_result });
-# 	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
-#     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
-#     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
-#     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
-# 	# collect answers
-# 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
-# 	my $problemNumber     = 1;
-#     foreach my $key (sort  keys %{$rh_answers}) {
-#     	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
-#     }
-# 	$answerTemplate      .= q{</table> <hr>};
-# 
-# 	my $FULL_URL = $self->url;
-# 	my $FORM_ACTION_URL  =  "$FULL_URL/webwork2/html2xml";
-# 	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
-# <html>
-# <head>
-# <base href="$FULL_URL">
-# <title>WeBWorK Editor using host $HOSTNAME</title>
-# </head>
-# <body>
-# 		    $answerTemplate
-# 		    <form action="$FORM_ACTION_URL" method="post">
-# 			$problemText
-# 	       <input type="hidden" name="answersSubmitted" value="1"> 
-# 	       <input type="hidden" name="problemAddress" value="probSource"> 
-# 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
-# 	       <input type="hidden" name="problemSeed" value="1234"> 
-# 	       <input type="hidden" name="pathToProblemFile" value="foobar">
-# 	       <p><input type="submit" name="submit" value="submit answers"></p>
-# 	     </form>
-# <HR>
-# <h3> Warning section </h3>
-# $warnings
-# <h3>
-# Debug message section
-# </h3>
-# $debug_messages
-# <h3>
-# internal errors
-# </h3>
-# $internal_debug_messages
-# 
-# </body>
-# </html>
-# 
-# ENDPROBLEMTEMPLATE
-# 
-# 
-# 
-# 	$problemTemplate;
-# }
-# 
 
 1;
diff --git a/clients/renderProblem.pl b/clients/renderProblem.pl
index 9878ee82e4..c4616dcdad 100755
--- a/clients/renderProblem.pl
+++ b/clients/renderProblem.pl
@@ -67,7 +67,7 @@ =head1 NAME
  my $use_site;
  #$use_site = 'test_webwork';    # select a rendering site 
  #$use_site = 'local';           # select a rendering site 
- $use_site = 'rochester_test';  # select a rendering site 
+ $use_site = 'hosted2';  # select a rendering site 
  
  
  ############################################################
@@ -116,7 +116,7 @@ =head1 NAME
 	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
 	$XML_PASSWORD     =  'xmlwebwork';
 	$XML_COURSE       =  'daemon_course';
-} elsif ($use_site eq 'rochester_test') {  
+} elsif ($use_site eq 'hosted2') {  
 	
 	$XML_URL      =  'https://hosted2.webwork.rochester.edu';
 	$FORM_ACTION_URL  =  'https://hosted2.webwork.rochester.edu/webwork2/html2xml';

From 8ff6b53df519e0dd48831def74212ca5a9ba6e90 Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Sun, 8 Apr 2012 00:47:39 -0400
Subject: [PATCH 12/73] Implemented viewing frame to PGProblemEditor, minor
 Localization fix

---
 conf/templates/math3/math3.css                |  19 +-
 htdocs/js/pg_editor_handlers.js               |  11 ++
 .../Instructor/PGProblemEditor.pm             | 162 +++++++++++++-----
 .../Instructor/PGProblemEditor2.pm            |  30 ++--
 lib/WeBWorK/Localize/en.po                    |   4 +
 5 files changed, 172 insertions(+), 54 deletions(-)
 create mode 100644 htdocs/js/pg_editor_handlers.js

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index 992c952741..36fd0d6247 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -759,14 +759,16 @@ Styles specifically for the problem viewer
 }*/
 
 #editor{
-	width: 750px;
+	width: 585px;
 }
 
 #editor .pg_editor_input_span{
 	margin-bottom: 10px;
+	display: none;
 }
 
 #editor .pg_editor_input_div{
+	margin-top: 20px;
 	margin-left: 50px;
 }
 
@@ -775,6 +777,21 @@ Styles specifically for the problem viewer
 	clear: both;
 }
 
+#pg_editor_header {
+    left: 790px;
+    position: absolute;
+    top: 130px;
+}
+
+#pg_editor_frame_id{
+	height: 474px;
+    left: 785px;
+    position: absolute;
+    top: 182px;
+    width: 500px;
+	overflow: scroll;
+}
+
 /*These are styles for the table of problem sets, found on the Homework Sets page.  Most are simple alignment changes which makes it so everything isn't bunched up together.*/
 
 .radio_span{
diff --git a/htdocs/js/pg_editor_handlers.js b/htdocs/js/pg_editor_handlers.js
new file mode 100644
index 0000000000..09bf7509fd
--- /dev/null
+++ b/htdocs/js/pg_editor_handlers.js
@@ -0,0 +1,11 @@
+/*Javascript for PG Problem Editor*/
+
+// $(function(){
+	// alert(2);
+	// document.getElementById('pg_editor_frame_id').onload = function(){
+		// alert(1);
+		// document.getElementById('pg_editor_frame_id').firstChild.style = "width: 1000px";
+		// alert(document.getElementById('pg_editor_frame_id').hasChildNodes());
+	// };
+	// alert(3);
+// });
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
index 1350de64ef..c19c44fc8b 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -672,12 +672,50 @@ EOF
 	
 ######### print action forms
 		
-			print CGI::start_table({});
 			#print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
 			
 			my @formsToShow = @{ ACTION_FORMS() };
 			my $default_choice = $formsToShow[0];
 			my $i = 0;
+			
+###################################################################COLUMN STYLE BEGIN###############################################################
+			
+			# foreach my $actionID (@formsToShow) {
+				# # Check permissions
+				# #next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
+				# my $actionForm = "${actionID}_form";
+				# my $newWindow = ($actionID =~ m/^(view|add_problem|save)$/)? 1: 0;
+				# my $onChange = "setRadio($i,$newWindow)";
+				# my %actionParams = $self->getActionParams($actionID);
+				# my $line_contents = $self->$actionForm($onChange, %actionParams);
+				# my $radio_params = {-type=>"radio", -name=>"action", -value=>$actionID};
+				# $radio_params->{checked}=1 if ($actionID eq $default_choice) ;
+				# $radio_params->{onclick} = "setTarget($newWindow)";
+				# $radio_params->{id} = "action$i";
+				# # print CGI::Tr({-valign=>"top"},
+					# # CGI::td({}, CGI::input($radio_params)),
+					# # CGI::td({}, $line_contents)
+				# # ) if $line_contents;
+				# if($line_contents){
+					# print CGI::start_div({-class=>"column"});
+					# print CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br());
+					# print CGI::div({-class=>"pg_editor_input_div"},$line_contents);
+					# print CGI::br();
+					# print CGI::end_div();
+				# }
+				# $i++;
+			# }
+			# my $checkbox = WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"newWindow", -label_text=>"Open in new window", -input_attr=>{-checked=>"checked", -onchange=>"updateTarget()"});
+			# $checkbox =~ s/\n//; # remove unwanted linebreak
+			# print CGI::div({-class=>"pd_editor_input_div", -id=>"submit_input_div"}, $checkbox, CGI::br(), WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submit_button_id", -input_attr=>{-name=>'submit', -value=>"Take Action!"}));
+			
+########################################################COLUMN STYLE END###########################################################################
+
+
+########################################################TABBER STYLE BEGIN#########################################################################			
+			
+			my @divArr = ();
+			
 			foreach my $actionID (@formsToShow) {
 				# Check permissions
 				#next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
@@ -690,20 +728,33 @@ EOF
 				$radio_params->{checked}=1 if ($actionID eq $default_choice) ;
 				$radio_params->{onclick} = "setTarget($newWindow)";
 				$radio_params->{id} = "action$i";
-				print CGI::Tr({-valign=>"top"},
-					CGI::td({}, CGI::input($radio_params)),
-					CGI::td({}, $line_contents)
-				) if $line_contents;
-				
+				# print CGI::Tr({-valign=>"top"},
+					# CGI::td({}, CGI::input($radio_params)),
+					# CGI::td({}, $line_contents)
+				# ) if $line_contents;
+				if($line_contents){
+					my @titleArr = split(" ", ucfirst(WeBWorK::underscore_to_whitespace($actionForm)));
+					my $title = $titleArr[0];
+					push @divArr, join("",
+					CGI::h3($title),
+					CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br()),
+					CGI::div({-class=>"pg_editor_input_div"},$line_contents),
+					CGI::br())
+				}
 				$i++;
 			}
-			my $checkbox = CGI::input({-type=>"checkbox", -id=>"newWindow", -checked=>"checked",
-						   -onchange=>"updateTarget()"});
+			
+			my $divArrRef = \@divArr;
+	
+			print CGI::div({-class=>"tabber"},
+				CGI::div({-class=>"tabbertab"},$divArrRef)
+			);
+			
+###################################################TABBER STYLE END##############################################################################
+			
+			my $checkbox = WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"newWindow", -label_text=>"Open in new window", -input_attr=>{-checked=>"checked", -onchange=>"updateTarget()"});
 			$checkbox =~ s/\n//; # remove unwanted linebreak
-			print CGI::Tr({}, CGI::td({-colspan=>2}, "Select above then:",
-			                  CGI::submit(-name=>'submit', -value=>"Take Action!"),
-						CGI::script("document.write('$checkbox in another window')")));
-			print CGI::end_table();	
+			print CGI::div({-class=>"pd_editor_input_div", -id=>"submit_input_div"}, $checkbox, CGI::br(), WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submit_button_id", -input_attr=>{-name=>'submit', -value=>"Take Action!"}));
 	
 	
 	print  CGI::end_form();
@@ -1220,15 +1271,17 @@ sub view_form {
 	my ($self, $onChange, %actionParams) = @_;
 	my $file_type     = $self->{file_type};
 	return "" if    $file_type eq 'hardcopy_header';  # these can't yet be edited from temporary files #FIXME
-	my $output_string = "View";
+	my $output_string = "";
 	unless ($file_type eq 'course_info' || $file_type eq 'options_info') {
 
 		$output_string .= join(" ",
-			" using seed ",
-			CGI::textfield(-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange),
-			"and display mode ",
-			CGI::popup_menu(-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, 
-			  -default=>$self->{displayMode}, -onmousedown=>$onChange)
+			# "Use what seed?: ",
+			# CGI::textfield(-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange),
+			WeBWorK::CGI_labeled_input(-type=>"text", -id=>"action_view_seed_id", -label_text=>"Using what seed?: ", -input_attr=>{-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange}),CGI::br(),
+			# "and display mode ",
+			# CGI::popup_menu(-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, 
+			  # -default=>$self->{displayMode}, -onmousedown=>$onChange)
+			WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_view_displayMode_id", -label_text=>"Using what display mode?: ", -input_attr=>{-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, -default=>$self->{displayMode}, -onmousedown=>$onChange}),CGI::br(),
 		);
 	}
 
@@ -1387,11 +1440,9 @@ sub add_problem_form {
 	};
 	return "" if $self->{file_type} eq 'course_info' || $self->{file_type} eq 'options_info';
 	return join(" ",
-		"Add to set " ,
-		CGI::popup_menu({name=>'action.add_problem.target_set', values=>\@allSetNames, default=>$setName, onmousedown=>$onChange}),
-		" as ",
-		CGI::popup_menu({name=>'action.add_problem.file_type', values=>['problem','set_header', 'hardcopy_header'], labels=>$labels, default=>$self->{file_type}, onmousedown=>$onChange}),
-		
+		WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_add_problem_target_set_id", -label_text=>"Add to what set?: ", -input_attr=>{name=>'action.add_problem.target_set', values=>\@allSetNames, default=>$setName, onmousedown=>$onChange}),CGI::br(),
+		WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_add_problem_file_type_id", -label_text=>"Add as what filetype?: ", -input_attr=>{name=>'action.add_problem.file_type', values=>['problem','set_header', 'hardcopy_header'], labels=>$labels, default=>$self->{file_type}, onmousedown=>$onChange}),
+		CGI::br()
 	);  #FIXME  add -lables to the pop up menu
 	return "";
 }
@@ -1709,38 +1760,51 @@ sub save_as_form {  # calls the save_as_handler
     # don't addor replace problems to sets if the set is the Undefined_Set or if the problem is the blank_problem.
     
     my $replace_problem_in_set  = ($can_add_problem_to_set)?
-			 CGI::input({
-    			 -type      => 'radio',
-    			 -name      => "action.save_as.saveMode",
-    			 -value     => "rename",
-    			 -label     => '',
-			 },"and replace ".CGI::b("set $fullSetID$probNum").',')  : ''
+			 # CGI::input({
+    			 # -type      => 'radio',
+    			 # -name      => "action.save_as.saveMode",
+    			 # -value     => "rename",
+    			 # -label     => '',
+			 # },"and replace ".CGI::b("set $fullSetID$probNum").',') 
+			 WeBWorK::CGI_labeled_input(-type=>'radio', -id=>'action_save_as_saveMode_rename_id', -label_text=>"Replace ".CGI::b("set $fullSetID$probNum"), -input_attr=>{
+			 -name      => "action.save_as.saveMode",
+    		 -value     => "rename",
+			 }).CGI::br() : ''
     ;
     my $add_problem_to_set      = ($can_add_problem_to_set)?
-             CGI::input({
-    			 -type      => 'radio',
-    			 -name      => "action.save_as.saveMode",
+             # CGI::input({
+    			 # -type      => 'radio',
+    			 # -name      => "action.save_as.saveMode",
+    			 # -value     => 'add_to_set_as_new_problem',
+    			 # -label     => '',
+    			 # -onfocus   => $onChange,
+    		 # },"and append to end of set $fullSetID",) : ''
+			 WeBWorK::CGI_labeled_input(-type=>'radio', -id=>"action_save_as_saveMode_new_problem_id", -label_text=>"Append to end of set $fullSetID", -input_attr=>{
+				 -name      => "action.save_as.saveMode",
     			 -value     => 'add_to_set_as_new_problem',
-    			 -label     => '',
-    			 -onfocus   => $onChange,
-    		 },"and append to end of set $fullSetID",) : ''
+				 -onfocus   => $onChange,
+			 }).CGI::br() : ''
     ;  
     my $rh_new_problem_options = {
-    			 -type      => 'radio',
+    			# -type      => 'radio',
     			 -name      => "action.save_as.saveMode",
     			 -value     => "new_independent_problem",
     			 -onfocus   => $onChange,
     			 };
     $rh_new_problem_options->{checked}=1 unless $can_add_problem_to_set;
-    my $create_new_problem       = CGI::input($rh_new_problem_options,"as a new independent problem");
+    my $create_new_problem       =  WeBWorK::CGI_labeled_input(-type=>'radio', -id=>"action_save_as_saveMode_independent_problem_id", -label_text=>"Append as new independent problem", -input_attr=>$rh_new_problem_options).CGI::br(); #CGI::input($rh_new_problem_options,"as a new independent problem");
     
     $andRelink = CGI::br(). $replace_problem_in_set . $add_problem_to_set . $create_new_problem;
     			 
-	return 'Save AS [TMPL]/'.
-	        CGI::textfield(
-			       -name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
-			       -onfocus=>$onChange
-			      ).",".
+	return #'Save AS [TMPL]/'.
+	        # CGI::textfield(
+			       # -name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
+			       # -onfocus=>$onChange
+			      # ).",".
+			WeBWorK::CGI_labeled_input(-type=>"text", -id=>"action_save_as_target_file_id", -label_text=>"Save AS [TMPL]/", -input_attr=>{
+				-name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
+			    -onfocus=>$onChange
+			}).
 			CGI::hidden(-name=>'action.save_as.source_file', -value=>$editFilePath ).
 			CGI::hidden(-name=>'action.save_as.file_type',-value=>$self->{file_type}).
 			$andRelink;
@@ -1951,7 +2015,21 @@ sub revert_handler {
 	# no redirect is needed
 }
 
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
 
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	
+	return "";
+}
+
+sub output_tabber_CSS{
+	return "";
+}
 
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
index ff12a154c6..9266057049 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
@@ -14,7 +14,7 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::ContentGenerator::Instructor::PGProblemEditor2;
+package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
 use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
 use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
@@ -23,7 +23,7 @@ use constant DEFAULT_SEED => 123456;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::PGProblemEditor2 - Edit a pg file
+WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
 
 =cut
 
@@ -596,7 +596,7 @@ sub body {
 	# FIXME 
 	# Should the seed be set from some particular user instance??
 	my $rows            = 20;
-	my $columns         = 80;
+	my $columns         = 70;
 	my $mode_list       = $ce->{pg}->{displayModes};
 	my $displayMode     = $self->{displayMode};
 	my $problemSeed     = $self->{problemSeed};	
@@ -623,7 +623,7 @@ sub body {
 		}
 		function updateTarget() {
 		  var inWindow = document.getElementById("newWindow").checked;
-		  document.getElementById("editor").target = (inWindow? "WW_View": "");
+		  document.getElementById("editor").target = (inWindow? "WW_View": "pg_editor_frame");
 		}
 		function setRadio(i,nw) {
 		  document.getElementById('action'+i).checked = true;
@@ -734,7 +734,8 @@ EOF
 				# ) if $line_contents;
 				if($line_contents){
 					my @titleArr = split(" ", ucfirst(WeBWorK::underscore_to_whitespace($actionForm)));
-					my $title = $titleArr[0];
+					pop @titleArr;
+					my $title = join(" ", @titleArr);
 					push @divArr, join("",
 					CGI::h3($title),
 					CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br()),
@@ -760,6 +761,11 @@ EOF
 	print  CGI::end_form();
 
 	print CGI::script("updateTarget()");
+	
+	print CGI::h3({-id=>"pg_editor_header"}, "Problem Viewer");
+	print CGI::start_iframe({-id=>"pg_editor_frame_id", -name=>"pg_editor_frame"});
+	print CGI::end_iframe();
+	
 	return "";
 
 
@@ -925,7 +931,7 @@ sub getFilePaths {
 		$setName =~ s/,v\d+$//;
 	}
 
-	die 'Internal error to PGProblemEditor2 -- file type is not defined'  unless defined $file_type;
+	die 'Internal error to PGProblemEditor -- file type is not defined'  unless defined $file_type;
 	#$self->addgoodmessage("file type is $file_type");  #FIXME remove
 	##########################################################
 	# Determine path to the input file to be edited. 
@@ -1301,7 +1307,7 @@ sub view_handler {
 	my $displayMode     = ($actionParams->{'action.view.displayMode'}) ? 
 	                                $actionParams->{'action.view.displayMode'}->[0]  
 	                                : $self->r->ce->{pg}->{options}->{displayMode};
-	                                
+						
 	my $editFilePath        = $self->{editFilePath};
 	my $tempFilePath        = $self->{tempFilePath};
 	########################################################                               
@@ -1665,7 +1671,7 @@ sub save_handler {
 			}
 		);
 	} elsif ($file_type eq 'source_path_for_problem_file') {  # redirect to ProblemSets.pm
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 		courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		my $viewURL = $self->systemLink($problemPage, 
@@ -1952,17 +1958,17 @@ sub save_as_handler {
 	my $new_file_type;
 
 	if ($saveMode eq 'new_independent_problem' ) {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => 'Undefined_Set', problemID => 'Undefined_Set'
 		);
 		$new_file_type = 'source_path_for_problem_file';
 	} elsif ($saveMode eq 'rename') {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		$new_file_type = $file_type;
 	} elsif ($saveMode eq 'add_to_set_as_new_problem') {
-	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		$new_file_type = $file_type;
@@ -2021,8 +2027,10 @@ sub output_JS{
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/pg_editor_handlers.js"}), CGI::end_script();
 	
 	return "";
 }
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index 818f0501ce..49e5daf656 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -78,3 +78,7 @@ msgstr "This course supports guest logins. Click %1 to log into this course as a
 #
 msgid "_PROBLEM_SET_SUMMARY"
 msgstr "This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."
+
+#
+msgid "_USER_TABLE_SUMMARY"
+msgstr "A table showing all the current users along with several fields of user information. The fields from left to right are: Login Name, Login Status, Assigned Sets, First Name, Last Name, Email Address, Student ID, Enrollment Status, Section, Recitation, Comments, and Permission Level.  Clicking on the links in the column headers will sort the table by the field it corresponds to. The Login Name fields contain checkboxes for selecting the user.  Clicking the link of the name itself will allow you to act as the selected user.  There will also be an image link following the name which will take you to a page where you can edit the selected user's information.  Clicking the emails will allow you to email the corresponding user.  Clicking the links in the entries in the assigned sets columns will take you to a page where you can view and reassign the sets for the selected user."

From 2ef261eeaaece27494e4732f4fb41ca45b539800 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:00:23 -0400
Subject: [PATCH 13/73] Fix errors that crept in when transferring from ghe3's
 SVN file in February

Also made some modifications in the warning channel print outs
---
 lib/WeBWorK/ContentGenerator/Problem.pm | 126 ++++++++++++------------
 1 file changed, 61 insertions(+), 65 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index ec8046e579..8bd46d7a3a 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -771,9 +771,9 @@ sub warnings {
  		my @pginternalerrors = @{ $self->{pginternalerrors}  };
 		print CGI::start_div();
 		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question processing error messages"));
-		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),   CGI::br(), join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
-		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ), CGI::br(), join(CGI::br(), @pgwarning)  )  if @pgwarning ;	
-		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ),  CGI::br(), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
+		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),  join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
+		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ),join(CGI::br(), @pgwarning)  )  if @pgwarning ;	
+		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
 		print CGI::end_div();
 	} 
 	# print "proceeding to SUPER::warnings";
@@ -799,6 +799,12 @@ sub head {
 	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
 }
 
+sub post_header_text {
+	my ($self) = @_;
+	return "" if ( $self->{invalidSet} );
+    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
+}
+
 sub options {
 	my ($self) = @_;
 	#warn "doing options in Problem";
@@ -933,7 +939,7 @@ sub body {
 	my $set = $self->{set};
 	my $problem = $self->{problem};
 	my $pg = $self->{pg};
-	print CGI::p("Entering Problem::body subroutine.  This indicates an older style system.template file -- consider upgrading. ");
+	print CGI::p("Entering Problem::body subroutine.  This indicates an old style system.template file -- consider upgrading. ");
 	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
 	unless($valid eq "valid"){
 		return $valid;
@@ -1098,7 +1104,7 @@ sub output_checkboxes{
 				-name    => "showCorrectAnswers",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	if ($can{showHints}) {
 		print CGI::div({style=>"color:red"},
@@ -1114,11 +1120,11 @@ sub output_checkboxes{
 				}
 				:
 				{
-					-name    => "showCorrectAnswers",
+					-name    => "showHints",
 					-value   => 1,
 				}
 			)
-		);
+		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {
 		print WeBWorK::CGI_labeled_input(
@@ -1133,10 +1139,10 @@ sub output_checkboxes{
 			}
 			:
 			{
-				-name    => "showCorrectAnswers",
+				-name    => "showSolutions",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	
 	if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
@@ -1166,7 +1172,7 @@ sub output_submit_buttons{
 		if ($user ne $effectiveUser) {
 			# if acting as a student, make it clear that answer submissions will
 			# apply to the student's records, not the professor's.
-			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
+			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>$r->maketext("submitAnswers"), -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
 		} else {
 			#print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>"alert('submit button clicked')");
 			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers"), -onclick=>""});
@@ -1188,12 +1194,7 @@ sub output_score_summary{
 	my $problem = $self->{problem};
 	my $set = $self->{set};
 	my $pg = $self->{pg};
-	my $scoreRecordedMessage = "";
-	if  (defined $self->{scoreRecordedMessage}) {
-		$scoreRecordedMessage = $self->{scoreRecordedMessage};
-	} else {
-		$scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
-	}
+	my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
 	my $submitAnswers = $self->{submitAnswers};
 	
 	# score summary
@@ -1201,16 +1202,8 @@ sub output_score_summary{
 	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
 	my $problem_status    = $problem->status || 0;
 	my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
-	#my ($attemptsLeft, $attemptsLeftNoun);
 	my $attemptsLeft = $problem->max_attempts - $attempts;
-#	if ($problem->max_attempts == -1) {
-#		# unlimited attempts
-#		$attemptsLeft = $r->maketext("unlimited");
-#		$attemptsLeftNoun = $r->maketext("attempts");
-#	} else {
-#		$attemptsLeft = $problem->max_attempts - $attempts;
-#		$attemptsLeftNoun = $attemptsLeft == 1 ? $r->maketext("attempt") : $r->maketext("attempts");
-#	}
+
 	
 	my $setClosed = 0;
 	my $setClosedMessage;
@@ -1240,7 +1233,6 @@ sub output_score_summary{
 			$problem->attempted
 				? $r->maketext("Your overall recorded score is [_1].  [_2]",$lastScore,$notCountedMessage) . CGI::br()
 				: "",
-#			$setClosed ? $setClosedMessage : $r->maketext("You have [_1] [_2] remaining.",$attemptsLeft,$attemptsLeftNoun) 
 			$setClosed ? $setClosedMessage : $r->maketext("You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.",$attemptsLeft) 
 		));
 	}else {
@@ -1264,6 +1256,18 @@ sub output_misc{
 	my %will = %{ $self->{will} };
 	my $user = $r->param('user');
 
+# 	print CGI::start_div();
+# 	
+# 	my $pgdebug = join(CGI::br(), @{$pg->{pgcore}->{DEBUG_messages}} );
+# 	my $pgwarning = join(CGI::br(), @{$pg->{pgcore}->{WARNING_messages}} );
+# 	my $pginternalerrors = join(CGI::br(),  @{$pg->{pgcore}->get_internal_debug_messages}   );
+# 	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
+# 	
+# 	print CGI::p({style=>"color:red;"}, $r->maketext("Checking additional error messages")) if $pgerrordiv  ;
+#  	print CGI::p($r->maketext("pg debug"),CGI::br(), $pgdebug                 )   if $pgdebug ;
+# 	print CGI::p($r->maketext("pg warning"),CGI::br(),$pgwarning                ) if $pgwarning ;	
+# 	print CGI::p($r->maketext("pg internal errors"),CGI::br(), $pginternalerrors) if $pginternalerrors;
+# 	print CGI::end_div()                                                          if $pgerrordiv ;
 	
 	# save state for viewOptions
 	print  CGI::hidden(
@@ -1300,8 +1304,7 @@ sub output_misc{
 
 # output_summary subroutine
 
-# prints out the feedback on the questions that the student has answered for 	
-# the current problem, along with available information about correctness
+# prints out the summary of the questions that the student has answered for the current problem, along with available information about correctness
 
 sub output_summary{
 	
@@ -1365,7 +1368,7 @@ sub output_custom_edit_message{
 	# custom message for editor
 	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
 		if ($editMode eq "temporaryFile") {
-			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file"), $problem->source_file));
+			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file: "), $problem->source_file));
 		} elsif ($editMode eq "savedFile") {
 			# taken care of in the initialization phase
 		}
@@ -1443,11 +1446,14 @@ sub output_email_instructor{
 sub output_hidden_info{
 	my $self = shift;
 	my $previewAnswers = $self->{previewAnswers};
-	
-	if($previewAnswers){
+	my $checkAnswers   = $self->{checkAnswers};
+	my $showPartialCorrectAnswers = $self->{pg}->{flags}->{showPartialCorrectAnswers};
+	if($previewAnswers){  # never color previewed answers 
 		return "";
 	}
-	else{
+	elsif (   ($checkAnswers  ) 
+	         or $showPartialCorrectAnswers )    { # color answers when partialCorrectAnswers is set
+	                                              # or when checkAnswers is submitted 
 		if(defined $self->{correct_ids}){
 			my $correctRef = $self->{correct_ids};
 			my @correct = @$correctRef;
@@ -1463,39 +1469,13 @@ sub output_hidden_info{
 			}
 		}
 		return "";
+	} else {
+		return "";
 	}
 }
 
 # output_JS subroutine
 
-# outputs all of the Javascript needed for this page. The main javascript needed here is color.js, which colors input fields based on whether or not they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so that the colors will show up correctly.
-
-sub output_JS{
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $site_url = $ce->{webworkURLs}->{htdocs};
-	
-	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
-	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
-	
-	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
-	
-	return "";
-}
-
-# Simply here to indicate to the template that this page has body part methods which can be called
-
-sub can_body_parts{
-	return "";
-}
-
-# output_wztooltip_JS subroutine
-
 # prints out the wz_tooltip.js script for the current site.
 
 sub output_wztooltip_JS{
@@ -1510,18 +1490,34 @@ sub output_wztooltip_JS{
 	return "";
 }
 
-# output_removDupli_JS
-
-# outputs the removeDuplicates JS function
+# outputs all of the Javascript needed for this page. 
+# The main javascript needed here is color.js, which colors input fields based on whether or not 
+# they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification 
+# information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into 
+# two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so 
+# that the colors will show up correctly.
 
-sub output_removDupli_JS{
+sub output_JS{
 	my $self = shift;
 	my $r = $self->r;
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
 	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
+	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	
+	# This is a file which initializes the proper JAVA applets should they be needed for the current problem.
+	print CGI::start_script({type=>"tesxt/javascript", src=>"$site_url/js/java_init.js"}), CGI::end_script();
+	
+	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
+	return "";
+}
+
+# Simply here to indicate to the template that this page has body part methods which can be called
+
+sub can_body_parts{
 	return "";
 }
 

From fc543480575de3e435cc023b0e2f91099c323b3b Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:02:31 -0400
Subject: [PATCH 14/73] Rename PGProblemEditor to PGProblemEditor2 to avoid
 redefining subroutines

Changed the package name in PGProblemEditor2 to PGProblemEditor2 to avoid duplicates.
---
 lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
index 9266057049..2c5e3855ac 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
@@ -14,7 +14,7 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
+package WeBWorK::ContentGenerator::Instructor::PGProblemEditor2;
 use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
 use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
@@ -23,7 +23,7 @@ use constant DEFAULT_SEED => 123456;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
+WeBWorK::ContentGenerator::Instructor::PGProblemEditor2 - Edit a pg file
 
 =cut
 

From 3fa16d8c8a619695691a93252f3ab4ad6d5c3f87 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:04:18 -0400
Subject: [PATCH 15/73] Comment out trace messages for the various warning
 channels

These can be turned back on by setting $TRACE_WARNINGS = 1
---
 lib/WeBWorK/ContentGenerator.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index d425e7c91b..0c9f8bef80 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -57,7 +57,7 @@ use WeBWorK::Localize;
 use mod_perl;
 use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
 
-
+our $TRACE_WARNINGS = 0;   # set to 1 to trace channel used by warning message
 
 
 BEGIN {
@@ -1067,7 +1067,7 @@ The implementation in this package checks for a note in the request named
 sub warnings {
 	my ($self) = @_;
 	my $r = $self->r;
-	print CGI::p("Entering ContentGenerator::warnings");
+	print CGI::p("Entering ContentGenerator::warnings") if $TRACE_WARNINGS;
 	print "\n<!-- BEGIN " . __PACKAGE__ . "::warnings -->\n";
 	my $warnings = MP2 ? $r->notes->get("warnings") : $r->notes("warnings");
 	print $self->warningOutput($warnings) if $warnings;
@@ -1949,7 +1949,7 @@ problem rendering.
 sub errorOutput($$$) {
 	my ($self, $error, $details) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::errorOutput subroutine</br>";
+	print "Entering ContentGenerator::errorOutput subroutine</br>" if $TRACE_WARNINGS;
 	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
 	my $method = $r->method;
 	my $uri = $r->uri;
@@ -2007,7 +2007,7 @@ and content generation.
 sub warningOutput($$) {
 	my ($self, $warnings) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::warningOutput subroutine</br>";
+	print "Entering ContentGenerator::warningOutput subroutine</br>" if $TRACE_WARNINGS;
 	my @warnings = split m/\n+/, $warnings;
 	foreach my $warning (@warnings) {
 		#$warning = escapeHTML($warning);  # this would prevent using tables in output from answer evaluators

From 1531892f47e21fe306195cc8cc08d5ede6d2d7b0 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:06:37 -0400
Subject: [PATCH 16/73] Supply environment when calling the xmlrpc webservice

---
 clients/renderProblem.pl | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/clients/renderProblem.pl b/clients/renderProblem.pl
index c4616dcdad..3155316220 100755
--- a/clients/renderProblem.pl
+++ b/clients/renderProblem.pl
@@ -200,6 +200,10 @@ =head1 NAME
 
 our $source;
 our $rh_result;
+
+# set fileName path to path for current file (this is a best guess -- may not always be correct)
+my $fileName = $ARGV[0]; # should this be ARGV[0]?
+
 # filter mode  main code
 
 {
@@ -229,8 +233,14 @@ =head1 NAME
 		courseName   	=> $credentials{courseID}||'',
 		password     	=> $credentials{password}||'',	
 		site_password   => $credentials{site_password}||'',
+		envir           => $xmlrpc_client->environment(),
+		                 
  };
 
+
+$fileName =~ s|/opt/webwork/libraries/NationalProblemLibrary|Library|;
+$input->{envir}->{fileName} = $fileName;
+
 #xmlrpcCall('renderProblem');
 our $output;
 our $result;
@@ -254,6 +264,36 @@ =head1 NAME
 
 ##################################################
 # end input/output section
+
+
+################################################################################
+# Storage utilities section
+################################################################################
+# 
+# sub write_session_credentials {
+# 	my $credentials = shift;
+# 	my %credentials = %$credentials;
+# 	my $string = "\$session_credentials = {session_key => $credentials{session_key},
+# 	                                       userID      => $credentials{userID},
+# 	                                       courseID    => $credentials{courseID},
+# 	              };\n";
+# 	local(*FH);
+# 	open(FH, '>'.CREDENTIALFILE) or die "Can't open file ".CREDENTIALFILE()." for writing";
+# 	print FH $string;
+# 	close(FH);
+# }
+# 
+# sub read_session_credentials {
+# 	local(*FH);
+# 	open(FH, '<'.CREDENTIALFILE) or die "Can't open file ".CREDENTIALFILE()." for writing";
+# 	local ($|);
+# 	my $string = <FH>;   # slurp the contents
+# 	my $session_credentials = eval( $string);
+# 	close(FH);
+# 	return $session_credentials;
+# }
+##################################################
+# end input/output section
 ##################################################
 
 sub pretty_print_rh { 

From 7ff1aec373c666fd3afdfea2593e0651b1ef5f3e Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 00:45:52 -0400
Subject: [PATCH 17/73] Fuss with the system.template files for math2 and math3

Try to make them as similar as possible
---
 conf/templates/math2/system.template | 109 ++++++++++++++------------
 conf/templates/math3/system.template | 113 ++++++++++++++-------------
 2 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/conf/templates/math2/system.template b/conf/templates/math2/system.template
index 29f521cd0f..cc6aa7c840 100644
--- a/conf/templates/math2/system.template
+++ b/conf/templates/math2/system.template
@@ -32,6 +32,9 @@
 <!--#if can="output_tabber_CSS"-->
 	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/tabber.css"/>
 <!--#endif-->
+<!--#if can="output_jquery_ui_CSS"-->
+	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/jquery-ui-1.8.18.custom.css"/>
+<!--#endif-->
 <!--#if can="output_JS"-->
 	<!--#output_JS-->
 <!--#endif-->
@@ -93,66 +96,68 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#endif -->
-			<!--#if can="output_problem_body"--> 
-			<!-- ====  print body parts if possible  -->		
-			  <div class="Body" style="background-color:#ffffff">
-			
-				<!--#if can="output_custom_edit_message"-->
-					<!--#output_custom_edit_message-->
-				<!--#endif-->
-				<!--#if can="output_summary"-->
-						<!--#output_summary-->
-				<!--#endif-->
-				
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-				
-				<!--#if can="output_form_start"-->
-					<!--#output_form_start-->
-					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-						<div class="problem">
-							<!--#if can="output_problem_body"-->
-								<!--#output_problem_body-->
-							<!--#endif-->
-							<!--#if can="output_message"-->
-								<!--#output_message-->
-							<!--#endif-->
-							<!--#if can="output_editorLink"-->
-								<!--#output_editorLink-->
-							<!--#endif-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-						<p>
-							<!--#if can="output_checkboxes"-->
-								<!--#output_checkboxes-->
-							<!--#endif-->
-							<!--#if can="output_submit_buttons"-->
-								<!--#output_submit_buttons-->
-							<!--#endif-->
-						</p>
+             <!--#endif-->
+             
+			 <!--#if can="output_problem_body"--> 
+				<!-- ==== in this case print body parts --ELSE-- print entire body -->		
+				  <div class="Body" style="background-color:#ffffff">
+	
+					<!--#if can="output_custom_edit_message"-->
+						<!--#output_custom_edit_message-->
 					<!--#endif-->
-					<!--#if can="output_score_summary"-->
-						<div class="scoreSummary">
-							<!--#output_score_summary-->
+					<!--#if can="output_summary"-->
+					    <div>
+							<!--#output_summary-->
 						</div>
 					<!--#endif-->
-					<!--#if can="output_misc"-->
-						<!--#output_misc-->
+					
+					<!--#if can="output_hidden_info"-->
+						<!--#output_hidden_info-->
+					<!--#endif-->
+					
+					<!--#if can="output_form_start"-->
+						<!--#output_form_start-->
+						<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+							<div class="problem">
+								<!--#if can="output_problem_body"-->
+									<!--#output_problem_body-->
+								<!--#endif-->
+								<!--#if can="output_message"-->
+									<!--#output_message-->
+								<!--#endif-->
+								<!--#if can="output_editorLink"-->
+									<!--#output_editorLink-->
+								<!--#endif-->
+							</div>
+						<!--#endif-->
+						<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+							<p>
+								<!--#if can="output_checkboxes"-->
+									<!--#output_checkboxes-->
+								<!--#endif-->
+								<!--#if can="output_submit_buttons"-->
+									<!--#output_submit_buttons-->
+								<!--#endif-->
+							</p>
+						<!--#endif-->
+						<!--#if can="output_score_summary"-->
+							<div class="scoreSummary">
+								<!--#output_score_summary-->
+							</div>
+						<!--#endif-->
+						<!--#if can="output_misc"-->
+							<!--#output_misc-->
+						<!--#endif-->
+						</form>
 					<!--#endif-->
-					</form>
 				</div>	  
 			<!-- ====  end printing body parts   -->
 			<!--#else-->
 			<!-- ==== couldn't print body parts so we'll print entire body -->	
-					  <div class="Body" style="background-color:#ffffff">
-					  <!--#body-->
-					  </div>
-			<!-- ==== end printing entire body ===>
-			<!--#endif-->
-			
+				  <div class="Body" style="background-color:#ffffff">
+				  <!--#body-->
+				  </div>
+
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 91e3d0a424..f7500e94bf 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -96,66 +96,67 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#else-->
-				 <!--#if can="output_problem_body"--> 
-			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
-					  <div class="Body" style="background-color:#ffffff">
-		
-						<!--#if can="output_custom_edit_message"-->
-							<!--#output_custom_edit_message-->
-						<!--#endif-->
-						<!--#if can="output_summary"-->
-								<!--#output_summary-->
+             <!--#endif-->
+             
+			 <!--#if can="output_problem_body"--> 
+				<!-- ==== in this case print body parts --ELSE-- print entire body -->		
+				  <div class="Body" style="background-color:#ffffff">
+	
+					<!--#if can="output_custom_edit_message"-->
+						<!--#output_custom_edit_message-->
+					<!--#endif-->
+					<!--#if can="output_summary"-->
+					    <div>
+							<!--#output_summary-->
+						</div>
+					<!--#endif-->
+					
+					<!--#if can="output_hidden_info"-->
+						<!--#output_hidden_info-->
+					<!--#endif-->
+					
+					<!--#if can="output_form_start"-->
+						<!--#output_form_start-->
+						<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+							<div class="problem">
+								<!--#if can="output_problem_body"-->
+									<!--#output_problem_body-->
+								<!--#endif-->
+								<!--#if can="output_message"-->
+									<!--#output_message-->
+								<!--#endif-->
+								<!--#if can="output_editorLink"-->
+									<!--#output_editorLink-->
+								<!--#endif-->
 							</div>
 						<!--#endif-->
-						
-						<!--#if can="output_hidden_info"-->
-							<!--#output_hidden_info-->
+						<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+							<p>
+								<!--#if can="output_checkboxes"-->
+									<!--#output_checkboxes-->
+								<!--#endif-->
+								<!--#if can="output_submit_buttons"-->
+									<!--#output_submit_buttons-->
+								<!--#endif-->
+							</p>
 						<!--#endif-->
-						
-						<!--#if can="output_form_start"-->
-							<!--#output_form_start-->
-							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-								<div class="problem">
-									<!--#if can="output_problem_body"-->
-										<!--#output_problem_body-->
-									<!--#endif-->
-									<!--#if can="output_message"-->
-										<!--#output_message-->
-									<!--#endif-->
-									<!--#if can="output_editorLink"-->
-										<!--#output_editorLink-->
-									<!--#endif-->
-								</div>
-							<!--#endif-->
-							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-								<p>
-									<!--#if can="output_checkboxes"-->
-										<!--#output_checkboxes-->
-									<!--#endif-->
-									<!--#if can="output_submit_buttons"-->
-										<!--#output_submit_buttons-->
-									<!--#endif-->
-								</p>
-							<!--#endif-->
-							<!--#if can="output_score_summary"-->
-								<div class="scoreSummary">
-									<!--#output_score_summary-->
-								</div>
-							<!--#endif-->
-							<!--#if can="output_misc"-->
-								<!--#output_misc-->
-							<!--#endif-->
-							</form>
+						<!--#if can="output_score_summary"-->
+							<div class="scoreSummary">
+								<!--#output_score_summary-->
+							</div>
 						<!--#endif-->
-					  </div>
-
-				<!--#else-->
-				<!-- ==== couldn't print body parts so we'll print entire body -->	
-						  <div class="Body" style="background-color:#ffffff">
-						  <!--#body-->
-						  </div>
-				<!--#endif-->
+						<!--#if can="output_misc"-->
+							<!--#output_misc-->
+						<!--#endif-->
+						</form>
+					<!--#endif-->
+				</div>	  
+			<!-- ====  end printing body parts   -->
+			<!--#else-->
+			<!-- ==== couldn't print body parts so we'll print entire body -->	
+				  <div class="Body" style="background-color:#ffffff">
+				  <!--#body-->
+				  </div>
 
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->

From b59a6b3a5300c7f19dc807e457ad4b674a289078 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 00:47:06 -0400
Subject: [PATCH 18/73] Remove coloring Show Hints as red and place show hints
 and show solutions on one line

---
 lib/WeBWorK/ContentGenerator/Problem.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index 8bd46d7a3a..d59647af99 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -939,7 +939,9 @@ sub body {
 	my $set = $self->{set};
 	my $problem = $self->{problem};
 	my $pg = $self->{pg};
-	print CGI::p("Entering Problem::body subroutine.  This indicates an old style system.template file -- consider upgrading. ");
+	print CGI::p("Entering Problem::body subroutine.  
+	         This indicates an old style system.template file -- consider upgrading. ",
+	         caller(1), );
 	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
 	unless($valid eq "valid"){
 		return $valid;
@@ -1107,8 +1109,7 @@ sub output_checkboxes{
 		),"&nbsp;";
 	}
 	if ($can{showHints}) {
-		print CGI::div({style=>"color:red"},
-			WeBWorK::CGI_labeled_input(
+		print WeBWorK::CGI_labeled_input(
 				-type	 => "checkbox",
 				-id		 => "showHints_id",
 				-label_text => $r->maketext("Show Hints"),
@@ -1123,7 +1124,6 @@ sub output_checkboxes{
 					-name    => "showHints",
 					-value   => 1,
 				}
-			)
 		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {

From 7b20f8daddf9621c6cee67c0d0ab4ffafaf65856 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 11:02:41 -0400
Subject: [PATCH 19/73] change channel for PGdebug and PGwarning messages so
 they don't got through the "flags" substructure.

They are now toplevel structures of pgcore.
---
 lib/WebworkClient.pm                   | 11 +++++++----
 lib/WebworkWebservice/RenderProblem.pm |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
index bba400691c..73d0759bbe 100755
--- a/lib/WebworkClient.pm
+++ b/lib/WebworkClient.pm
@@ -473,14 +473,14 @@ sub formatRenderedProblem {
 	# PG debug messages generated with DEBUG_message();
 	#################################################
 	
-	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+	my $debug_messages = $rh_result->{debug_messages} ||     [];
     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
     
 	#################################################    
 	# PG warning messages generated with WARN_message();
 	#################################################
 
-    my $PG_warning_messages =  $rh_result->{flags}->{WARNING_messages} ||     [];
+    my $PG_warning_messages =  $rh_result->{warning_messages} ||     [];
     $PG_warning_messages = join("<br/>\n", @{  $PG_warning_messages }    );
     
 	#################################################
@@ -492,6 +492,8 @@ sub formatRenderedProblem {
 
     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+    
+    my $fileName = $self->{input}->{envir}->{fileName} || "Can't find file name";
 	# collect answers
 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
 	my $problemNumber     = 1;
@@ -500,7 +502,7 @@ sub formatRenderedProblem {
     }
 	$answerTemplate      .= q{</table> <hr>};
 
-
+	my $test = pretty_print($rh_result);
 	my $XML_URL      = $self->url;
 	my $FORM_ACTION_URL  =  $self->{form_action_url};
 	my $courseID         =  $self->{courseID};
@@ -515,6 +517,7 @@ sub formatRenderedProblem {
 <title>$XML_URL WeBWorK Editor using host $XML_URL</title>
 </head>
 <body>
+$test
 <h2> WeBWorK Editor using host $XML_URL</h2>
 		    $answerTemplate
 		    <form action="$FORM_ACTION_URL" method="post">
@@ -523,7 +526,7 @@ sub formatRenderedProblem {
 	       <input type="hidden" name="problemAddress" value="probSource"> 
 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
 	       <input type="hidden" name="problemSeed" value="1234"> 
-	       <input type="hidden" name="pathToProblemFile" value="foobar">
+	       <input type="hidden" name="pathToProblemFile" value="$fileName">
 	       <input type="hidden" name=courseName value="$courseID">
 	       <input type="hidden" name=courseID value="$courseID">
 	       <input type="hidden" name="userID" value="$userID">
diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
index ee72cf750d..057f02356c 100644
--- a/lib/WebworkWebservice/RenderProblem.pm
+++ b/lib/WebworkWebservice/RenderProblem.pm
@@ -419,9 +419,11 @@ sub renderProblem {
 		
 	);
   
-    my $internal_debug_messages;
+    my ($internal_debug_messages, $pgwarning_messages, $pgdebug_messages);
     if (ref ($pg->{pgcore}) ) {
     	$internal_debug_messages = $pg->{pgcore}->get_internal_debug_messages;
+    	$pgwarning_messages        = $pg ->{pgcore}->get_warning_messages();
+    	$pgdebug_messages          = $pg ->{pgcore}->get_debug_messages();
     } else {
     	$internal_debug_messages = ['Error in obtaining debug messages from PGcore'];
     }
@@ -432,11 +434,13 @@ sub renderProblem {
 		answers 					=> $pg->{answers},
 		errors         				=> $pg->{errors},
 		WARNINGS	   				=> encode_base64( 
-		                                 "WARNINGS\n".$warning_messages."\nMore\n".$pg->{warnings} 
+		                                 "WARNINGS\n".$warning_messages."\n<br/>More<br/>\n".$pg->{warnings} 
 		                               ),
 		problem_result 				=> $pg->{result},
 		problem_state				=> $pg->{state},
 		flags						=> $pg->{flags},
+		warning_messages            => $pgwarning_messages,
+		debug_messages              => $pgdebug_messages,
 		internal_debug_messages     => $internal_debug_messages,
 	};
 	

From 4baa69fb1750f5c8fcf3c065b77ab043e77bf4e0 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 11:06:39 -0400
Subject: [PATCH 20/73] Remove test string which printed the entire
 environment.

---
 lib/WebworkClient.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
index 73d0759bbe..3f6d86b435 100755
--- a/lib/WebworkClient.pm
+++ b/lib/WebworkClient.pm
@@ -517,7 +517,7 @@ sub formatRenderedProblem {
 <title>$XML_URL WeBWorK Editor using host $XML_URL</title>
 </head>
 <body>
-$test
+
 <h2> WeBWorK Editor using host $XML_URL</h2>
 		    $answerTemplate
 		    <form action="$FORM_ACTION_URL" method="post">

From f845c34dfa54156cab3cb72d0b5c2c78129c61f7 Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Fri, 23 Mar 2012 20:39:24 -0400
Subject: [PATCH 21/73] ghe3: implemented Datepicker

---
 conf/templates/math3/math3.css                |    6 +-
 conf/templates/math3/system.template          |  111 +-
 .../Instructor/ProblemSetList.pm              | 1076 ++++++++++-------
 3 files changed, 724 insertions(+), 469 deletions(-)

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index 1220807061..1d24caf0f1 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -293,7 +293,7 @@ clear: both;
 	padding: 0;
 	margin: 1ex .5em .1ex .1em;
 	font-size: smaller;
-}
+} 
 
 /*Relative Positioning -- a alternate style for the loginstatus which uses relative positioning.  Tested, but was decided that it didn't work great. Feel free to uncomment if you want to try it out.*/
 
@@ -716,7 +716,7 @@ span.gray_button{
 	width: 100%;
 }
 
-/*Styles specifically for the problem viewer*/
+Styles specifically for the problem viewer
 
 #problem_viewer_form{
 	margin-left: 10px;
@@ -758,7 +758,7 @@ span.gray_button{
 	margin-top: 10%;
 	margin-left: 10%;
 	margin-right: 10%;
-}
+}*/
 
 #editor{
 	width: 750px;
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 715dd931f9..91e3d0a424 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -96,66 +96,67 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#endif -->
-			<!--#if can="output_problem_body"--> 
-			<!-- ====  print body parts if possible  -->		
-			  <div class="Body" style="background-color:#ffffff">
-			
-				<!--#if can="output_custom_edit_message"-->
-					<!--#output_custom_edit_message-->
-				<!--#endif-->
-				<!--#if can="output_summary"-->
-						<!--#output_summary-->
-				<!--#endif-->
-				
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-				
-				<!--#if can="output_form_start"-->
-					<!--#output_form_start-->
-					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-						<div class="problem">
-							<!--#if can="output_problem_body"-->
-								<!--#output_problem_body-->
-							<!--#endif-->
-							<!--#if can="output_message"-->
-								<!--#output_message-->
+			<!--#else-->
+				 <!--#if can="output_problem_body"--> 
+			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
+					  <div class="Body" style="background-color:#ffffff">
+		
+						<!--#if can="output_custom_edit_message"-->
+							<!--#output_custom_edit_message-->
+						<!--#endif-->
+						<!--#if can="output_summary"-->
+								<!--#output_summary-->
+							</div>
+						<!--#endif-->
+						
+						<!--#if can="output_hidden_info"-->
+							<!--#output_hidden_info-->
+						<!--#endif-->
+						
+						<!--#if can="output_form_start"-->
+							<!--#output_form_start-->
+							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+								<div class="problem">
+									<!--#if can="output_problem_body"-->
+										<!--#output_problem_body-->
+									<!--#endif-->
+									<!--#if can="output_message"-->
+										<!--#output_message-->
+									<!--#endif-->
+									<!--#if can="output_editorLink"-->
+										<!--#output_editorLink-->
+									<!--#endif-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_editorLink"-->
-								<!--#output_editorLink-->
+							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+								<p>
+									<!--#if can="output_checkboxes"-->
+										<!--#output_checkboxes-->
+									<!--#endif-->
+									<!--#if can="output_submit_buttons"-->
+										<!--#output_submit_buttons-->
+									<!--#endif-->
+								</p>
 							<!--#endif-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-						<p>
-							<!--#if can="output_checkboxes"-->
-								<!--#output_checkboxes-->
+							<!--#if can="output_score_summary"-->
+								<div class="scoreSummary">
+									<!--#output_score_summary-->
+								</div>
 							<!--#endif-->
-							<!--#if can="output_submit_buttons"-->
-								<!--#output_submit_buttons-->
+							<!--#if can="output_misc"-->
+								<!--#output_misc-->
 							<!--#endif-->
-						</p>
-					<!--#endif-->
-					<!--#if can="output_score_summary"-->
-						<div class="scoreSummary">
-							<!--#output_score_summary-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_misc"-->
-						<!--#output_misc-->
-					<!--#endif-->
-					</form>
-				</div>	  
-			<!-- ====  end printing body parts   -->
-			<!--#else-->
-			<!-- ==== couldn't print body parts so we'll print entire body -->	
-					  <div class="Body" style="background-color:#ffffff">
-					  <!--#body-->
+							</form>
+						<!--#endif-->
 					  </div>
-			<!-- ==== end printing entire body ===>
-			<!--#endif-->
-			
+
+				<!--#else-->
+				<!-- ==== couldn't print body parts so we'll print entire body -->	
+						  <div class="Body" style="background-color:#ffffff">
+						  <!--#body-->
+						  </div>
+				<!--#endif-->
+
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index ed52a2d741..0f05d3da9e 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -263,7 +263,7 @@ sub pre_header_initialize {
 		my @setsToScore = ();
 	
 		if ($scope eq "none") { 
-			return "No sets selected for scoring.";
+			return $r->maketext("No sets selected for scoring".".");
 		} elsif ($scope eq "all") {
 			@setsToScore = @{ $r->param("allSetIDs") };
 		} elsif ($scope eq "visible") {
@@ -303,7 +303,7 @@ sub initialize {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	########## set initial values for state fields
@@ -336,12 +336,12 @@ sub initialize {
 	
 	$self->{editMode} = $r->param("editMode") || 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify homework sets."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify homework sets.")))
 		if $self->{editMode} and not $authz->hasPermissions($user, "modify_problem_sets");
 	
 	$self->{exportMode} = $r->param("exportMode") || 0;
 
-	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to modify set definition files."))
+	return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to modify set definition files.")))
 		if $self->{exportMode} and not $authz->hasPermissions($user, "modify_set_def_files");
 	
 	$self->{primarySortField} = $r->param("primarySortField") || "due_date";
@@ -372,7 +372,7 @@ sub initialize {
 	$self->{actionID} = $actionID;
 	if ($actionID) {
 		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
-			die "Action $actionID not found";
+			die $r->maketext("Action [_1] not found", $actionID);
 		}
 		# Check permissions
 		if (not FORM_PERMS()->{$actionID} or $authz->hasPermissions($user, FORM_PERMS()->{$actionID})) {
@@ -383,20 +383,17 @@ sub initialize {
 			}
 			my %actionParams = $self->getActionParams($actionID);
 			my %tableParams = $self->getTableParams();
-			$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
-			$self->addmessage(
-			                     $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
-			                     CGI::hr()
-			);
+			$self->addmessage(CGI::div({class=>"Message"}, $r->maketext("Results of last action performed").": "));
+			$self->addmessage($self->$actionHandler(\%genericParams, \%actionParams, \%tableParams));
 		} else {
-			return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to perform this action."));
+			return CGI::div({class=>"ResultsWithError"}, CGI::p($r->maketext("You are not authorized to perform this action.")));
 		}
 		
 		
 
 	} else {
 	
-		$self->addgoodmessage("Please select action to be performed.");
+		$self->addgoodmessage($r->maketext("Please select action to be performed."));
 	}
 		
 
@@ -418,7 +415,7 @@ sub body {
 	# templates for getting field names
 	my $setTemplate = $self->{setTemplate} = $db->newGlobalSet;
 	
-	return CGI::div({class => "ResultsWithError"}, "You are not authorized to access the Instructor tools.")
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("You are not authorized to access the instructor tools."))
 		unless $authz->hasPermissions($user, "access_instructor_tools");
 	
 	# This table can be consulted when display-ready forms of field names are needed.
@@ -426,7 +423,6 @@ sub body {
 		$setTemplate->FIELDS();
 	
 	@prettyFieldNames{qw(
-		select
 		problems
 		users
 		filename
@@ -439,18 +435,17 @@ sub body {
 		visible
 		enable_reduced_scoring	
 	)} = (
-		"Select",
-		"Edit<br> Problems",
-		"Edit<br> Assigned Users",
-		"Set Definition Filename",
-		"Edit<br> Set Data", 
-		"Set Header", 
-		"Hardcopy Header", 
-		"Open Date", 
-		"Due Date", 
-		"Answer Date", 
-		"Visible",
-		"Reduced Credit<br> Enabled" 
+		$r->maketext("Edit Problems"),
+		$r->maketext("Edit Assigned Users"),
+		$r->maketext("Set Definition Filename"),
+		$r->maketext("Edit Set Data"), 
+		$r->maketext("Set Header"), 
+		$r->maketext("Hardcopy Header"), 
+		$r->maketext("Open Date"), 
+		$r->maketext("Due Date"), 
+		$r->maketext("Answer Date"), 
+		$r->maketext("Visible"),
+		$r->maketext("Reduced Credit Enabled") 
 	);
 	
 
@@ -497,9 +492,14 @@ sub body {
 		@Sets = sort $primarySortSub @Sets;
 	}
 
+	########## print site identifying information
+	
+	print WeBWorK::CGI_labeled_input(-type=>"button", -id=>"show_hide", -input_attr=>{-value=>$r->maketext("Show/Hide Site Description"), -class=>"button_input"});
+	print CGI::p({-id=>"site_description", -style=>"display:none"}, CGI::em($r->maketext("_HMWKSETS_EDITOR_DESCRIPTION")));
+	
 	########## print beginning of form
 	
-	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist"});
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"problemsetlist", -class=>"edit_form", -id=>"edit_form_id"});
 	print $self->hidden_authen_fields();
 	
 	########## print state data
@@ -528,10 +528,10 @@ sub body {
 	
 	########## print action forms
 	
-	print CGI::p(CGI::b("Any changes made below will be reflected in the set for ALL students.")) if $editMode;
+	print CGI::p(CGI::b($r->maketext("Any changes made below will be reflected in the set for ALL students."))) if $editMode;
 
-	print CGI::start_table({});
-	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+	# print CGI::start_table({});
+	print CGI::p($r->maketext("Select an action to perform").":");
 
 	my @formsToShow;
 	if ($editMode) {
@@ -545,52 +545,66 @@ sub body {
 	}
 	
 	my $i = 0;
+	my @divArr = ();
+
 	foreach my $actionID (@formsToShow) {
 		# Check permissions
 		next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
 		my $actionForm = "${actionID}_form";
-		my $onChange = "document.problemsetlist.action[$i].checked=true";
+		#my $onChange = "document.problemsetlist.action[$i].checked=true";
+		my $onChange = "";
 		my %actionParams = $self->getActionParams($actionID);
 		
-		print CGI::Tr({-valign=>"top"},
-			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
-			CGI::td({}, $self->$actionForm($onChange, %actionParams))
-		);
+		# print CGI::Tr({-valign=>"top"},
+			# CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			# CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		# );
+		
+		my $extraspace = (ucfirst(WeBWorK::split_cap($actionID)) eq "Filter") ? "" : CGI::br();
 		
+		push @divArr, join("",
+			CGI::h3($r->maketext(ucfirst(WeBWorK::split_cap($actionID)))),
+			CGI::span({-class=>"radio_span"}, WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionID."_id", -label_text=>$r->maketext(ucfirst(WeBWorK::split_cap($actionID))), -input_attr=>{-name=>"action", -value=>$actionID}, -label_attr=>{-class=>"radio_label"})),
+			CGI::br(),
+			$self->$actionForm($onChange, %actionParams),
+			CGI::br(),
+			$extraspace,
+		);
 		$i++;
 	}
 	
-	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all sets',
+	my $divArrRef = \@divArr;
+	
+	print CGI::div({-class=>"tabber"},
+		CGI::div({-class=>"tabbertab"},$divArrRef)
+		);
+	
+	my $selectAll =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_all", -input_attr=>{-name=>'check_all', -value=>$r->maketext('Select all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                           document.problemsetlist.elements[i].checked = true
 	                       }
 	                    }" });
-   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all sets',
+   	my $selectNone =WeBWorK::CGI_labeled_input(-type=>'button', -id=>"select_none", -input_attr=>{-name=>'check_none', -value=>$r->maketext('Unselect all sets'),
 	       onClick => "for (i in document.problemsetlist.elements)  { 
 	                       if (document.problemsetlist.elements[i].name =='selected_sets') { 
 	                          document.problemsetlist.elements[i].checked = false
 	                       }
 	                    }" });
 	unless ($editMode or $exportMode) {
-		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
-			$selectAll." ". $selectNone
-			)
-		);
+		print $selectAll." ". $selectNone;
 	}
-	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
-		CGI::submit(-value=>"Take Action!"))
-	);
-	print CGI::end_table();
-	
+	print WeBWorK::CGI_labeled_input(-type=>"reset", -id=>"clear_entries", -input_attr=>{-value=>$r->maketext("Clear"), -class=>"button_input"});
+	print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"take_action", -input_attr=>{-value=>$r->maketext("Take Action!"), -class=>"button_input"}).CGI::br().CGI::br();
+
 	########## print table
 	
 	########## first adjust heading if in editMode
-	$prettyFieldNames{set_id} = "Edit All <br> Set Data" if $editMode;
-	$prettyFieldNames{enable_reduced_scoring} = 'Enable Reduced<br>Credit' if $editMode;
+	$prettyFieldNames{set_id} = $r->maketext("Edit All Set Data") if $editMode;
+	$prettyFieldNames{enable_reduced_scoring} = $r->maketext('Enable Reduced Credit') if $editMode;
 	
 	
-	print CGI::p({},"Showing ", scalar @visibleSetIDs, " out of ", scalar @allSetIDs, " sets.");
+	print CGI::p({},$r->maketext("Showing [_1] out of [_2] sets.", scalar @visibleSetIDs, scalar @allSetIDs));
 	
 	$self->printTableHTML(\@Sets, \%prettyFieldNames,
 		editMode => $editMode,
@@ -644,58 +658,43 @@ sub getTableParams {
 
 sub filter_form {
 	my ($self, $onChange, %actionParams) = @_;
-	#return CGI::table({}, CGI::Tr({-valign=>"top"},
-	#	CGI::td({}, 
+	my $r = $self->r;
+
 	return join("", 
-			"Show ",
-			CGI::popup_menu(
-				-name => "action.filter.scope",
-				-values => [qw(all none selected match_ids visible unvisible)],
-				-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
-				-labels => {
-					all => "all sets",
-					none => "no sets",
-					selected => "sets checked below",
-					visible => "sets visible to students",
-					unvisible => "sets hidden from students", 
-					match_ids => "sets with matching set IDs:",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"filter_select",
+				-label_text=>$r->maketext("Show which sets?").": ",
+				-input_attr=>{
+					-name => "action.filter.scope",
+					-values => [qw(all none selected match_ids visible unvisible)],
+					-default => $actionParams{"action.filter.scope"}->[0] || "match_ids",
+					-labels => {
+						all => $r->maketext("all sets"),
+						none => $r->maketext("no sets"),
+						selected => $r->maketext("selected sets"),
+						visible => $r->maketext("visible sets"),
+						unvisible => $r->maketext("hidden sets"), 
+						match_ids => $r->maketext("enter matching set IDs below"),
+					},
+					-onchange => $onChange,
+				}
 			),
+			CGI::br(),
 			" ",
-			CGI::textfield(
-				-name => "action.filter.set_ids",
-				-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
-				-width => "50",
-				-onchange => $onChange,
+			CGI::div({-id=>"filter_elements"},
+			WeBWorK::CGI_labeled_input(
+				-type=>"text",
+				-id=>"filter_text",
+				-label_text=>$r->maketext("Match on what? (separate multiple IDs with commas)").": ",
+				-input_attr=>{
+					-name => "action.filter.set_ids",
+					-value => $actionParams{"action.filter.set_ids"}->[0] || "",,
+					-width => "50",
+					-onchange => $onChange,
+				}
+			), CGI::span({-id=>"filter_err_msg", -class=>"ResultsWithError"}, $r->maketext("Please enter in a value to match in the filter field.")),
 			),
-			" (separate multiple IDs with commas)",
-			CGI::br(),
-#			"Open dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.open_date",
-#				-values => [ keys %{ $self->{open_dates} } ],
-#				-default => $actionParams{"action.filter.open_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{open_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Due dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.due_date",
-#				-values => [ keys %{ $self->{due_dates} } ],
-#				-default => $actionParams{"action.filter.due_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{due_dates}) },
-#				-onchange => $onChange,
-#			),
-#			" Answer dates: ",
-#			CGI::popup_menu(
-#				-name => "action.filter.answer_date",
-#				-values => [ keys %{ $self->{answer_dates} } ],
-#				-default => $actionParams{"action.filter.answer_date"}->[0] || "",
-#				-labels => { $self->menuLabels($self->{answer_dates}) },
-#				-onchange => $onChange,
-#			),
-			
 	);
 }
 
@@ -710,16 +709,18 @@ sub filter_handler {
 	my $result;
 	
 	my $scope = $actionParams->{"action.filter.scope"}->[0];
+	
 	if ($scope eq "all") {
-		$result = "showing all sets";
+		$result = $r->maketext("showing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "none") {
-		$result = "showing no sets";
+		$result = $r->maketext("showing no sets");
 		$self->{visibleSetIDs} = [];
 	} elsif ($scope eq "selected") {
-		$result = "showing selected sets";
+		$result = $r->maketext("showing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	} elsif ($scope eq "match_ids") {
+		#my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		my @setIDs = split /\s*,\s*/, $actionParams->{"action.filter.set_ids"}->[0];
 		$self->{visibleSetIDs} = \@setIDs;
 	} elsif ($scope eq "match_open_date") {
@@ -748,45 +749,55 @@ sub filter_handler {
 
 sub sort_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 	return join ("",
-		"Primary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.primary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_1",
+			-label_text=>$r->maketext("Sort by").": ",
+			-input_attr=>{
+				-name => "action.sort.primary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.primary"}->[0] || "due_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" Secondary sort: ",
-		CGI::popup_menu(
-			-name => "action.sort.secondary",
-			-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
-			-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
-			-labels => {
-				set_id		=> "Set Name",
-				set_header 	=> "Set Header",
-				hardcopy_header	=> "Hardcopy Header",
-				open_date	=> "Open Date",
-				due_date	=> "Due Date",
-				answer_date	=> "Answer Date",
-				visible	=> "Visibility",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"sort_select_2",
+			-label_text=>$r->maketext("Then by").": ",
+			-input_attr=>{
+				-name => "action.sort.secondary",
+				-values => [qw(set_id set_header hardcopy_header open_date due_date answer_date visible)],
+				-default => $actionParams{"action.sort.secondary"}->[0] || "open_date",
+				-labels => {
+					set_id		=> $r->maketext("Set Name"),
+					set_header 	=> $r->maketext("Set Header"),
+					hardcopy_header	=> $r->maketext("Hardcopy Header"),
+					open_date	=> $r->maketext("Open Date"),
+					due_date	=> $r->maketext("Due Date"),
+					answer_date	=> $r->maketext("Answer Date"),
+					visible	=> $r->maketext("Visibility"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		".",
 	);
 }
 
 sub sort_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 	
 	my $primary = $actionParams->{"action.sort.primary"}->[0];
 	my $secondary = $actionParams->{"action.sort.secondary"}->[0];
@@ -795,52 +806,58 @@ sub sort_handler {
 	$self->{secondarySortField} = $secondary;
 
 	my %names = (
-		set_id		=> "Set Name",
-		set_header	=> "Set Header",
-		hardcopy_header	=> "Hardcopy Header",
-		open_date	=> "Open Date",
-		due_date	=> "Due Date",
-		answer_date	=> "Answer Date",
-		visible	=> "Visibility",
+		set_id		=> $r->maketext("Set Name"),
+		set_header	=> $r->maketext("Set Header"),
+		hardcopy_header	=> $r->maketext("Hardcopy Header"),
+		open_date	=> $r->maketext("Open Date"),
+		due_date	=> $r->maketext("Due Date"),
+		answer_date	=> $r->maketext("Answer Date"),
+		visible	=> $r->maketext("Visibility"),
 	);
 	
-	return "sort by $names{$primary} and then by $names{$secondary}.";
+	return $r->maketext("Sort by [_1] and then by [_2]", $names{$primary}, $names{$secondary});
 }
 
 
 sub edit_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Edit ",
-		CGI::popup_menu(
-			-name => "action.edit.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"edit_select",
+			-label_text=>$r->maketext("Edit which sets?").": ",
+			-input_attr=>{
+				-name => "action.edit.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
 
 sub edit_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.edit.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "editing all sets";
+		$result = $r->maketext("editing all sets");
 		$self->{visibleSetIDs} = $self->{allSetIDs};
 	} elsif ($scope eq "visible") {
-		$result = "editing visible sets";
+		$result = $r->maketext("editing visible sets");
 		# leave visibleUserIDs alone
 	} elsif ($scope eq "selected") {
-		$result = "editing selected sets";
+		$result = $r->maketext("editing selected sets");
 		$self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{editMode} = 1;
@@ -850,32 +867,42 @@ sub edit_handler {
 
 sub publish_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.publish.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.publish.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.publish.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.publish.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.publish.value"}->[0] || "1",
-			-labels => {
-				0 => "hidden",
-				1 => "visible",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"publish_visibility_select",
+			-label_text=>$r->maketext("Choose visibility of the sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.publish.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.publish.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Hidden"),
+					1 => $r->maketext("Visible"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" for students.",
 	);
 }
 
@@ -890,22 +917,22 @@ sub publish_handler {
 	my $scope = $actionParams->{"action.publish.scope"}->[0];
 	my $value = $actionParams->{"action.publish.value"}->[0];
 
-	my $verb = $value ? "made visible for" : "hidden from";
+	my $verb = $value ? $r->maketext("made visible for") : $r->maketext("hidden from");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result = CGI::div({class=>"ResultsWithError"},"No change made to any set.");
+		$result = CGI::div({class=>"ResultsWithError"},$r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All sets [_1] all students", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All visible sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All visible sets [_1] all students", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"All selected sets $verb all students.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("All selected sets [_1] all students", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -918,32 +945,42 @@ sub publish_handler {
 }
 sub enable_reduced_scoring_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Make ",
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.scope",
-			-values => [ qw(none all selected) ],
-			-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
-			-labels => {
-				none => "",
-				all => "all sets",
-#				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_filter_select",
+			-label_text=>$r->maketext("Choose which sets to be affected").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.scope",
+				-values => [ qw(none all selected) ],
+				-default => $actionParams{"action.enable_reduced_scoring.scope"}->[0] || "selected",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+#					visible => "visible sets",
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		CGI::popup_menu(
-			-name => "action.enable_reduced_scoring.value",
-			-values => [ 0, 1 ],
-			-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
-			-labels => {
-				0 => "disable",
-				1 => "enable",
-			},
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"reduced_scoring_enable_disable_select",
+			-label_text=>$r->maketext("Enable/Disable reduced scoring for selected sets").": ",
+			-input_attr=>{
+				-name => "action.enable_reduced_scoring.value",
+				-values => [ 0, 1 ],
+				-default => $actionParams{"action.enable_reduced_scoring.value"}->[0] || "1",
+				-labels => {
+					0 => $r->maketext("Disable"),
+					1 => $r->maketext("Enable"),
+				},
+				-onchange => $onChange,
+			}
 		),
-		" reduced sccoring.",
 	);
 }
 
@@ -958,22 +995,22 @@ sub enable_reduced_scoring_handler {
 	my $scope = $actionParams->{"action.enable_reduced_scoring.scope"}->[0];
 	my $value = $actionParams->{"action.enable_reduced_scoring.value"}->[0];
 
-	my $verb = $value ? "enabled" : "disabled";
+	my $verb = $value ? $r->maketext("enabled") : $r->maketext("disabled");
 	
 	my @setIDs;
 	
 	if ($scope eq "none") { # FIXME: double negative "Make no sets hidden" might make professor expect all sets to be made visible.
 		@setIDs = ();
-		$result =  CGI::div({class=>"ResultsWithError"}, "No change made to any set.");
+		$result =  CGI::div({class=>"ResultsWithError"}, $r->maketext("No change made to any set"));
 	} elsif ($scope eq "all") {
 		@setIDs = @{ $self->{allSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for all sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for all sets", $verb));
 	} elsif ($scope eq "visible") {
 		@setIDs = @{ $self->{visibleSetIDs} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for visable sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for visable sets", $verb));
 	} elsif ($scope eq "selected") {
 		@setIDs = @{ $genericParams->{selected_sets} };
-		$result = CGI::div({class=>"ResultsWithoutError"},"Reduced Credit $verb for selected sets.");
+		$result = CGI::div({class=>"ResultsWithoutError"},$r->maketext("Reduced Credit [_1] for selected sets", $verb));
 	}
 	
 	# can we use UPDATE here, instead of fetch/change/store?
@@ -987,19 +1024,24 @@ sub enable_reduced_scoring_handler {
 
 sub score_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join ("",
-		"Score ",
-		CGI::popup_menu(
-			-name => "action.score.scope",
-			-values => [qw(none all selected)],
-			-default => $actionParams{"action.score.scope"}->[0] || "none",
-			-labels => {
-				none => "no sets.",
-				all => "all sets.",
-				selected => "selected sets.",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"score_select",
+			-label_text=>$r->maketext("Score which sets?").": ",
+			-input_attr=>{
+				-name => "action.score.scope",
+				-values => [qw(none all selected)],
+				-default => $actionParams{"action.score.scope"}->[0] || "none",
+				-labels => {
+					none => $r->maketext("no sets"),
+					all => $r->maketext("all sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 	
@@ -1019,7 +1061,7 @@ sub score_handler {
 	
 	if ($scope eq "none") { 
 		@setsToScore = ();
-		return "No sets selected for scoring.";
+		return $r->maketext("No sets selected for scoring");
 	} elsif ($scope eq "all") {
 		@setsToScore = @{ $self->{allSetIDs} };
 	} elsif ($scope eq "visible") {
@@ -1043,23 +1085,26 @@ sub score_handler {
 
 sub delete_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		CGI::div({class=>"ResultsWithError"}, 
-			"Delete ",
-			CGI::popup_menu(
+		CGI::span({-class=>"ResultsWithError"}, CGI::em($r->maketext("Warning: Deletion destroys all user-related data and is not undoable!"))),CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"delete_select",
+			-label_text=>$r->maketext("Delete how many?").": ",
+			-input_attr=>{
 				-name => "action.delete.scope",
 				-values => [qw(none selected)],
 				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
 				-labels => {
-					none => "no sets.",
+					none => $r->maketext("no sets"),
 					#visible => "visible sets.",
-					selected => "selected sets.",
+					selected => $r->maketext("selected sets"),
 				},
 				-onchange => $onChange,
-			),
-			CGI::em(" Deletion destroys all set-related data and is not undoable!"),
-		)
+			}
+		),
 	);
 }
 
@@ -1094,34 +1139,42 @@ sub delete_handler {
 	$self->{selectedSetIDs} = [ keys %selectedSetIDs ];
 	
 	my $num = @setIDsToDelete;
-	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num set" .
-	                                           ($num == 1 ? "" : "s")
-	);
+	 return CGI::div({class=>"ResultsWithoutError"},  $r->maketext("deleted [_1] sets", $num) );
 }
 
 sub create_form {
 	my ($self, $onChange, %actionParams) = @_;
-
 	my $r      = $self->r;
 	
-	return "Create a new set named: ", 
-		CGI::textfield(
-			-name => "action.create.name",
-			-value => $actionParams{"action.create.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+	return join("",
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"create_text",
+			-label_text=>$r->maketext("Name the new set").": ",
+			-input_attr=>{
+				-name => "action.create.name",
+				-value => $actionParams{"action.create.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
-		" as ",
-		CGI::popup_menu(
-			-name => "action.create.type",
-			-values => [qw(empty copy)],
-			-default => $actionParams{"action.create.type"}->[0] || "empty",
-			-labels => {
-				empty => "a new empty set.",
-				copy => "a duplicate of the first selected set.",
-			},
-			-onchange => $onChange,
-		);
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"create_select",
+			-label_text=>$r->maketext("Create as what type of set?").": ",
+			-input_attr=>{
+				-name => "action.create.type",
+				-values => [qw(empty copy)],
+				-default => $actionParams{"action.create.type"}->[0] || "empty",
+				-labels => {
+					empty => $r->maketext("a new empty set"),
+					copy => $r->maketext("a duplicate of the first selected set"),
+				},
+				-onchange => $onChange,
+			}
+		),
+	);
 			
 }
 
@@ -1132,8 +1185,8 @@ sub create_handler {
 	my $db     = $r->db;
 	
 	my $newSetID = $actionParams->{"action.create.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: no set name specified!") unless $newSetID =~ /\S/;
-	return CGI::div({class => "ResultsWithError"}, "Set $newSetID exists.  No set created") if $db->existsGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: no set name specified!")) unless $newSetID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Set [_1] exists.  No set created", $newSetID)) if $db->existsGlobalSet($newSetID);
 	my $newSetRecord = $db->newGlobalSet;
 	my $oldSetID = $self->{selectedSetIDs}->[0];
 
@@ -1154,7 +1207,7 @@ sub create_handler {
 		$newSetRecord->enable_reduced_scoring(DEFAULT_ENABLED_REDUCED_SCORING_STATE());
 		$db->addGlobalSet($newSetRecord);
 	} elsif ($type eq "copy") {
-		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless $oldSetID =~ /\S/;
+		return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless $oldSetID =~ /\S/;
 		$newSetRecord = $db->getGlobalSet($oldSetID);
 		$newSetRecord->set_id($newSetID);
 		$db->addGlobalSet($newSetRecord);
@@ -1193,9 +1246,9 @@ sub create_handler {
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 	push @{ $self->{allSetIds} }, $newSetID;
 	
-	return CGI::div({class => "ResultsWithError"}, "Failed to create new set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to create new set: [_1]", $@)) if $@;
 	
-	 return CGI::div({class=>"ResultsWithoutError"},"Successfully created new set $newSetID" );
+	 return CGI::div({class=>"ResultsWithoutError"},$r->maketext("Successfully created new set [_1]", $newSetID));
 	
 }
 
@@ -1217,45 +1270,65 @@ sub import_form {
 			);
 	
 	return join(" ",
-		"Import ",
-		CGI::popup_menu(
-			-name => "action.import.number",
-			-values => [ 1, 8 ],
-			-default => $actionParams{"action.import.number"}->[0] || "1",
-			-labels => {
-				1 => "a single set",
-				8 => "multiple sets",
-			},
-			-onchange => "$onChange;$importScript",
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_amt_select",
+			-label_text=>$r->maketext("Import how many sets?").": ",
+			-input_attr=>{
+				-name => "action.import.number",
+				-values => [ 1, 8 ],
+				-default => $actionParams{"action.import.number"}->[0] || "1",
+				-labels => {
+					1 => $r->maketext("a single set"),
+					8 => $r->maketext("multiple sets"),
+				},
+				-onchange => "$onChange;$importScript",
+			}
 		),
-		" from ", # set definition file(s) ",
-		CGI::popup_menu(
-			-name => "action.import.source",
-			-values => [ "", $self->getDefList() ],
-			-labels => { "" => "the following file(s)" },
-			-default => $actionParams{"action.import.source"}->[0] || "",
-			-size => $actionParams{"action.import.number"}->[0] || "1",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"import_source_select",
+			-label_text=>$r->maketext("Import from where?").": ",
+			-input_attr=>{
+				-name => "action.import.source",
+				-values => [ "", $self->getDefList() ],
+				-labels => { "" => $r->maketext("Enter filenames below") },
+				-default => $actionParams{"action.import.source"}->[0] || "",
+				-size => $actionParams{"action.import.number"}->[0] || "1",
+				-onchange => $onChange,
+			},
+			-label_attr=>{-id=>"import_source_select_label"}
 		),
-		" with set name(s): ",
-		CGI::textfield(
-			-name => "action.import.name",
-			-value => $actionParams{"action.import.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		CGI::br(),
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"import_text",
+			-label_text=>$r->maketext("Import sets with names").": ",
+			-input_attr=>{
+				-name => "action.import.name",
+				-value => $actionParams{"action.import.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
+		CGI::br(),
 		($authz->hasPermissions($user, "assign_problem_sets")) 
 			?
-			"assigning this set to " .
-			CGI::popup_menu(
-				-name => "action.import.assign",
-				-value => [qw(user all)],
-				-default => $actionParams{"action.import.assign"}->[0] || "user",
-				-labels => {
-					all => "all current users.",
-					user => "only $user.",
-				},
-				-onchange => $onChange,
+			WeBWorK::CGI_labeled_input(
+				-type=>"select",
+				-id=>"import_users_select",
+				-label_text=>$r->maketext("Assign this set to which users?").": ",
+				-input_attr=>{
+					-name => "action.import.assign",
+					-value => [qw(all none)],
+					-default => $actionParams{"action.import.assign"}->[0] || "none",
+					-labels => {
+						all => $r->maketext("all users"),
+						none => $r->maketext("no users"),
+					},
+					-onchange => $onChange,
+				}
 			)
 			:
 			""	#user does not have permissions to assign problem sets
@@ -1264,6 +1337,7 @@ sub import_form {
 
 sub import_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my @fileNames = @{ $actionParams->{"action.import.source"} };
 	my $newSetName = $actionParams->{"action.import.name"}->[0];
@@ -1280,28 +1354,29 @@ sub import_handler {
 	my $numSkipped = @$skipped;
 
    return CGI::div(
-		{class=>"ResultsWithoutError"},	
-		$numAdded . " set" . ($numAdded == 1 ? "" : "s") . " added, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped"
-		. " (" . join (", ", @$skipped) . ") "
-	);
+		{class=>"ResultsWithoutError"},	$r->maketext("[_1] sets added, [_2] sets skipped. Skipped sets: ([_3])", $numAdded, $numSkipped, join(", ", @$skipped)));
 }
 
 sub export_form {
 	my ($self, $onChange, %actionParams) = @_;
+	my $r = $self->r;
 
 	return join("",
-		"Export ",
-		CGI::popup_menu(
-			-name => "action.export.scope",
-			-values => [qw(all visible selected)],
-			-default => $actionParams{"action.export.scope"}->[0] || "visible",
-			-labels => {
-				all => "all sets",
-				visible => "visible sets",
-				selected => "selected sets",
-			},
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>"export_select",
+			-label_text=>$r->maketext("Export which sets?").": ",
+			-input_attr=>{
+				-name => "action.export.scope",
+				-values => [qw(all visible selected)],
+				-default => $actionParams{"action.export.scope"}->[0] || "visible",
+				-labels => {
+					all => $r->maketext("all sets"),
+					visible => $r->maketext("visible sets"),
+					selected => $r->maketext("selected sets"),
+				},
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1309,19 +1384,20 @@ sub export_form {
 # this does not actually export any files, rather it sends us to a new page in order to export the files
 sub export_handler {
 	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
 
 	my $result;
 	
 	my $scope = $actionParams->{"action.export.scope"}->[0];
 	if ($scope eq "all") {
-		$result = "exporting all sets";
+		$result = $r->maketext("exporting all sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $self->{allSetIDs};
 
 	} elsif ($scope eq "visible") {
-		$result = "exporting visible sets";
+		$result = $r->maketext("exporting visible sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs};
 	} elsif ($scope eq "selected") {
-		$result = "exporting selected sets";
+		$result = $r->maketext("exporting selected sets");
 		$self->{selectedSetIDs} = $self->{visibleSetIDs} = $genericParams->{selected_sets}; # an arrayref
 	}
 	$self->{exportMode} = 1;
@@ -1331,7 +1407,8 @@ sub export_handler {
 
 sub cancelExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon export";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon export"));
 }
 
 sub cancelExport_handler {
@@ -1349,12 +1426,13 @@ sub cancelExport_handler {
 	}
 	$self->{exportMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
+	return CGI::div({class=>"ResultsWithError"},  $r->maketext("export abandoned"));
 }
 
 sub saveExport_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Export selected sets.";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Export selected sets"));
 }
 
 sub saveExport_handler {
@@ -1384,17 +1462,14 @@ sub saveExport_handler {
 	
 	my @reasons = map { "set $_ - " . $reason->{$_} } keys %$reason;
 
-	return 	CGI::div( {class=>$resultFont},
-	    $numExported . " set" . ($numExported == 1 ? "" : "s") . " exported, "
-		. $numSkipped . " set" . ($numSkipped == 1 ? "" : "s") . " skipped."
-		. (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")
-		);
+	return 	CGI::div({class=>$resultFont}, $r->maketext("[_1] sets exported, [_2] sets skipped. Skipped sets: ([_3])", $numExported, $numSkipped, (($numSkipped) ? CGI::ul(CGI::li(\@reasons)) : "")));
 
 }
 
 sub cancelEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Abandon changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Abandon changes"));
 }
 
 sub cancelEdit_handler {
@@ -1412,12 +1487,13 @@ sub cancelEdit_handler {
 	}
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes abandoned"));
 }
 
 sub saveEdit_form {
 	my ($self, $onChange, %actionParams) = @_;
-	return "Save changes";
+	my $r = $self->r;
+	return CGI::span($r->maketext("Save changes"));
 }
 
 sub saveEdit_handler {
@@ -1446,20 +1522,20 @@ sub saveEdit_handler {
 		my $curr_time = time;
 		my $seconds_per_year = 31_556_926;
 		my $cutoff = $curr_time + $seconds_per_year*10;
-		return CGI::div({class=>'ResultsWithError'}, "Error: open date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: open date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->open_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: due date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: due date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->due_date > $cutoff;
-		return CGI::div({class=>'ResultsWithError'}, "Error: answer date cannot be more than 10 years from now in set $setID")
+		return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: answer date cannot be more than 10 years from now in set [_1]", $setID))
 			if $Set->answer_date > $cutoff;
 		
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date)  {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Due date must come after open date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Due date must come after open date in set [_1]", $setID));
 		}
 		if ($Set->due_date > $Set->answer_date) {
-			return CGI::div({class=>'ResultsWithError'}, "Error: Answer date must come after due date in set $setID");
+			return CGI::div({class=>'ResultsWithError'}, $r->maketext("Error: Answer date must come after due date in set [_1]", $setID));
 		}
 		
 		$db->putGlobalSet($Set);
@@ -1475,7 +1551,7 @@ sub saveEdit_handler {
 	
 	$self->{editMode} = 0;
 	
-	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+	return CGI::div({class=>"ResultsWithError"}, $r->maketext("changes saved") );
 }
 
 sub duplicate_form {
@@ -1487,12 +1563,16 @@ sub duplicate_form {
 	return "" unless @visible_sets == 1;
 	
 	return join ("", 
-		"Duplicate this set and name it: ", 
-		CGI::textfield(
-			-name => "action.duplicate.name",
-			-value => $actionParams{"action.duplicate.name"}->[0] || "",
-			-width => "50",
-			-onchange => $onChange,
+		WeBWorK::CGI_labeled_input(
+			-type=>"text",
+			-id=>"duplicate_text",
+			-label_text=>$r->maketext("Duplicate this set and name it").": ",
+			-input_attr=>{
+				-name => "action.duplicate.name",
+				-value => $actionParams{"action.duplicate.name"}->[0] || "",
+				-width => "50",
+				-onchange => $onChange,
+			}
 		),
 	);
 }
@@ -1504,11 +1584,11 @@ sub duplicate_handler {
 	my $db = $r->db;
 	
 	my $oldSetID = $self->{selectedSetIDs}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set selected for duplication!") unless defined($oldSetID) and $oldSetID =~ /\S/;	
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set selected for duplication!")) unless defined($oldSetID) and $oldSetID =~ /\S/;	
 	my $newSetID = $actionParams->{"action.duplicate.name"}->[0];
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: no set name specified!") unless $newSetID =~ /\S/;		
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: no set name specified!")) unless $newSetID =~ /\S/;		
 	# DBFIXME checking for existence -- don't need to fetch
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: set $newSetID already exists!") if defined $db->getGlobalSet($newSetID);
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: set [_1] already exists!", $newSetID)) if defined $db->getGlobalSet($newSetID);
 
 	my $newSet = $db->getGlobalSet($oldSetID);
 	$newSet->set_id($newSetID);
@@ -1522,9 +1602,9 @@ sub duplicate_handler {
 	
 	push @{ $self->{visibleSetIDs} }, $newSetID;
 
-	return CGI::div({class => "ResultsWithError"}, "Failed to duplicate set: $@") if $@;
+	return CGI::div({class => "ResultsWithError"}, $r->maketext("Failed to duplicate set: [_1]", $@)) if $@;
 	
-	return "SUCCESS";
+	return $r->maketext("Success");
 }
 
 ################################################################################
@@ -1540,22 +1620,26 @@ sub bySetID         { $a->set_id         cmp $b->set_id         }
 #FIXME  eventually we may be able to remove these checks, if we can trust 
 # that the dates are always defined
 # dates which are the empty string '' or undefined  are treated as 0
-sub byOpenDate      { my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
+sub byOpenDate      {
+					  my $result = eval{( $a->open_date || 0 )      <=> ( $b->open_date || 0 ) };
                       return $result unless $@;
                       warn "Open date not correctly defined.";
                       return 0;
 }
-sub byDueDate       { my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
+sub byDueDate       { 
+					  my $result = eval{( $a->due_date || 0 )     <=> ( $b->due_date || 0 )   };      
                       return $result unless $@;
                       warn "Due date not correctly defined.";
                       return 0;
 }
-sub byAnswerDate    { my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
+sub byAnswerDate    { 
+					  my $result = eval{( $a->answer_date || 0)    <=> ( $b->answer_date || 0 )  };    
                       return $result unless $@;
                       warn "Answer date not correctly defined.";
                       return 0;
 }
-sub byVisible     { my $result = eval{$a->visible      cmp $b->visible   };      
+sub byVisible     {   
+					  my $result = eval{$a->visible      cmp $b->visible   };      
                       return $result unless $@;
                       warn "Visibility status not correctly defined.";
                       return 0;
@@ -1595,7 +1679,7 @@ sub importSetsFromDef {
 
 	# FIXME: do we really want everything to fail on one bad file name?
 	foreach my $fileName (@setDefFiles) {
-		die "won't be able to read from file $dir/$fileName: does it exist? is it readable?"
+		die $r->maketext("won't be able to read from file [_1]/[_2]: does it exist? is it readable?", $dir, $fileName)
 			unless -r "$dir/$fileName";
 	}
 
@@ -1661,7 +1745,7 @@ sub importSetsFromDef {
 
 		#create the set
 		eval {$db->addGlobalSet($newSetRecord)};
-		die "addGlobalSet $setName in ProblemSetList:  $@" if $@;
+		die $r->maketext("addGlobalSet [_1] in ProblemSetList:  [_2]", $setName, $@) if $@;
 
 		#do we need to add locations to the set_locations table?
 		if ( $restrictIP ne 'No' && $restrictLoc ) {
@@ -1671,18 +1755,13 @@ sub importSetsFromDef {
 					$newSetLocation->set_id( $setName );
 					$newSetLocation->location_id( $restrictLoc );
 					eval {$db->addGlobalSetLocation($newSetLocation)};
-					warn("error adding set location $restrictLoc " .
-					     "for set $setName: $@") if $@;
+					warn($r->maketext("error adding set location [_1] for set [_2]: [_3]", $restrictLoc, $setName, $@)) if $@;
 				} else {
 					# this should never happen.
-					warn("input set location $restrictLoc" .
-					     " already exists for set " . 
-					     "$setName.\n");
+					warn($r->maketext("input set location [_1] already exists for set [_2].", $restrictLoc, $setName)."\n");
 				}
 			} else { 
-				warn("restriction location $restrictLoc " .
-				     "does not exist.  IP restrictions have " .
-				     "been ignored.\n");
+				warn($r->maketext("restriction location [_1] does not exist.  IP restrictions have been ignored.", $restrictLoc)."\n");
 				$newSetRecord->restrict_ip('No');
 				$newSetRecord->relax_restrict_ip('No');
 				eval { $db->putGlobalSet($newSetRecord) };
@@ -1725,6 +1804,8 @@ sub readSetDef {
 	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
+	
+	my $r = $self->r;
 
 	if ($fileName =~ m|^set([.\w-]+)\.def$|) {
 		$setName = $1;
@@ -1817,7 +1898,7 @@ sub readSetDef {
 			} elsif ($item eq 'problemList') {
 				last;
 			} else {
-				warn "readSetDef error, can't read the line: ||$line||";
+				warn $r->maketext("readSetDef error, can't read the line: ||[_1]||", $line);
 			}
 		}
 
@@ -1827,7 +1908,7 @@ sub readSetDef {
 		my ($time1, $time2, $time3) = map {  $self->parseDateTime($_);  }    ($openDate, $dueDate, $answerDate);
 	
 		unless ($time1 <= $time2 and $time2 <= $time3) {
-			warn "The open date: $openDate, due date: $dueDate, and answer date: $answerDate must be defined and in chronological order.";
+			warn $r->maketext("The open date: [_1], due date: [_2], and answer date: [_3] must be defined and in chronological order.", $openDate, $dueDate, $answerDate);
 		}
 
 		# Check header file names
@@ -1844,26 +1925,21 @@ sub readSetDef {
 		# check that the values for hideWork and hideScore are valid
 		if ( $hideScore ne 'N' && $hideScore ne 'Y' && 
 		     $hideScore ne 'BeforeAnswerDate' ) {
-			warn("The value $hideScore for the hideScore option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideScore option is not valid; it will be replaced with 'N'.", $hideScore)."\n");
 			$hideScore = 'N';
 		}
 		if ( $hideWork ne 'N' && $hideWork ne 'Y' && 
 		     $hideWork ne 'BeforeAnswerDate' ) {
-			warn("The value $hideWork for the hideWork option " .
-			     "is not valid; it will be replaced with 'N'.\n");
+			warn($r->maketext("The value [_1] for the hideWork option is not valid; it will be replaced with 'N'.", $hideWork)."\n");
 			$hideWork = 'N';
 		}
 		if ( $timeCap ne '0' && $timeCap ne '1' ) {
-			warn("The value $timeCap for the capTimeLimit option " .
-			     "is not valid; it will be replaced with '0'.\n");
+			warn($r->maketext("The value [_1] for the capTimeLimit option is not valid; it will be replaced with '0'.", $timeCap)."\n");
 			$timeCap = '0';
 		}
 		if ( $restrictIP ne 'No' && $restrictIP ne 'DenyFrom' &&
 		     $restrictIP ne 'RestrictTo' ) {
-			warn("The value $restrictIP for the restrictIP " .
-			     "option is not valid; it will be replaced " . 
-			     "with 'No'.\n");
+			warn($r->maketext("The value [_1] for the restrictIP option is not valid; it will be replaced with 'No'.", $restrictIP)."\n");
 			$restrictIP = 'No';
 			$restrictLoc = '';
 			$relaxRestrictIP = 'No';
@@ -1871,9 +1947,7 @@ sub readSetDef {
 		if ( $relaxRestrictIP ne 'No' && 
 		     $relaxRestrictIP ne 'AfterAnswerDate' &&
 		     $relaxRestrictIP ne 'AfterVersionAnswerDate' ) {
-			warn("The value $relaxRestrictIP for the " .
-			     "relaxRestrictIP option is not valid; it will " . 
-			     "be replaced with 'No'.\n");
+			warn($r->maketext("The value [_1] for the relaxRestrictIP option is not valid; it will be replaced with 'No'.", $relaxRestrictIP)."\n");
 			$relaxRestrictIP = 'No';
 		}
 		# to verify that restrictLoc is valid requires a database
@@ -1943,7 +2017,7 @@ sub readSetDef {
 		 $relaxRestrictIP,
 		);
 	} else {
-		warn "Can't open file $filePath\n";
+		warn $r->maketext("Can't open file [_1]", $filePath)."\n";
 	}
 }
 
@@ -1964,14 +2038,14 @@ SET:	foreach my $set (keys %filenames) {
 		# files can be exported to sub directories but not parent directories
 		if ($fileName =~ /\.\./) {
 			push @skipped, $set;
-			$reason{$set} = "Illegal filename contains '..'";
+			$reason{$set} = $r->maketext("Illegal filename contains '..'");
 			next SET;
 		}
 
 		my $setRecord = $db->getGlobalSet($set);
 		unless (defined $setRecord) {
 			push @skipped, $set;
-			$reason{$set} = "No record found.";
+			$reason{$set} = $r->maketext("No record found.");
 			next SET;
 		}
 		my $filePath = $ce->{courseDirs}->{templates} . '/' . $fileName;
@@ -1979,7 +2053,7 @@ SET:	foreach my $set (keys %filenames) {
 		# back up existing file
 		if(-e $filePath) {
 			rename($filePath, "$filePath.bak") or 
-				$reason{$set} = "Existing file $filePath could not be backed up and was lost.";
+				$reason{$set} = $r->maketext("Existing file [_1] could not be backed up and was lost.", $filePath);
 		}
 		
 		my $openDate     = $self->formatDateTime($setRecord->open_date);
@@ -1995,7 +2069,7 @@ SET:	foreach my $set (keys %filenames) {
 			my $problemRecord = $db->getGlobalProblem($set, $prob); # checked
 			unless (defined $problemRecord) {
 				push @skipped, $set;
-				$reason{$set} = "No record found for problem $prob.";
+				$reason{$set} = $r->maketext("No record found for problem [_1].", $prob);
 				next SET;
 			}
 			my $source_file   = $problemRecord->source_file();
@@ -2065,7 +2139,7 @@ EOF
 		$filePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{templates}, $filePath);
 		eval {
 			local *SETDEF;
-			open SETDEF, ">$filePath" or die "Failed to open $filePath";
+			open SETDEF, ">$filePath" or die $r->maketext("Failed to open [_1]", $filePath);
 			print SETDEF $fileContents;
 			close SETDEF;
 		};
@@ -2088,7 +2162,7 @@ EOF
 ################################################################################
 
 sub fieldEditHTML {
-	my ($self, $fieldName, $value, $properties) = @_;
+	my ($self, $fieldName, $value, $properties, $dateTimeScripts) = @_;
 	my $size = $properties->{size};
 	my $type = $properties->{type};
 	my $access = $properties->{access};
@@ -2101,16 +2175,130 @@ sub fieldEditHTML {
 	}
 	
 	if ($type eq "number" or $type eq "text") {
-		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+		my $id = $fieldName."_id";
+		my $out = CGI::input({type=>"text", name=>$fieldName, id=>$id, value=>"", size=>$size});
+		my $content = "";
+		my $bareName = "";
+		my $timezone = substr($value, -3);
+		
+		if(index($fieldName, ".open_date") != -1){
+			my @temp = split(/.open_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.open_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testopenDate = new Date(dateText);
+            var testdueDate = new Date(dueDateTextBox.val());
+            if (testopenDate > testdueDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var open = \$(this).datetimepicker('getDate');
+		var open_obj = new Date(open.getTime());
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'minDate', open_obj);
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".due_date") != -1){
+			my @temp = split(/.due_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.due_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+		var openDateTextBox = \$('#$bareName\\\\.open_date_id');
+        var answersDateTextBox = \$('#$bareName\\\\.answer_date_id');
+
+        if (openDateTextBox.val() != '') {
+            var testopenDate = new Date(openDateTextBox.val());
+			var testdueDate = new Date(dateText);
+            if (testopenDate > testdueDate)
+                openDateTextBox.val(dateText);
+        }
+        else {
+            openDateTextBox.val(dateText);
+        }
+
+		if (answersDateTextBox.val() != '') {
+			var testdueDate = new Date(dateText);
+			var testanswersDate = new Date(answersDateTextBox.val());
+			if(testdueDate > testanswersDate)
+				answersDateTextBox.val(dateText);
+		}
+		else {
+			answersDateTextBox.val(dateText);
+		}
+    },
+    onSelect: function (selectedDateTime){
+        var due = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.open_date_id').datetimepicker('option', 'maxDate', new Date(due.getTime()));
+		\$('#$bareName\\\\.answer_date_id').datetimepicker('option', 'minDate', new Date(due.getTime()));
+    }
+});
+CONTENT
+		}
+		elsif(index($fieldName, ".answer_date") != -1){
+			my @temp = split(/.answer_date/, $fieldName);
+			$bareName = $temp[0];
+			$bareName =~ s/\./\\\\\./g;
+			$content = <<"CONTENT";
+\$('#$bareName\\\\.answer_date_id').datetimepicker({
+	ampm: true,
+	timeFormat: 'hh:mmtt',
+	timeSuffix: ' $timezone',
+	separator: ' at ',
+    onClose: function(dateText, inst) {
+        var dueDateTextBox = \$('#$bareName\\\\.due_date_id');
+        if (dueDateTextBox.val() != '') {
+            var testdueDate = new Date(dueDateTextBox.val());
+            var testanswersDate = new Date(dateText);
+            if (testdueDate > testanswersDate)
+                dueDateTextBox.val(dateText);
+        }
+        else {
+            dueDateTextBox.val(dateText);
+        }
+    },
+    onSelect: function (selectedDateTime){
+        var answers = \$(this).datetimepicker('getDate');
+        \$('#$bareName\\\\.due_date_id').datetimepicker('option', 'maxDate', new Date(answers.getTime()));
+    }
+});
+CONTENT
+		}
+		
+		push @$dateTimeScripts, $content;
+		return $out;
 	}
 	
 	if ($type eq "filelist") {
-		return CGI::popup_menu({
-			name => $fieldName,
-			value => [ sort keys %$headerFiles ],
-			labels => $headerFiles,
-			default => $value || 0,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName,
+				value => [ sort keys %$headerFiles ],
+				labels => $headerFiles,
+				default => $value || 0,
+			}
+		),
 	}
 
 	if ($type eq "enumerable") {
@@ -2128,12 +2316,17 @@ sub fieldEditHTML {
 			$value = $synonyms->{"*"};
 		}
 		
-		return CGI::popup_menu({
-			name => $fieldName, 
-			values => [keys %$items],
-			default => $value,
-			labels => $items,
-		});
+		return WeBWorK::CGI_labeled_input(
+			-type=>"select",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				name => $fieldName, 
+				values => [keys %$items],
+				default => $value,
+				labels => $items,
+			}
+		),
 	}
 	
 	if ($type eq "checked") {
@@ -2141,11 +2334,16 @@ sub fieldEditHTML {
 		# FIXME: kludge (R)
 		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
 		# in which case the hidden field overrides the parameter with a 0
-		return CGI::checkbox(
-			-name => $fieldName,
-			-checked => $value,
-			-label => "",
-			-value => 1
+		return WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$fieldName."_id",
+			-label_text=>ucfirst($fieldName),
+			-input_attr=>{
+				-name => $fieldName,
+				-checked => $value,
+				-label => "",
+				-value => 1
+			}
 		) . CGI::hidden(
 			-name => $fieldName,
 			-value => 0
@@ -2168,8 +2366,8 @@ sub recordEditHTML {
 	my $exportMode = $options{exportMode};
 	my $setSelected = $options{setSelected};
 
-	my $visibleClass = $Set->visible ? "visible" : "hidden";
-	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? 'Reduced Credit Enabled' : 'Reduced Credit Disabled';
+	my $visibleClass = $Set->visible ? $r->maketext("visible") : $r->maketext("hidden");
+	my $enable_reduced_scoringClass = $Set->enable_reduced_scoring ? $r->maketext('Reduced Credit Enabled') : $r->maketext('Reduced Credit Disabled');
 
 	my $users = $db->countSetUsers($Set->set_id);
 	my $totalUsers = $self->{totalUsers};
@@ -2199,26 +2397,39 @@ sub recordEditHTML {
 					: CGI::a({href=>$usersAssignedToSetURL}, "$users/$totalUsers");
 	$fakeRecord{filename} = CGI::input({-name => "set.$set_id", -value=>"set$set_id.def", -size=>60});
 					
-		
+	
 	# Select
 	if ($editMode) {
 		# column not there
 	} else {
 		# selection checkbox
-		push @tableCells, CGI::checkbox(
-			-name => "selected_sets",
-			-value => $set_id,
-			-checked => $setSelected,
-			-label => "",
+		# Set ID
+		my $label = "";
+		if ($editMode) {
+			$label = CGI::a({href=>$problemListURL}, "$set_id");
+		} else {		
+			$label = CGI::font({class=>$visibleClass}, $set_id . $imageLink);
+		}
+		
+		push @tableCells, WeBWorK::CGI_labeled_input(
+			-type=>"checkbox",
+			-id=>$set_id."_id",
+			-label_text=>$label,
+			-input_attr=>$setSelected ?
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-checked => "checked",
+				-class => "table_checkbox",
+			}
+			:
+			{
+				-name => "selected_sets",
+				-value => $set_id,
+				-class => "table_checkbox",
+			}
 		);
 	}
-	
-	# Set ID
-	if ($editMode) {
-		push @tableCells, CGI::a({href=>$problemListURL}, "$set_id");
-	} else {		
-	push @tableCells, CGI::font({class=>$visibleClass}, $set_id . $imageLink);
-	}
 
 	# Problems link
 	if ($editMode) {
@@ -2249,6 +2460,10 @@ sub recordEditHTML {
 	# make a hash out of this so we can test membership easily
 	my %nonkeyfields; @nonkeyfields{$Set->NONKEYFIELDS} = ();
 	
+	my @chooseDateTimeScripts = ();
+	
+	push @chooseDateTimeScripts, "addOnLoadEvent(function() {";
+
 	# Set Fields
 	foreach my $field (@fieldsToShow) {
 		next unless exists $nonkeyfields{$field};
@@ -2258,15 +2473,20 @@ sub recordEditHTML {
 		$properties{access} = "readonly" unless $editMode;
 		$fieldValue = $self->formatDateTime($fieldValue) if $field =~ /_date/;
 		$fieldValue =~ s/ /&nbsp;/g unless $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /visible/ and not $editMode;
-		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enable_reduced_scoring/ and not $editMode;
-		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /visible/ and not $editMode;
+		$fieldValue = ($fieldValue) ? $r->maketext("Yes") : $r->maketext("No") if $field =~ /enable_reduced_scoring/ and not $editMode;
+		push @tableCells, CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties, \@chooseDateTimeScripts));
 		#$fakeRecord{$field} = CGI::font({class=>$visibleClass}, $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
 	}
-
+	
+	push @chooseDateTimeScripts, "});";
+	
 	#@tableCells = map { $fakeRecord{$_} } @fieldsToShow;
+	
+	my $out = CGI::Tr({}, CGI::td({}, \@tableCells));
+	my $scripts = CGI::start_script({-type=>"text/javascript"}).(join("", @chooseDateTimeScripts)).CGI::end_script();
 
-	return CGI::Tr({}, CGI::td({}, \@tableCells));
+	return $out.$scripts;
 }
 
 sub printTableHTML {
@@ -2316,22 +2536,25 @@ sub printTableHTML {
 	
 	@headers = sort @headers;
 	my %headers = map { $_ => $_ } @headers;
-	$headers{""} = "Use System Default";
+	$headers{""} = $r->maketext("Use System Default");
 	$self->{headerFiles} = \%headers;	# store these header files so we don't have to look for them later.
 
 
 	my @tableHeadings = map { $fieldNames{$_} } @realFieldNames;
+	shift @tableHeadings;
 	
 	# prepend selection checkbox? only if we're NOT editing!
 #	unshift @tableHeadings, "Select", "Set", "Problems" unless $editMode;
 
 	# print the table
 	if ($editMode or $exportMode) {
-		print CGI::start_table({});
+		print CGI::start_table({-id=>"set_table_id", -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") });#"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	} else {
-		print CGI::start_table({-border=>1});
+		print CGI::start_table({-id=>"set_table_id", -border=>1, -class=>"set_table", -summary=>$r->maketext("_PROBLEM_SET_SUMMARY") }); #"This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."});
 	}
 	
+	print CGI::caption($r->maketext("Set List"));
+	
 	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
 	
 
@@ -2352,10 +2575,41 @@ sub printTableHTML {
 	##########################################
 	
 	print CGI::p(
-                      CGI::i("No sets shown.  Choose one of the options above to list the sets in the course.")
+                      CGI::i($r->maketext("No sets shown.  Choose one of the options above to list the sets in the course."))
 	) unless @Sets;
 }
 
+# output_JS subroutine
+
+# outputs all of the Javascript required for this page
+
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-1.8.18.custom.min.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-ui-timepicker-addon.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/form_checker_hmwksets.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/hmwksets_handlers.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/show_hide.js"}), CGI::end_script();
+	return "";
+}
+
+# Just tells template to output the stylesheet for Tabber
+sub output_tabber_CSS{
+	return "";
+}
+
+#Tells template to output stylesheet for Jquery-UI
+sub output_jquery_ui_CSS{
+	return "";
+}
+
 1;
 
 =head1 AUTHOR

From 94ff68bec66641b1847d988aff37d3089eca5ed6 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Wed, 14 Mar 2012 22:18:33 -0400
Subject: [PATCH 22/73] Bring checkProblems up to point where it can
 authenticate for webservices.

Next task is to combine it with Test::Harness to check library problems
---
 clients/checkProblem.pl  | 481 +++++++++------------------------------
 clients/renderProblem.pl |   4 +-
 2 files changed, 106 insertions(+), 379 deletions(-)

diff --git a/clients/checkProblem.pl b/clients/checkProblem.pl
index 5a60b6cee6..89c4d0acef 100755
--- a/clients/checkProblem.pl
+++ b/clients/checkProblem.pl
@@ -65,12 +65,12 @@ =head1 NAME
  #use constant  DISPLAY_COMMAND  => 'open -a firefox ';   #browser opens tempoutputfile above
  # use constant  DISPLAY_COMMAND  => "open -a 'Google Chrome' ";
    use constant DISPLAY_COMMAND => " less ";   # display tempoutputfile with less
- ############################################################
+
  
  my $use_site;
- $use_site = 'test_webwork';    # select a rendering site 
+ #$use_site = 'test_webwork';    # select a rendering site 
  #$use_site = 'local';           # select a rendering site 
- #$use_site = 'rochester_test';  # select a rendering site 
+ $use_site = 'hosted2';  # select a rendering site 
  
  
  ############################################################
@@ -112,19 +112,21 @@ =head1 NAME
 #     result. A different name can be used but the course must exist on the server.
 
 
-our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE);
+our $UNIT_TESTS_ON             = 1;
+
+our ( $XML_URL,$FORM_ACTION_URL, $XML_PASSWORD, $XML_COURSE, %credentials);
 if ($use_site eq 'local') {
-# the rest can work!!
+	# the rest can work!!
 	$XML_URL      =  'http://localhost:80';
 	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
 	$XML_PASSWORD     =  'xmlwebwork';
 	$XML_COURSE       =  'daemon_course';
-} elsif ($use_site eq 'rochester_test') {  
+} elsif ($use_site eq 'hosted2') {  
 	
-	$XML_URL      =  'http://128.151.231.2';
-	$FORM_ACTION_URL  =  'http://128.151.231.2/webwork2/html2xml';
+	$XML_URL      =  'https://hosted2.webwork.rochester.edu';
+	$FORM_ACTION_URL  =  'https://hosted2.webwork.rochester.edu/webwork2/html2xml';
  	$XML_PASSWORD     = 'xmlwebwork';
- 	$XML_COURSE       = 'daemon_course';
+ 	$XML_COURSE       = 'gage_course';
 	
 } elsif ($use_site eq 'test_webwork') {
 
@@ -141,6 +143,50 @@ =head1 NAME
 
 
 
+####################################################
+# get credentials
+####################################################
+
+
+my $credential_path;
+my @path_list = ('.ww_credentials', '/Users/gage/.ww_credentials', '/Users/gage/ww_session_credentials');
+foreach my $path (@path_list) {
+	if (-r "$path" ) {
+		$credential_path = $path;
+		last;
+	}
+}
+unless ( $credential_path ) {
+	die <<EOF;
+Can't find path for credentials. Looked in @path_list.
+Place a credential file containing the following information at one of the locations above.
+%credentials = (
+        userID          => "my login name for the webwork course",
+        password        => "my password ",
+        courseID        => "the name of the webwork course",
+);
+1;
+---------------------------------------------------------
+EOF
+}
+
+eval{require $credential_path};
+if ($@  or not defined %credentials) {
+
+print STDERR <<EOF;
+
+The credentials file should contain this:
+%credentials = (
+        userID          => "my login name for the webwork course",
+        password        => "my password ",
+        courseID        => "the name of the webwork course",
+);
+1;
+EOF
+die;
+}
+
+
 
 our @COMMANDS = qw( listLibraries    renderProblem  ); #listLib  readFile tex2pdf 
 
@@ -150,35 +196,68 @@ =head1 NAME
 ##################################################
 
 
-
-our $xmlrpc_client = new WebworkClient;
-
 ##################################################
 # input/output section
 ##################################################
 
 
-$xmlrpc_client->url($XML_URL);
-$xmlrpc_client->{form_action_url}= $FORM_ACTION_URL;
-$xmlrpc_client->{displayMode}   = DISPLAYMODE();
-$xmlrpc_client->{user}          = 'xmluser';
-$xmlrpc_client->{password}      = $XML_PASSWORD;
-$xmlrpc_client->{course}        = $XML_COURSE;
+# filter mode  main code
+
+
+############################################
+# Build client
+############################################
+our $xmlrpc_client = new WebworkClient (
+	url                    => $XML_URL,
+	form_action_url        => $FORM_ACTION_URL,
+	displayMode            => DISPLAYMODE(),
+	site_password          =>  $credentials{site_password},
+	courseID               =>  $credentials{courseID},
+	userID                 =>  $credentials{userID},
+	session_key            =>  $credentials{session_key},
+);
+ 
+ 
+ my $input = { 
+		userID      	=> $credentials{userID}||'',
+		session_key	 	=> $credentials{session_key}||'',
+		courseID   		=> $credentials{courseID}||'',
+		courseName   	=> $credentials{courseID}||'',
+		password     	=> $credentials{password}||'',	
+		site_password   => $credentials{site_password}||'',
+ };
+
 
 our $source = '';
+our $filePath = '';
+our $rh_result;
+# {
+# 	local($/);
+# 	$source   = <>; #slurp standard input
+# 	#print $source;  # return input to BBedit
+#  $xmlrpc_client->encodeSource($source);
+# }
 our $output;
 our $return_string;
+
 if (@ARGV) {
 	local(*FH);
 	open(FH, ">>".LOG_FILE()) || die "Can't open log file ". LOG_FILE();
-	$source = (defined $ARGV[0]) ? `cat $ARGV[0]` : '' ;
+	{
+		local($/);
+		$filePath = $ARGV[0];
+		$source   = <>; #slurp standard input
+		#print $source;  # return input to BBedit
+	}	
     $xmlrpc_client->encodeSource($source);
-	if ( $xmlrpc_client->xmlrpcCall('renderProblem') )    {
+    
+    
+	if ( $xmlrpc_client->xmlrpcCall('renderProblem', $input) )    {
 	        $output = $xmlrpc_client->{output};
 		if (defined($output->{flags}->{error_flag}) and $output->{flags}->{error_flag} ) {
-			$return_string = "0\t $ARGV[0] has errors\n";
+			$return_string = "0\t $filePath has errors\n";
 		} elsif (defined($output->{errors}) and $output->{errors} ){
-			$return_string = "0\t $ARGV[0] has syntax errors\n";
+			$return_string = "0\t $filePath has syntax errors\n";
 		} else {
 			# 
 			if (defined($output->{flags}->{DEBUG_messages}) ) {
@@ -203,16 +282,16 @@ =head1 NAME
 			$return_string = "0\t ".$return_string."\n" if $return_string;   # add a 0 if there was an warning or debug message.
 		}
 		unless ($return_string) {
-			$return_string = "1\t $ARGV[0] is ok\n";
+			$return_string = "1\t $filePath is ok\n";
 		}
 	} else {
 		
-		$return_string = "0\t $ARGV[0] has undetermined errors -- could not be read perhaps?\n";
+		$return_string = "0\t $filePath has undetermined errors -- could not be read perhaps?\n";
 	}
 	print FH $return_string;
 	close(FH);
 } else {
-    print "0 $ARGV[0]  something went wrong -- could not render file\n";
+    print "0 $filePath  something went wrong -- could not render file\n";
 	print STDERR "Useage: ./checkProblem.pl    [file_name]\n";
 	print STDERR "For example: ./checkProblem.pl    input.txt\n";
 	print STDERR "Output is sent to the log file: ",LOG_FILE();
@@ -220,358 +299,6 @@ =head1 NAME
 }
 
 
-##################################################
-# XMLRPC client -- 
-# the code below is identical between renderProblem.pl and renderViaXMLRPC.pm????
-# and has been included in WebworkClient.pm
-##################################################
 
-# package WeBWorK::ContentGenerator::renderViaXMLRPC_client;
-# 
-# use Crypt::SSLeay;  # needed for https
-# use XMLRPC::Lite;
-# use MIME::Base64 qw( encode_base64 decode_base64);
-# 
-# use constant  TRANSPORT_METHOD => 'XMLRPC::Lite';
-# use constant  REQUEST_CLASS    => 'WebworkXMLRPC';  # WebworkXMLRPC is used for soap also!!
-# use constant  REQUEST_URI      => 'mod_xmlrpc';
-# 
-# sub new {
-# 	my $self = {
-# 		output   		=> '',
-# 		encodedSource 	=> '',
-# 		url             => '',
-# 		password        => '',
-# 		course          => '',
-# 		displayMode     => '',
-# 		inputs_ref      => {		 AnSwEr0001 => '',
-# 				 					 AnSwEr0002 => '',
-# 				 					 AnSwEr0003 => '',
-# 		},
-# 	};
-# 
-# 	bless $self;
-# }
-# 
-# 
-# our $result;
-# 
-# ##################################################
-# # Utilities -- 
-# #    this code is identical between renderProblem.pl and renderViaXMLRPC.pm
-# ##################################################
-# 
-# sub xmlrpcCall {
-# 	my $self        = shift;
-# 	my $command     = shift;
-# 	$command        = 'listLibraries' unless $command;
-# 
-# 	  my $requestResult = TRANSPORT_METHOD
-# 			-> proxy($self->{url}.'/'.REQUEST_URI);
-#      
-# 	  my $input = $self->setInputTable();
-# 	  local( $result);
-# 	  # use eval to catch errors
-# 	  eval { $result = $requestResult->call(REQUEST_CLASS.'.'.$command,$input) };
-# 	  if ($@) {
-# 	  	print STDERR "There were a lot of errors for $command\n" ;
-# 	  	print STDERR "Errors: \n $@\n End Errors\n" ;
-# 	  	return 0 #failure
-# 	  }
-# 	  	  
-# 	  unless (ref($result) and $result->fault) {    	
-# 	  	my $rh_result = $result->result();
-# 	    #print STDERR pretty_print_rh($rh_result);
-# 		$self->{output} = $rh_result; #$self->formatRenderedProblem($rh_result);
-# 		return 1; # success
-# 
-# 	  } else {
-# 		$self->{output} = 'Error from server: '. join( ",\n ",
-# 		  $result->faultcode,
-# 		  $result->faultstring);
-# 		return 0; #failure
-# 	  }
-# }
-#   
-# sub encodeSource {
-# 	my $self = shift;
-# 	my $source = shift;
-# 	$self->{encodedSource} =encode_base64($source);
-# }
-# sub url {
-# 	my $self = shift;
-# 	my $new_url = shift;
-# 	$self->{url} = $new_url if defined($new_url) and $new_url =~ /\S/;
-# 	$self->{url};
-# }
-# sub pretty_print {    # provides html output -- NOT a method
-#     my $r_input = shift;
-#     my $level = shift;
-#     $level = 4 unless defined($level);
-#     $level--;
-#     return '' unless $level > 0;  # only print three levels of hashes (safety feature)
-#     my $out = '';
-#     if ( not ref($r_input) ) {
-#     	$out = $r_input if defined $r_input;    # not a reference
-#     	$out =~ s/</&lt;/g  ;  # protect for HTML output
-#     } elsif ("$r_input" =~/hash/i) {  # this will pick up objects whose '$self' is hash and so works better than ref($r_iput).
-# 	    local($^W) = 0;
-# 	    
-# 		$out .= "$r_input " ."<TABLE border = \"2\" cellpadding = \"3\" BGCOLOR = \"#FFFFFF\">";
-# 		
-# 		
-# 		foreach my $key ( sort ( keys %$r_input )) {
-# 			$out .= "<tr><TD> $key</TD><TD>=&gt;</td><td>&nbsp;".pretty_print($r_input->{$key}) . "</td></tr>";
-# 		}
-# 		$out .="</table>";
-# 	} elsif (ref($r_input) eq 'ARRAY' ) {
-# 		my @array = @$r_input;
-# 		$out .= "( " ;
-# 		while (@array) {
-# 			$out .= pretty_print(shift @array, $level) . " , ";
-# 		}
-# 		$out .= " )";
-# 	} elsif (ref($r_input) eq 'CODE') {
-# 		$out = "$r_input";
-# 	} else {
-# 		$out = $r_input;
-# 		$out =~ s/</&lt;/g; # protect for HTML output
-# 	}
-# 	
-# 	return $out." ";
-# }
-# 
-# sub setInputTable_for_listLib {
-# 	my $self = shift;
-# 	my $out = {
-# 		pw          =>   $self->{password},
-# 		set         =>   'set0',
-# 		library_name =>  'Library',
-# 		command      =>  'all',
-# 	};
-# 
-# 	$out;
-# }
-# sub setInputTable {
-# 	my $self = shift;
-# 	my $out = {
-# 		pw          =>   $self->{password},
-# 		library_name =>  'Library',
-# 		command      =>  'renderProblem',
-# 		answer_form_submitted   => 1,
-# 		course                  => $self->{course},
-# 		extra_packages_to_load  => [qw( AlgParserWithImplicitExpand Expr
-# 		                                ExprWithImplicitExpand AnswerEvaluator
-# 		                                AnswerEvaluatorMaker 
-# 		)],
-# 		mode                    => $self->{displayMode},
-# 		modules_to_evaluate     => [ qw( 
-# Exporter
-# DynaLoader								
-# GD
-# WWPlot
-# Fun
-# Circle
-# Label								
-# PGrandom
-# Units
-# Hermite
-# List								
-# Match
-# Multiple
-# Select							
-# AlgParser
-# AnswerHash							
-# Fraction
-# VectorField							
-# Complex1
-# Complex							
-# MatrixReal1 Matrix							
-# Distributions
-# Regression
-# 
-# 		)], 
-# 		envir                   => $self->environment(),
-# 		problem_state           => {
-# 		
-# 			num_of_correct_ans  => 0,
-# 			num_of_incorrect_ans => 4,
-# 			recorded_score       => 1.0,
-# 		},
-# 		source                   => $self->{encodedSource},  #base64 encoded
-# 		
-# 		
-# 		
-# 	};
-# 
-# 	$out;
-# }
-# 
-# sub environment {
-# 	my $self = shift;
-# 	my $envir = {
-# 		answerDate  => '4014438528',
-# 		CAPA_Graphics_URL=>'http://webwork-db.math.rochester.edu/capa_graphics/',
-# 		CAPA_GraphicsDirectory =>'/ww/webwork/CAPA/CAPA_Graphics/',
-# 		CAPA_MCTools=>'/ww/webwork/CAPA/CAPA_MCTools/',
-# 		CAPA_Tools=>'/ww/webwork/CAPA/CAPA_Tools/',
-# 		cgiDirectory=>'Not defined',
-# 		cgiURL => 'Not defined',
-# 		classDirectory=> 'Not defined',
-# 		courseName=>'Not defined',
-# 		courseScriptsDirectory=>'not defined',
-# 		displayMode=>$self->{displayMode},
-# 		dueDate=> '4014438528',
-# 		effectivePermissionLevel => 10,
-# 		externalGif2EpsPath=>'not defined',
-# 		externalPng2EpsPath=>'not defined',
-# 		externalTTHPath=>'/usr/local/bin/tth',
-# 		fileName=>'set0/prob1a.pg',
-# 		formattedAnswerDate=>'6/19/00',
-# 		formattedDueDate=>'6/19/00',
-# 		formattedOpenDate=>'6/19/00',
-# 		functAbsTolDefault=> 0.0000001,
-# 		functLLimitDefault=>0,
-# 		functMaxConstantOfIntegration=> 1000000000000.0,
-# 		functNumOfPoints=> 5,
-# 		functRelPercentTolDefault=> 0.000001,
-# 		functULimitDefault=>1,
-# 		functVarDefault=> 'x',
-# 		functZeroLevelDefault=> 0.000001,
-# 		functZeroLevelTolDefault=>0.000001,
-# 		htmlDirectory =>'not defined',
-# 		htmlURL =>'not defined',
-# 		inputs_ref => $self->{inputs_ref},
-# 		macroDirectory=>'not defined',
-# 		numAbsTolDefault=>0.0000001,
-# 		numFormatDefault=>'%0.13g',
-# 		numOfAttempts=> 0,
-# 		numRelPercentTolDefault => 0.0001,
-# 		numZeroLevelDefault =>0.000001,
-# 		numZeroLevelTolDefault =>0.000001,
-# 		openDate=> '3014438528',
-# 		permissionLevel =>10,
-# 		PRINT_FILE_NAMES_FOR => [ 'gage'],
-# 		probFileName => 'set0/prob1a.pg',
-# 		problemSeed  => 1234,
-# 		problemValue =>1,
-# 		probNum => 13,
-# 		psvn => 54321,
-# 		psvn=> 54321,
-# 		questionNumber => 1,
-# 		scriptDirectory => 'Not defined',
-# 		sectionName => 'Gage',
-# 		sectionNumber => 1,
-# 		sessionKey=> 'Not defined',
-# 		setNumber =>'not defined',
-# 		studentLogin =>'gage',
-# 		studentName => 'Mike Gage',
-# 		tempDirectory => 'not defined',
-# 		templateDirectory=>'not defined',
-# 		tempURL=>'not defined',
-# 		webworkDocsURL => 'not defined',
-# 		
-# 		showHints => 1,               # extra options -- usually passed from the input form
-# 		showSolutions => 1,
-# 		
-# 	};
-# 	$envir;
-# };
-# 
-# sub formatAnswerRow {
-# 	my $self = shift;
-# 	my $rh_answer = shift;
-# 	my $problemNumber = shift;
-# 	my $answerString  = $rh_answer->{original_student_ans}||'&nbsp;';
-# 	my $correctAnswer = $rh_answer->{correct_ans}||'';
-# 	my $ans_message   = $rh_answer->{ans_message}||'';
-# 	my $score         = ($rh_answer->{score}) ? 'Correct' : 'Incorrect';
-# 	my $row = qq{
-# 		<tr>
-# 		    <td>
-# 				Prob: $problemNumber
-# 			</td>
-# 			<td>
-# 				$answerString
-# 			</td>
-# 			<td>
-# 			    $score
-# 			</td>
-# 			<td>
-# 				Correct answer is $correctAnswer
-# 			</td>
-# 			<td>
-# 				<i>$ans_message</i>
-# 			</td>
-# 		</tr>\n
-# 	};
-# 	$row;
-# }
-# 	
-# sub formatRenderedProblem {
-# 	my $self 			  = shift;
-# 	my $rh_result         = $self->{output};  # wrap problem in formats
-# 	my $problemText       = decode_base64($rh_result->{text});
-# 	my $rh_answers        = $rh_result->{answers};
-# 	my $encodedSource     = $self->{encodedSource}||'foobar';
-# 	my $warnings          = '';
-# 	if ( defined ($rh_result->{WARNINGS}) and $rh_result->{WARNINGS} ){
-# 		$warnings = "<div style=\"background-color:pink\">
-# 		             <p >WARNINGS</p><p>".decode_base64($rh_result->{WARNINGS})."</p></div>";
-# 	}
-# 	#warn "keys: ", join(" | ", sort keys %{$rh_result });
-# 	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
-#     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
-#     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
-#     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
-# 	# collect answers
-# 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
-# 	my $problemNumber     = 1;
-#     foreach my $key (sort  keys %{$rh_answers}) {
-#     	$answerTemplate  .= $self->formatAnswerRow($rh_answers->{$key}, $problemNumber++);
-#     }
-# 	$answerTemplate      .= q{</table> <hr>};
-# 
-# 	my $FULL_URL = $self->url;
-# 	my $FORM_ACTION_URL  =  "$FULL_URL/webwork2/html2xml";
-# 	my $problemTemplate = <<ENDPROBLEMTEMPLATE;
-# <html>
-# <head>
-# <base href="$FULL_URL">
-# <title>WeBWorK Editor using host $HOSTNAME</title>
-# </head>
-# <body>
-# 		    $answerTemplate
-# 		    <form action="$FORM_ACTION_URL" method="post">
-# 			$problemText
-# 	       <input type="hidden" name="answersSubmitted" value="1"> 
-# 	       <input type="hidden" name="problemAddress" value="probSource"> 
-# 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
-# 	       <input type="hidden" name="problemSeed" value="1234"> 
-# 	       <input type="hidden" name="pathToProblemFile" value="foobar">
-# 	       <p><input type="submit" name="submit" value="submit answers"></p>
-# 	     </form>
-# <HR>
-# <h3> Warning section </h3>
-# $warnings
-# <h3>
-# Debug message section
-# </h3>
-# $debug_messages
-# <h3>
-# internal errors
-# </h3>
-# $internal_debug_messages
-# 
-# </body>
-# </html>
-# 
-# ENDPROBLEMTEMPLATE
-# 
-# 
-# 
-# 	$problemTemplate;
-# }
-# 
 
 1;
diff --git a/clients/renderProblem.pl b/clients/renderProblem.pl
index 9878ee82e4..c4616dcdad 100755
--- a/clients/renderProblem.pl
+++ b/clients/renderProblem.pl
@@ -67,7 +67,7 @@ =head1 NAME
  my $use_site;
  #$use_site = 'test_webwork';    # select a rendering site 
  #$use_site = 'local';           # select a rendering site 
- $use_site = 'rochester_test';  # select a rendering site 
+ $use_site = 'hosted2';  # select a rendering site 
  
  
  ############################################################
@@ -116,7 +116,7 @@ =head1 NAME
 	$FORM_ACTION_URL  =  'http://localhost:80/webwork2/html2xml';
 	$XML_PASSWORD     =  'xmlwebwork';
 	$XML_COURSE       =  'daemon_course';
-} elsif ($use_site eq 'rochester_test') {  
+} elsif ($use_site eq 'hosted2') {  
 	
 	$XML_URL      =  'https://hosted2.webwork.rochester.edu';
 	$FORM_ACTION_URL  =  'https://hosted2.webwork.rochester.edu/webwork2/html2xml';

From b36f259c55cd53984c91256b1a06c5ed01241eea Mon Sep 17 00:00:00 2001
From: Grant He <ghe3@u.rochester.edu>
Date: Sun, 8 Apr 2012 00:47:39 -0400
Subject: [PATCH 23/73] Implemented viewing frame to PGProblemEditor, minor
 Localization fix

---
 conf/templates/math3/math3.css                |  19 +-
 htdocs/js/pg_editor_handlers.js               |  11 ++
 .../Instructor/PGProblemEditor.pm             | 162 +++++++++++++-----
 .../Instructor/PGProblemEditor2.pm            |  30 ++--
 lib/WeBWorK/Localize/en.po                    |   4 +
 5 files changed, 172 insertions(+), 54 deletions(-)
 create mode 100644 htdocs/js/pg_editor_handlers.js

diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index 1d24caf0f1..f211bc0098 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -761,14 +761,16 @@ Styles specifically for the problem viewer
 }*/
 
 #editor{
-	width: 750px;
+	width: 585px;
 }
 
 #editor .pg_editor_input_span{
 	margin-bottom: 10px;
+	display: none;
 }
 
 #editor .pg_editor_input_div{
+	margin-top: 20px;
 	margin-left: 50px;
 }
 
@@ -777,6 +779,21 @@ Styles specifically for the problem viewer
 	clear: both;
 }
 
+#pg_editor_header {
+    left: 790px;
+    position: absolute;
+    top: 130px;
+}
+
+#pg_editor_frame_id{
+	height: 474px;
+    left: 785px;
+    position: absolute;
+    top: 182px;
+    width: 500px;
+	overflow: scroll;
+}
+
 /*These are styles for the table of problem sets, found on the Homework Sets page.  Most are simple alignment changes which makes it so everything isn't bunched up together.*/
 
 .radio_span{
diff --git a/htdocs/js/pg_editor_handlers.js b/htdocs/js/pg_editor_handlers.js
new file mode 100644
index 0000000000..09bf7509fd
--- /dev/null
+++ b/htdocs/js/pg_editor_handlers.js
@@ -0,0 +1,11 @@
+/*Javascript for PG Problem Editor*/
+
+// $(function(){
+	// alert(2);
+	// document.getElementById('pg_editor_frame_id').onload = function(){
+		// alert(1);
+		// document.getElementById('pg_editor_frame_id').firstChild.style = "width: 1000px";
+		// alert(document.getElementById('pg_editor_frame_id').hasChildNodes());
+	// };
+	// alert(3);
+// });
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
index 1350de64ef..c19c44fc8b 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -672,12 +672,50 @@ EOF
 	
 ######### print action forms
 		
-			print CGI::start_table({});
 			#print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
 			
 			my @formsToShow = @{ ACTION_FORMS() };
 			my $default_choice = $formsToShow[0];
 			my $i = 0;
+			
+###################################################################COLUMN STYLE BEGIN###############################################################
+			
+			# foreach my $actionID (@formsToShow) {
+				# # Check permissions
+				# #next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
+				# my $actionForm = "${actionID}_form";
+				# my $newWindow = ($actionID =~ m/^(view|add_problem|save)$/)? 1: 0;
+				# my $onChange = "setRadio($i,$newWindow)";
+				# my %actionParams = $self->getActionParams($actionID);
+				# my $line_contents = $self->$actionForm($onChange, %actionParams);
+				# my $radio_params = {-type=>"radio", -name=>"action", -value=>$actionID};
+				# $radio_params->{checked}=1 if ($actionID eq $default_choice) ;
+				# $radio_params->{onclick} = "setTarget($newWindow)";
+				# $radio_params->{id} = "action$i";
+				# # print CGI::Tr({-valign=>"top"},
+					# # CGI::td({}, CGI::input($radio_params)),
+					# # CGI::td({}, $line_contents)
+				# # ) if $line_contents;
+				# if($line_contents){
+					# print CGI::start_div({-class=>"column"});
+					# print CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br());
+					# print CGI::div({-class=>"pg_editor_input_div"},$line_contents);
+					# print CGI::br();
+					# print CGI::end_div();
+				# }
+				# $i++;
+			# }
+			# my $checkbox = WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"newWindow", -label_text=>"Open in new window", -input_attr=>{-checked=>"checked", -onchange=>"updateTarget()"});
+			# $checkbox =~ s/\n//; # remove unwanted linebreak
+			# print CGI::div({-class=>"pd_editor_input_div", -id=>"submit_input_div"}, $checkbox, CGI::br(), WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submit_button_id", -input_attr=>{-name=>'submit', -value=>"Take Action!"}));
+			
+########################################################COLUMN STYLE END###########################################################################
+
+
+########################################################TABBER STYLE BEGIN#########################################################################			
+			
+			my @divArr = ();
+			
 			foreach my $actionID (@formsToShow) {
 				# Check permissions
 				#next if FORM_PERMS()->{$actionID} and not $authz->hasPermissions($user, FORM_PERMS()->{$actionID});
@@ -690,20 +728,33 @@ EOF
 				$radio_params->{checked}=1 if ($actionID eq $default_choice) ;
 				$radio_params->{onclick} = "setTarget($newWindow)";
 				$radio_params->{id} = "action$i";
-				print CGI::Tr({-valign=>"top"},
-					CGI::td({}, CGI::input($radio_params)),
-					CGI::td({}, $line_contents)
-				) if $line_contents;
-				
+				# print CGI::Tr({-valign=>"top"},
+					# CGI::td({}, CGI::input($radio_params)),
+					# CGI::td({}, $line_contents)
+				# ) if $line_contents;
+				if($line_contents){
+					my @titleArr = split(" ", ucfirst(WeBWorK::underscore_to_whitespace($actionForm)));
+					my $title = $titleArr[0];
+					push @divArr, join("",
+					CGI::h3($title),
+					CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br()),
+					CGI::div({-class=>"pg_editor_input_div"},$line_contents),
+					CGI::br())
+				}
 				$i++;
 			}
-			my $checkbox = CGI::input({-type=>"checkbox", -id=>"newWindow", -checked=>"checked",
-						   -onchange=>"updateTarget()"});
+			
+			my $divArrRef = \@divArr;
+	
+			print CGI::div({-class=>"tabber"},
+				CGI::div({-class=>"tabbertab"},$divArrRef)
+			);
+			
+###################################################TABBER STYLE END##############################################################################
+			
+			my $checkbox = WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"newWindow", -label_text=>"Open in new window", -input_attr=>{-checked=>"checked", -onchange=>"updateTarget()"});
 			$checkbox =~ s/\n//; # remove unwanted linebreak
-			print CGI::Tr({}, CGI::td({-colspan=>2}, "Select above then:",
-			                  CGI::submit(-name=>'submit', -value=>"Take Action!"),
-						CGI::script("document.write('$checkbox in another window')")));
-			print CGI::end_table();	
+			print CGI::div({-class=>"pd_editor_input_div", -id=>"submit_input_div"}, $checkbox, CGI::br(), WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submit_button_id", -input_attr=>{-name=>'submit', -value=>"Take Action!"}));
 	
 	
 	print  CGI::end_form();
@@ -1220,15 +1271,17 @@ sub view_form {
 	my ($self, $onChange, %actionParams) = @_;
 	my $file_type     = $self->{file_type};
 	return "" if    $file_type eq 'hardcopy_header';  # these can't yet be edited from temporary files #FIXME
-	my $output_string = "View";
+	my $output_string = "";
 	unless ($file_type eq 'course_info' || $file_type eq 'options_info') {
 
 		$output_string .= join(" ",
-			" using seed ",
-			CGI::textfield(-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange),
-			"and display mode ",
-			CGI::popup_menu(-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, 
-			  -default=>$self->{displayMode}, -onmousedown=>$onChange)
+			# "Use what seed?: ",
+			# CGI::textfield(-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange),
+			WeBWorK::CGI_labeled_input(-type=>"text", -id=>"action_view_seed_id", -label_text=>"Using what seed?: ", -input_attr=>{-name=>'action.view.seed',-value=>$self->{problemSeed},-onfocus=>$onChange}),CGI::br(),
+			# "and display mode ",
+			# CGI::popup_menu(-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, 
+			  # -default=>$self->{displayMode}, -onmousedown=>$onChange)
+			WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_view_displayMode_id", -label_text=>"Using what display mode?: ", -input_attr=>{-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, -default=>$self->{displayMode}, -onmousedown=>$onChange}),CGI::br(),
 		);
 	}
 
@@ -1387,11 +1440,9 @@ sub add_problem_form {
 	};
 	return "" if $self->{file_type} eq 'course_info' || $self->{file_type} eq 'options_info';
 	return join(" ",
-		"Add to set " ,
-		CGI::popup_menu({name=>'action.add_problem.target_set', values=>\@allSetNames, default=>$setName, onmousedown=>$onChange}),
-		" as ",
-		CGI::popup_menu({name=>'action.add_problem.file_type', values=>['problem','set_header', 'hardcopy_header'], labels=>$labels, default=>$self->{file_type}, onmousedown=>$onChange}),
-		
+		WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_add_problem_target_set_id", -label_text=>"Add to what set?: ", -input_attr=>{name=>'action.add_problem.target_set', values=>\@allSetNames, default=>$setName, onmousedown=>$onChange}),CGI::br(),
+		WeBWorK::CGI_labeled_input(-type=>"select", -id=>"action_add_problem_file_type_id", -label_text=>"Add as what filetype?: ", -input_attr=>{name=>'action.add_problem.file_type', values=>['problem','set_header', 'hardcopy_header'], labels=>$labels, default=>$self->{file_type}, onmousedown=>$onChange}),
+		CGI::br()
 	);  #FIXME  add -lables to the pop up menu
 	return "";
 }
@@ -1709,38 +1760,51 @@ sub save_as_form {  # calls the save_as_handler
     # don't addor replace problems to sets if the set is the Undefined_Set or if the problem is the blank_problem.
     
     my $replace_problem_in_set  = ($can_add_problem_to_set)?
-			 CGI::input({
-    			 -type      => 'radio',
-    			 -name      => "action.save_as.saveMode",
-    			 -value     => "rename",
-    			 -label     => '',
-			 },"and replace ".CGI::b("set $fullSetID$probNum").',')  : ''
+			 # CGI::input({
+    			 # -type      => 'radio',
+    			 # -name      => "action.save_as.saveMode",
+    			 # -value     => "rename",
+    			 # -label     => '',
+			 # },"and replace ".CGI::b("set $fullSetID$probNum").',') 
+			 WeBWorK::CGI_labeled_input(-type=>'radio', -id=>'action_save_as_saveMode_rename_id', -label_text=>"Replace ".CGI::b("set $fullSetID$probNum"), -input_attr=>{
+			 -name      => "action.save_as.saveMode",
+    		 -value     => "rename",
+			 }).CGI::br() : ''
     ;
     my $add_problem_to_set      = ($can_add_problem_to_set)?
-             CGI::input({
-    			 -type      => 'radio',
-    			 -name      => "action.save_as.saveMode",
+             # CGI::input({
+    			 # -type      => 'radio',
+    			 # -name      => "action.save_as.saveMode",
+    			 # -value     => 'add_to_set_as_new_problem',
+    			 # -label     => '',
+    			 # -onfocus   => $onChange,
+    		 # },"and append to end of set $fullSetID",) : ''
+			 WeBWorK::CGI_labeled_input(-type=>'radio', -id=>"action_save_as_saveMode_new_problem_id", -label_text=>"Append to end of set $fullSetID", -input_attr=>{
+				 -name      => "action.save_as.saveMode",
     			 -value     => 'add_to_set_as_new_problem',
-    			 -label     => '',
-    			 -onfocus   => $onChange,
-    		 },"and append to end of set $fullSetID",) : ''
+				 -onfocus   => $onChange,
+			 }).CGI::br() : ''
     ;  
     my $rh_new_problem_options = {
-    			 -type      => 'radio',
+    			# -type      => 'radio',
     			 -name      => "action.save_as.saveMode",
     			 -value     => "new_independent_problem",
     			 -onfocus   => $onChange,
     			 };
     $rh_new_problem_options->{checked}=1 unless $can_add_problem_to_set;
-    my $create_new_problem       = CGI::input($rh_new_problem_options,"as a new independent problem");
+    my $create_new_problem       =  WeBWorK::CGI_labeled_input(-type=>'radio', -id=>"action_save_as_saveMode_independent_problem_id", -label_text=>"Append as new independent problem", -input_attr=>$rh_new_problem_options).CGI::br(); #CGI::input($rh_new_problem_options,"as a new independent problem");
     
     $andRelink = CGI::br(). $replace_problem_in_set . $add_problem_to_set . $create_new_problem;
     			 
-	return 'Save AS [TMPL]/'.
-	        CGI::textfield(
-			       -name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
-			       -onfocus=>$onChange
-			      ).",".
+	return #'Save AS [TMPL]/'.
+	        # CGI::textfield(
+			       # -name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
+			       # -onfocus=>$onChange
+			      # ).",".
+			WeBWorK::CGI_labeled_input(-type=>"text", -id=>"action_save_as_target_file_id", -label_text=>"Save AS [TMPL]/", -input_attr=>{
+				-name=>'action.save_as.target_file', -size=>60, -value=>"$shortFilePath",  
+			    -onfocus=>$onChange
+			}).
 			CGI::hidden(-name=>'action.save_as.source_file', -value=>$editFilePath ).
 			CGI::hidden(-name=>'action.save_as.file_type',-value=>$self->{file_type}).
 			$andRelink;
@@ -1951,7 +2015,21 @@ sub revert_handler {
 	# no redirect is needed
 }
 
+sub output_JS{
+	my $self = shift;
+	my $r = $self->r;
+	my $ce = $r->ce;
 
+	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	
+	return "";
+}
+
+sub output_tabber_CSS{
+	return "";
+}
 
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
index ff12a154c6..9266057049 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
@@ -14,7 +14,7 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::ContentGenerator::Instructor::PGProblemEditor2;
+package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
 use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
 use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
@@ -23,7 +23,7 @@ use constant DEFAULT_SEED => 123456;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::PGProblemEditor2 - Edit a pg file
+WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
 
 =cut
 
@@ -596,7 +596,7 @@ sub body {
 	# FIXME 
 	# Should the seed be set from some particular user instance??
 	my $rows            = 20;
-	my $columns         = 80;
+	my $columns         = 70;
 	my $mode_list       = $ce->{pg}->{displayModes};
 	my $displayMode     = $self->{displayMode};
 	my $problemSeed     = $self->{problemSeed};	
@@ -623,7 +623,7 @@ sub body {
 		}
 		function updateTarget() {
 		  var inWindow = document.getElementById("newWindow").checked;
-		  document.getElementById("editor").target = (inWindow? "WW_View": "");
+		  document.getElementById("editor").target = (inWindow? "WW_View": "pg_editor_frame");
 		}
 		function setRadio(i,nw) {
 		  document.getElementById('action'+i).checked = true;
@@ -734,7 +734,8 @@ EOF
 				# ) if $line_contents;
 				if($line_contents){
 					my @titleArr = split(" ", ucfirst(WeBWorK::underscore_to_whitespace($actionForm)));
-					my $title = $titleArr[0];
+					pop @titleArr;
+					my $title = join(" ", @titleArr);
 					push @divArr, join("",
 					CGI::h3($title),
 					CGI::div({-class=>"pg_editor_input_span"},WeBWorK::CGI_labeled_input(-type=>"radio", -id=>$actionForm."_id", -label_text=>ucfirst(WeBWorK::underscore_to_whitespace($actionForm)), -input_attr=>$radio_params),CGI::br()),
@@ -760,6 +761,11 @@ EOF
 	print  CGI::end_form();
 
 	print CGI::script("updateTarget()");
+	
+	print CGI::h3({-id=>"pg_editor_header"}, "Problem Viewer");
+	print CGI::start_iframe({-id=>"pg_editor_frame_id", -name=>"pg_editor_frame"});
+	print CGI::end_iframe();
+	
 	return "";
 
 
@@ -925,7 +931,7 @@ sub getFilePaths {
 		$setName =~ s/,v\d+$//;
 	}
 
-	die 'Internal error to PGProblemEditor2 -- file type is not defined'  unless defined $file_type;
+	die 'Internal error to PGProblemEditor -- file type is not defined'  unless defined $file_type;
 	#$self->addgoodmessage("file type is $file_type");  #FIXME remove
 	##########################################################
 	# Determine path to the input file to be edited. 
@@ -1301,7 +1307,7 @@ sub view_handler {
 	my $displayMode     = ($actionParams->{'action.view.displayMode'}) ? 
 	                                $actionParams->{'action.view.displayMode'}->[0]  
 	                                : $self->r->ce->{pg}->{options}->{displayMode};
-	                                
+						
 	my $editFilePath        = $self->{editFilePath};
 	my $tempFilePath        = $self->{tempFilePath};
 	########################################################                               
@@ -1665,7 +1671,7 @@ sub save_handler {
 			}
 		);
 	} elsif ($file_type eq 'source_path_for_problem_file') {  # redirect to ProblemSets.pm
-		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		my $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 		courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		my $viewURL = $self->systemLink($problemPage, 
@@ -1952,17 +1958,17 @@ sub save_as_handler {
 	my $new_file_type;
 
 	if ($saveMode eq 'new_independent_problem' ) {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => 'Undefined_Set', problemID => 'Undefined_Set'
 		);
 		$new_file_type = 'source_path_for_problem_file';
 	} elsif ($saveMode eq 'rename') {
-		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		$new_file_type = $file_type;
 	} elsif ($saveMode eq 'add_to_set_as_new_problem') {
-	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2",$r,
+	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor",$r,
 			courseID => $courseName, setID => $setName, problemID => $problemNumber
 		);
 		$new_file_type = $file_type;
@@ -2021,8 +2027,10 @@ sub output_JS{
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/jquery-1.7.1.min.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
 	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/tabber.js"}), CGI::end_script();
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/pg_editor_handlers.js"}), CGI::end_script();
 	
 	return "";
 }
diff --git a/lib/WeBWorK/Localize/en.po b/lib/WeBWorK/Localize/en.po
index 818f0501ce..49e5daf656 100644
--- a/lib/WeBWorK/Localize/en.po
+++ b/lib/WeBWorK/Localize/en.po
@@ -78,3 +78,7 @@ msgstr "This course supports guest logins. Click %1 to log into this course as a
 #
 msgid "_PROBLEM_SET_SUMMARY"
 msgstr "This is a table showing the current Homework sets for this class.  The fields from left to right are: Edit Set Data, Edit Problems, Edit Assigned Users, Visibility to students, Reduced Credit Enabled, Date it was opened, Date it is due, and the Date during which the answers are posted.  The Edit Set Data field contains checkboxes for selection and a link to the set data editing page.  The cells in the Edit Problems fields contain links which take you to a page where you can edit the containing problems, and the cells in the edit assigned users field contains links which take you to a page where you can edit what students the set is assigned to."
+
+#
+msgid "_USER_TABLE_SUMMARY"
+msgstr "A table showing all the current users along with several fields of user information. The fields from left to right are: Login Name, Login Status, Assigned Sets, First Name, Last Name, Email Address, Student ID, Enrollment Status, Section, Recitation, Comments, and Permission Level.  Clicking on the links in the column headers will sort the table by the field it corresponds to. The Login Name fields contain checkboxes for selecting the user.  Clicking the link of the name itself will allow you to act as the selected user.  There will also be an image link following the name which will take you to a page where you can edit the selected user's information.  Clicking the emails will allow you to email the corresponding user.  Clicking the links in the entries in the assigned sets columns will take you to a page where you can view and reassign the sets for the selected user."

From 4deb6f5f821480a83b6bfd4b9eb3853e5b5bfb6c Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:00:23 -0400
Subject: [PATCH 24/73] Fix errors that crept in when transferring from ghe3's
 SVN file in February

Also made some modifications in the warning channel print outs
---
 lib/WeBWorK/ContentGenerator/Problem.pm | 126 ++++++++++++------------
 1 file changed, 61 insertions(+), 65 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index ec8046e579..8bd46d7a3a 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -771,9 +771,9 @@ sub warnings {
  		my @pginternalerrors = @{ $self->{pginternalerrors}  };
 		print CGI::start_div();
 		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question processing error messages"));
-		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),   CGI::br(), join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
-		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ), CGI::br(), join(CGI::br(), @pgwarning)  )  if @pgwarning ;	
-		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ),  CGI::br(), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
+		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),  join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
+		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ),join(CGI::br(), @pgwarning)  )  if @pgwarning ;	
+		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
 		print CGI::end_div();
 	} 
 	# print "proceeding to SUPER::warnings";
@@ -799,6 +799,12 @@ sub head {
 	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
 }
 
+sub post_header_text {
+	my ($self) = @_;
+	return "" if ( $self->{invalidSet} );
+    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
+}
+
 sub options {
 	my ($self) = @_;
 	#warn "doing options in Problem";
@@ -933,7 +939,7 @@ sub body {
 	my $set = $self->{set};
 	my $problem = $self->{problem};
 	my $pg = $self->{pg};
-	print CGI::p("Entering Problem::body subroutine.  This indicates an older style system.template file -- consider upgrading. ");
+	print CGI::p("Entering Problem::body subroutine.  This indicates an old style system.template file -- consider upgrading. ");
 	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
 	unless($valid eq "valid"){
 		return $valid;
@@ -1098,7 +1104,7 @@ sub output_checkboxes{
 				-name    => "showCorrectAnswers",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	if ($can{showHints}) {
 		print CGI::div({style=>"color:red"},
@@ -1114,11 +1120,11 @@ sub output_checkboxes{
 				}
 				:
 				{
-					-name    => "showCorrectAnswers",
+					-name    => "showHints",
 					-value   => 1,
 				}
 			)
-		);
+		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {
 		print WeBWorK::CGI_labeled_input(
@@ -1133,10 +1139,10 @@ sub output_checkboxes{
 			}
 			:
 			{
-				-name    => "showCorrectAnswers",
+				-name    => "showSolutions",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	
 	if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
@@ -1166,7 +1172,7 @@ sub output_submit_buttons{
 		if ($user ne $effectiveUser) {
 			# if acting as a student, make it clear that answer submissions will
 			# apply to the student's records, not the professor's.
-			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
+			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>$r->maketext("submitAnswers"), -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
 		} else {
 			#print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>"alert('submit button clicked')");
 			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers"), -onclick=>""});
@@ -1188,12 +1194,7 @@ sub output_score_summary{
 	my $problem = $self->{problem};
 	my $set = $self->{set};
 	my $pg = $self->{pg};
-	my $scoreRecordedMessage = "";
-	if  (defined $self->{scoreRecordedMessage}) {
-		$scoreRecordedMessage = $self->{scoreRecordedMessage};
-	} else {
-		$scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
-	}
+	my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
 	my $submitAnswers = $self->{submitAnswers};
 	
 	# score summary
@@ -1201,16 +1202,8 @@ sub output_score_summary{
 	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
 	my $problem_status    = $problem->status || 0;
 	my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
-	#my ($attemptsLeft, $attemptsLeftNoun);
 	my $attemptsLeft = $problem->max_attempts - $attempts;
-#	if ($problem->max_attempts == -1) {
-#		# unlimited attempts
-#		$attemptsLeft = $r->maketext("unlimited");
-#		$attemptsLeftNoun = $r->maketext("attempts");
-#	} else {
-#		$attemptsLeft = $problem->max_attempts - $attempts;
-#		$attemptsLeftNoun = $attemptsLeft == 1 ? $r->maketext("attempt") : $r->maketext("attempts");
-#	}
+
 	
 	my $setClosed = 0;
 	my $setClosedMessage;
@@ -1240,7 +1233,6 @@ sub output_score_summary{
 			$problem->attempted
 				? $r->maketext("Your overall recorded score is [_1].  [_2]",$lastScore,$notCountedMessage) . CGI::br()
 				: "",
-#			$setClosed ? $setClosedMessage : $r->maketext("You have [_1] [_2] remaining.",$attemptsLeft,$attemptsLeftNoun) 
 			$setClosed ? $setClosedMessage : $r->maketext("You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.",$attemptsLeft) 
 		));
 	}else {
@@ -1264,6 +1256,18 @@ sub output_misc{
 	my %will = %{ $self->{will} };
 	my $user = $r->param('user');
 
+# 	print CGI::start_div();
+# 	
+# 	my $pgdebug = join(CGI::br(), @{$pg->{pgcore}->{DEBUG_messages}} );
+# 	my $pgwarning = join(CGI::br(), @{$pg->{pgcore}->{WARNING_messages}} );
+# 	my $pginternalerrors = join(CGI::br(),  @{$pg->{pgcore}->get_internal_debug_messages}   );
+# 	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
+# 	
+# 	print CGI::p({style=>"color:red;"}, $r->maketext("Checking additional error messages")) if $pgerrordiv  ;
+#  	print CGI::p($r->maketext("pg debug"),CGI::br(), $pgdebug                 )   if $pgdebug ;
+# 	print CGI::p($r->maketext("pg warning"),CGI::br(),$pgwarning                ) if $pgwarning ;	
+# 	print CGI::p($r->maketext("pg internal errors"),CGI::br(), $pginternalerrors) if $pginternalerrors;
+# 	print CGI::end_div()                                                          if $pgerrordiv ;
 	
 	# save state for viewOptions
 	print  CGI::hidden(
@@ -1300,8 +1304,7 @@ sub output_misc{
 
 # output_summary subroutine
 
-# prints out the feedback on the questions that the student has answered for 	
-# the current problem, along with available information about correctness
+# prints out the summary of the questions that the student has answered for the current problem, along with available information about correctness
 
 sub output_summary{
 	
@@ -1365,7 +1368,7 @@ sub output_custom_edit_message{
 	# custom message for editor
 	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
 		if ($editMode eq "temporaryFile") {
-			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file"), $problem->source_file));
+			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file: "), $problem->source_file));
 		} elsif ($editMode eq "savedFile") {
 			# taken care of in the initialization phase
 		}
@@ -1443,11 +1446,14 @@ sub output_email_instructor{
 sub output_hidden_info{
 	my $self = shift;
 	my $previewAnswers = $self->{previewAnswers};
-	
-	if($previewAnswers){
+	my $checkAnswers   = $self->{checkAnswers};
+	my $showPartialCorrectAnswers = $self->{pg}->{flags}->{showPartialCorrectAnswers};
+	if($previewAnswers){  # never color previewed answers 
 		return "";
 	}
-	else{
+	elsif (   ($checkAnswers  ) 
+	         or $showPartialCorrectAnswers )    { # color answers when partialCorrectAnswers is set
+	                                              # or when checkAnswers is submitted 
 		if(defined $self->{correct_ids}){
 			my $correctRef = $self->{correct_ids};
 			my @correct = @$correctRef;
@@ -1463,39 +1469,13 @@ sub output_hidden_info{
 			}
 		}
 		return "";
+	} else {
+		return "";
 	}
 }
 
 # output_JS subroutine
 
-# outputs all of the Javascript needed for this page. The main javascript needed here is color.js, which colors input fields based on whether or not they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so that the colors will show up correctly.
-
-sub output_JS{
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $site_url = $ce->{webworkURLs}->{htdocs};
-	
-	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
-	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
-	
-	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
-	
-	return "";
-}
-
-# Simply here to indicate to the template that this page has body part methods which can be called
-
-sub can_body_parts{
-	return "";
-}
-
-# output_wztooltip_JS subroutine
-
 # prints out the wz_tooltip.js script for the current site.
 
 sub output_wztooltip_JS{
@@ -1510,18 +1490,34 @@ sub output_wztooltip_JS{
 	return "";
 }
 
-# output_removDupli_JS
-
-# outputs the removeDuplicates JS function
+# outputs all of the Javascript needed for this page. 
+# The main javascript needed here is color.js, which colors input fields based on whether or not 
+# they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification 
+# information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into 
+# two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so 
+# that the colors will show up correctly.
 
-sub output_removDupli_JS{
+sub output_JS{
 	my $self = shift;
 	my $r = $self->r;
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
 	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
+	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	
+	# This is a file which initializes the proper JAVA applets should they be needed for the current problem.
+	print CGI::start_script({type=>"tesxt/javascript", src=>"$site_url/js/java_init.js"}), CGI::end_script();
+	
+	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
+	return "";
+}
+
+# Simply here to indicate to the template that this page has body part methods which can be called
+
+sub can_body_parts{
 	return "";
 }
 

From 0d5d426912540a8ab061b46ea6673bdc2cf72f14 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:02:31 -0400
Subject: [PATCH 25/73] Rename PGProblemEditor to PGProblemEditor2 to avoid
 redefining subroutines

Changed the package name in PGProblemEditor2 to PGProblemEditor2 to avoid duplicates.
---
 lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
index 9266057049..2c5e3855ac 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor2.pm
@@ -14,7 +14,7 @@
 # Artistic License for more details.
 ################################################################################
 
-package WeBWorK::ContentGenerator::Instructor::PGProblemEditor;
+package WeBWorK::ContentGenerator::Instructor::PGProblemEditor2;
 use base qw(WeBWorK);
 use base qw(WeBWorK::ContentGenerator::Instructor);
 use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
@@ -23,7 +23,7 @@ use constant DEFAULT_SEED => 123456;
 
 =head1 NAME
 
-WeBWorK::ContentGenerator::Instructor::PGProblemEditor - Edit a pg file
+WeBWorK::ContentGenerator::Instructor::PGProblemEditor2 - Edit a pg file
 
 =cut
 

From 59e68662f3ff8d3752147b89a01ecdedbaa80904 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:04:18 -0400
Subject: [PATCH 26/73] Comment out trace messages for the various warning
 channels

These can be turned back on by setting $TRACE_WARNINGS = 1
---
 lib/WeBWorK/ContentGenerator.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index d425e7c91b..0c9f8bef80 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -57,7 +57,7 @@ use WeBWorK::Localize;
 use mod_perl;
 use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
 
-
+our $TRACE_WARNINGS = 0;   # set to 1 to trace channel used by warning message
 
 
 BEGIN {
@@ -1067,7 +1067,7 @@ The implementation in this package checks for a note in the request named
 sub warnings {
 	my ($self) = @_;
 	my $r = $self->r;
-	print CGI::p("Entering ContentGenerator::warnings");
+	print CGI::p("Entering ContentGenerator::warnings") if $TRACE_WARNINGS;
 	print "\n<!-- BEGIN " . __PACKAGE__ . "::warnings -->\n";
 	my $warnings = MP2 ? $r->notes->get("warnings") : $r->notes("warnings");
 	print $self->warningOutput($warnings) if $warnings;
@@ -1949,7 +1949,7 @@ problem rendering.
 sub errorOutput($$$) {
 	my ($self, $error, $details) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::errorOutput subroutine</br>";
+	print "Entering ContentGenerator::errorOutput subroutine</br>" if $TRACE_WARNINGS;
 	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
 	my $method = $r->method;
 	my $uri = $r->uri;
@@ -2007,7 +2007,7 @@ and content generation.
 sub warningOutput($$) {
 	my ($self, $warnings) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::warningOutput subroutine</br>";
+	print "Entering ContentGenerator::warningOutput subroutine</br>" if $TRACE_WARNINGS;
 	my @warnings = split m/\n+/, $warnings;
 	foreach my $warning (@warnings) {
 		#$warning = escapeHTML($warning);  # this would prevent using tables in output from answer evaluators

From 6a54627064ce0cf00844a2eb44d78654926d6ea8 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sat, 14 Apr 2012 23:06:37 -0400
Subject: [PATCH 27/73] Supply environment when calling the xmlrpc webservice

---
 clients/renderProblem.pl | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/clients/renderProblem.pl b/clients/renderProblem.pl
index c4616dcdad..3155316220 100755
--- a/clients/renderProblem.pl
+++ b/clients/renderProblem.pl
@@ -200,6 +200,10 @@ =head1 NAME
 
 our $source;
 our $rh_result;
+
+# set fileName path to path for current file (this is a best guess -- may not always be correct)
+my $fileName = $ARGV[0]; # should this be ARGV[0]?
+
 # filter mode  main code
 
 {
@@ -229,8 +233,14 @@ =head1 NAME
 		courseName   	=> $credentials{courseID}||'',
 		password     	=> $credentials{password}||'',	
 		site_password   => $credentials{site_password}||'',
+		envir           => $xmlrpc_client->environment(),
+		                 
  };
 
+
+$fileName =~ s|/opt/webwork/libraries/NationalProblemLibrary|Library|;
+$input->{envir}->{fileName} = $fileName;
+
 #xmlrpcCall('renderProblem');
 our $output;
 our $result;
@@ -254,6 +264,36 @@ =head1 NAME
 
 ##################################################
 # end input/output section
+
+
+################################################################################
+# Storage utilities section
+################################################################################
+# 
+# sub write_session_credentials {
+# 	my $credentials = shift;
+# 	my %credentials = %$credentials;
+# 	my $string = "\$session_credentials = {session_key => $credentials{session_key},
+# 	                                       userID      => $credentials{userID},
+# 	                                       courseID    => $credentials{courseID},
+# 	              };\n";
+# 	local(*FH);
+# 	open(FH, '>'.CREDENTIALFILE) or die "Can't open file ".CREDENTIALFILE()." for writing";
+# 	print FH $string;
+# 	close(FH);
+# }
+# 
+# sub read_session_credentials {
+# 	local(*FH);
+# 	open(FH, '<'.CREDENTIALFILE) or die "Can't open file ".CREDENTIALFILE()." for writing";
+# 	local ($|);
+# 	my $string = <FH>;   # slurp the contents
+# 	my $session_credentials = eval( $string);
+# 	close(FH);
+# 	return $session_credentials;
+# }
+##################################################
+# end input/output section
 ##################################################
 
 sub pretty_print_rh { 

From 7efe517ff1bb6f3db9c7cf9369383e4f08d695d7 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 00:45:52 -0400
Subject: [PATCH 28/73] Fuss with the system.template files for math2 and math3

Try to make them as similar as possible
---
 conf/templates/math2/system.template | 109 ++++++++++++++------------
 conf/templates/math3/system.template | 113 ++++++++++++++-------------
 2 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/conf/templates/math2/system.template b/conf/templates/math2/system.template
index 29f521cd0f..cc6aa7c840 100644
--- a/conf/templates/math2/system.template
+++ b/conf/templates/math2/system.template
@@ -32,6 +32,9 @@
 <!--#if can="output_tabber_CSS"-->
 	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/tabber.css"/>
 <!--#endif-->
+<!--#if can="output_jquery_ui_CSS"-->
+	<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/jquery-ui-1.8.18.custom.css"/>
+<!--#endif-->
 <!--#if can="output_JS"-->
 	<!--#output_JS-->
 <!--#endif-->
@@ -93,66 +96,68 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#endif -->
-			<!--#if can="output_problem_body"--> 
-			<!-- ====  print body parts if possible  -->		
-			  <div class="Body" style="background-color:#ffffff">
-			
-				<!--#if can="output_custom_edit_message"-->
-					<!--#output_custom_edit_message-->
-				<!--#endif-->
-				<!--#if can="output_summary"-->
-						<!--#output_summary-->
-				<!--#endif-->
-				
-				<!--#if can="output_hidden_info"-->
-					<!--#output_hidden_info-->
-				<!--#endif-->
-				
-				<!--#if can="output_form_start"-->
-					<!--#output_form_start-->
-					<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-						<div class="problem">
-							<!--#if can="output_problem_body"-->
-								<!--#output_problem_body-->
-							<!--#endif-->
-							<!--#if can="output_message"-->
-								<!--#output_message-->
-							<!--#endif-->
-							<!--#if can="output_editorLink"-->
-								<!--#output_editorLink-->
-							<!--#endif-->
-						</div>
-					<!--#endif-->
-					<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-						<p>
-							<!--#if can="output_checkboxes"-->
-								<!--#output_checkboxes-->
-							<!--#endif-->
-							<!--#if can="output_submit_buttons"-->
-								<!--#output_submit_buttons-->
-							<!--#endif-->
-						</p>
+             <!--#endif-->
+             
+			 <!--#if can="output_problem_body"--> 
+				<!-- ==== in this case print body parts --ELSE-- print entire body -->		
+				  <div class="Body" style="background-color:#ffffff">
+	
+					<!--#if can="output_custom_edit_message"-->
+						<!--#output_custom_edit_message-->
 					<!--#endif-->
-					<!--#if can="output_score_summary"-->
-						<div class="scoreSummary">
-							<!--#output_score_summary-->
+					<!--#if can="output_summary"-->
+					    <div>
+							<!--#output_summary-->
 						</div>
 					<!--#endif-->
-					<!--#if can="output_misc"-->
-						<!--#output_misc-->
+					
+					<!--#if can="output_hidden_info"-->
+						<!--#output_hidden_info-->
+					<!--#endif-->
+					
+					<!--#if can="output_form_start"-->
+						<!--#output_form_start-->
+						<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+							<div class="problem">
+								<!--#if can="output_problem_body"-->
+									<!--#output_problem_body-->
+								<!--#endif-->
+								<!--#if can="output_message"-->
+									<!--#output_message-->
+								<!--#endif-->
+								<!--#if can="output_editorLink"-->
+									<!--#output_editorLink-->
+								<!--#endif-->
+							</div>
+						<!--#endif-->
+						<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+							<p>
+								<!--#if can="output_checkboxes"-->
+									<!--#output_checkboxes-->
+								<!--#endif-->
+								<!--#if can="output_submit_buttons"-->
+									<!--#output_submit_buttons-->
+								<!--#endif-->
+							</p>
+						<!--#endif-->
+						<!--#if can="output_score_summary"-->
+							<div class="scoreSummary">
+								<!--#output_score_summary-->
+							</div>
+						<!--#endif-->
+						<!--#if can="output_misc"-->
+							<!--#output_misc-->
+						<!--#endif-->
+						</form>
 					<!--#endif-->
-					</form>
 				</div>	  
 			<!-- ====  end printing body parts   -->
 			<!--#else-->
 			<!-- ==== couldn't print body parts so we'll print entire body -->	
-					  <div class="Body" style="background-color:#ffffff">
-					  <!--#body-->
-					  </div>
-			<!-- ==== end printing entire body ===>
-			<!--#endif-->
-			
+				  <div class="Body" style="background-color:#ffffff">
+				  <!--#body-->
+				  </div>
+
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->
 			<!--#if can="output_past_answer_button" can="output_email_instructor"-->
diff --git a/conf/templates/math3/system.template b/conf/templates/math3/system.template
index 91e3d0a424..f7500e94bf 100644
--- a/conf/templates/math3/system.template
+++ b/conf/templates/math3/system.template
@@ -96,66 +96,67 @@
 				  including the warning messages below.
 				  </p>
 				  </div>
-			<!--#else-->
-				 <!--#if can="output_problem_body"--> 
-			        <!-- ==== in this case print body parts --ELSE-- print entire body -->		
-					  <div class="Body" style="background-color:#ffffff">
-		
-						<!--#if can="output_custom_edit_message"-->
-							<!--#output_custom_edit_message-->
-						<!--#endif-->
-						<!--#if can="output_summary"-->
-								<!--#output_summary-->
+             <!--#endif-->
+             
+			 <!--#if can="output_problem_body"--> 
+				<!-- ==== in this case print body parts --ELSE-- print entire body -->		
+				  <div class="Body" style="background-color:#ffffff">
+	
+					<!--#if can="output_custom_edit_message"-->
+						<!--#output_custom_edit_message-->
+					<!--#endif-->
+					<!--#if can="output_summary"-->
+					    <div>
+							<!--#output_summary-->
+						</div>
+					<!--#endif-->
+					
+					<!--#if can="output_hidden_info"-->
+						<!--#output_hidden_info-->
+					<!--#endif-->
+					
+					<!--#if can="output_form_start"-->
+						<!--#output_form_start-->
+						<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
+							<div class="problem">
+								<!--#if can="output_problem_body"-->
+									<!--#output_problem_body-->
+								<!--#endif-->
+								<!--#if can="output_message"-->
+									<!--#output_message-->
+								<!--#endif-->
+								<!--#if can="output_editorLink"-->
+									<!--#output_editorLink-->
+								<!--#endif-->
 							</div>
 						<!--#endif-->
-						
-						<!--#if can="output_hidden_info"-->
-							<!--#output_hidden_info-->
+						<!--#if can="output_checkboxes" can="output_submit_buttons"-->
+							<p>
+								<!--#if can="output_checkboxes"-->
+									<!--#output_checkboxes-->
+								<!--#endif-->
+								<!--#if can="output_submit_buttons"-->
+									<!--#output_submit_buttons-->
+								<!--#endif-->
+							</p>
 						<!--#endif-->
-						
-						<!--#if can="output_form_start"-->
-							<!--#output_form_start-->
-							<!--#if can="output_problem_body" can="output_message" can="output_editorLink"-->
-								<div class="problem">
-									<!--#if can="output_problem_body"-->
-										<!--#output_problem_body-->
-									<!--#endif-->
-									<!--#if can="output_message"-->
-										<!--#output_message-->
-									<!--#endif-->
-									<!--#if can="output_editorLink"-->
-										<!--#output_editorLink-->
-									<!--#endif-->
-								</div>
-							<!--#endif-->
-							<!--#if can="output_checkboxes" can="output_submit_buttons"-->
-								<p>
-									<!--#if can="output_checkboxes"-->
-										<!--#output_checkboxes-->
-									<!--#endif-->
-									<!--#if can="output_submit_buttons"-->
-										<!--#output_submit_buttons-->
-									<!--#endif-->
-								</p>
-							<!--#endif-->
-							<!--#if can="output_score_summary"-->
-								<div class="scoreSummary">
-									<!--#output_score_summary-->
-								</div>
-							<!--#endif-->
-							<!--#if can="output_misc"-->
-								<!--#output_misc-->
-							<!--#endif-->
-							</form>
+						<!--#if can="output_score_summary"-->
+							<div class="scoreSummary">
+								<!--#output_score_summary-->
+							</div>
 						<!--#endif-->
-					  </div>
-
-				<!--#else-->
-				<!-- ==== couldn't print body parts so we'll print entire body -->	
-						  <div class="Body" style="background-color:#ffffff">
-						  <!--#body-->
-						  </div>
-				<!--#endif-->
+						<!--#if can="output_misc"-->
+							<!--#output_misc-->
+						<!--#endif-->
+						</form>
+					<!--#endif-->
+				</div>	  
+			<!-- ====  end printing body parts   -->
+			<!--#else-->
+			<!-- ==== couldn't print body parts so we'll print entire body -->	
+				  <div class="Body" style="background-color:#ffffff">
+				  <!--#body-->
+				  </div>
 
 			<!--#endif-->  
 <!--			      ==============END BODY OF PROBLEM===============      -->

From 72d969c72d2235073e60a17166d5db722f3253bf Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 00:47:06 -0400
Subject: [PATCH 29/73] Remove coloring Show Hints as red and place show hints
 and show solutions on one line

---
 lib/WeBWorK/ContentGenerator/Problem.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index 8bd46d7a3a..d59647af99 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -939,7 +939,9 @@ sub body {
 	my $set = $self->{set};
 	my $problem = $self->{problem};
 	my $pg = $self->{pg};
-	print CGI::p("Entering Problem::body subroutine.  This indicates an old style system.template file -- consider upgrading. ");
+	print CGI::p("Entering Problem::body subroutine.  
+	         This indicates an old style system.template file -- consider upgrading. ",
+	         caller(1), );
 	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
 	unless($valid eq "valid"){
 		return $valid;
@@ -1107,8 +1109,7 @@ sub output_checkboxes{
 		),"&nbsp;";
 	}
 	if ($can{showHints}) {
-		print CGI::div({style=>"color:red"},
-			WeBWorK::CGI_labeled_input(
+		print WeBWorK::CGI_labeled_input(
 				-type	 => "checkbox",
 				-id		 => "showHints_id",
 				-label_text => $r->maketext("Show Hints"),
@@ -1123,7 +1124,6 @@ sub output_checkboxes{
 					-name    => "showHints",
 					-value   => 1,
 				}
-			)
 		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {

From 381fc49a3b893bafe8499f2522e71491b4767df7 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 11:02:41 -0400
Subject: [PATCH 30/73] change channel for PGdebug and PGwarning messages so
 they don't got through the "flags" substructure.

They are now toplevel structures of pgcore.
---
 lib/WebworkClient.pm                   | 11 +++++++----
 lib/WebworkWebservice/RenderProblem.pm |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
index bba400691c..73d0759bbe 100755
--- a/lib/WebworkClient.pm
+++ b/lib/WebworkClient.pm
@@ -473,14 +473,14 @@ sub formatRenderedProblem {
 	# PG debug messages generated with DEBUG_message();
 	#################################################
 	
-	my $debug_messages = $rh_result->{flags}->{DEBUG_messages} ||     [];
+	my $debug_messages = $rh_result->{debug_messages} ||     [];
     $debug_messages = join("<br/>\n", @{  $debug_messages }    );
     
 	#################################################    
 	# PG warning messages generated with WARN_message();
 	#################################################
 
-    my $PG_warning_messages =  $rh_result->{flags}->{WARNING_messages} ||     [];
+    my $PG_warning_messages =  $rh_result->{warning_messages} ||     [];
     $PG_warning_messages = join("<br/>\n", @{  $PG_warning_messages }    );
     
 	#################################################
@@ -492,6 +492,8 @@ sub formatRenderedProblem {
 
     my $internal_debug_messages = $rh_result->{internal_debug_messages} || [];
     $internal_debug_messages = join("<br/>\n", @{ $internal_debug_messages  } );
+    
+    my $fileName = $self->{input}->{envir}->{fileName} || "Can't find file name";
 	# collect answers
 	my $answerTemplate    = q{<hr>ANSWERS <table border="3" align="center">};
 	my $problemNumber     = 1;
@@ -500,7 +502,7 @@ sub formatRenderedProblem {
     }
 	$answerTemplate      .= q{</table> <hr>};
 
-
+	my $test = pretty_print($rh_result);
 	my $XML_URL      = $self->url;
 	my $FORM_ACTION_URL  =  $self->{form_action_url};
 	my $courseID         =  $self->{courseID};
@@ -515,6 +517,7 @@ sub formatRenderedProblem {
 <title>$XML_URL WeBWorK Editor using host $XML_URL</title>
 </head>
 <body>
+$test
 <h2> WeBWorK Editor using host $XML_URL</h2>
 		    $answerTemplate
 		    <form action="$FORM_ACTION_URL" method="post">
@@ -523,7 +526,7 @@ sub formatRenderedProblem {
 	       <input type="hidden" name="problemAddress" value="probSource"> 
 	       <input type="hidden" name="problemSource" value="$encodedSource"> 
 	       <input type="hidden" name="problemSeed" value="1234"> 
-	       <input type="hidden" name="pathToProblemFile" value="foobar">
+	       <input type="hidden" name="pathToProblemFile" value="$fileName">
 	       <input type="hidden" name=courseName value="$courseID">
 	       <input type="hidden" name=courseID value="$courseID">
 	       <input type="hidden" name="userID" value="$userID">
diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
index ee72cf750d..057f02356c 100644
--- a/lib/WebworkWebservice/RenderProblem.pm
+++ b/lib/WebworkWebservice/RenderProblem.pm
@@ -419,9 +419,11 @@ sub renderProblem {
 		
 	);
   
-    my $internal_debug_messages;
+    my ($internal_debug_messages, $pgwarning_messages, $pgdebug_messages);
     if (ref ($pg->{pgcore}) ) {
     	$internal_debug_messages = $pg->{pgcore}->get_internal_debug_messages;
+    	$pgwarning_messages        = $pg ->{pgcore}->get_warning_messages();
+    	$pgdebug_messages          = $pg ->{pgcore}->get_debug_messages();
     } else {
     	$internal_debug_messages = ['Error in obtaining debug messages from PGcore'];
     }
@@ -432,11 +434,13 @@ sub renderProblem {
 		answers 					=> $pg->{answers},
 		errors         				=> $pg->{errors},
 		WARNINGS	   				=> encode_base64( 
-		                                 "WARNINGS\n".$warning_messages."\nMore\n".$pg->{warnings} 
+		                                 "WARNINGS\n".$warning_messages."\n<br/>More<br/>\n".$pg->{warnings} 
 		                               ),
 		problem_result 				=> $pg->{result},
 		problem_state				=> $pg->{state},
 		flags						=> $pg->{flags},
+		warning_messages            => $pgwarning_messages,
+		debug_messages              => $pgdebug_messages,
 		internal_debug_messages     => $internal_debug_messages,
 	};
 	

From 0e2c228aa13a577f878d7918efa47a5b4d7c3570 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 15 Apr 2012 11:06:39 -0400
Subject: [PATCH 31/73] Remove test string which printed the entire
 environment.

---
 lib/WebworkClient.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebworkClient.pm b/lib/WebworkClient.pm
index 73d0759bbe..3f6d86b435 100755
--- a/lib/WebworkClient.pm
+++ b/lib/WebworkClient.pm
@@ -517,7 +517,7 @@ sub formatRenderedProblem {
 <title>$XML_URL WeBWorK Editor using host $XML_URL</title>
 </head>
 <body>
-$test
+
 <h2> WeBWorK Editor using host $XML_URL</h2>
 		    $answerTemplate
 		    <form action="$FORM_ACTION_URL" method="post">

From 0326da01048ecf99eb0754b0dce9b7bfa95de713 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 19 Apr 2012 08:49:01 -0400
Subject: [PATCH 32/73] Set displayMode to images in postlocal.conf.dist -- to
 server as a model for overriding the default displayMode

---
 conf/postlocal.conf.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/postlocal.conf.dist b/conf/postlocal.conf.dist
index ecc6eb5e5e..2a8b6e814f 100755
--- a/conf/postlocal.conf.dist
+++ b/conf/postlocal.conf.dist
@@ -197,6 +197,9 @@ $pg{displayModes} = [
 	"LaTeXMathML",   # render TeX math expressions on the client side using LaTeXMathML
 ];
 
++# Default display mode. Should be an uncommented item listed above.
++$pg{options}{displayMode}        = "images";
+ 
 ################################################################################
 #  The macro file search path. (Check with entries in global.conf before overriding)
 ################################################################################

From 92fcea5a7f35512cabe3992f6dc9d421ba3d179b Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 19 Apr 2012 10:14:27 -0400
Subject: [PATCH 33/73] Create links to PGProblemEditor2.  Adjust math3.css and
 math2.css to display viewing window.

---
 conf/templates/math2/math2.css          | 97 +++++++++++++++++++++++--
 conf/templates/math3/math3.css          | 11 ++-
 lib/WeBWorK/ContentGenerator/Problem.pm | 14 +++-
 3 files changed, 109 insertions(+), 13 deletions(-)

diff --git a/conf/templates/math2/math2.css b/conf/templates/math2/math2.css
index df80f2766f..9ac8682380 100644
--- a/conf/templates/math2/math2.css
+++ b/conf/templates/math2/math2.css
@@ -93,6 +93,7 @@ h2.compound { float: right; margin: 0; padding: 0 }*/
 	-moz-border-radius-topright: 1.5ex; -moz-border-radius-topleft: 1.5ex;
 	margin-bottom: 1ex; 
 	margin-top: 0;
+	width: 90%;
 	overflow: hidden;
 }
 .info-box h2,
@@ -279,11 +280,33 @@ clear: both;
 }*/
 /* [ww] instead of a search form, we want the loginstatus there */
 /*#masthead form {*/
+
+/*Loginstatus -- the element fixed on the top right corner of the page, which tells the user whether they are logged in or not, and provides them with a log out link if they are logged in.*/
+
 #masthead #loginstatus {
 	float: right;
 	padding: 0;
 	margin: 1ex .5em .1ex .1em;
 	font-size: smaller;
+} 
+
+/*Relative Positioning -- a alternate style for the loginstatus which uses relative positioning.  Tested, but was decided that it didn't work great. Feel free to uncomment if you want to try it out.*/
+
+/*#loginstatus {
+	color: white;
+	position: relative;
+	top: -140px;
+	left: 470px;
+	width: 150px;
+	text-align: center;
+	padding: 0;
+	margin: 1ex .5em .1ex .1em;
+	font-size: smaller;
+}*/
+
+
+#loginstatus a{
+	color: white;
 }
 #masthead #loginstatus #Nav {
 	padding: 1ex;
@@ -404,11 +427,11 @@ clear: both;
     font-size:100%;
 	float: right;
 	max-width: 40%;
+	min-width: 0;
 	overflow: auto;
-	margin-right: -1px;
+	/*margin-right: -1px;*/
 	background-color: #fff;
 }
-
 #InfoPanel ol {
 	font-size:100%;
 }
@@ -429,9 +452,9 @@ div.AuthorComment { background-color: #00E0E0; color: black; }
 /*ul.LinksMenu ul { list-style: none; margin-left: 0.5em; padding-left: 0; }*/
 
 /* background styles for success and failure messages */
-div.WarningMessage { background-color: #ffcccc; padding: 3px 3px 3px 3px; }
+div.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
 div.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
-div.ResultsWithError { color: #C33; background-color: inherit; } /* red */
+div.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
 div.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
 label.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
 label.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
@@ -439,7 +462,7 @@ label.ResultsWithError { color: #FF9494; background-color: inherit; } /* error r
 label.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
 span.WarningMessage { background-color: #FF9494; padding: 3px 3px 3px 3px; }
 span.ResultsWithoutError { color: inherit; background-color: #8F8; } /* green */
-span.ResultsWithError { color: #C33; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
+span.ResultsWithError { color: #FF9494; background-color: inherit; } /* error red, from http://www.colourlovers.com/color/FF9494/error_red*/
 span.ResultsAlert { color: #F60; background-color: inherit; } /* orange */
 span.correct { color: inherit; background-color: #8F8; } /* green */
 span.incorrect { color: #FF9494; background-color: inherit; } /* red */
@@ -683,7 +706,7 @@ span.gray_button{
 }
 
 #editor #form_div{
-	/*float: left;*/
+	float: left;
 	width: 100%;
 }
 
@@ -729,10 +752,70 @@ span.gray_button{
 	margin-top: 10%;
 	margin-left: 10%;
 	margin-right: 10%;
+}*/
+
+#editor{
+	width: 585px;
+}
+
+#editor .pg_editor_input_span{
+	margin-bottom: 10px;
+	display: none;
+}
+
+#editor .pg_editor_input_div{
+	margin-top: 20px;
+	margin-left: 50px;
+}
+
+#editor #submit_input_div{
+	margin-top: 10px;
+	clear: both;
+}
+
+#pg_editor_header {
+    left: 790px;
+    position: absolute;
+    top: 130px;
+}
+
+#pg_editor_frame_id{
+	height: 474px;
+    left: 785px;
+    position: absolute;
+    top: 182px;
+    width: 50%;
+	overflow: scroll;
 }
 
-/*These are styles for the tables of problem sets*/
+/*These are styles for the table of problem sets, found on the Homework Sets page.  Most are simple alignment changes which makes it so everything isn't bunched up together.*/
 
+.radio_span{
+	visibility: hidden;
+}
+
+table.problem_sets_table {
+	width: 640px;
+	float: left;
+	margin-bottom: 3%;
+}
+
+table.problem_sets_table caption {
+}
+
+table.problem_sets_table th{
+	width: 320px;
+	padding-bottom: 10px;
+}
+
+table.problem_sets_table td{
+	width: 320px;
+}
+
+div.problem_sets_options {
+	clear: both;
+	margin: 1% 1% 1% 1%;
+}
 
 /*This is the styling specifically for the tables of problems displayed for each problem set page*/
 table.problem_set_table{
diff --git a/conf/templates/math3/math3.css b/conf/templates/math3/math3.css
index f211bc0098..4bea2e1ff9 100644
--- a/conf/templates/math3/math3.css
+++ b/conf/templates/math3/math3.css
@@ -716,7 +716,7 @@ span.gray_button{
 	width: 100%;
 }
 
-Styles specifically for the problem viewer
+/*Styles specifically for the problem viewer*/
 
 #problem_viewer_form{
 	margin-left: 10px;
@@ -790,7 +790,7 @@ Styles specifically for the problem viewer
     left: 785px;
     position: absolute;
     top: 182px;
-    width: 500px;
+    width: 50%;
 	overflow: scroll;
 }
 
@@ -829,7 +829,12 @@ table.problem_set_table{
 	#width: 640px;
 	text-align: left;
 }
-
+table.problem_set_table th{
+	padding-right: 30px;
+}
+table.problem_set_table td{
+	padding-right: 30px;
+}
 /*BUG FIXES*/
 
 table#grades_table pre{
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index d59647af99..40beab6bfb 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -1039,7 +1039,7 @@ sub output_editorLink{
 	my $pg = $self->{pg};
 	
 	my $r = $self->r;
-	
+	my $ce = $r->ce;
 	my $authz = $r->authz;
 	my $urlpath = $r->urlpath;
 	my $user = $r->param('user');
@@ -1050,17 +1050,23 @@ sub output_editorLink{
 	# format as "[edit]" like we're doing with course info file, etc.
 	# add edit link for set as well.
 	my $editorLink = "";
+	my $editorLink2 = "";
 	# if we are here without a real homework set, carry that through
 	my $forced_field = [];
 	$forced_field = ['sourceFilePath' =>  $r->param("sourceFilePath")] if
 		($set->set_id eq 'Undefined_Set');
-	if ($authz->hasPermissions($user, "modify_problem_sets")) {
+	if ($authz->hasPermissions($user, "modify_problem_sets") and $ce->{showeditors}->{pgproblemeditor1}) {
 		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor", $r, 
 			courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
 		my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
 		$editorLink = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor'}, $r->maketext("Edit this problem")));
 	}
-	
+	if ($authz->hasPermissions($user, "modify_problem_sets") and $ce->{showeditors}->{pgproblemeditor2}) {
+		my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::PGProblemEditor2", $r, 
+			courseID => $courseName, setID => $set->set_id, problemID => $problem->problem_id);
+		my $editorURL = $self->systemLink($editorPage, params=>$forced_field);
+		$editorLink2 = CGI::p(CGI::a({href=>$editorURL,target =>'WW_Editor2'}, $r->maketext("Edit this problem with new editor")));
+	}
 	##### translation errors? #####
 
 	if ($pg->{flags}->{error_flag}) {
@@ -1068,6 +1074,7 @@ sub output_editorLink{
 		    print "Call errorOutput</br>";
 			print $self->errorOutput($pg->{errors}, $pg->{body_text});
 			print $editorLink;
+			print $editorLink2;
 		} else {
 			print $self->errorOutput($pg->{errors}, $r->maketext("You do not have permission to view the details of this error."));
 		}
@@ -1076,6 +1083,7 @@ sub output_editorLink{
 	}
 	else{
 		print $editorLink;
+		print $editorLink2;
 	}
 	return "";
 }

From 26a4d49cafa59d99b917faa32a9c30dacdbb142f Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Tue, 8 May 2012 10:46:40 -0400
Subject: [PATCH 34/73] Changed bugs url

---
 lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index ab562f25cc..8db964d2be 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -131,7 +131,7 @@ sub body {
 	             <button class="button" type="button" id="undo_button">Undo</button>
 	             <button class="button" type="button" id="redo_button">Redo</button>
 	             <button class="button" type="button" id="delete_problem">Remove Selected</button>
-	             <a class="button" href="http://bugs.webwork.maa.org/">BUGS!</a>
+	             <a class="button" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a>
 	       </span>';
   print '</div>';
   

From afe9f93517559c6f80ffb5b3f9ee919ae0bda0b4 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 20 May 2012 13:41:25 -0400
Subject: [PATCH 35/73] Replaced relative call for javaScripts with an absolute
 call beginning with the value of $webwork_htdocs_url.  Fixes for now the
 changes made to webwork_htdocs_url at U. of Rochester which allows all js and
 css files to be served using lighttpd through port 8080.

---
 .../ContentGenerator/Instructor/SetMaker3.pm  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 1a3d6605c5..482f8a1547 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -94,22 +94,25 @@ sub options {
 }
 
 sub head {
-  print '<script src="/webwork2_files/js/jquery-1.7.min.js"></script>';
-  print '<script src="/webwork2_files/js/jquery-ui-1.8.16.custom.min.js"></script>';
-  print '<script src="/webwork2_files/js/ui.tabs.closable.min.js"></script>';
+	my ($self) = @_;
+	my $ce = $self->r->ce;
+    my $webwork_htdocs_url = $ce->{webwork_htdocs_url};
+  print qq!<script src="$webwork_htdocs_url/js/jquery-1.7.min.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/jquery-ui-1.8.16.custom.min.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/ui.tabs.closable.min.js"></script>!;
   
-  print '<script src="/webwork2_files/js/dnd.js"></script>';
-  #print '<script src="/webwork2_files/js/problem_grid.js"></script>';
-  #print '<script src="/webwork2_files/js/form_builder.js"></script>';
-  print '<script src="/webwork2_files/js/library_browser.js"></script>';
-  print '<script src="/webwork2_files/js/modernizr-2.0.6.js"></script>';
+  print qq!<script src="$webwork_htdocs_url/js/dnd.js"></script>!;
+  #print qq!<script src="$webwork_htdocs_url/js/problem_grid.js"></script>!;
+  #print qq!<script src="$webwork_htdocs_url/js/form_builder.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/library_browser.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/modernizr-2.0.6.js"></script>!;
   #my ($self) = @_;
   #my $r = $self->r;
   #start a timer to save people's stuff idk if people want this
   #print "<script> setInterval('saveChanges(\"mainform\", \"".$r->uri."\")', 680000); </script>";
   #print '<link rel="stylesheet" type="text/css" href="/webwork2_files/css/setmaker3.css" />';
-  print '<link href="/webwork2_files/css/ui-lightness/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>';
-  print '<link rel="stylesheet" type="text/css" href="/webwork2_files/css/library_browser.css" />';
+  print  qq!<link href="$webwork_htdocs_url/css/ui-lightness/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>!;
+  print  qq!<link rel="stylesheet" type="text/css" href="$webwork_htdocs_url/css/library_browser.css" />!;
   #print '<script>window.addEventListener("load", setup, false);</script>';
   return "";
 }

From 67b0028870389399019582772d8e81bf02e3c2b3 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Wed, 23 May 2012 12:57:35 -0400
Subject: [PATCH 36/73] Started work on the move to backbone

---
 htdocs/js/LibraryBrowser/backbone.js          | 1431 +++++++++++++++++
 htdocs/js/LibraryBrowser/jquery-1.7.2.min.js  |    4 +
 .../{ => LibraryBrowser}/library_browser.js   |  697 ++++----
 htdocs/js/LibraryBrowser/underscore.js        | 1059 ++++++++++++
 4 files changed, 2862 insertions(+), 329 deletions(-)
 create mode 100644 htdocs/js/LibraryBrowser/backbone.js
 create mode 100644 htdocs/js/LibraryBrowser/jquery-1.7.2.min.js
 rename htdocs/js/{ => LibraryBrowser}/library_browser.js (71%)
 create mode 100644 htdocs/js/LibraryBrowser/underscore.js

diff --git a/htdocs/js/LibraryBrowser/backbone.js b/htdocs/js/LibraryBrowser/backbone.js
new file mode 100644
index 0000000000..3373c952bf
--- /dev/null
+++ b/htdocs/js/LibraryBrowser/backbone.js
@@ -0,0 +1,1431 @@
+//     Backbone.js 0.9.2
+
+//     (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+(function(){
+
+  // Initial Setup
+  // -------------
+
+  // Save a reference to the global object (`window` in the browser, `global`
+  // on the server).
+  var root = this;
+
+  // Save the previous value of the `Backbone` variable, so that it can be
+  // restored later on, if `noConflict` is used.
+  var previousBackbone = root.Backbone;
+
+  // Create a local reference to slice/splice.
+  var slice = Array.prototype.slice;
+  var splice = Array.prototype.splice;
+
+  // The top-level namespace. All public Backbone classes and modules will
+  // be attached to this. Exported for both CommonJS and the browser.
+  var Backbone;
+  if (typeof exports !== 'undefined') {
+    Backbone = exports;
+  } else {
+    Backbone = root.Backbone = {};
+  }
+
+  // Current version of the library. Keep in sync with `package.json`.
+  Backbone.VERSION = '0.9.2';
+
+  // Require Underscore, if we're on the server, and it's not already present.
+  var _ = root._;
+  if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
+
+  // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
+  var $ = root.jQuery || root.Zepto || root.ender;
+
+  // Set the JavaScript library that will be used for DOM manipulation and
+  // Ajax calls (a.k.a. the `$` variable). By default Backbone will use: jQuery,
+  // Zepto, or Ender; but the `setDomLibrary()` method lets you inject an
+  // alternate JavaScript library (or a mock library for testing your views
+  // outside of a browser).
+  Backbone.setDomLibrary = function(lib) {
+    $ = lib;
+  };
+
+  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
+  // to its previous owner. Returns a reference to this Backbone object.
+  Backbone.noConflict = function() {
+    root.Backbone = previousBackbone;
+    return this;
+  };
+
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
+  // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+  // set a `X-Http-Method-Override` header.
+  Backbone.emulateHTTP = false;
+
+  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
+  // `application/json` requests ... will encode the body as
+  // `application/x-www-form-urlencoded` instead and will send the model in a
+  // form param named `model`.
+  Backbone.emulateJSON = false;
+
+  // Backbone.Events
+  // -----------------
+
+  // Regular expression used to split event strings
+  var eventSplitter = /\s+/;
+
+  // A module that can be mixed in to *any object* in order to provide it with
+  // custom events. You may bind with `on` or remove with `off` callback functions
+  // to an event; trigger`-ing an event fires all callbacks in succession.
+  //
+  //     var object = {};
+  //     _.extend(object, Backbone.Events);
+  //     object.on('expand', function(){ alert('expanded'); });
+  //     object.trigger('expand');
+  //
+  var Events = Backbone.Events = {
+
+    // Bind one or more space separated events, `events`, to a `callback`
+    // function. Passing `"all"` will bind the callback to all events fired.
+    on: function(events, callback, context) {
+
+      var calls, event, node, tail, list;
+      if (!callback) return this;
+      events = events.split(eventSplitter);
+      calls = this._callbacks || (this._callbacks = {});
+
+      // Create an immutable callback list, allowing traversal during
+      // modification.  The tail is an empty object that will always be used
+      // as the next node.
+      while (event = events.shift()) {
+        list = calls[event];
+        node = list ? list.tail : {};
+        node.next = tail = {};
+        node.context = context;
+        node.callback = callback;
+        calls[event] = {tail: tail, next: list ? list.next : node};
+      }
+
+      return this;
+    },
+
+    // Remove one or many callbacks. If `context` is null, removes all callbacks
+    // with that function. If `callback` is null, removes all callbacks for the
+    // event. If `events` is null, removes all bound callbacks for all events.
+    off: function(events, callback, context) {
+      var event, calls, node, tail, cb, ctx;
+
+      // No events, or removing *all* events.
+      if (!(calls = this._callbacks)) return;
+      if (!(events || callback || context)) {
+        delete this._callbacks;
+        return this;
+      }
+
+      // Loop through the listed events and contexts, splicing them out of the
+      // linked list of callbacks if appropriate.
+      events = events ? events.split(eventSplitter) : _.keys(calls);
+      while (event = events.shift()) {
+        node = calls[event];
+        delete calls[event];
+        if (!node || !(callback || context)) continue;
+        // Create a new list, omitting the indicated callbacks.
+        tail = node.tail;
+        while ((node = node.next) !== tail) {
+          cb = node.callback;
+          ctx = node.context;
+          if ((callback && cb !== callback) || (context && ctx !== context)) {
+            this.on(event, cb, ctx);
+          }
+        }
+      }
+
+      return this;
+    },
+
+    // Trigger one or many events, firing all bound callbacks. Callbacks are
+    // passed the same arguments as `trigger` is, apart from the event name
+    // (unless you're listening on `"all"`, which will cause your callback to
+    // receive the true name of the event as the first argument).
+    trigger: function(events) {
+      var event, node, calls, tail, args, all, rest;
+      if (!(calls = this._callbacks)) return this;
+      all = calls.all;
+      events = events.split(eventSplitter);
+      rest = slice.call(arguments, 1);
+
+      // For each event, walk through the linked list of callbacks twice,
+      // first to trigger the event, then to trigger any `"all"` callbacks.
+      while (event = events.shift()) {
+        if (node = calls[event]) {
+          tail = node.tail;
+          while ((node = node.next) !== tail) {
+            node.callback.apply(node.context || this, rest);
+          }
+        }
+        if (node = all) {
+          tail = node.tail;
+          args = [event].concat(rest);
+          while ((node = node.next) !== tail) {
+            node.callback.apply(node.context || this, args);
+          }
+        }
+      }
+
+      return this;
+    }
+
+  };
+
+  // Aliases for backwards compatibility.
+  Events.bind   = Events.on;
+  Events.unbind = Events.off;
+
+  // Backbone.Model
+  // --------------
+
+  // Create a new model, with defined attributes. A client id (`cid`)
+  // is automatically generated and assigned for you.
+  var Model = Backbone.Model = function(attributes, options) {
+    var defaults;
+    attributes || (attributes = {});
+    if (options && options.parse) attributes = this.parse(attributes);
+    if (defaults = getValue(this, 'defaults')) {
+      attributes = _.extend({}, defaults, attributes);
+    }
+    if (options && options.collection) this.collection = options.collection;
+    this.attributes = {};
+    this._escapedAttributes = {};
+    this.cid = _.uniqueId('c');
+    this.changed = {};
+    this._silent = {};
+    this._pending = {};
+    this.set(attributes, {silent: true});
+    // Reset change tracking.
+    this.changed = {};
+    this._silent = {};
+    this._pending = {};
+    this._previousAttributes = _.clone(this.attributes);
+    this.initialize.apply(this, arguments);
+  };
+
+  // Attach all inheritable methods to the Model prototype.
+  _.extend(Model.prototype, Events, {
+
+    // A hash of attributes whose current and previous value differ.
+    changed: null,
+
+    // A hash of attributes that have silently changed since the last time
+    // `change` was called.  Will become pending attributes on the next call.
+    _silent: null,
+
+    // A hash of attributes that have changed since the last `'change'` event
+    // began.
+    _pending: null,
+
+    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
+    // CouchDB users may want to set this to `"_id"`.
+    idAttribute: 'id',
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Return a copy of the model's `attributes` object.
+    toJSON: function(options) {
+      return _.clone(this.attributes);
+    },
+
+    // Get the value of an attribute.
+    get: function(attr) {
+      return this.attributes[attr];
+    },
+
+    // Get the HTML-escaped value of an attribute.
+    escape: function(attr) {
+      var html;
+      if (html = this._escapedAttributes[attr]) return html;
+      var val = this.get(attr);
+      return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val);
+    },
+
+    // Returns `true` if the attribute contains a value that is not null
+    // or undefined.
+    has: function(attr) {
+      return this.get(attr) != null;
+    },
+
+    // Set a hash of model attributes on the object, firing `"change"` unless
+    // you choose to silence it.
+    set: function(key, value, options) {
+      var attrs, attr, val;
+
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      if (_.isObject(key) || key == null) {
+        attrs = key;
+        options = value;
+      } else {
+        attrs = {};
+        attrs[key] = value;
+      }
+
+      // Extract attributes and options.
+      options || (options = {});
+      if (!attrs) return this;
+      if (attrs instanceof Model) attrs = attrs.attributes;
+      if (options.unset) for (attr in attrs) attrs[attr] = void 0;
+
+      // Run validation.
+      if (!this._validate(attrs, options)) return false;
+
+      // Check for changes of `id`.
+      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
+
+      var changes = options.changes = {};
+      var now = this.attributes;
+      var escaped = this._escapedAttributes;
+      var prev = this._previousAttributes || {};
+
+      // For each `set` attribute...
+      for (attr in attrs) {
+        val = attrs[attr];
+
+        // If the new and current value differ, record the change.
+        if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
+          delete escaped[attr];
+          (options.silent ? this._silent : changes)[attr] = true;
+        }
+
+        // Update or delete the current value.
+        options.unset ? delete now[attr] : now[attr] = val;
+
+        // If the new and previous value differ, record the change.  If not,
+        // then remove changes for this attribute.
+        if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) {
+          this.changed[attr] = val;
+          if (!options.silent) this._pending[attr] = true;
+        } else {
+          delete this.changed[attr];
+          delete this._pending[attr];
+        }
+      }
+
+      // Fire the `"change"` events.
+      if (!options.silent) this.change(options);
+      return this;
+    },
+
+    // Remove an attribute from the model, firing `"change"` unless you choose
+    // to silence it. `unset` is a noop if the attribute doesn't exist.
+    unset: function(attr, options) {
+      (options || (options = {})).unset = true;
+      return this.set(attr, null, options);
+    },
+
+    // Clear all attributes on the model, firing `"change"` unless you choose
+    // to silence it.
+    clear: function(options) {
+      (options || (options = {})).unset = true;
+      return this.set(_.clone(this.attributes), options);
+    },
+
+    // Fetch the model from the server. If the server's representation of the
+    // model differs from its current attributes, they will be overriden,
+    // triggering a `"change"` event.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        if (!model.set(model.parse(resp, xhr), options)) return false;
+        if (success) success(model, resp);
+      };
+      options.error = Backbone.wrapError(options.error, model, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Set a hash of model attributes, and sync the model to the server.
+    // If the server returns an attributes hash that differs, the model's
+    // state will be `set` again.
+    save: function(key, value, options) {
+      var attrs, current;
+
+      // Handle both `("key", value)` and `({key: value})` -style calls.
+      if (_.isObject(key) || key == null) {
+        attrs = key;
+        options = value;
+      } else {
+        attrs = {};
+        attrs[key] = value;
+      }
+      options = options ? _.clone(options) : {};
+
+      // If we're "wait"-ing to set changed attributes, validate early.
+      if (options.wait) {
+        if (!this._validate(attrs, options)) return false;
+        current = _.clone(this.attributes);
+      }
+
+      // Regular saves `set` attributes before persisting to the server.
+      var silentOptions = _.extend({}, options, {silent: true});
+      if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
+        return false;
+      }
+
+      // After a successful server-side save, the client is (optionally)
+      // updated with the server-side state.
+      var model = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        var serverAttrs = model.parse(resp, xhr);
+        if (options.wait) {
+          delete options.wait;
+          serverAttrs = _.extend(attrs || {}, serverAttrs);
+        }
+        if (!model.set(serverAttrs, options)) return false;
+        if (success) {
+          success(model, resp);
+        } else {
+          model.trigger('sync', model, resp, options);
+        }
+      };
+
+      // Finish configuring and sending the Ajax request.
+      options.error = Backbone.wrapError(options.error, model, options);
+      var method = this.isNew() ? 'create' : 'update';
+      var xhr = (this.sync || Backbone.sync).call(this, method, this, options);
+      if (options.wait) this.set(current, silentOptions);
+      return xhr;
+    },
+
+    // Destroy this model on the server if it was already persisted.
+    // Optimistically removes the model from its collection, if it has one.
+    // If `wait: true` is passed, waits for the server to respond before removal.
+    destroy: function(options) {
+      options = options ? _.clone(options) : {};
+      var model = this;
+      var success = options.success;
+
+      var triggerDestroy = function() {
+        model.trigger('destroy', model, model.collection, options);
+      };
+
+      if (this.isNew()) {
+        triggerDestroy();
+        return false;
+      }
+
+      options.success = function(resp) {
+        if (options.wait) triggerDestroy();
+        if (success) {
+          success(model, resp);
+        } else {
+          model.trigger('sync', model, resp, options);
+        }
+      };
+
+      options.error = Backbone.wrapError(options.error, model, options);
+      var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options);
+      if (!options.wait) triggerDestroy();
+      return xhr;
+    },
+
+    // Default URL for the model's representation on the server -- if you're
+    // using Backbone's restful methods, override this to change the endpoint
+    // that will be called.
+    url: function() {
+      var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError();
+      if (this.isNew()) return base;
+      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
+    },
+
+    // **parse** converts a response into the hash of attributes to be `set` on
+    // the model. The default implementation is just to pass the response along.
+    parse: function(resp, xhr) {
+      return resp;
+    },
+
+    // Create a new model with identical attributes to this one.
+    clone: function() {
+      return new this.constructor(this.attributes);
+    },
+
+    // A model is new if it has never been saved to the server, and lacks an id.
+    isNew: function() {
+      return this.id == null;
+    },
+
+    // Call this method to manually fire a `"change"` event for this model and
+    // a `"change:attribute"` event for each changed attribute.
+    // Calling this will cause all objects observing the model to update.
+    change: function(options) {
+      options || (options = {});
+      var changing = this._changing;
+      this._changing = true;
+
+      // Silent changes become pending changes.
+      for (var attr in this._silent) this._pending[attr] = true;
+
+      // Silent changes are triggered.
+      var changes = _.extend({}, options.changes, this._silent);
+      this._silent = {};
+      for (var attr in changes) {
+        this.trigger('change:' + attr, this, this.get(attr), options);
+      }
+      if (changing) return this;
+
+      // Continue firing `"change"` events while there are pending changes.
+      while (!_.isEmpty(this._pending)) {
+        this._pending = {};
+        this.trigger('change', this, options);
+        // Pending and silent changes still remain.
+        for (var attr in this.changed) {
+          if (this._pending[attr] || this._silent[attr]) continue;
+          delete this.changed[attr];
+        }
+        this._previousAttributes = _.clone(this.attributes);
+      }
+
+      this._changing = false;
+      return this;
+    },
+
+    // Determine if the model has changed since the last `"change"` event.
+    // If you specify an attribute name, determine if that attribute has changed.
+    hasChanged: function(attr) {
+      if (!arguments.length) return !_.isEmpty(this.changed);
+      return _.has(this.changed, attr);
+    },
+
+    // Return an object containing all the attributes that have changed, or
+    // false if there are no changed attributes. Useful for determining what
+    // parts of a view need to be updated and/or what attributes need to be
+    // persisted to the server. Unset attributes will be set to undefined.
+    // You can also pass an attributes object to diff against the model,
+    // determining if there *would be* a change.
+    changedAttributes: function(diff) {
+      if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
+      var val, changed = false, old = this._previousAttributes;
+      for (var attr in diff) {
+        if (_.isEqual(old[attr], (val = diff[attr]))) continue;
+        (changed || (changed = {}))[attr] = val;
+      }
+      return changed;
+    },
+
+    // Get the previous value of an attribute, recorded at the time the last
+    // `"change"` event was fired.
+    previous: function(attr) {
+      if (!arguments.length || !this._previousAttributes) return null;
+      return this._previousAttributes[attr];
+    },
+
+    // Get all of the attributes of the model at the time of the previous
+    // `"change"` event.
+    previousAttributes: function() {
+      return _.clone(this._previousAttributes);
+    },
+
+    // Check if the model is currently in a valid state. It's only possible to
+    // get into an *invalid* state if you're using silent changes.
+    isValid: function() {
+      return !this.validate(this.attributes);
+    },
+
+    // Run validation against the next complete set of model attributes,
+    // returning `true` if all is well. If a specific `error` callback has
+    // been passed, call that instead of firing the general `"error"` event.
+    _validate: function(attrs, options) {
+      if (options.silent || !this.validate) return true;
+      attrs = _.extend({}, this.attributes, attrs);
+      var error = this.validate(attrs, options);
+      if (!error) return true;
+      if (options && options.error) {
+        options.error(this, error, options);
+      } else {
+        this.trigger('error', this, error, options);
+      }
+      return false;
+    }
+
+  });
+
+  // Backbone.Collection
+  // -------------------
+
+  // Provides a standard collection class for our sets of models, ordered
+  // or unordered. If a `comparator` is specified, the Collection will maintain
+  // its models in sort order, as they're added and removed.
+  var Collection = Backbone.Collection = function(models, options) {
+    options || (options = {});
+    if (options.model) this.model = options.model;
+    if (options.comparator) this.comparator = options.comparator;
+    this._reset();
+    this.initialize.apply(this, arguments);
+    if (models) this.reset(models, {silent: true, parse: options.parse});
+  };
+
+  // Define the Collection's inheritable methods.
+  _.extend(Collection.prototype, Events, {
+
+    // The default model for a collection is just a **Backbone.Model**.
+    // This should be overridden in most cases.
+    model: Model,
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // The JSON representation of a Collection is an array of the
+    // models' attributes.
+    toJSON: function(options) {
+      return this.map(function(model){ return model.toJSON(options); });
+    },
+
+    // Add a model, or list of models to the set. Pass **silent** to avoid
+    // firing the `add` event for every new model.
+    add: function(models, options) {
+      var i, index, length, model, cid, id, cids = {}, ids = {}, dups = [];
+      options || (options = {});
+      models = _.isArray(models) ? models.slice() : [models];
+
+      // Begin by turning bare objects into model references, and preventing
+      // invalid models or duplicate models from being added.
+      for (i = 0, length = models.length; i < length; i++) {
+        if (!(model = models[i] = this._prepareModel(models[i], options))) {
+          throw new Error("Can't add an invalid model to a collection");
+        }
+        cid = model.cid;
+        id = model.id;
+        if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) {
+          dups.push(i);
+          continue;
+        }
+        cids[cid] = ids[id] = model;
+      }
+
+      // Remove duplicates.
+      i = dups.length;
+      while (i--) {
+        models.splice(dups[i], 1);
+      }
+
+      // Listen to added models' events, and index models for lookup by
+      // `id` and by `cid`.
+      for (i = 0, length = models.length; i < length; i++) {
+        (model = models[i]).on('all', this._onModelEvent, this);
+        this._byCid[model.cid] = model;
+        if (model.id != null) this._byId[model.id] = model;
+      }
+
+      // Insert models into the collection, re-sorting if needed, and triggering
+      // `add` events unless silenced.
+      this.length += length;
+      index = options.at != null ? options.at : this.models.length;
+      splice.apply(this.models, [index, 0].concat(models));
+      if (this.comparator) this.sort({silent: true});
+      if (options.silent) return this;
+      for (i = 0, length = this.models.length; i < length; i++) {
+        if (!cids[(model = this.models[i]).cid]) continue;
+        options.index = i;
+        model.trigger('add', model, this, options);
+      }
+      return this;
+    },
+
+    // Remove a model, or a list of models from the set. Pass silent to avoid
+    // firing the `remove` event for every model removed.
+    remove: function(models, options) {
+      var i, l, index, model;
+      options || (options = {});
+      models = _.isArray(models) ? models.slice() : [models];
+      for (i = 0, l = models.length; i < l; i++) {
+        model = this.getByCid(models[i]) || this.get(models[i]);
+        if (!model) continue;
+        delete this._byId[model.id];
+        delete this._byCid[model.cid];
+        index = this.indexOf(model);
+        this.models.splice(index, 1);
+        this.length--;
+        if (!options.silent) {
+          options.index = index;
+          model.trigger('remove', model, this, options);
+        }
+        this._removeReference(model);
+      }
+      return this;
+    },
+
+    // Add a model to the end of the collection.
+    push: function(model, options) {
+      model = this._prepareModel(model, options);
+      this.add(model, options);
+      return model;
+    },
+
+    // Remove a model from the end of the collection.
+    pop: function(options) {
+      var model = this.at(this.length - 1);
+      this.remove(model, options);
+      return model;
+    },
+
+    // Add a model to the beginning of the collection.
+    unshift: function(model, options) {
+      model = this._prepareModel(model, options);
+      this.add(model, _.extend({at: 0}, options));
+      return model;
+    },
+
+    // Remove a model from the beginning of the collection.
+    shift: function(options) {
+      var model = this.at(0);
+      this.remove(model, options);
+      return model;
+    },
+
+    // Get a model from the set by id.
+    get: function(id) {
+      if (id == null) return void 0;
+      return this._byId[id.id != null ? id.id : id];
+    },
+
+    // Get a model from the set by client id.
+    getByCid: function(cid) {
+      return cid && this._byCid[cid.cid || cid];
+    },
+
+    // Get the model at the given index.
+    at: function(index) {
+      return this.models[index];
+    },
+
+    // Return models with matching attributes. Useful for simple cases of `filter`.
+    where: function(attrs) {
+      if (_.isEmpty(attrs)) return [];
+      return this.filter(function(model) {
+        for (var key in attrs) {
+          if (attrs[key] !== model.get(key)) return false;
+        }
+        return true;
+      });
+    },
+
+    // Force the collection to re-sort itself. You don't need to call this under
+    // normal circumstances, as the set will maintain sort order as each item
+    // is added.
+    sort: function(options) {
+      options || (options = {});
+      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
+      var boundComparator = _.bind(this.comparator, this);
+      if (this.comparator.length == 1) {
+        this.models = this.sortBy(boundComparator);
+      } else {
+        this.models.sort(boundComparator);
+      }
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Pluck an attribute from each model in the collection.
+    pluck: function(attr) {
+      return _.map(this.models, function(model){ return model.get(attr); });
+    },
+
+    // When you have more items than you want to add or remove individually,
+    // you can reset the entire set with a new list of models, without firing
+    // any `add` or `remove` events. Fires `reset` when finished.
+    reset: function(models, options) {
+      models  || (models = []);
+      options || (options = {});
+      for (var i = 0, l = this.models.length; i < l; i++) {
+        this._removeReference(this.models[i]);
+      }
+      this._reset();
+      this.add(models, _.extend({silent: true}, options));
+      if (!options.silent) this.trigger('reset', this, options);
+      return this;
+    },
+
+    // Fetch the default set of models for this collection, resetting the
+    // collection when they arrive. If `add: true` is passed, appends the
+    // models to the collection instead of resetting.
+    fetch: function(options) {
+      options = options ? _.clone(options) : {};
+      if (options.parse === undefined) options.parse = true;
+      var collection = this;
+      var success = options.success;
+      options.success = function(resp, status, xhr) {
+        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
+        if (success) success(collection, resp);
+      };
+      options.error = Backbone.wrapError(options.error, collection, options);
+      return (this.sync || Backbone.sync).call(this, 'read', this, options);
+    },
+
+    // Create a new instance of a model in this collection. Add the model to the
+    // collection immediately, unless `wait: true` is passed, in which case we
+    // wait for the server to agree.
+    create: function(model, options) {
+      var coll = this;
+      options = options ? _.clone(options) : {};
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      if (!options.wait) coll.add(model, options);
+      var success = options.success;
+      options.success = function(nextModel, resp, xhr) {
+        if (options.wait) coll.add(nextModel, options);
+        if (success) {
+          success(nextModel, resp);
+        } else {
+          nextModel.trigger('sync', model, resp, options);
+        }
+      };
+      model.save(null, options);
+      return model;
+    },
+
+    // **parse** converts a response into a list of models to be added to the
+    // collection. The default implementation is just to pass it through.
+    parse: function(resp, xhr) {
+      return resp;
+    },
+
+    // Proxy to _'s chain. Can't be proxied the same way the rest of the
+    // underscore methods are proxied because it relies on the underscore
+    // constructor.
+    chain: function () {
+      return _(this.models).chain();
+    },
+
+    // Reset all internal state. Called when the collection is reset.
+    _reset: function(options) {
+      this.length = 0;
+      this.models = [];
+      this._byId  = {};
+      this._byCid = {};
+    },
+
+    // Prepare a model or hash of attributes to be added to this collection.
+    _prepareModel: function(model, options) {
+      options || (options = {});
+      if (!(model instanceof Model)) {
+        var attrs = model;
+        options.collection = this;
+        model = new this.model(attrs, options);
+        if (!model._validate(model.attributes, options)) model = false;
+      } else if (!model.collection) {
+        model.collection = this;
+      }
+      return model;
+    },
+
+    // Internal method to remove a model's ties to a collection.
+    _removeReference: function(model) {
+      if (this == model.collection) {
+        delete model.collection;
+      }
+      model.off('all', this._onModelEvent, this);
+    },
+
+    // Internal method called every time a model in the set fires an event.
+    // Sets need to update their indexes when models change ids. All other
+    // events simply proxy through. "add" and "remove" events that originate
+    // in other collections are ignored.
+    _onModelEvent: function(event, model, collection, options) {
+      if ((event == 'add' || event == 'remove') && collection != this) return;
+      if (event == 'destroy') {
+        this.remove(model, options);
+      }
+      if (model && event === 'change:' + model.idAttribute) {
+        delete this._byId[model.previous(model.idAttribute)];
+        this._byId[model.id] = model;
+      }
+      this.trigger.apply(this, arguments);
+    }
+
+  });
+
+  // Underscore methods that we want to implement on the Collection.
+  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find',
+    'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any',
+    'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex',
+    'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf',
+    'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy'];
+
+  // Mix in each Underscore method as a proxy to `Collection#models`.
+  _.each(methods, function(method) {
+    Collection.prototype[method] = function() {
+      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
+    };
+  });
+
+  // Backbone.Router
+  // -------------------
+
+  // Routers map faux-URLs to actions, and fire events when routes are
+  // matched. Creating a new one sets its `routes` hash, if not set statically.
+  var Router = Backbone.Router = function(options) {
+    options || (options = {});
+    if (options.routes) this.routes = options.routes;
+    this._bindRoutes();
+    this.initialize.apply(this, arguments);
+  };
+
+  // Cached regular expressions for matching named param parts and splatted
+  // parts of route strings.
+  var namedParam    = /:\w+/g;
+  var splatParam    = /\*\w+/g;
+  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
+
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Router.prototype, Events, {
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // Manually bind a single named route to a callback. For example:
+    //
+    //     this.route('search/:query/p:num', 'search', function(query, num) {
+    //       ...
+    //     });
+    //
+    route: function(route, name, callback) {
+      Backbone.history || (Backbone.history = new History);
+      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
+      if (!callback) callback = this[name];
+      Backbone.history.route(route, _.bind(function(fragment) {
+        var args = this._extractParameters(route, fragment);
+        callback && callback.apply(this, args);
+        this.trigger.apply(this, ['route:' + name].concat(args));
+        Backbone.history.trigger('route', this, name, args);
+      }, this));
+      return this;
+    },
+
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate: function(fragment, options) {
+      Backbone.history.navigate(fragment, options);
+    },
+
+    // Bind all defined routes to `Backbone.history`. We have to reverse the
+    // order of the routes here to support behavior where the most general
+    // routes can be defined at the bottom of the route map.
+    _bindRoutes: function() {
+      if (!this.routes) return;
+      var routes = [];
+      for (var route in this.routes) {
+        routes.unshift([route, this.routes[route]]);
+      }
+      for (var i = 0, l = routes.length; i < l; i++) {
+        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
+      }
+    },
+
+    // Convert a route string into a regular expression, suitable for matching
+    // against the current location hash.
+    _routeToRegExp: function(route) {
+      route = route.replace(escapeRegExp, '\\$&')
+                   .replace(namedParam, '([^\/]+)')
+                   .replace(splatParam, '(.*?)');
+      return new RegExp('^' + route + '$');
+    },
+
+    // Given a route, and a URL fragment that it matches, return the array of
+    // extracted parameters.
+    _extractParameters: function(route, fragment) {
+      return route.exec(fragment).slice(1);
+    }
+
+  });
+
+  // Backbone.History
+  // ----------------
+
+  // Handles cross-browser history management, based on URL fragments. If the
+  // browser does not support `onhashchange`, falls back to polling.
+  var History = Backbone.History = function() {
+    this.handlers = [];
+    _.bindAll(this, 'checkUrl');
+  };
+
+  // Cached regex for cleaning leading hashes and slashes .
+  var routeStripper = /^[#\/]/;
+
+  // Cached regex for detecting MSIE.
+  var isExplorer = /msie [\w.]+/;
+
+  // Has the history handling already been started?
+  History.started = false;
+
+  // Set up all inheritable **Backbone.History** properties and methods.
+  _.extend(History.prototype, Events, {
+
+    // The default interval to poll for hash changes, if necessary, is
+    // twenty times a second.
+    interval: 50,
+
+    // Gets the true hash value. Cannot use location.hash directly due to bug
+    // in Firefox where location.hash will always be decoded.
+    getHash: function(windowOverride) {
+      var loc = windowOverride ? windowOverride.location : window.location;
+      var match = loc.href.match(/#(.*)$/);
+      return match ? match[1] : '';
+    },
+
+    // Get the cross-browser normalized URL fragment, either from the URL,
+    // the hash, or the override.
+    getFragment: function(fragment, forcePushState) {
+      if (fragment == null) {
+        if (this._hasPushState || forcePushState) {
+          fragment = window.location.pathname;
+          var search = window.location.search;
+          if (search) fragment += search;
+        } else {
+          fragment = this.getHash();
+        }
+      }
+      if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length);
+      return fragment.replace(routeStripper, '');
+    },
+
+    // Start the hash change handling, returning `true` if the current URL matches
+    // an existing route, and `false` otherwise.
+    start: function(options) {
+      if (History.started) throw new Error("Backbone.history has already been started");
+      History.started = true;
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
+      this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this._wantsHashChange = this.options.hashChange !== false;
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
+      var fragment          = this.getFragment();
+      var docMode           = document.documentMode;
+      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+
+      if (oldIE) {
+        this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
+        this.navigate(fragment);
+      }
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._hasPushState) {
+        $(window).bind('popstate', this.checkUrl);
+      } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
+        $(window).bind('hashchange', this.checkUrl);
+      } else if (this._wantsHashChange) {
+        this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
+      }
+
+      // Determine if we need to change the base url, for a pushState link
+      // opened by a non-pushState browser.
+      this.fragment = fragment;
+      var loc = window.location;
+      var atRoot  = loc.pathname == this.options.root;
+
+      // If we've started off with a route from a `pushState`-enabled browser,
+      // but we're currently in a browser that doesn't support it...
+      if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
+        this.fragment = this.getFragment(null, true);
+        window.location.replace(this.options.root + '#' + this.fragment);
+        // Return immediately as browser will do redirect to new url
+        return true;
+
+      // Or if we've started out with a hash-based route, but we're currently
+      // in a browser where it could be `pushState`-based instead...
+      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
+        this.fragment = this.getHash().replace(routeStripper, '');
+        window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
+      }
+
+      if (!this.options.silent) {
+        return this.loadUrl();
+      }
+    },
+
+    // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
+    // but possibly useful for unit testing Routers.
+    stop: function() {
+      $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
+      clearInterval(this._checkUrlInterval);
+      History.started = false;
+    },
+
+    // Add a route to be tested when the fragment changes. Routes added later
+    // may override previous routes.
+    route: function(route, callback) {
+      this.handlers.unshift({route: route, callback: callback});
+    },
+
+    // Checks the current URL to see if it has changed, and if it has,
+    // calls `loadUrl`, normalizing across the hidden iframe.
+    checkUrl: function(e) {
+      var current = this.getFragment();
+      if (current == this.fragment && this.iframe) current = this.getFragment(this.getHash(this.iframe));
+      if (current == this.fragment) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl() || this.loadUrl(this.getHash());
+    },
+
+    // Attempt to load the current URL fragment. If a route succeeds with a
+    // match, returns `true`. If no defined routes matches the fragment,
+    // returns `false`.
+    loadUrl: function(fragmentOverride) {
+      var fragment = this.fragment = this.getFragment(fragmentOverride);
+      var matched = _.any(this.handlers, function(handler) {
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
+          return true;
+        }
+      });
+      return matched;
+    },
+
+    // Save a fragment into the hash history, or replace the URL state if the
+    // 'replace' option is passed. You are responsible for properly URL-encoding
+    // the fragment in advance.
+    //
+    // The options object can contain `trigger: true` if you wish to have the
+    // route callback be fired (not usually desirable), or `replace: true`, if
+    // you wish to modify the current URL without adding an entry to the history.
+    navigate: function(fragment, options) {
+      if (!History.started) return false;
+      if (!options || options === true) options = {trigger: options};
+      var frag = (fragment || '').replace(routeStripper, '');
+      if (this.fragment == frag) return;
+
+      // If pushState is available, we use it to set the fragment as a real URL.
+      if (this._hasPushState) {
+        if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
+        this.fragment = frag;
+        window.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, frag);
+
+      // If hash changes haven't been explicitly disabled, update the hash
+      // fragment to store history.
+      } else if (this._wantsHashChange) {
+        this.fragment = frag;
+        this._updateHash(window.location, frag, options.replace);
+        if (this.iframe && (frag != this.getFragment(this.getHash(this.iframe)))) {
+          // Opening and closing the iframe tricks IE7 and earlier to push a history entry on hash-tag change.
+          // When replace is true, we don't want this.
+          if(!options.replace) this.iframe.document.open().close();
+          this._updateHash(this.iframe.location, frag, options.replace);
+        }
+
+      // If you've told us that you explicitly don't want fallback hashchange-
+      // based history, then `navigate` becomes a page refresh.
+      } else {
+        window.location.assign(this.options.root + fragment);
+      }
+      if (options.trigger) this.loadUrl(fragment);
+    },
+
+    // Update the hash location, either replacing the current entry, or adding
+    // a new one to the browser history.
+    _updateHash: function(location, fragment, replace) {
+      if (replace) {
+        location.replace(location.toString().replace(/(javascript:|#).*$/, '') + '#' + fragment);
+      } else {
+        location.hash = fragment;
+      }
+    }
+  });
+
+  // Backbone.View
+  // -------------
+
+  // Creating a Backbone.View creates its initial element outside of the DOM,
+  // if an existing element is not provided...
+  var View = Backbone.View = function(options) {
+    this.cid = _.uniqueId('view');
+    this._configure(options || {});
+    this._ensureElement();
+    this.initialize.apply(this, arguments);
+    this.delegateEvents();
+  };
+
+  // Cached regex to split keys for `delegate`.
+  var delegateEventSplitter = /^(\S+)\s*(.*)$/;
+
+  // List of view options to be merged as properties.
+  var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
+
+  // Set up all inheritable **Backbone.View** properties and methods.
+  _.extend(View.prototype, Events, {
+
+    // The default `tagName` of a View's element is `"div"`.
+    tagName: 'div',
+
+    // jQuery delegate for element lookup, scoped to DOM elements within the
+    // current view. This should be prefered to global lookups where possible.
+    $: function(selector) {
+      return this.$el.find(selector);
+    },
+
+    // Initialize is an empty function by default. Override it with your own
+    // initialization logic.
+    initialize: function(){},
+
+    // **render** is the core function that your view should override, in order
+    // to populate its element (`this.el`), with the appropriate HTML. The
+    // convention is for **render** to always return `this`.
+    render: function() {
+      return this;
+    },
+
+    // Remove this view from the DOM. Note that the view isn't present in the
+    // DOM by default, so calling this method may be a no-op.
+    remove: function() {
+      this.$el.remove();
+      return this;
+    },
+
+    // For small amounts of DOM Elements, where a full-blown template isn't
+    // needed, use **make** to manufacture elements, one at a time.
+    //
+    //     var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
+    //
+    make: function(tagName, attributes, content) {
+      var el = document.createElement(tagName);
+      if (attributes) $(el).attr(attributes);
+      if (content) $(el).html(content);
+      return el;
+    },
+
+    // Change the view's element (`this.el` property), including event
+    // re-delegation.
+    setElement: function(element, delegate) {
+      if (this.$el) this.undelegateEvents();
+      this.$el = (element instanceof $) ? element : $(element);
+      this.el = this.$el[0];
+      if (delegate !== false) this.delegateEvents();
+      return this;
+    },
+
+    // Set callbacks, where `this.events` is a hash of
+    //
+    // *{"event selector": "callback"}*
+    //
+    //     {
+    //       'mousedown .title':  'edit',
+    //       'click .button':     'save'
+    //       'click .open':       function(e) { ... }
+    //     }
+    //
+    // pairs. Callbacks will be bound to the view, with `this` set properly.
+    // Uses event delegation for efficiency.
+    // Omitting the selector binds the event to `this.el`.
+    // This only works for delegate-able events: not `focus`, `blur`, and
+    // not `change`, `submit`, and `reset` in Internet Explorer.
+    delegateEvents: function(events) {
+      if (!(events || (events = getValue(this, 'events')))) return;
+      this.undelegateEvents();
+      for (var key in events) {
+        var method = events[key];
+        if (!_.isFunction(method)) method = this[events[key]];
+        if (!method) throw new Error('Method "' + events[key] + '" does not exist');
+        var match = key.match(delegateEventSplitter);
+        var eventName = match[1], selector = match[2];
+        method = _.bind(method, this);
+        eventName += '.delegateEvents' + this.cid;
+        if (selector === '') {
+          this.$el.bind(eventName, method);
+        } else {
+          this.$el.delegate(selector, eventName, method);
+        }
+      }
+    },
+
+    // Clears all callbacks previously bound to the view with `delegateEvents`.
+    // You usually don't need to use this, but may wish to if you have multiple
+    // Backbone views attached to the same DOM element.
+    undelegateEvents: function() {
+      this.$el.unbind('.delegateEvents' + this.cid);
+    },
+
+    // Performs the initial configuration of a View with a set of options.
+    // Keys with special meaning *(model, collection, id, className)*, are
+    // attached directly to the view.
+    _configure: function(options) {
+      if (this.options) options = _.extend({}, this.options, options);
+      for (var i = 0, l = viewOptions.length; i < l; i++) {
+        var attr = viewOptions[i];
+        if (options[attr]) this[attr] = options[attr];
+      }
+      this.options = options;
+    },
+
+    // Ensure that the View has a DOM element to render into.
+    // If `this.el` is a string, pass it through `$()`, take the first
+    // matching element, and re-assign it to `el`. Otherwise, create
+    // an element from the `id`, `className` and `tagName` properties.
+    _ensureElement: function() {
+      if (!this.el) {
+        var attrs = getValue(this, 'attributes') || {};
+        if (this.id) attrs.id = this.id;
+        if (this.className) attrs['class'] = this.className;
+        this.setElement(this.make(this.tagName, attrs), false);
+      } else {
+        this.setElement(this.el, false);
+      }
+    }
+
+  });
+
+  // The self-propagating extend function that Backbone classes use.
+  var extend = function (protoProps, classProps) {
+    var child = inherits(this, protoProps, classProps);
+    child.extend = this.extend;
+    return child;
+  };
+
+  // Set up inheritance for the model, collection, and view.
+  Model.extend = Collection.extend = Router.extend = View.extend = extend;
+
+  // Backbone.sync
+  // -------------
+
+  // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
+  var methodMap = {
+    'create': 'POST',
+    'update': 'PUT',
+    'delete': 'DELETE',
+    'read':   'GET'
+  };
+
+  // Override this function to change the manner in which Backbone persists
+  // models to the server. You will be passed the type of request, and the
+  // model in question. By default, makes a RESTful Ajax request
+  // to the model's `url()`. Some possible customizations could be:
+  //
+  // * Use `setTimeout` to batch rapid-fire updates into a single request.
+  // * Send up the models as XML instead of JSON.
+  // * Persist models via WebSockets instead of Ajax.
+  //
+  // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
+  // as `POST`, with a `_method` parameter containing the true HTTP method,
+  // as well as all requests with the body as `application/x-www-form-urlencoded`
+  // instead of `application/json` with the model in a param named `model`.
+  // Useful when interfacing with server-side languages like **PHP** that make
+  // it difficult to read the body of `PUT` requests.
+  Backbone.sync = function(method, model, options) {
+    var type = methodMap[method];
+
+    // Default options, unless specified.
+    options || (options = {});
+
+    // Default JSON-request options.
+    var params = {type: type, dataType: 'json'};
+
+    // Ensure that we have a URL.
+    if (!options.url) {
+      params.url = getValue(model, 'url') || urlError();
+    }
+
+    // Ensure that we have the appropriate request data.
+    if (!options.data && model && (method == 'create' || method == 'update')) {
+      params.contentType = 'application/json';
+      params.data = JSON.stringify(model.toJSON());
+    }
+
+    // For older servers, emulate JSON by encoding the request into an HTML-form.
+    if (Backbone.emulateJSON) {
+      params.contentType = 'application/x-www-form-urlencoded';
+      params.data = params.data ? {model: params.data} : {};
+    }
+
+    // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
+    // And an `X-HTTP-Method-Override` header.
+    if (Backbone.emulateHTTP) {
+      if (type === 'PUT' || type === 'DELETE') {
+        if (Backbone.emulateJSON) params.data._method = type;
+        params.type = 'POST';
+        params.beforeSend = function(xhr) {
+          xhr.setRequestHeader('X-HTTP-Method-Override', type);
+        };
+      }
+    }
+
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && !Backbone.emulateJSON) {
+      params.processData = false;
+    }
+
+    // Make the request, allowing the user to override any Ajax options.
+    return $.ajax(_.extend(params, options));
+  };
+
+  // Wrap an optional error callback with a fallback error event.
+  Backbone.wrapError = function(onError, originalModel, options) {
+    return function(model, resp) {
+      resp = model === originalModel ? resp : model;
+      if (onError) {
+        onError(originalModel, resp, options);
+      } else {
+        originalModel.trigger('error', originalModel, resp, options);
+      }
+    };
+  };
+
+  // Helpers
+  // -------
+
+  // Shared empty constructor function to aid in prototype-chain creation.
+  var ctor = function(){};
+
+  // Helper function to correctly set up the prototype chain, for subclasses.
+  // Similar to `goog.inherits`, but uses a hash of prototype properties and
+  // class properties to be extended.
+  var inherits = function(parent, protoProps, staticProps) {
+    var child;
+
+    // The constructor function for the new subclass is either defined by you
+    // (the "constructor" property in your `extend` definition), or defaulted
+    // by us to simply call the parent's constructor.
+    if (protoProps && protoProps.hasOwnProperty('constructor')) {
+      child = protoProps.constructor;
+    } else {
+      child = function(){ parent.apply(this, arguments); };
+    }
+
+    // Inherit class (static) properties from parent.
+    _.extend(child, parent);
+
+    // Set the prototype chain to inherit from `parent`, without calling
+    // `parent`'s constructor function.
+    ctor.prototype = parent.prototype;
+    child.prototype = new ctor();
+
+    // Add prototype properties (instance properties) to the subclass,
+    // if supplied.
+    if (protoProps) _.extend(child.prototype, protoProps);
+
+    // Add static properties to the constructor function, if supplied.
+    if (staticProps) _.extend(child, staticProps);
+
+    // Correctly set child's `prototype.constructor`.
+    child.prototype.constructor = child;
+
+    // Set a convenience property in case the parent's prototype is needed later.
+    child.__super__ = parent.prototype;
+
+    return child;
+  };
+
+  // Helper function to get a value from a Backbone object as a property
+  // or as a function.
+  var getValue = function(object, prop) {
+    if (!(object && object[prop])) return null;
+    return _.isFunction(object[prop]) ? object[prop]() : object[prop];
+  };
+
+  // Throw an error when a URL is needed, and none is supplied.
+  var urlError = function() {
+    throw new Error('A "url" property or function must be specified');
+  };
+
+}).call(this);
diff --git a/htdocs/js/LibraryBrowser/jquery-1.7.2.min.js b/htdocs/js/LibraryBrowser/jquery-1.7.2.min.js
new file mode 100644
index 0000000000..16ad06c5ac
--- /dev/null
+++ b/htdocs/js/LibraryBrowser/jquery-1.7.2.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.2 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
+a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.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 contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.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|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={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,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/htdocs/js/library_browser.js b/htdocs/js/LibraryBrowser/library_browser.js
similarity index 71%
rename from htdocs/js/library_browser.js
rename to htdocs/js/LibraryBrowser/library_browser.js
index eacc1f073e..f4babaf0cc 100644
--- a/htdocs/js/library_browser.js
+++ b/htdocs/js/LibraryBrowser/library_browser.js
@@ -64,6 +64,8 @@ function redo() {
 	redoFunc();
 }
 
+
+//MOVE
 function highlightSets(event) {
 	//console.log(this.getAttribute("data-path"));
 	var problemID = this.getAttribute("data-path");
@@ -82,6 +84,7 @@ function unHighlightSets(event) {
 	$(".contains_problem").removeClass("contains_problem");
 }
 
+//SMOKE
 function updateMessage(message) {
 	var messageBox = document.getElementById("messages");
 	messageBox.innerHTML = message;
@@ -100,7 +103,6 @@ function showErrorResponse(data){
  * unobtrusively start up our javascript
  */
 $(document).ready(function() {
-	// do stuff when DOM is ready
 
 	// get usernames and keys from hidden variables:
 	var myUser = document.getElementById("hidden_user").value;
@@ -118,7 +120,7 @@ $(document).ready(function() {
 	}
 
 	// get our sets
-	setList = new SetList();
+	setList = new SetList();//REMOVE
 
 	// attach function for deleting selected problems
 	document.getElementById("delete_problem").addEventListener("click", function(event) {
@@ -138,7 +140,7 @@ $(document).ready(function() {
 						"data-path"));
 			});
 		}
-	}, false);
+	}, false);//REMOVE
 
 	// attach undo and redo
 	document.getElementById("undo_button").addEventListener("click", undo, false);
@@ -147,16 +149,16 @@ $(document).ready(function() {
 	$("#dialog").dialog({
 		autoOpen : false,
 		modal : true
-	});
+	});//MOVE
 	// create set button listner
 	document.getElementById("create_set").addEventListener("click", function() {
 		Set.createSet(setList, false);
 		$("#dialog").dialog('close');
-	});
+	});//MOVE
 
 	document.getElementById("new_problem_set").addEventListener("click", function() {
 		setList.createSet();
-	}, false);
+	}, false);//MOVE
 
 	// this stil doesn't work
 	$("#new_problem_set").droppable({
@@ -165,14 +167,14 @@ $(document).ready(function() {
 			problemPlaceholder = ui.draggable.attr("data-path")
 			$("#dialog").dialog('open');
 		}
-	});
+	});//MOVE
 //   setup  slider for side bar
 	$("#problem_sets_container").resizable({
 		cursor: 'move',
 		//animate: true,
 		//ghost: true,
 		delay: 0,
-	});
+	});//MOVE
 
 
 	// some window set up:
@@ -217,13 +219,13 @@ $(document).ready(function() {
 							$(".ww_selected").removeClass(
 									"ww_selected");
 						}
-					});
- 
-	$("#problems_container").removeClass("ui-corner-all");
-	
-	listLibRequest.xml_command = "listLibraries";
+					});//MOVE
 
-	updateMessage("Loading libraries... may take some time");
+	$("#problems_container").removeClass("ui-corner-all");//MOVE
+
+	listLibRequest.xml_command = "listLibraries";//MOVE
+
+	updateMessage("Loading libraries... may take some time");//MOVE
 
 	$.post(webserviceURL, listLibRequest,
 			function(data) {
@@ -240,46 +242,47 @@ $(document).ready(function() {
 					myWindow.document.write(data);
 					myWindow.focus();
 				}
-			});
-	
-	
-});
+			});//MOVE
+
 
+});//include everything in the onload command, add templates
+
+//becomes the main app view
 function CardCatolog(libNames) {
 	this.searchBox = new Search();
 	this.displayBox = document.getElementById("library_list");
 	this.listBox = document.getElementById("library_list_box");
-	
+
 	//this.library = new Library(libName);
 	//this.working_library = this.library;
 	var topLibraries = new Array();
 	for(var i = 0; i < libNames.length; i++){
 		topLibraries.push(new Library(libNames[i]));
 	}
-	
-	
+
+
 	// set up unobtrusive controlls:
-		
+
 	this.searchButton = document.getElementById("run_search");
-	
+
 	this.nextButton = document.getElementById("nextList");
 	this.prevButton = document.getElementById("prevList");
 	this.probsPerPage = document.getElementById("prob_per_page");
 	this.topProbIndex = 0;
-	
+
 	var workAroundTheClosure = this;
-	
+
 	this.buildLibraryBox(topLibraries);
 	//this.library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.library)});
-	
+
 	this.searchButton.addEventListener('click', function() {workAroundTheClosure.searchBox.go();}, false);
-	
+
 	document.getElementById("load_problems").addEventListener('click', function(){
 		if(workAroundTheClosure.working_library.problems > 0){
 			console.log("loaded");
 			console.log(workAroundTheClosure.working_library.problems);
 			workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-		} 
+		}
 		else {
 			workAroundTheClosure.working_library.loadProblems(function() {
 				console.log("callback!");
@@ -287,7 +290,7 @@ function CardCatolog(libNames) {
 				});
 			}
 	}, false);
-	
+
 	this.nextButton.addEventListener('click', function() {
 		console.log("Next Button was clicked");
 		// then load new problems? yes because we shouldn't
@@ -321,14 +324,14 @@ CardCatolog.prototype.buildLibraryBox = function(topLibraries){
 	newLibList.id = "topLibList" + (this.displayBox.childNodes.length + 1);
 	//newLibList.setAttribute("data-propName", currentLibrary.path);
 	var workAroundTheClosure = this;
-	
+
 	for (var i = 0; i < topLibraries.length; i++) {
 		var option = document.createElement("option")
 		option.value = topLibraries[i].name;
 		option.innerHTML = topLibraries[i].name;
 		newLibList.add(option, null);
 	}
-	
+
 	newLibList.addEventListener("change", function(event) {
 		var changedLib = event.target;// should be the select we just created
 		var listBox = event.target.parentNode;
@@ -342,11 +345,11 @@ CardCatolog.prototype.buildLibraryBox = function(topLibraries){
 		workAroundTheClosure.working_library = topLibraries[changedLib.selectedIndex];
 		workAroundTheClosure.working_library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.working_library)});
 	}, false);
-	
+
 	this.listBox.appendChild(newLibList);
 	this.working_library = topLibraries[0];
 	this.working_library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.working_library)});
-	
+
 }
 
 CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
@@ -407,7 +410,7 @@ CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
 	while (listBox.childNodes.length > count + 1) {
 		listBox.removeChild(listBox.lastChild);
 	}
-	
+
 	if (currentLibrary.children.hasOwnProperty(changedLib.options[changedLib.selectedIndex].value)) {
 		var child = currentLibrary.children[changedLib.options[changedLib.selectedIndex].value];
 		this.working_library = child;
@@ -435,9 +438,9 @@ function Search(){
 	this.textChaptersBox = document.getElementById("textChaptersBox");
 	this.textSectionsBox = document.getElementById("textSectionsBox");
 	this.keywordsBox = document.getElementById("keywordsBox");
-	
-	
-	
+
+
+
 	var workAroundTheClosure = this;
 	subjectBox.addEventListener("change", function() {
 		//update inputs
@@ -465,7 +468,7 @@ function Search(){
 	this.updateSubjectBox();
 	this.updateChaptersBox();
 	this.updateSectionsBox();
-	
+
 }
 
 function SearchResult(){
@@ -475,30 +478,30 @@ function SearchResult(){
 }
 
 SearchResult.prototype.createPageControls = function(){
-	
+
 	this.nextButton = document.createElement("button");
 	//<button type="button" disabled=true id="nextList">Next</button>
 	this.nextButton.id = this.searchName + "nextList";
 	this.nextButton.type = "button";
 	this.nextButton.innerHTML = "Next";
 	this.nextButton.setAttribute("disabled", true);
-	
+
 	this.prevButton = document.createElement("button");
 	//<button type="button" disabled=true id="prevList">Previous</button>
 	this.prevButton.id = this.searchName + "prevList";
 	this.prevButton.type = "button";
 	this.prevButton.innerHTML = "Previous";
 	this.prevButton.setAttribute("disabled", true);
-	
+
 	var thisContainer = document.getElementById(this.searchName);
 	thisContainer.appendChild(this.prevButton);
 	thisContainer.appendChild(this.nextButton);
-	
-	
+
+
 	//hard coded for now
 	this.probsPerPage = 10;//document.getElementById("prob_per_page");
 	this.topProbIndex = 0;
-	
+
 	//attach event listeners:
 	var workAroundTheClosure = this;
 	this.nextButton.addEventListener('click', function() {
@@ -514,8 +517,8 @@ SearchResult.prototype.createPageControls = function(){
 			workAroundTheClosure.topProbIndex = 0;
 		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, workAroundTheClosure.probsPerPage);
 	}, false);
-	
-	
+
+
 }
 
 
@@ -531,18 +534,18 @@ Search.prototype.go = function() {
 			console.log("result: " + response.server_response);
 			updateMessage(response.server_response);
 			var results = response.result_data.split(",");
-			
+
 			var newSearchResult = new SearchResult();
-			
+
 			$tabs.tabs("add", "#"+newSearchResult.searchName, "Search (" + results.length + ")");
 			var thisContainer = document.getElementById(newSearchResult.searchName);
 			var displayList = document.createElement("ul");
 			thisContainer.appendChild(displayList);
-			
-			
-			
+
+
+
 			newSearchResult.createPageControls();
-			
+
 			newSearchResult.displayBox = displayList;
 			newSearchResult.problems = new Array();
 			for(var i = 0; i < results.length; i++){
@@ -600,25 +603,25 @@ Search.prototype.updateInputs = function(){
 Search.prototype.updateSubjectBox = function(){
 	listLibRequest.xml_command = "searchLib";
 	listLibRequest.subcommand = "getAllDBsubjects";
-	this.update(this.subjectBox, "All Subjects");	
+	this.update(this.subjectBox, "All Subjects");
 };
 
 Search.prototype.updateChaptersBox = function(){
 	listLibRequest.xml_command = "searchLib";
 	listLibRequest.subcommand = "getAllDBchapters";
-	this.update(this.chaptersBox, "All Chapters");	
+	this.update(this.chaptersBox, "All Chapters");
 };
 
 Search.prototype.updateSectionsBox = function(){
 	listLibRequest.xml_command = "searchLib";
 	listLibRequest.subcommand = "getSectionListings";
-	this.update(this.sectionsBox, "All Sections");	
+	this.update(this.sectionsBox, "All Sections");
 };
 
 Search.prototype.updateTextbookBox = function(){
 	listLibRequest.xml_command = "searchLib";
 	listLibRequest.subcommand = "getDBTextbooks";
-	this.update(this.textbooksBox, "All Textbooks");	
+	this.update(this.textbooksBox, "All Textbooks");
 };
 
 Search.prototype.update = function(box, blankName){
@@ -628,7 +631,7 @@ Search.prototype.update = function(box, blankName){
 			var response = $.parseJSON(data);
 			console.log("result: " + response.server_response);
 			updateMessage(response.server_response);
-			
+
 			box.options.length = 0;
 			var options = response.result_data.split(",");
 			for (var i = 0; i < options.length; i++) {
@@ -675,7 +678,7 @@ Search.prototype.update = function(box, blankName){
 function Library(name, parent) {
 	this.name = name;
 	this.parent = false;
-	
+
 	if(parent){
 		this.parent = parent;
 		this.path = parent.path + "/" + name;
@@ -683,7 +686,7 @@ function Library(name, parent) {
 		this.path = name;
 	}
 	this.children = new Object();
-	
+
 	this.problems = new Array();
 }
 
@@ -694,9 +697,9 @@ Library.prototype.loadChildren = function(callback){
 	listLibRequest.command = "dirOnly";
 	listLibRequest.maxdepth = 0;
 	listLibRequest.library_name = this.path;
-	
+
 	updateMessage("Loading libraries... may take some time");
-	
+
 	var workAroundLibrary = this;
 	$.post(webserviceURL, listLibRequest,
 			function(data) {
@@ -729,7 +732,7 @@ Library.prototype.loadProblems = function(callback){
 	listLibRequest.command = "files";
 	listLibRequest.maxdepth = 0;
 	listLibRequest.library_name = this.path+"/";
-	
+
 	updateMessage("Loading problems");
 	console.log(listLibRequest.library_name);
 	var workAroundLibrary = this;
@@ -747,7 +750,7 @@ Library.prototype.loadProblems = function(callback){
 					workAroundLibrary.problems = new Array();
 					for(var i = 0; i < problemList.length; i++){
 						workAroundLibrary.problems.push(new Problem(problemList[i]));
-					}					
+					}
 					//console.log("Problems:");
 					//console.log(workAroundLibrary.problems);
 					callback();
@@ -767,6 +770,7 @@ Library.prototype.loadProblems = function(callback){
  * The set object
  ******************************************************************************/
 // object
+/*
 function Set(setName) {// id might not exist..use date if nessisary
 	this.id = generateUniqueID();
 	this.name = setName;
@@ -776,46 +780,229 @@ function Set(setName) {// id might not exist..use date if nessisary
 	this.displayBox;
 	this.previousOrder;
 }
-// controller
-Set.prototype.renderSet = function() {
-	/*
-	 * sudo code for display stuff: create a tab next to library_box make it's
-	 * id setID load in the problems from the set add the nessisary listeners
-	 * etc to the problems switch to that tab
-	 */
-
-	if (document.getElementById(this.name)
-			&& $.contains(document.getElementById("problems_container"),
-					document.getElementById(this.name))) {
-		// might as well reload the problems
-		while (this.displayBox.hasChildNodes()) {
-			this.displayBox.removeChild(this.displayBox.lastChild);
-		}
-		for ( var i = 0; i < this.problemArray.length; i++) {
-			this.renderProblem(this.problemArray[i]);
-		}
-	} else {
-		$tabs.tabs("add", "#" + this.name, this.name + " (" + this.problemArray.length + ")");
-		var thisContainer = document.getElementById(this.name);
-		thisContainer.setAttribute("data-uid", this.id);
-		this.displayBox = document.createElement("ul");
-		this.displayBox.id = this.name + "_list";
-		var workAroundSet = this;
-		$(this.displayBox).sortable({
-			axis: 'y',
-			start : function(event, ui) {
-				workAroundSet.previousOrder = $(this).sortable('toArray');
-			},
-			update : function(event, ui) {
-				workAroundSet.reorderProblems($(this).sortable('toArray'));
-			}
-		});// sortable code
-		thisContainer.appendChild(this.displayBox);
-		for ( var i = 0; i < this.problemArray.length; i++) {
-			this.renderProblem(this.problemArray[i]);
-		}
-	}
-}
+*/
+var ProblemList = Backbone.Collection.extend({
+    model:Problem,
+/*
+    comparator: function(todo) {
+        return todo.get('order');
+    }
+*/
+});
+
+var Set = Backbone.Model.extend({
+    defaults:{
+        name: "defaultSet",
+        problems: new ProblemList
+    },
+
+    initialize:function(){
+        this.get('problems').on('add', this.addProblem, this);
+        this.get('problems').on('remove', this.removeProblem, this);
+    },
+
+    addProblem: function(problem) {
+        var self = this;
+
+        listLibRequest.set = this.get('name');// switch to data attribute
+        listLibRequest.problemPath = problem.get('path');
+        listLibRequest.xml_command = "addProblem";
+
+        $.post(webserviceURL, listLibRequest, function (data) {
+            try {
+                var response = $.parseJSON(data);
+                console.log("result: " + response.server_response);
+                updateMessage(response.server_response);
+                // still have to test for success..everywhere
+                if (undoing) {// might be a better way to do this later
+                    redo_stack.push(function () {
+                        self.removeProblem(probPath);
+                    });
+                    undoing = false;
+                } else {
+                    undo_stack.push(function () {
+                        self.removeProblem(probPath);
+                    });
+                }
+                //hopfully I can get rid of this
+                //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
+            } catch (err) {
+                showErrorResponse(data);
+            }
+        });
+    },
+
+    removeProblem: function(problem) {
+        var self = this;
+        listLibRequest.set = self.get('name');// switch to data attribute
+        listLibRequest.problemPath = problem.get('path');
+        listLibRequest.xml_command = "deleteProblem";
+
+        $.post(webserviceURL, listLibRequest, function (data) {
+            try {
+                var response = $.parseJSON(data);
+                console.log("result: " + response.server_response);
+                updateMessage(response.server_response);
+                // still have to test for success....
+                if (undoing) {
+                    redo_stack.push(function () {
+                        self.addProblem(probPath);
+                    });
+                    undoing = false;
+                } else {
+                    undo_stack.push(function () {
+                        self.addProblem(probPath);
+                    });
+                }
+                /*workAroundSet.loadProblems($.contains(document
+                 .getElementById("problems_container"), document
+                 .getElementById(self.name)));*/
+            } catch (err) {
+                showErrorResponse(data);
+            }
+        });
+    },
+
+    loadProblems: function() {
+        var self = this;
+
+        listLibRequest.xml_command = "listSetProblems";
+        listLibRequest.set = self.get('name');
+        $.post(webserviceURL, listLibRequest,
+            function (data) {
+                try {//this is the wrong way to be error checking
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    self.problems.reset();
+                    var problems = response.result_data.split(",");
+                    for (var i = 0; i < problems.length; i++) {
+                        if (problems[i] != "") {
+                            self.problems.add({path: problems[i]});
+                        }
+                    }
+                    //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
+                } catch (err) {
+                    showErrorResponse(data);
+                }
+            }
+        );
+    }
+
+    //For reroder
+    //http://localtodos.com/javascripts/todos.js (look at sortables in particular)
+    /*
+
+     reorderProblems = function(setOrder) {
+     var workAroundOrder = this.previousOrder;
+     var workAroundSet = this;
+     if(document.getElementById(workAroundSet.displayBox.id)){
+     if (undoing) {
+     redo_stack.push(function() {
+     // resort the list
+     if(document.getElementById(workAroundSet.displayBox.id)){
+     for ( var i = 0; i < workAroundOrder.length; i++) {
+     var tempProblem = document.getElementById(workAroundOrder[i]);
+     workAroundSet.displayBox.removeChild(tempProblem);
+     workAroundSet.displayBox.appendChild(tempProblem);
+     }
+     $(workAroundSet.displayBox).sortable("refresh");
+     }
+     workAroundSet.reorderProblems(workAroundOrder);
+     });
+     undoing = false;
+     } else {
+     undo_stack.push(function() {
+     // resort the list
+     if(document.getElementById(workAroundSet.displayBox.id)){
+     for ( var i = 0; i < workAroundOrder.length; i++) {
+     var tempProblem = document.getElementById(workAroundOrder[i]);
+     workAroundSet.displayBox.removeChild(tempProblem);
+     workAroundSet.displayBox.appendChild(tempProblem);
+     }
+     $(workAroundSet.displayBox).sortable("refresh");
+     }
+     // $(workAroundSet.displayBox).sortable( "refreshPositions" )
+     workAroundSet.reorderProblems(workAroundOrder);
+     });
+     }
+     // load problems:
+     // var problems = this.displayBox.childNodes;
+     var probList = new Array();
+     for ( var i = 0; i < setOrder.length; i++) {
+     probList.push(document.getElementById(setOrder[i]).getAttribute(
+     "data-path"));
+     }
+
+     var probListString = probList.join(",");
+     listLibRequest.probList = probListString;
+     listLibRequest.xml_command = "reorderProblems";
+     listLibRequest.set = this.name;
+     $.post(webserviceURL, listLibRequest, function(data) {
+     try {
+     var response = $.parseJSON(data);
+     console.log("result: " + response.server_response);
+     updateMessage(response.server_response);
+     } catch (err) {
+     showErrorResponse(data);
+     }
+     });
+     this.previousOrder = $(workAroundSet.displayBox).sortable('toArray');
+     }
+     */
+
+});
+
+var SetView = Backbone.View.extend({
+
+    initialize: function(){
+
+
+    },
+
+    render:function(){
+        /*
+         * sudo code for display stuff: create a tab next to library_box make it's
+         * id setID load in the problems from the set add the nessisary listeners
+         * etc to the problems switch to that tab
+         *//*
+        var self = this;
+        if (document.getElementById(self.get('name'))
+            && $.contains(document.getElementById("problems_container"),
+            document.getElementById(self.get('name')))) {
+            // might as well reload the problems
+            while (this.displayBox.hasChildNodes()) {
+                this.displayBox.removeChild(this.displayBox.lastChild);
+            }
+            for ( var i = 0; i < this.problemArray.length; i++) {
+                this.renderProblem(this.problemArray[i]);
+            }
+        } else {
+            $tabs.tabs("add", "#" + this.name, this.name + " (" + this.problemArray.length + ")");
+            var thisContainer = document.getElementById(this.name);
+            thisContainer.setAttribute("data-uid", this.id);
+            this.displayBox = document.createElement("ul");
+            this.displayBox.id = this.name + "_list";
+            var workAroundSet = this;
+            $(this.displayBox).sortable({
+                axis: 'y',
+                start : function(event, ui) {
+                    workAroundSet.previousOrder = $(this).sortable('toArray');
+                },
+                update : function(event, ui) {
+                    workAroundSet.reorderProblems($(this).sortable('toArray'));
+                }
+            });// sortable code
+            thisContainer.appendChild(this.displayBox);
+            for ( var i = 0; i < this.problemArray.length; i++) {
+                this.renderProblem(this.problemArray[i]);
+            }
+        }*/
+
+        //Template and fix up, that was just ugly
+
+        return this;
+    }
+});
 
 Set.prototype.renderProblem = function(problem) {
 	var newSetItem = problem.render(this.displayBox);
@@ -828,156 +1015,7 @@ Set.prototype.renderProblem = function(problem) {
 	$(this.displayBox).sortable("refresh");
 }
 
-Set.prototype.loadProblems = function(shouldRender) {
-	listLibRequest.xml_command = "listSetProblems";
-	listLibRequest.set = this.name;
-	this.problems = new Object();
-	this.problemArray = new Array();
-	var workAroundTheClosure = this;
-	$.post(webserviceURL, listLibRequest,
-		function(data) {
-			try {
-				var response = $.parseJSON(data);
-				console.log("result: " + response.server_response);
-
-				var problems = response.result_data.split(",");
-				for ( var i = 0; i < problems.length; i++) {
-					if (problems[i] != "") {
-						var newProblem = new Problem(problems[i]);
-						workAroundTheClosure.problems[newProblem.path] = newProblem;
-						workAroundTheClosure.problemArray.push(newProblem);
-					}
-				}
-				document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
-				if (shouldRender) {
-					$('a[href="#'+workAroundTheClosure.name+'"] span').text(workAroundTheClosure.name+" ("+ workAroundTheClosure.problemArray.length + ") ");
-					workAroundTheClosure.renderSet();
-				}
-			} catch (err) {
-				var myWindow = window.open('', '',
-						'width=500,height=800');
-				myWindow.document.write(data);
-				myWindow.focus();
-			}
-		});
-}
-
-Set.prototype.addProblem = function(probPath) {
-	listLibRequest.set = this.name;// switch to data attribute
-	listLibRequest.problemPath = probPath;
-	listLibRequest.xml_command = "addProblem";
-	var workAroundSet = this;
-	$.post(webserviceURL, listLibRequest, function(data) {
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			updateMessage(response.server_response);
-			// still have to test for success..everywhere
-			if (undoing) {// might be a better way to do this later
-				redo_stack.push(function() {
-					workAroundSet.removeProblem(probPath);
-				});
-				undoing = false;
-			} else {
-				undo_stack.push(function() {
-					workAroundSet.removeProblem(probPath);
-				});
-			}
-			workAroundSet.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(workAroundSet.name)));
-		} catch (err) {
-			showErrorResponse(data);
-		}
-	});
-}
-
-Set.prototype.removeProblem = function(probPath) {
-	listLibRequest.set = this.name;// switch to data attribute
-	listLibRequest.problemPath = probPath;
-	listLibRequest.xml_command = "deleteProblem";
-	var workAroundSet = this;
-	$.post(webserviceURL, listLibRequest, function(data) {
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			updateMessage(response.server_response);
-			// still have to test for success....
-			if (undoing) {
-				redo_stack.push(function() {
-					workAroundSet.addProblem(probPath);
-				});
-				undoing = false;
-			} else {
-				undo_stack.push(function() {
-					workAroundSet.addProblem(probPath);
-				});
-			}
-			workAroundSet.loadProblems($.contains(document
-					.getElementById("problems_container"), document
-					.getElementById(workAroundSet.name)));
-		} catch (err) {
-			showErrorResponse(data);
-		}
-	});
-}
-
-Set.prototype.reorderProblems = function(setOrder) {
-	var workAroundOrder = this.previousOrder;
-	var workAroundSet = this;
-	if(document.getElementById(workAroundSet.displayBox.id)){
-		if (undoing) {
-			redo_stack.push(function() {
-				// resort the list
-				if(document.getElementById(workAroundSet.displayBox.id)){
-					for ( var i = 0; i < workAroundOrder.length; i++) {
-						var tempProblem = document.getElementById(workAroundOrder[i]);
-						workAroundSet.displayBox.removeChild(tempProblem);
-						workAroundSet.displayBox.appendChild(tempProblem);
-					}
-					$(workAroundSet.displayBox).sortable("refresh");
-				}
-				workAroundSet.reorderProblems(workAroundOrder);
-			});
-			undoing = false;
-		} else {
-			undo_stack.push(function() {
-				// resort the list
-				if(document.getElementById(workAroundSet.displayBox.id)){
-					for ( var i = 0; i < workAroundOrder.length; i++) {
-						var tempProblem = document.getElementById(workAroundOrder[i]);
-						workAroundSet.displayBox.removeChild(tempProblem);
-						workAroundSet.displayBox.appendChild(tempProblem);
-					}
-					$(workAroundSet.displayBox).sortable("refresh");
-				}
-				// $(workAroundSet.displayBox).sortable( "refreshPositions" )
-				workAroundSet.reorderProblems(workAroundOrder);
-			});
-		}
-		// load problems:
-		// var problems = this.displayBox.childNodes;
-		var probList = new Array();
-		for ( var i = 0; i < setOrder.length; i++) {
-			probList.push(document.getElementById(setOrder[i]).getAttribute(
-					"data-path"));
-		}
-	
-		var probListString = probList.join(",");
-		listLibRequest.probList = probListString;
-		listLibRequest.xml_command = "reorderProblems";
-		listLibRequest.set = this.name;
-		$.post(webserviceURL, listLibRequest, function(data) {
-			try {
-				var response = $.parseJSON(data);
-				console.log("result: " + response.server_response);
-				updateMessage(response.server_response);
-			} catch (err) {
-				showErrorResponse(data);
-			}
-		});
-		this.previousOrder = $(workAroundSet.displayBox).sortable('toArray');
-	}
-}
-
+//not sure how this is gonna work...
 Set.createSet = function(refreshList, callback) {//change callback to work with strings..
 	listLibRequest.xml_command = "createNewSet";
 	listLibRequest.new_set_name = document.getElementById("dialog_text").value;
@@ -996,7 +1034,7 @@ Set.createSet = function(refreshList, callback) {//change callback to work with
 		if(callback){
 			callback();
 		}
-		
+
 	});
 }
 
@@ -1081,9 +1119,9 @@ SetList.prototype.renderList = function(setName) {
 	$(addingSet).droppable(
 			{
 				tolerance : 'pointer',
-				
+
 				hoverClass: 'drophover',
-				
+
 				drop : function(event, ui) {
 					var recievingSet = workAroundSetList[this
 							.getAttribute("data-uid")];
@@ -1102,78 +1140,79 @@ SetList.prototype.createSet = function() {
  * The problem object
  ******************************************************************************/
 // object
-function Problem(path) {
-	this.path = path;
-	this.data = false;
-	this.id = generateUniqueID();
-}
-
-Problem.prototype.render = function(displayBox) {
-	var problem = this;
-	listLibRequest.set = problem.path;
-	listLibRequest.problemSource = problem.path;
-	listLibRequest.xml_command = "renderProblem";
-	var workAroundDisplayBox = displayBox;
-	var newItem = document.createElement('li');
-	newItem.setAttribute("data-path", problem.path);
-	newItem.setAttribute("data-uid", problem.id);
-	newItem.id = problem.path + problem.id;
-	//set a loading image while we wait for the problem
-	var loadingImage = document.createElement("img");
-	loadingImage.src = '/webwork2_files/images/ajax-loader-small.gif';
-	newItem.appendChild(loadingImage);
-	//add the item to the box so that we dont lose our place
-	workAroundDisplayBox.appendChild(newItem);
-
-	var handle = document.createElement("div");
-	handle.className = "handle";
-	var container = document.createElement("div");
-
-	if (!problem.data) {
-		//if we haven't gotten this problem yet, ask for it
-		$.post(webserviceURL, listLibRequest, function(data) {
-			//console.log(data);
-			//newItem.innerHTML = data;
-			container.innerHTML = data;
-			newItem.innerHTML = null;
-			newItem.appendChild(handle);
-			newItem.appendChild(container);
-			$(newItem).draggable({
-				helper : 'clone',
-				handle : 'div.handle',
-				revert : true,
-				appendTo : 'body',
-				cursorAt : {
-					top : 0,
-					left : 0
-				},
-				opacity : 0.35
-			});
-			problem.data = data;
-		});
-	} else {
-		console.log("didn't have to go to the server");
-		//if we've gotten it just load up the stored data
-		//newItem.innerHTML = data;
-		container.innerHTML = problem.data;
-		newItem.innerHTML = null;
-		newItem.appendChild(handle);
-		newItem.appendChild(container);
-		$(newItem).draggable({
-			helper : 'clone',
-			revert : true,
-			handle : 'div.handle',
-			appendTo : 'body',
-			cursorAt : {
-				top : 0,
-				left : 0
-			},
-			opacity : 0.35
-		});
-	}
 
-	newItem.addEventListener("mouseover", highlightSets, false);
-	//newItem.addEventListener("mouseout", unHighlightSets, false);
+var Problem = Backbone.Model.extend({
+    defaults:function(){
+        return{
+           path: "",
+           data: false,
+        };
+    },
+
+    initialize: function(){
+
+    },
+    //this is a server render, different from a view render
+    render: function() {
+        var problem = this;
+
+        listLibRequest.set = problem.path;
+        listLibRequest.problemSource = problem.path;
+        listLibRequest.xml_command = "renderProblem";
+
+
+        if (!problem.data) {
+            //if we haven't gotten this problem yet, ask for it
+            $.post(webserviceURL, listLibRequest, function(data) {
+                problem.data = data;
+            });
+        }
+    }
+});
 
-	return newItem;
-}
+var ProblemView = Backbone.View.extend({
+
+    initialize: function(){
+        this.model.on('change:data', this.render, this);
+    },
+
+    render: function(){
+        var problem = this.model;
+        problem.render();
+        //template all of this
+        var workAroundDisplayBox = displayBox;
+        var newItem = document.createElement('li');
+        newItem.setAttribute("data-path", problem.path);
+        newItem.setAttribute("data-uid", problem.id);
+        newItem.id = problem.path + problem.id;
+        //set a loading image while we wait for the problem
+        var loadingImage = document.createElement("img");
+        loadingImage.src = '/webwork2_files/images/ajax-loader-small.gif';
+        //add the item to the box so that we dont lose our place
+        workAroundDisplayBox.appendChild(newItem);
+
+        var handle = document.createElement("div");
+        handle.className = "handle";
+        var container = document.createElement("div");
+        container.innerHTML = problem.data?problem.data:loadingImage;
+        newItem.appendChild(handle);
+        newItem.appendChild(container);
+        $(newItem).draggable({
+            helper : 'clone',
+            revert : true,
+            handle : 'div.handle',
+            appendTo : 'body',
+            cursorAt : {
+                top : 0,
+                left : 0
+            },
+            opacity : 0.35
+        });
+
+        newItem.addEventListener("mouseover", highlightSets, false);
+        //newItem.addEventListener("mouseout", unHighlightSets, false);
+
+        this.setElement(newItem);
+        return this;
+    }
+});
diff --git a/htdocs/js/LibraryBrowser/underscore.js b/htdocs/js/LibraryBrowser/underscore.js
new file mode 100644
index 0000000000..f6f7e2f23d
--- /dev/null
+++ b/htdocs/js/LibraryBrowser/underscore.js
@@ -0,0 +1,1059 @@
+//     Underscore.js 1.3.3
+//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Underscore is freely distributable under the MIT license.
+//     Portions of Underscore are inspired or borrowed from Prototype,
+//     Oliver Steele's Functional, and John Resig's Micro-Templating.
+//     For all details and documentation:
+//     http://documentcloud.github.com/underscore
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `global` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Establish the object that gets returned to break out of a loop iteration.
+  var breaker = {};
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var slice            = ArrayProto.slice,
+      unshift          = ArrayProto.unshift,
+      toString         = ObjProto.toString,
+      hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeForEach      = ArrayProto.forEach,
+    nativeMap          = ArrayProto.map,
+    nativeReduce       = ArrayProto.reduce,
+    nativeReduceRight  = ArrayProto.reduceRight,
+    nativeFilter       = ArrayProto.filter,
+    nativeEvery        = ArrayProto.every,
+    nativeSome         = ArrayProto.some,
+    nativeIndexOf      = ArrayProto.indexOf,
+    nativeLastIndexOf  = ArrayProto.lastIndexOf,
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind;
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) { return new wrapper(obj); };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object via a string identifier,
+  // for Closure Compiler "advanced" mode.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root['_'] = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.3.3';
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
+  // Delegates to **ECMAScript 5**'s native `forEach` if available.
+  var each = _.each = _.forEach = function(obj, iterator, context) {
+    if (obj == null) return;
+    if (nativeForEach && obj.forEach === nativeForEach) {
+      obj.forEach(iterator, context);
+    } else if (obj.length === +obj.length) {
+      for (var i = 0, l = obj.length; i < l; i++) {
+        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
+      }
+    } else {
+      for (var key in obj) {
+        if (_.has(obj, key)) {
+          if (iterator.call(context, obj[key], key, obj) === breaker) return;
+        }
+      }
+    }
+  };
+
+  // Return the results of applying the iterator to each element.
+  // Delegates to **ECMAScript 5**'s native `map` if available.
+  _.map = _.collect = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+    each(obj, function(value, index, list) {
+      results[results.length] = iterator.call(context, value, index, list);
+    });
+    if (obj.length === +obj.length) results.length = obj.length;
+    return results;
+  };
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+    }
+    each(obj, function(value, index, list) {
+      if (!initial) {
+        memo = value;
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, value, index, list);
+      }
+    });
+    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    return memo;
+  };
+
+  // The right-associative version of reduce, also known as `foldr`.
+  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    }
+    var reversed = _.toArray(obj).reverse();
+    if (context && !initial) iterator = _.bind(iterator, context);
+    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
+  };
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, iterator, context) {
+    var result;
+    any(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) {
+        result = value;
+        return true;
+      }
+    });
+    return result;
+  };
+
+  // Return all the elements that pass a truth test.
+  // Delegates to **ECMAScript 5**'s native `filter` if available.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
+    each(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    each(obj, function(value, index, list) {
+      if (!iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Delegates to **ECMAScript 5**'s native `every` if available.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, iterator, context) {
+    var result = true;
+    if (obj == null) return result;
+    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
+    each(obj, function(value, index, list) {
+      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Delegates to **ECMAScript 5**'s native `some` if available.
+  // Aliased as `any`.
+  var any = _.some = _.any = function(obj, iterator, context) {
+    iterator || (iterator = _.identity);
+    var result = false;
+    if (obj == null) return result;
+    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
+    each(obj, function(value, index, list) {
+      if (result || (result = iterator.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if a given value is included in the array or object using `===`.
+  // Aliased as `contains`.
+  _.include = _.contains = function(obj, target) {
+    var found = false;
+    if (obj == null) return found;
+    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+    found = any(obj, function(value) {
+      return value === target;
+    });
+    return found;
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    return _.map(obj, function(value) {
+      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, function(value){ return value[key]; });
+  };
+
+  // Return the maximum element or (element-based computation).
+  _.max = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0]) return Math.max.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return -Infinity;
+    var result = {computed : -Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed >= result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0]) return Math.min.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return Infinity;
+    var result = {computed : Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed < result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Shuffle an array.
+  _.shuffle = function(obj) {
+    var shuffled = [], rand;
+    each(obj, function(value, index, list) {
+      rand = Math.floor(Math.random() * (index + 1));
+      shuffled[index] = shuffled[rand];
+      shuffled[rand] = value;
+    });
+    return shuffled;
+  };
+
+  // Sort the object's values by a criterion produced by an iterator.
+  _.sortBy = function(obj, val, context) {
+    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value : value,
+        criteria : iterator.call(context, value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      if (a === void 0) return 1;
+      if (b === void 0) return -1;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }), 'value');
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = function(obj, val) {
+    var result = {};
+    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+    each(obj, function(value, index) {
+      var key = iterator(value, index);
+      (result[key] || (result[key] = [])).push(value);
+    });
+    return result;
+  };
+
+  // Use a comparator function to figure out at what index an object should
+  // be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator) {
+    iterator || (iterator = _.identity);
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >> 1;
+      iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
+    }
+    return low;
+  };
+
+  // Safely convert anything iterable into a real, live array.
+  _.toArray = function(obj) {
+    if (!obj)                                     return [];
+    if (_.isArray(obj))                           return slice.call(obj);
+    if (_.isArguments(obj))                       return slice.call(obj);
+    if (obj.toArray && _.isFunction(obj.toArray)) return obj.toArray();
+    return _.values(obj);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    return _.isArray(obj) ? obj.length : _.keys(obj).length;
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head` and `take`. The **guard** check
+  // allows it to work with `_.map`.
+  _.first = _.head = _.take = function(array, n, guard) {
+    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+  };
+
+  // Returns everything but the last entry of the array. Especcialy useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N. The **guard** check allows it to work with
+  // `_.map`.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array. The **guard** check allows it to work with `_.map`.
+  _.last = function(array, n, guard) {
+    if ((n != null) && !guard) {
+      return slice.call(array, Math.max(array.length - n, 0));
+    } else {
+      return array[array.length - 1];
+    }
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail`.
+  // Especially useful on the arguments object. Passing an **index** will return
+  // the rest of the values in the array from that index onward. The **guard**
+  // check allows it to work with `_.map`.
+  _.rest = _.tail = function(array, index, guard) {
+    return slice.call(array, (index == null) || guard ? 1 : index);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, function(value){ return !!value; });
+  };
+
+  // Return a completely flattened version of an array.
+  _.flatten = function(array, shallow) {
+    return _.reduce(array, function(memo, value) {
+      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
+      memo[memo.length] = value;
+      return memo;
+    }, []);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iterator) {
+    var initial = iterator ? _.map(array, iterator) : array;
+    var results = [];
+    // The `isSorted` flag is irrelevant if the array only contains two elements.
+    if (array.length < 3) isSorted = true;
+    _.reduce(initial, function (memo, value, index) {
+      if (isSorted ? _.last(memo) !== value || !memo.length : !_.include(memo, value)) {
+        memo.push(value);
+        results.push(array[index]);
+      }
+      return memo;
+    }, []);
+    return results;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(_.flatten(arguments, true));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays. (Aliased as "intersect" for back-compat.)
+  _.intersection = _.intersect = function(array) {
+    var rest = slice.call(arguments, 1);
+    return _.filter(_.uniq(array), function(item) {
+      return _.every(rest, function(other) {
+        return _.indexOf(other, item) >= 0;
+      });
+    });
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = _.flatten(slice.call(arguments, 1), true);
+    return _.filter(array, function(value){ return !_.include(rest, value); });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    var args = slice.call(arguments);
+    var length = _.max(_.pluck(args, 'length'));
+    var results = new Array(length);
+    for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
+    return results;
+  };
+
+  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+  // we need this function. Return the position of the first occurrence of an
+  // item in an array, or -1 if the item is not included in the array.
+  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = function(array, item, isSorted) {
+    if (array == null) return -1;
+    var i, l;
+    if (isSorted) {
+      i = _.sortedIndex(array, item);
+      return array[i] === item ? i : -1;
+    }
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
+    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
+    return -1;
+  };
+
+  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+  _.lastIndexOf = function(array, item) {
+    if (array == null) return -1;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
+    var i = array.length;
+    while (i--) if (i in array && array[i] === item) return i;
+    return -1;
+  };
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (arguments.length <= 1) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = arguments[2] || 1;
+
+    var len = Math.max(Math.ceil((stop - start) / step), 0);
+    var idx = 0;
+    var range = new Array(len);
+
+    while(idx < len) {
+      range[idx++] = start;
+      start += step;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Reusable constructor function for prototype setting.
+  var ctor = function(){};
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Binding with arguments is also known as `curry`.
+  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
+  // We check for `func.bind` first, to fail fast when `func` is undefined.
+  _.bind = function bind(func, context) {
+    var bound, args;
+    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError;
+    args = slice.call(arguments, 2);
+    return bound = function() {
+      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+      ctor.prototype = func.prototype;
+      var self = new ctor;
+      var result = func.apply(self, args.concat(slice.call(arguments)));
+      if (Object(result) === result) return result;
+      return self;
+    };
+  };
+
+  // Bind all of an object's methods to that object. Useful for ensuring that
+  // all callbacks defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var funcs = slice.call(arguments, 1);
+    if (funcs.length == 0) funcs = _.functions(obj);
+    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memo = {};
+    hasher || (hasher = _.identity);
+    return function() {
+      var key = hasher.apply(this, arguments);
+      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    };
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){ return func.apply(null, args); }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = function(func) {
+    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+  };
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time.
+  _.throttle = function(func, wait) {
+    var context, args, timeout, throttling, more, result;
+    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+    return function() {
+      context = this; args = arguments;
+      var later = function() {
+        timeout = null;
+        if (more) func.apply(context, args);
+        whenDone();
+      };
+      if (!timeout) timeout = setTimeout(later, wait);
+      if (throttling) {
+        more = true;
+      } else {
+        result = func.apply(context, args);
+      }
+      whenDone();
+      throttling = true;
+      return result;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  _.debounce = function(func, wait, immediate) {
+    var timeout;
+    return function() {
+      var context = this, args = arguments;
+      var later = function() {
+        timeout = null;
+        if (!immediate) func.apply(context, args);
+      };
+      if (immediate && !timeout) func.apply(context, args);
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = function(func) {
+    var ran = false, memo;
+    return function() {
+      if (ran) return memo;
+      ran = true;
+      return memo = func.apply(this, arguments);
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return function() {
+      var args = [func].concat(slice.call(arguments, 0));
+      return wrapper.apply(this, args);
+    };
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var funcs = arguments;
+    return function() {
+      var args = arguments;
+      for (var i = funcs.length - 1; i >= 0; i--) {
+        args = [funcs[i].apply(this, args)];
+      }
+      return args[0];
+    };
+  };
+
+  // Returns a function that will only be executed after being called N times.
+  _.after = function(times, func) {
+    if (times <= 0) return func();
+    return function() {
+      if (--times < 1) { return func.apply(this, arguments); }
+    };
+  };
+
+  // Object Functions
+  // ----------------
+
+  // Retrieve the names of an object's properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = nativeKeys || function(obj) {
+    if (obj !== Object(obj)) throw new TypeError('Invalid object');
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    return _.map(obj, _.identity);
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      for (var prop in source) {
+        obj[prop] = source[prop];
+      }
+    });
+    return obj;
+  };
+
+  // Return a copy of the object only containing the whitelisted properties.
+  _.pick = function(obj) {
+    var result = {};
+    each(_.flatten(slice.call(arguments, 1)), function(key) {
+      if (key in obj) result[key] = obj[key];
+    });
+    return result;
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      for (var prop in source) {
+        if (obj[prop] == null) obj[prop] = source[prop];
+      }
+    });
+    return obj;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Internal recursive comparison function.
+  function eq(a, b, stack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
+    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a._chain) a = a._wrapped;
+    if (b._chain) b = b._wrapped;
+    // Invoke a custom `isEqual` method if one is provided.
+    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
+    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className != toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, dates, and booleans are compared by value.
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return a == String(b);
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+        // other numeric values.
+        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a == +b;
+      // RegExps are compared by their source patterns and flags.
+      case '[object RegExp]':
+        return a.source == b.source &&
+               a.global == b.global &&
+               a.multiline == b.multiline &&
+               a.ignoreCase == b.ignoreCase;
+    }
+    if (typeof a != 'object' || typeof b != 'object') return false;
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+    var length = stack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (stack[length] == a) return true;
+    }
+    // Add the first object to the stack of traversed objects.
+    stack.push(a);
+    var size = 0, result = true;
+    // Recursively compare objects and arrays.
+    if (className == '[object Array]') {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      size = a.length;
+      result = size == b.length;
+      if (result) {
+        // Deep compare the contents, ignoring non-numeric properties.
+        while (size--) {
+          // Ensure commutative equality for sparse arrays.
+          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
+        }
+      }
+    } else {
+      // Objects with different constructors are not equivalent.
+      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) return false;
+      // Deep compare objects.
+      for (var key in a) {
+        if (_.has(a, key)) {
+          // Count the expected number of properties.
+          size++;
+          // Deep compare each member.
+          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
+        }
+      }
+      // Ensure that both objects contain the same number of properties.
+      if (result) {
+        for (key in b) {
+          if (_.has(b, key) && !(size--)) break;
+        }
+        result = !size;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    stack.pop();
+    return result;
+  }
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b, []);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (obj == null) return true;
+    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    for (var key in obj) if (_.has(obj, key)) return false;
+    return true;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType == 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) == '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    return obj === Object(obj);
+  };
+
+  // Is a given variable an arguments object?
+  _.isArguments = function(obj) {
+    return toString.call(obj) == '[object Arguments]';
+  };
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return !!(obj && _.has(obj, 'callee'));
+    };
+  }
+
+  // Is a given value a function?
+  _.isFunction = function(obj) {
+    return toString.call(obj) == '[object Function]';
+  };
+
+  // Is a given value a string?
+  _.isString = function(obj) {
+    return toString.call(obj) == '[object String]';
+  };
+
+  // Is a given value a number?
+  _.isNumber = function(obj) {
+    return toString.call(obj) == '[object Number]';
+  };
+
+  // Is a given object a finite number?
+  _.isFinite = function(obj) {
+    return _.isNumber(obj) && isFinite(obj);
+  };
+
+  // Is the given value `NaN`?
+  _.isNaN = function(obj) {
+    // `NaN` is the only value for which `===` is not reflexive.
+    return obj !== obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
+
+  // Is a given value a date?
+  _.isDate = function(obj) {
+    return toString.call(obj) == '[object Date]';
+  };
+
+  // Is the given value a regular expression?
+  _.isRegExp = function(obj) {
+    return toString.call(obj) == '[object RegExp]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Has own property?
+  _.has = function(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iterators.
+  _.identity = function(value) {
+    return value;
+  };
+
+  // Run a function **n** times.
+  _.times = function (n, iterator, context) {
+    for (var i = 0; i < n; i++) iterator.call(context, i);
+  };
+
+  // Escape a string for HTML interpolation.
+  _.escape = function(string) {
+    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
+  };
+
+  // If the value of the named property is a function then invoke it;
+  // otherwise, return it.
+  _.result = function(object, property) {
+    if (object == null) return null;
+    var value = object[property];
+    return _.isFunction(value) ? value.call(object) : value;
+  };
+
+  // Add your own custom functions to the Underscore object, ensuring that
+  // they're correctly added to the OOP wrapper as well.
+  _.mixin = function(obj) {
+    each(_.functions(obj), function(name){
+      addToWrapper(name, _[name] = obj[name]);
+    });
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = idCounter++;
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /.^/;
+
+  // Certain characters need to be escaped so that they can be put into a
+  // string literal.
+  var escapes = {
+    '\\': '\\',
+    "'": "'",
+    'r': '\r',
+    'n': '\n',
+    't': '\t',
+    'u2028': '\u2028',
+    'u2029': '\u2029'
+  };
+
+  for (var p in escapes) escapes[escapes[p]] = p;
+  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+  var unescaper = /\\(\\|'|r|n|t|u2028|u2029)/g;
+
+  // Within an interpolation, evaluation, or escaping, remove HTML escaping
+  // that had been previously added.
+  var unescape = function(code) {
+    return code.replace(unescaper, function(match, escape) {
+      return escapes[escape];
+    });
+  };
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  _.template = function(text, data, settings) {
+    settings = _.defaults(settings || {}, _.templateSettings);
+
+    // Compile the template source, taking care to escape characters that
+    // cannot be included in a string literal and then unescape them in code
+    // blocks.
+    var source = "__p+='" + text
+      .replace(escaper, function(match) {
+        return '\\' + escapes[match];
+      })
+      .replace(settings.escape || noMatch, function(match, code) {
+        return "'+\n_.escape(" + unescape(code) + ")+\n'";
+      })
+      .replace(settings.interpolate || noMatch, function(match, code) {
+        return "'+\n(" + unescape(code) + ")+\n'";
+      })
+      .replace(settings.evaluate || noMatch, function(match, code) {
+        return "';\n" + unescape(code) + "\n;__p+='";
+      }) + "';\n";
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __p='';" +
+      "var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n" +
+      source + "return __p;\n";
+
+    var render = new Function(settings.variable || 'obj', '_', source);
+    if (data) return render(data, _);
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+
+    // Provide the compiled function source as a convenience for build time
+    // precompilation.
+    template.source = 'function(' + (settings.variable || 'obj') + '){\n' +
+      source + '}';
+
+    return template;
+  };
+
+  // Add a "chain" function, which will delegate to the wrapper.
+  _.chain = function(obj) {
+    return _(obj).chain();
+  };
+
+  // The OOP Wrapper
+  // ---------------
+
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+  var wrapper = function(obj) { this._wrapped = obj; };
+
+  // Expose `wrapper.prototype` as `_.prototype`
+  _.prototype = wrapper.prototype;
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(obj, chain) {
+    return chain ? _(obj).chain() : obj;
+  };
+
+  // A method to easily add functions to the OOP wrapper.
+  var addToWrapper = function(name, func) {
+    wrapper.prototype[name] = function() {
+      var args = slice.call(arguments);
+      unshift.call(args, this._wrapped);
+      return result(func.apply(_, args), this._chain);
+    };
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    wrapper.prototype[name] = function() {
+      var wrapped = this._wrapped;
+      method.apply(wrapped, arguments);
+      var length = wrapped.length;
+      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
+      return result(wrapped, this._chain);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    wrapper.prototype[name] = function() {
+      return result(method.apply(this._wrapped, arguments), this._chain);
+    };
+  });
+
+  // Start chaining a wrapped Underscore object.
+  wrapper.prototype.chain = function() {
+    this._chain = true;
+    return this;
+  };
+
+  // Extracts the result from a wrapped and chained object.
+  wrapper.prototype.value = function() {
+    return this._wrapped;
+  };
+
+}).call(this);

From 61760a523b3e81e6bcbcd0bce699ef235cf8b477 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 13:48:40 -0400
Subject: [PATCH 37/73] Added code to create, edit, and assign achievements to
 students

---
 conf/database.conf.dist                 |  28 +++
 conf/global.conf.dist                   | 170 +++++++++--------
 lib/WeBWorK/Constants.pm                |  12 +-
 lib/WeBWorK/ContentGenerator.pm         |  68 ++++---
 lib/WeBWorK/ContentGenerator/Problem.pm | 237 +++++++++++-------------
 lib/WeBWorK/DB.pm                       | 230 +++++++++++++++++++++++
 lib/WeBWorK/DB/Schema/NewSQL.pm         |   6 +
 lib/WeBWorK/URLPath.pm                  | 142 ++++++--------
 lib/WeBWorK/Utils.pm                    |  32 +++-
 9 files changed, 595 insertions(+), 330 deletions(-)

diff --git a/conf/database.conf.dist b/conf/database.conf.dist
index 5a4d19a95c..141095fb46 100644
--- a/conf/database.conf.dist
+++ b/conf/database.conf.dist
@@ -279,6 +279,34 @@ $dbLayouts{sql_single} = {
 			tableOverride => "${courseName}_setting"
 		},
 	},
+   	achievement => {
+		record => "WeBWorK::DB::Record::Achievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_achievement"
+		},
+	},
+	achievement_user => {
+		record => "WeBWorK::DB::Record::UserAchievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_achievement_user"
+	 	},
+        },
+	global_user_achievement => {
+		record => "WeBWorK::DB::Record::GlobalUserAchievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_global_user_achievement"
+		},
+	},
+
 };
 
 
diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 4626b9be0c..5ef7400724 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -23,14 +23,27 @@
 # configuration file (webwork.apache-config) and is available for use here. In
 # addition, the $courseName variable holds the name of the current course.
 
+################################################################################
+# Seed variables
 ################################################################################
 
-include("conf/prelocal.conf");
+# Set these variables to correspond to your configuration and preferences. You
+# will need to restart the webserver to reset the variables in this section.
+
+# URL of WeBWorK handler. If WeBWorK is to be on the web server root, use "". Note 
+# that using "" may not work so we suggest sticking with "/webwork2".
+$webwork_url         = "/webwork2";
+
+
+$server_root_url   = "";  # e.g.  http://webwork.yourschool.edu
+$server_userID     = "";  # e.g.  www-data    
+$server_groupID    = "";  # e.g.  wwdata
+
+
+# In the apache configuration file (often called httpd.conf) you will find
+# User wwadmin   --- this is the $server_userID -- of course it may be wwhttpd or some other name
+# Group wwdata   --- this is the $server_groupID -- this will have different names also
 
-################################################################################
-# prelocal.conf  should contain basic information about 
-# certain directories on your server
-################################################################################
 # Root directory of PG.
 $pg_dir              = "/opt/webwork/pg";
 
@@ -43,6 +56,47 @@ $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
 
+################################################################################
+# Paths to external programs 
+################################################################################
+
+# system utilities
+$externalPrograms{mv}    = "/bin/mv";
+$externalPrograms{cp}    = "/bin/cp";
+$externalPrograms{rm}    = "/bin/rm";
+$externalPrograms{mkdir} = "/bin/mkdir";
+$externalPrograms{tar}   = "/bin/tar";
+$externalPrograms{gzip}  = "/bin/gzip";
+
+# equation rendering/hardcopy utiltiies
+$externalPrograms{latex}    = "/usr/bin/latex";
+$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
+$externalPrograms{dvipng}   = "/usr/bin/dvipng";
+$externalPrograms{tth}      = "/usr/bin/tth";
+
+####################################################
+# NetPBM - basic image manipulation utilities
+# Most sites only need to configure $netpbm_prefix.
+####################################################
+my $netpbm_prefix = "/usr/bin";
+$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
+$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
+$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
+$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
+$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
+
+# url checker
+$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
+
+# image conversions utiltiies
+# the source file is given on stdin, and the output expected on stdout.
+$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
+
+# mysql clients
+$externalPrograms{mysql}     = "/usr/bin/mysql";
+$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
 
 ################################################################################
 # Mail settings
@@ -124,11 +178,6 @@ $mail{editor_window_columns} = 100;
 # Customizing the action of the "Email your instructor" button
 ###################################################
 
-# This is best done by copying the lines below, entering them
-# in the postlocal.conf file and making the desired modifications. 
-# Then you will not need to update these modifications
-# when you download a new version of WeBWorK.
-
 # Use this to customize the text of the feedback button.
 $feedback_button_name = "Email instructor";
 
@@ -158,6 +207,12 @@ $courseURLs{feedbackFormURL} = "";
 $defaultTheme = "math2";
 $defaultThemeTemplate = "system";
 
+################################################################################
+# Achievements
+################################################################################
+$achevementsEnabled = 0;
+$achievementPointsPerProblem = 5;
+
 ################################################################################
 # Language
 ################################################################################
@@ -213,9 +268,7 @@ $webworkURLs{root}          = "$webwork_url";
 $webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs";
 $webworkURLs{htdocs}        = "$webwork_htdocs_url";
 
-
 # Location of web-accessible temporary files, such as equation images.
-# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
 $webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
 $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 
@@ -275,8 +328,8 @@ $courseDirs{html_images} = "$courseDirs{html}/images";
 
 # Location of web-accessible, course-specific temporary files, like static and
 # dynamically-generated PG graphics.
-$courseDirs{html_temp}   =  "$courseDirs{html}/tmp";
-$courseURLs{html_temp}   =  "$courseURLs{html}/tmp";
+$courseDirs{html_temp}   = "$courseDirs{html}/tmp";
+$courseURLs{html_temp}   = "$courseURLs{html}/tmp";
 
 # Location of course-specific logs, like the transaction log.
 $courseDirs{logs}        = "$courseDirs{root}/logs";
@@ -287,6 +340,10 @@ $courseDirs{scoring}     = "$courseDirs{root}/scoring";
 # Location of PG templates and set definition files.
 $courseDirs{templates}   = "$courseDirs{root}/templates";
 
+# Location of course achievement files.
+$courseDirs{achievements}   = "$courseDirs{templates}/achievements";
+$courseURLs{achievements}   = "$courseURLs{html}/achievements";
+
 # Location of course-specific macro files.
 $courseDirs{macros}      = "$courseDirs{templates}/macros";
 
@@ -451,18 +508,20 @@ $default_status = "Enrolled";
 # GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
 # GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-################################################################################
-# set these variables in prelocal.conf
-#
-# $database_dsn = "dbi:mysql:webwork";
-# $database_username = "webworkWrite";
-# #$database_password = ""; #set this in prelocal.conf
-################################################################################
+$database_dsn = "dbi:mysql:webwork";
+$database_username = "webworkWrite";
+$database_password = "";
+$database_debug = 0;
 
-# $database_debug = 0;
+# Variables for sql_moodle database layout.
+$moodle_dsn = "dbi:mysql:moodle";
+$moodle_username = $database_username;
+$moodle_password = $database_password;
+$moodle_table_prefix = "mdl_";
+$moodle17 = 0;
 
-# Database schemas are defined in the file conf/database.conf and stored in the
-# hash %dbLayouts. The standard schema is called "sql_single";
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
 include "conf/database.conf";
 
 # Select the default database layout. This can be overridden in the course.conf
@@ -498,6 +557,8 @@ $problemLibrary_db = {
 # Logs
 ################################################################################
 
+# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
+# top-level hash.
 
 # Logs data about how long it takes to process problems. (Do not confuse this
 # with the /other/ timing log which can be set by WeBWorK::Timing and is used
@@ -525,7 +586,7 @@ $courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
 $courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Site defaults (Usually overridden in postlocal.conf)
+# Site defaults (FIXME: what other things could be "site defaults"?)
 ################################################################################
 
 # Set the default timezone of courses on this server. To get a list of valid
@@ -565,7 +626,7 @@ $siteDefaults{default_templates_course} ="modelCourse";
 # current database layout is found.
 # 
 $authen{user_module} = {
-	# sql_moodle => "WeBWorK::Authen::Moodle",
+	sql_moodle => "WeBWorK::Authen::Moodle",
 	# sql_ldap   => "WeBWorK::Authen::LDAP",
 	"*" => "WeBWorK::Authen",
 };
@@ -576,12 +637,15 @@ $authen{user_module} = {
 # 
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-################################################################################
 # Options for particular authentication modules
-################################################################################
 
-# If you are using ldap this next snippet should be copied and entered into postlocal.conf.
-# Make modifications there so that it works with your local LDAP protocol
+# $authen{moodle_options} = {
+# 	dsn => $moodle_dsn,
+# 	username => $moodle_username,
+# 	password => $moodle_password,
+# 	table_prefix => $moodle_table_prefix,
+# 	moodle17 => $moodle17,
+# };
 
 $authen{ldap_options} = {
 	# hosts to attempt to connect to, in order. For example:
@@ -632,7 +696,7 @@ $authen{ldap_options} = {
 };
 
 ################################################################################
-# Authorization system (Make local overrides in postlocal.conf )
+# Authorization system
 ################################################################################
 
 # this section lets you define which groups of users can perform which actions.
@@ -649,7 +713,6 @@ $authen{ldap_options} = {
 	grade_proctor => 3,
 	ta => 5,
 	professor => 10,
-	admin     => 20,
 );
 
 # this hash maps operations to the roles that are allowed to perform those
@@ -691,6 +754,8 @@ $authen{ldap_options} = {
 	modify_problem_template_files  => "professor",
 	manage_course_files            => "professor",
 	
+        edit_achievements              => "professor",
+
 	create_and_delete_courses      => "professor",
 	fix_course_databases           => "professor",
 	
@@ -1029,44 +1094,3 @@ $webworkRoot    = $webworkDirs{root};
 $webworkURLRoot = $webworkURLs{root};
 $pgRoot         = $pg{directories}{root};
 
-################################################################################
-# Temporary hack for displaying the different versions of the editors
-################################################################################
-# These behaviors can be overridden in postlocal.conf
-# These configurations can be placed in CourseConfig to tune the behavior for individual courses
-%showeditors = (
-	classlisteditor1   => 1,
-	classlisteditor2   => 0,
-	
-	homeworkseteditor1 => 1,
-	homeworkseteditor2 => 0,
-	
-	librarybrowser1    => 1,
-	librarybrowser2    => 0,
-	librarybrowser3    => 1,
-	
-	pgproblemeditor1   => 1,
-	pgproblemeditor2   => 0,
-);
-
-################################################################################
-# Webservices
-################################################################################
-$webservices = {
-	enableCourseActions => 0, # enable createCourse, addUser, dropUser
-	enableCourseActionsLog => 0,# enable logging of course actions
-								# will log when courses are created and 
-								# when students are added or dropped
-	courseActionsLogfile => "$webworkDirs{logs}/courseactions.log",
-	# enable this to assign all visible homework sets to new students
-	# added by webservices
-	courseActionsAssignHomework => 0, 
-};
-
-################################################################################
-# Site wide overrides are entered into the file postlocal.conf
-################################################################################
-
-include("conf/postlocal.conf");
-
-1; #final line of the file to reassure perl that it was read properly.
diff --git a/lib/WeBWorK/Constants.pm b/lib/WeBWorK/Constants.pm
index 31a64e2d31..7fe8002b14 100644
--- a/lib/WeBWorK/Constants.pm
+++ b/lib/WeBWorK/Constants.pm
@@ -134,7 +134,7 @@ $WeBWorK::ContentGenerator::Instructor::Config::ConfigValues = [
 		  type => 'text'},
 		{ var => 'defaultTheme',
 		  doc => 'Theme (refresh page after saving changes to reveal new theme.)',
-		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, math3 union.  The theme
+		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, and dgage.  The theme
 specifies a unified look and feel for the WeBWorK course web pages.',
 		  values => [qw(math math2 math3 ur dgage  union)],
 		  type => 'popuplist'},
@@ -150,7 +150,15 @@ specifies a unified look and feel for the WeBWorK course web pages.',
 		{ var => 'siteDefaults{timezone}',
 		  doc => 'Timezone for the course',
 		  doc2 => 'Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as "America/New_York","America/Chicago", "America/Denver", "America/Phoenix" or "America/Los_Angeles". Complete list: <a href="http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones">TimeZoneFiles</a>',
-		  type => 'text'},],
+		  type => 'text'},
+    		{ var => 'achievementsEnabled',
+		  doc => 'Enable Course Achievements',
+		  doc2 => 'Activiating this will enable Mathchievements for webwork.  Mathchievements can be managed by using the Achievement Editor link.',
+		  type => 'boolean'},                
+                { var => 'achievementPointsPerProblem',
+                  doc => 'Achievement Points Per Problem',
+                  doc2 => 'This is the number of achievement points given to each user for completing a problem.',
+                  type => 'number'},],
 	['Permissions',
 		{ var => 'permissionLevels{login}',
 		  doc => 'Allowed to login to the course',
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index d425e7c91b..c94167fe6d 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator.pm,v 1.196 2009/06/04 01:33:15 gage Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -560,9 +560,12 @@ sub links {
 	my $eUserID   = $r->param("effectiveUser");
 	my $setID     = $urlpath->arg("setID");
 	my $problemID = $urlpath->arg("problemID");
-	
+	my $achievementID = $urlpath->arg("achievementID");
+
 	my $prettySetID = $setID;
+	my $prettyAchievementID = $achievementID;
 	$prettySetID =~ s/_/ /g if defined $prettySetID;
+	$prettyAchievementID =~ s/_/ /g if defined $prettyAchievementID;
 	
 	# it's possible that the setID and the problemID are invalid, since they're just taken from the URL path info
 	if ($authen->was_verified) {
@@ -699,6 +702,10 @@ sub links {
 			
 			print CGI::li(&$makelink("${pfx}Grades", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 			
+			if ($ce->{achievementsEnabled}) {
+			    print CGI::li(&$makelink("${pfx}Achievements", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)); 
+			}
+
 			if ($authz->hasPermissions($userID, "access_instructor_tools")) {
 				$pfx .= "Instructor::";
 				
@@ -706,18 +713,10 @@ sub links {
 				print &$makelink("${pfx}Index", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				print CGI::start_ul();
 				
-				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{classlisteditor1};
-				print CGI::li(&$makelink("${pfx}UserList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{classlisteditor2};;
+				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				
 				print CGI::start_li(); # Homework Set Editor
-				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
-					if $ce->{showeditors}->{homeworkseteditor1};
-				print "<br/>";
-				print &$makelink("${pfx}ProblemSetList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
-					if $ce->{showeditors}->{homeworkseteditor2};;
-				
+				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				## only show editor link for non-versioned sets
 				if (defined $setID && $setID !~ /,v\d+$/ ) {
 					print CGI::start_ul();
@@ -726,14 +725,7 @@ sub links {
 					
 					if (defined $problemID) {
 						print CGI::start_ul();
-						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"))
-							if $ce->{showeditors}->{pgproblemeditor1};
-						print CGI::end_ul();
-					}
-					if (defined $problemID) {
-						print CGI::start_ul();
-						print CGI::li(&$makelink("${pfx}PGProblemEditor2", text=>"--$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor2"))
-							if $ce->{showeditors}->{pgproblemeditor2};;
+						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"));
 						print CGI::end_ul();
 					}
 					
@@ -742,12 +734,8 @@ sub links {
 				}
 				print CGI::end_li(); # end Homework Set Editor
 				
-				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser1};
-				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser2};
-				print CGI::li(&$makelink("${pfx}SetMaker3", text=>$r->maketext("Library Browser 3"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser3};
+				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				print CGI::start_li(); # Stats
 				print &$makelink("${pfx}Stats", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				if ($userID ne $eUserID or defined $setID) {
@@ -788,6 +776,18 @@ sub links {
 					print CGI::li(&$makelink("${pfx}Scoring", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				}
 				
+				#Show achievement editor for instructors
+				if ($ce->{achievementsEnabled} && $authz->hasPermissions($userID, "edit_achievements")) {
+				    print CGI::li(&$makelink("${pfx}AchievementList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				    if (defined $achievementID ) {
+					print CGI::start_ul();
+					print CGI::start_li(); # $achievementID
+					print &$makelink("${pfx}AchievementEditor", text=>"$prettyAchievementID", urlpath_args=>{%args,achievementID=>$achievementID}, systemlink_args=>\%systemlink_args);
+					print CGI::end_ul();
+				    }
+				    
+				}
+
 				if ($authz->hasPermissions($userID, "send_mail")) {
 					print CGI::li(&$makelink("${pfx}SendMail", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				}
@@ -1067,7 +1067,7 @@ The implementation in this package checks for a note in the request named
 sub warnings {
 	my ($self) = @_;
 	my $r = $self->r;
-	print CGI::p("Entering ContentGenerator::warnings");
+	
 	print "\n<!-- BEGIN " . __PACKAGE__ . "::warnings -->\n";
 	my $warnings = MP2 ? $r->notes->get("warnings") : $r->notes("warnings");
 	print $self->warningOutput($warnings) if $warnings;
@@ -1245,10 +1245,8 @@ handled.
 sub if_warnings {
 	my ($self, $arg) = @_;
 	my $r = $self->r;
-
-	if ( (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) 
-	     or ($self->{pgerrors}) )  
-	{
+	
+	if (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) {
 		return $arg;
 	} else {
 		!$arg;
@@ -1626,9 +1624,7 @@ sub hidden_fields {
 # 		$html .= CGI::hidden($param, @values);  #MEG
 # 		 warn "$param ", join(" ", @values) if @values >1; #this should never happen!!!
 		my $value  = $r->param($param);
-#		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
-		$html .= CGI::hidden(-name=>$param, -default=>$value, -id=>"hidden_".$param); # (can't name these items when using real CGI) 
-
+		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
 	}
 	return $html;
 }
@@ -1949,7 +1945,7 @@ problem rendering.
 sub errorOutput($$$) {
 	my ($self, $error, $details) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::errorOutput subroutine</br>";
+	
 	my $time = time2str("%a %b %d %H:%M:%S %Y", time);
 	my $method = $r->method;
 	my $uri = $r->uri;
@@ -2007,7 +2003,7 @@ and content generation.
 sub warningOutput($$) {
 	my ($self, $warnings) = @_;
 	my $r = $self->{r};
-	print "Entering ContentGenerator::warningOutput subroutine</br>";
+	
 	my @warnings = split m/\n+/, $warnings;
 	foreach my $warning (@warnings) {
 		#$warning = escapeHTML($warning);  # this would prevent using tables in output from answer evaluators
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index ec8046e579..434bba50f6 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -41,6 +41,7 @@ use WeBWorK::DB::Utils qw(global2user user2global);
 use URI::Escape;
 use WeBWorK::Localize;
 use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+use WeBWorK::AchievementEvaluator;
 
 ################################################################################
 # CGI param interface to this module (up-to-date as of v1.153)
@@ -261,9 +262,9 @@ sub attemptResults {
 		$answerMessage =~ s/\n/<BR>/g;
 		$numCorrect += $answerScore >= 1;
 		$numBlanks++ unless $studentAnswer =~/\S/ || $answerScore >= 1;   # unless student answer contains entry
-		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("Correct")) :
+		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("correct")) :
 		                   $answerScore > 0  ? $r->maketext("[_1]% correct", int($answerScore*100)) :
-                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("Incorrect"));
+                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("incorrect"));
 		$fully = $r->maketext("completely") if $answerScore >0 and $answerScore < 1;
 		
 		push @correct_ids,   $name if $answerScore == 1;
@@ -600,7 +601,7 @@ sub pre_header_initialize {
 			$problem->problem_seed($problemSeed);
 		}
 
-		my $visiblityStateClass = ($set->visible) ? $r->maketext("Visible") : $r->maketext("Hidden");
+		my $visiblityStateClass = ($set->visible) ? $r->maketext("visible") : $r->maketext("hidden");
 		my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
 		$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::font({class=>$visiblityStateClass}, $visiblityStateText))));
 
@@ -722,19 +723,6 @@ sub pre_header_initialize {
 			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
 		},
 	);
-	# sometimes, for example if the file can't be read, $pg->{pgcore} won't be defined
-	# because the PG file is never run
-	#
-	if (defined ($pg->{pgcore}) ) {
-		my $debug_msg = CGI::br().join( CGI::br(), @{ $pg->{pgcore}->get_debug_messages});
-		$self->addmessage($debug_msg ) if $debug_msg;
-		$self->{pgdebug}          = $pg->{pgcore}->get_debug_messages;
-		$self->{pgwarning}        = $pg->{pgcore}->get_warning_messages;
-		$self->{pginternalerrors} = $pg->{pgcore}->get_internal_debug_messages ;
-		$self->{pgerrors} = @{$self->{pgdebug}} || @{$self->{pgwarning}} || @{$self->{pginternalerrors}}||0;
-	} else {
-		$self->{pgerrors}=undef;  # unable to obtain errors
-	}
 
 	debug("end pg processing");
 	
@@ -752,51 +740,36 @@ sub pre_header_initialize {
 	$self->{will} = \%will;
 	$self->{pg} = $pg;
 }
-sub warnings {
-	my $self = shift;
-	# print "entering warnings() subroutine internal messages = ", $self->{pgerrors},CGI::br();
- 	my $r  = $self->r;
-# 	my $pg = $self->{pg};
-# 	warn "type of pg is ",ref($pg);
-#  	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
-    # print warning messages
-    if (not defined $self->{pgerrors} ) {
-    	print CGI::start_div();
-		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question failed to render"));
-		print CGI::p($r->maketext("Unable to obtain error messages from within the PG question." ));
-		print CGI::end_div();
-    } elsif ( $self->{pgerrors} > 0 ) {
-        my @pgdebug          = @{ $self->{pgdebug}           };
- 		my @pgwarning        = @{ $self->{pgwarning}         };
- 		my @pginternalerrors = @{ $self->{pginternalerrors}  };
-		print CGI::start_div();
-		print CGI::h3({style=>"color:red;"}, $r->maketext("PG question processing error messages"));
-		print CGI::p(CGI::h3($r->maketext("PG debug messages" ) ),   CGI::br(), join(CGI::br(), @pgdebug  )  )  if @pgdebug   ;
-		print CGI::p(CGI::h3($r->maketext("PG warning messages" ) ), CGI::br(), join(CGI::br(), @pgwarning)  )  if @pgwarning ;	
-		print CGI::p(CGI::h3($r->maketext("PG internal errors" ) ),  CGI::br(), join(CGI::br(), @pginternalerrors )) if @pginternalerrors;
-		print CGI::end_div();
-	} 
-	# print "proceeding to SUPER::warnings";
-	$self->SUPER::warnings();
-	"";
-}
 
-### #FIXME  not clear this is ever used
-# sub if_errors($$) {
-# 	my ($self, $arg) = @_;
-# 	
-# 	if ($self->{isOpen}) {
-# 		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
-# 	} else {
-# 		return !$arg;
-# 	}
-# }
+sub if_errors($$) {
+	my ($self, $arg) = @_;
+	
+	if ($self->{isOpen}) {
+		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
+	} else {
+		return !$arg;
+	}
+}
 
 sub head {
 	my ($self) = @_;
+	my $ce = $self->r->ce;
 
 	return "" if ( $self->{invalidSet} );
+
+	#If we are using achievements then print the achievement css file
+	if ($ce->{achievementsEnabled}) {
+	    print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$ce->{webworkURLs}->{htdocs}/css/achievements.css\"/>";	
+	}
+
 	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
+
+}
+
+sub post_header_text {
+	my ($self) = @_;
+	return "" if ( $self->{invalidSet} );
+    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
 }
 
 sub options {
@@ -933,7 +906,7 @@ sub body {
 	my $set = $self->{set};
 	my $problem = $self->{problem};
 	my $pg = $self->{pg};
-	print CGI::p("Entering Problem::body subroutine.  This indicates an older style system.template file -- consider upgrading. ");
+	
 	my $valid = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::check_invalid($self);
 	unless($valid eq "valid"){
 		return $valid;
@@ -1025,10 +998,10 @@ sub output_message{
 sub output_editorLink{
 	
 	my $self = shift;
-	
-	my $set = $self->{set};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
+
+	my $set             = $self->{set};
+	my $problem         = $self->{problem};
+	my $pg              = $self->{pg};
 	
 	my $r = $self->r;
 	
@@ -1057,13 +1030,10 @@ sub output_editorLink{
 
 	if ($pg->{flags}->{error_flag}) {
 		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
-		    print "Call errorOutput</br>";
 			print $self->errorOutput($pg->{errors}, $pg->{body_text});
-			print $editorLink;
 		} else {
 			print $self->errorOutput($pg->{errors}, $r->maketext("You do not have permission to view the details of this error."));
 		}
-		
 		print "";
 	}
 	else{
@@ -1098,10 +1068,10 @@ sub output_checkboxes{
 				-name    => "showCorrectAnswers",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	if ($can{showHints}) {
-		print CGI::div({style=>"color:red"},
+		print CGI::span({style=>"color:red"},
 			WeBWorK::CGI_labeled_input(
 				-type	 => "checkbox",
 				-id		 => "showHints_id",
@@ -1114,11 +1084,11 @@ sub output_checkboxes{
 				}
 				:
 				{
-					-name    => "showCorrectAnswers",
+					-name    => "showHints",
 					-value   => 1,
 				}
 			)
-		);
+		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {
 		print WeBWorK::CGI_labeled_input(
@@ -1133,10 +1103,10 @@ sub output_checkboxes{
 			}
 			:
 			{
-				-name    => "showCorrectAnswers",
+				-name    => "showSolutions",
 				-value   => 1,
 			}
-		);
+		),"&nbsp;";
 	}
 	
 	if ($can{showCorrectAnswers} or $can{showHints} or $can{showSolutions}) {
@@ -1166,7 +1136,7 @@ sub output_submit_buttons{
 		if ($user ne $effectiveUser) {
 			# if acting as a student, make it clear that answer submissions will
 			# apply to the student's records, not the professor's.
-			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
+			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>$r->maketext("submitAnswers"), -value=>$r->maketext("Submit Answers for [_1]", $effectiveUser)});
 		} else {
 			#print CGI::submit(-name=>"submitAnswers", -label=>"Submit Answers", -onclick=>"alert('submit button clicked')");
 			print WeBWorK::CGI_labeled_input(-type=>"submit", -id=>"submitAnswers_id", -input_attr=>{-name=>"submitAnswers", -value=>$r->maketext("Submit Answers"), -onclick=>""});
@@ -1185,32 +1155,22 @@ sub output_submit_buttons{
 sub output_score_summary{
 	my $self = shift;
 	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
 	my $problem = $self->{problem};
 	my $set = $self->{set};
 	my $pg = $self->{pg};
-	my $scoreRecordedMessage = "";
-	if  (defined $self->{scoreRecordedMessage}) {
-		$scoreRecordedMessage = $self->{scoreRecordedMessage};
-	} else {
-		$scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
-	}
+	my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
 	my $submitAnswers = $self->{submitAnswers};
-	
+
 	# score summary
+	warn "num_correct =", $problem->num_correct,"num_incorrect=",$problem->num_incorrect 
+	        unless defined($problem->num_correct) and defined($problem->num_incorrect) ;
 	my $attempts = $problem->num_correct + $problem->num_incorrect;
 	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
 	my $problem_status    = $problem->status || 0;
 	my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
-	#my ($attemptsLeft, $attemptsLeftNoun);
 	my $attemptsLeft = $problem->max_attempts - $attempts;
-#	if ($problem->max_attempts == -1) {
-#		# unlimited attempts
-#		$attemptsLeft = $r->maketext("unlimited");
-#		$attemptsLeftNoun = $r->maketext("attempts");
-#	} else {
-#		$attemptsLeft = $problem->max_attempts - $attempts;
-#		$attemptsLeftNoun = $attemptsLeft == 1 ? $r->maketext("attempt") : $r->maketext("attempts");
-#	}
 	
 	my $setClosed = 0;
 	my $setClosedMessage;
@@ -1231,6 +1191,7 @@ sub output_score_summary{
 	#		$setClosedMessage .= " Additional attempts will not be recorded.";
 	#	}
 	#}
+
 	unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
 		my $notCountedMessage = ($problem->value) ? "" : $r->maketext("(This problem will not count towards your grade.)");
 		print CGI::p(join("",
@@ -1240,7 +1201,6 @@ sub output_score_summary{
 			$problem->attempted
 				? $r->maketext("Your overall recorded score is [_1].  [_2]",$lastScore,$notCountedMessage) . CGI::br()
 				: "",
-#			$setClosed ? $setClosedMessage : $r->maketext("You have [_1] [_2] remaining.",$attemptsLeft,$attemptsLeftNoun) 
 			$setClosed ? $setClosedMessage : $r->maketext("You have [negquant,_1,unlimited attempts,attempt,attempts] remaining.",$attemptsLeft) 
 		));
 	}else {
@@ -1264,6 +1224,18 @@ sub output_misc{
 	my %will = %{ $self->{will} };
 	my $user = $r->param('user');
 
+	print CGI::start_div();
+	
+	my $pgdebug = join(CGI::br(), @{$pg->{pgcore}->{flags}->{DEBUG_messages}} );
+	my $pgwarning = join(CGI::br(), @{$pg->{pgcore}->{flags}->{WARNING_messages}} );
+	my $pginternalerrors = join(CGI::br(),  @{$pg->{pgcore}->get_internal_debug_messages}   );
+	my $pgerrordiv = $pgdebug||$pgwarning||$pginternalerrors;  # is 1 if any of these are non-empty
+	
+	print CGI::p({style=>"color:red;"}, $r->maketext("Checking additional error messages")) if $pgerrordiv  ;
+ 	print CGI::p("pg debug<br/> $pgdebug"                   ) if $pgdebug ;
+	print CGI::p("pg warning<br/>$pgwarning"                ) if $pgwarning ;	
+	print CGI::p("pg internal errors<br/> $pginternalerrors") if $pginternalerrors;
+	print CGI::end_div()                                      if $pgerrordiv ;
 	
 	# save state for viewOptions
 	print  CGI::hidden(
@@ -1300,8 +1272,7 @@ sub output_misc{
 
 # output_summary subroutine
 
-# prints out the feedback on the questions that the student has answered for 	
-# the current problem, along with available information about correctness
+# prints out the summary of the questions that the student has answered for the current problem, along with available information about correctness
 
 sub output_summary{
 	
@@ -1316,7 +1287,9 @@ sub output_summary{
 	my $previewAnswers = $self->{previewAnswers};
 	
 	my $r = $self->r;
-	
+	my $ce = $r->ce;
+	my $db = $r->db;
+
 	my $authz = $r->authz;
 	my $user = $r->param('user');
 	
@@ -1324,12 +1297,20 @@ sub output_summary{
 	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
 	# until after the due date
 	# do I need to check $will{showCorrectAnswers} to make preflight work??
-	if (defined($pg->{flags}->{showPartialCorrectAnswers}) and ($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
-		# print this if user submitted answers OR requested correct answers
-		
-		print $self->attemptResults($pg, 1,
+	if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
+		# print this if user submitted answers OR requested correct answers	    
+	    my $results = $self->attemptResults($pg, 1,
 			$will{showCorrectAnswers},
 			$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
+
+           #If achievements enabled check to see if there are new ones.and print them
+	    if ($ce->{achievementsEnabled}) {
+		my $achievementMessage = WeBWorK::AchievementEvaluator::checkForAchievements($problem, $pg, $db, $ce);
+		print $achievementMessage;
+	    }
+
+	    print $results;
+
 	} elsif ($checkAnswers) {
 		# print this if user previewed answers
 		print CGI::div({class=>'ResultsWithError'},$r->maketext("ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED")), CGI::br();
@@ -1365,7 +1346,7 @@ sub output_custom_edit_message{
 	# custom message for editor
 	if ($authz->hasPermissions($user, "modify_problem_sets") and defined $editMode) {
 		if ($editMode eq "temporaryFile") {
-			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file"), $problem->source_file));
+			print CGI::p(CGI::div({class=>'temporaryFile'}, $r->maketext("Viewing temporary file: "), $problem->source_file));
 		} elsif ($editMode eq "savedFile") {
 			# taken care of in the initialization phase
 		}
@@ -1374,6 +1355,9 @@ sub output_custom_edit_message{
 	return "";
 }
 
+
+
+
 # output_past_answer_button
 
 # prints out the "Show Past Answers" button
@@ -1443,11 +1427,14 @@ sub output_email_instructor{
 sub output_hidden_info{
 	my $self = shift;
 	my $previewAnswers = $self->{previewAnswers};
-	
-	if($previewAnswers){
+	my $checkAnswers   = $self->{checkAnswers};
+	my $showPartialCorrectAnswers = $self->{pg}->{flags}->{showPartialCorrectAnswers};
+	if($previewAnswers){  # never color previewed answers 
 		return "";
 	}
-	else{
+	elsif (   ($checkAnswers  ) 
+	         or $showPartialCorrectAnswers )    { # color answers when partialCorrectAnswers is set
+	                                              # or when checkAnswers is submitted 
 		if(defined $self->{correct_ids}){
 			my $correctRef = $self->{correct_ids};
 			my @correct = @$correctRef;
@@ -1463,39 +1450,13 @@ sub output_hidden_info{
 			}
 		}
 		return "";
+	} else {
+		return "";
 	}
 }
 
 # output_JS subroutine
 
-# outputs all of the Javascript needed for this page. The main javascript needed here is color.js, which colors input fields based on whether or not they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so that the colors will show up correctly.
-
-sub output_JS{
-	my $self = shift;
-	my $r = $self->r;
-	my $ce = $r->ce;
-
-	my $site_url = $ce->{webworkURLs}->{htdocs};
-	
-	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
-	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
-	
-	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
-	
-	return "";
-}
-
-# Simply here to indicate to the template that this page has body part methods which can be called
-
-sub can_body_parts{
-	return "";
-}
-
-# output_wztooltip_JS subroutine
-
 # prints out the wz_tooltip.js script for the current site.
 
 sub output_wztooltip_JS{
@@ -1510,18 +1471,34 @@ sub output_wztooltip_JS{
 	return "";
 }
 
-# output_removDupli_JS
-
-# outputs the removeDuplicates JS function
+# outputs all of the Javascript needed for this page. 
+# The main javascript needed here is color.js, which colors input fields based on whether or not 
+# they are correct when answers are submitted.  When a problem attempts results, it prints out hidden fields containing identification 
+# information for the fields that were correct and the fields that were incorrect.  color.js collects of the correct and incorrect fields into 
+# two arrays using the information gathered from the hidden fields, and then loops through and changes the styles so 
+# that the colors will show up correctly.
 
-sub output_removDupli_JS{
+sub output_JS{
 	my $self = shift;
 	my $r = $self->r;
 	my $ce = $r->ce;
 
 	my $site_url = $ce->{webworkURLs}->{htdocs};
 	
-	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/removeDuplicates.js"}), CGI::end_script();
+	# This file declares a function called addOnLoadEvent which allows multiple different scripts to add to a single onLoadEvent handler on a page.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/addOnLoadEvent.js"}), CGI::end_script();
+	
+	# This is a file which initializes the proper JAVA applets should they be needed for the current problem.
+	print CGI::start_script({type=>"tesxt/javascript", src=>"$site_url/js/java_init.js"}), CGI::end_script();
+	
+	# The color.js file, which uses javascript to color the input fields based on whether they are correct or incorrect.
+	print CGI::start_script({type=>"text/javascript", src=>"$site_url/js/color.js"}), CGI::end_script();
+	return "";
+}
+
+# Simply here to indicate to the template that this page has body part methods which can be called
+
+sub can_body_parts{
 	return "";
 }
 
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index ed899a2e81..205eba1aa7 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -534,6 +534,7 @@ sub deleteUser {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
 	$self->deleteUserSet($userID, undef);
 	$self->deletePassword($userID);
+	$self->deleteGlobalUserAchievement($userID);
 	$self->deletePermissionLevel($userID);
 	$self->deleteKey($userID);
 	return $self->{user}->delete($userID);
@@ -1120,6 +1121,235 @@ sub deleteGlobalSet {
 	return $self->{set}->delete($setID);
 }
 
+####################################################################
+## achievement functions
+###############################################################
+
+BEGIN {
+	*Achievement = gen_schema_accessor("achievement");
+	*newAchievement = gen_new("achievement");
+	*countAchievementsWhere = gen_count_where("achievement");
+	*existsAchievementWhere = gen_exists_where("achievement");
+	*listAchievementsWhere = gen_list_where("achievement");
+	*getAchievementsWhere = gen_get_records_where("achievement");
+}
+
+sub countAchievements { return scalar shift->listAchievements(@_) }
+
+sub listAchievements {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{achievement}->get_fields_where(["achievement_id"]);
+	} else {
+		return $self->{achievement}->count_where;
+	}
+}
+
+sub existsAchievement {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	return $self->{achievement}->exists($achievementID);
+}
+
+sub getAchievement {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	return ( $self->getAchievements($achievementID) )[0];
+}
+
+sub getAchievements {
+	my ($self, @achievementIDs) = shift->checkArgs(\@_, qw/achievement_id*/);
+	return $self->{achievement}->gets(map { [$_] } @achievementIDs);
+}
+
+sub addAchievement {
+	my ($self, $Achievement) = shift->checkArgs(\@_, qw/REC:achievement/);
+	
+	eval {
+
+		return $self->{achievement}->add($Achievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addAchievement: achievement exists (perhaps you meant to use putAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putAchievement {
+	my ($self, $Achievement) = shift->checkArgs(\@_, qw/REC:achievement/);
+	my $rows = $self->{achievement}->put($Achievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putAchievement: achievement not found (perhaps you meant to use addAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteAchievement {
+	# achievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $achievementID) = shift->checkArgs(\@_, "achievement_id$U");
+	$self->deleteUserAchievement(undef, $achievementID);
+	return $self->{achievement}->delete($achievementID);
+}
+
+####################################################################
+## global_user_achievement functions
+###############################################################
+
+BEGIN {
+	*GlobalUserAchievement = gen_schema_accessor("global_user_achievement");
+	*newGlobalUserAchievement = gen_new("global_user_achievement");
+	*countGlobalUserAchievementsWhere = gen_count_where("global_user_achievement");
+	*existsGlobalUserAchievementWhere = gen_exists_where("global_user_achievement");
+	*listGlobalUserAchievementsWhere = gen_list_where("global_user_achievement");
+	*getGlobalUserAchievementsWhere = gen_get_records_where("global_user_achievement");
+}
+
+sub countGlobalUserAchievements { return scalar shift->listGlobalUserAchievements(@_) }
+
+sub listGlobalUserAchievements {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{global_user_achievement}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{global_user_achievement}->count_where;
+	}
+}
+
+sub existsGlobalUserAchievement {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return $self->{global_user_achievement}->exists($userID);
+}
+
+sub getGlobalUserAchievement {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return ( $self->getGlobalUserAchievements($userID) )[0];
+}
+
+sub getGlobalUserAchievements {
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
+	return $self->{global_user_achievement}->gets(map { [$_] } @userIDs);
+}
+
+sub addGlobalUserAchievement {
+	my ($self, $globalUserAchievement) = shift->checkArgs(\@_, qw/REC:global_user_achievement/);
+	
+	eval {
+
+	    return $self->{global_user_achievement}->add($globalUserAchievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addGlobalUserAchievement: user achievement exists (perhaps you meant to use putGlobalUserAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putGlobalUserAchievement {
+	my ($self, $globalUserAchievement) = shift->checkArgs(\@_, qw/REC:global_user_achievement/);
+	my $rows = $self->{global_user_achievement}->put($globalUserAchievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putGlobalUserAchievement: user achievement not found (perhaps you meant to use addGlobalUserAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteGlobalUserAchievement {
+	# userAchievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID) = shift->checkArgs(\@_, "user_id$U");
+	return $self->{global_user_achievement}->delete($userID);
+}
+
+
+################################################################################
+# achievement_user functions
+################################################################################
+
+BEGIN {
+	*UserAchievement = gen_schema_accessor("achievement_user");
+	*newUserAchievement = gen_new("achievement_user");
+	*countUserAchievementsWhere = gen_count_where("achievement_user");
+	*existsUserAchievementWhere = gen_exists_where("achievement_user");
+	*listUserAchievementsWhere = gen_list_where("achievement_user");
+	*getUserAchievementsWhere = gen_get_records_where("achievement_user");
+}
+
+sub countAchievementUsers { return scalar shift->listAchievementUsers(@_) }
+
+sub listAchievementUsers {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	my $where = [achievement_id_eq => $achievementID];
+	if (wantarray) {
+		return map { @$_ } $self->{achievement_user}->get_fields_where(["user_id"], $where);
+	} else {
+		return $self->{achievement_user}->count_where($where);
+	}
+}
+
+sub countUserAchievements { return scalar shift->listUserAchievements(@_) }
+
+sub listUserAchievements {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	my $where = [user_id_eq => $userID];
+	if (wantarray) {
+		return map { @$_ } $self->{achievement_user}->get_fields_where(["achievement_id"], $where);
+	} else {
+		return $self->{achievement_user}->count_where($where);
+	}
+}
+
+sub existsUserAchievement {
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, qw/user_id achievement_id/);
+	return $self->{achievement_user}->exists($userID, $achievementID);
+}
+
+sub getUserAchievement {
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, qw/user_id achievement_id/);
+	return ( $self->getUserAchievements([$userID, $achievementID]) )[0];
+}
+
+sub getUserAchievements {
+	my ($self, @userAchievementIDs) = shift->checkArgsRefList(\@_, qw/user_id achievement_id/);
+	return $self->{achievement_user}->gets(@userAchievementIDs);
+}
+
+sub addUserAchievement {
+	my ($self, $UserAchievement) = shift->checkArgs(\@_, qw/REC:achievement_user/);
+	
+	croak "addUserAchievement: user ", $UserAchievement->user_id, " not found"
+		unless $self->{user}->exists($UserAchievement->user_id);
+	croak "addUserAchievement: achievement ", $UserAchievement->achievement_id, " not found"
+		unless $self->{achievement}->exists($UserAchievement->achievement_id);
+	
+	eval {
+		return $self->{achievement_user}->add($UserAchievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUserAchievement: user achievement exists (perhaps you meant to use putUserAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putUserAchievement {
+	my ($self, $UserAchievement) = shift->checkArgs(\@_, qw/REC:achievement_user/);
+	my $rows = $self->{achievement_user}->put($UserAchievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUserAchievement: user achievement not found (perhaps you meant to use addUserAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteUserAchievement {
+	# userID and achievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, "user_id$U", "achievement_id$U");
+	return $self->{achievement_user}->delete($userID, $achievementID);
+}
+
 ################################################################################
 # set_user functions
 ################################################################################
diff --git a/lib/WeBWorK/DB/Schema/NewSQL.pm b/lib/WeBWorK/DB/Schema/NewSQL.pm
index d6a53d9774..aafb1c684e 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL.pm
@@ -46,6 +46,12 @@ sub where_user_id_eq {
 	return {user_id=>$user_id};
 }
 
+# can be used for achievement_user
+sub where_achievement_id_eq {
+    my ($self, $flags, $achievement_id) = @_;
+    return {achievement_id=>$achievement_id};
+}
+
 # can be used for user,password,permission,key,set_user,problem_user
 sub where_user_id_like {
 	my ($self, $flags, $user_id) = @_;
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
index fb9f5ec787..b3a75f1807 100644
--- a/lib/WeBWorK/URLPath.pm
+++ b/lib/WeBWorK/URLPath.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/lib/WeBWorK/URLPath.pm,v 1.36 2008/04/29 19:27:34 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -46,7 +46,6 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  
  course_admin                        /admin/ -> logout, options, instructor_tools
  html2xml                            /html2xml/
- instructorXMLHandler     			     /instructorXMLHandler/
  set_list                            /$courseID/
  
  equation_display                    /$courseID/equation/
@@ -68,26 +67,16 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_user_detail              /$courseID/instructor/users/$userID/
  instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
  
- instructor_user_list2                /$courseID/instructor/users2/
- instructor_user_detail2              /$courseID/instructor/users2/$userID/ #not created yet
- instructor_sets_assigned_to_user2    /$courseID/instructor/users2/$userID/sets/ #not created yet
-
- 
  instructor_set_list                 /$courseID/instructor/sets/
  instructor_set_detail               /$courseID/instructor/sets/$setID/
  instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
  
- instructor_set_list2                 /$courseID/instructor/sets2/
- instructor_set_detail2               /$courseID/instructor/sets2/$setID/ #not created yet
- instructor_users_assigned_to_set2    /$courseID/instructor/sets2/$setID/users/ #not created yet
- 
  instructor_add_users                /$courseID/instructor/add_users/
  instructor_set_assigner             /$courseID/instructor/assigner/
  instructor_file_transfer            /$courseID/instructor/files/
  instructor_file_manager             /$courseID/instructor/file_manager/
  instructor_set_maker                /$courseID/instructor/setmaker/
  instructor_set_maker2               /$courseID/instructor/setmaker2/
- instructor_set_maker3               /$courseID/instructor/setmaker3/
  instructor_get_target_set_problems  /$courseID/instructor/GetTargetSetProblems/
  instructor_get_library_set_problems /$courseID/instructor/GetLibrarySetProblems/
  instructor_config                   /$courseID/instructor/config/
@@ -97,11 +86,6 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
  instructor_problem_editor_withset_withproblem
                                      /$courseID/instructor/pgProblemEditor/$setID/$problemID/
-                                     
- instructor_problem_editor2           /$courseID/instructor/pgProblemEditor2/
- instructor_problem_editor2_withset   /$courseID/instructor/pgProblemEditor2/$setID/
- instructor_problem_editor2_withset_withproblem
-                                     /$courseID/instructor/pgProblemEditor2/$setID/$problemID/
  
  instructor_scoring                  /$courseID/instructor/scoring/
  instructor_scoring_download         /$courseID/instructor/scoringDownload/
@@ -120,6 +104,11 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  problem_list                        /$courseID/$setID/
  problem_detail                      /$courseID/$setID/$problemID/
 
+ achievements                        /$courseID/achievements
+ instructor_achievement_list         /$courseID//instructor/achievement_list
+ instructor_achievement_editor       /$courseID/instructor/achievement_list/$achievementID/editor
+ instructor_achievement_user_editor  /$courseID/instructor/achievement_list/$achievementID/users
+
 =cut
 
 ################################################################################
@@ -130,7 +119,7 @@ our %pathTypes = (
 	root => {
 		name    => 'WeBWorK',
 		parent  => '',
-		kids    => [ qw/course_admin  html2xml instructorXMLHandler set_list / ],
+		kids    => [ qw/course_admin  html2xml set_list / ],
 		match   => qr|^/|,
 		capture => [ qw// ],
 		produce => '/',
@@ -156,19 +145,11 @@ our %pathTypes = (
 		produce => 'html2xml/',
 		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
 	},
-	instructorXMLHandler => {
-		name => 'instructorXMLHandler',
-		parent => 'root',
-		kids => [ qw// ],
-		match   => qr|^instructorXMLHandler/|,
-		capture => [ qw// ],
-		produce => 'instructorXMLHandler/',
-		display => 'WeBWorK::ContentGenerator::instructorXMLHandler',
-	},
+
 	set_list => {
 		name    => '$courseID',
 		parent  => 'root',
-		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz grades hardcopy
+		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz grades hardcopy achievements
 			logout options instructor_tools problem_list
 		/ ],
 		match   => qr|^([^/]+)/|,
@@ -233,6 +214,15 @@ our %pathTypes = (
 		produce => 'grades/',
 		display => 'WeBWorK::ContentGenerator::Grades',
 	},
+        achievements  => {
+	        name    => 'Achievements',
+                parent  => 'set_list',
+                kids    => [ qw// ],
+                match   => qr|^achievements/|,
+                capture => [ qw// ],
+                produce => 'achievements/',
+                display => 'WeBWorK::ContentGenerator::Achievements',
+        },
 	hardcopy => {
 		name    => 'Hardcopy Generator',
 		parent  => 'set_list',
@@ -293,12 +283,9 @@ our %pathTypes = (
 	instructor_tools => {
 		name    => 'Instructor Tools',
 		parent  => 'set_list',
-		kids    => [ qw/instructor_user_list instructor_user_list2 instructor_set_list instructor_set_list2 
-		    instructor_add_users
+		kids    => [ qw/instructor_user_list instructor_set_list instructor_add_users instructor_achievement_list
 			instructor_set_assigner instructor_file_manager
-			instructor_problem_editor instructor_problem_editor2 
-			instructor_set_maker instructor_set_maker2 instructor_set_maker3 
-			instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
+			instructor_problem_editor instructor_set_maker instructor_set_maker2 instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
 			instructor_config
 			instructor_scoring instructor_scoring_download instructor_mail_merge
 			instructor_answer_log instructor_preflight instructor_statistics
@@ -321,15 +308,6 @@ our %pathTypes = (
 		produce => 'users/',
 		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
 	},
-	instructor_user_list2 => {
-		name    => 'Classlist Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_user_detail/ ],
-		match   => qr|^users2/|,
-		capture => [ qw// ],
-		produce => 'users2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::UserList2',
-	},
 	instructor_user_detail => {
 		name    => 'Sets assigned to $userID',
 		parent  => 'instructor_user_list',
@@ -360,15 +338,6 @@ our %pathTypes = (
 		produce => 'sets/',
 		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
 	},
-	instructor_set_list2 => {
-		name    => 'Hmwk Sets Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_set_detail/ ],
-		match   => qr|^sets2/|,
-		capture => [ qw// ],
-		produce => 'sets2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList2',
-	},
 	instructor_set_detail => {
 		name    => 'Set Detail for set $setID',
 		parent  => 'instructor_set_list',
@@ -444,15 +413,6 @@ our %pathTypes = (
 		capture => [ qw// ],
 		produce => 'setmaker2/',
 		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker2',
-	},
-		instructor_set_maker3 => {
-		name    => 'Library Browser 3',
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^setmaker3/|,
-		capture => [ qw// ],
-		produce => 'setmaker3/',
-		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker3',
 	},
 	instructor_get_target_set_problems => {
 		name    => 'Get Target Set Problems',
@@ -490,15 +450,6 @@ our %pathTypes = (
 		produce => 'pgProblemEditor/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
-	instructor_problem_editor2 => {
-		name    => 'Problem Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_problem_editor2_withset/ ],
-		match   => qr|^pgProblemEditor2/|,
-		capture => [ qw// ],
-		produce => 'pgProblemEditor2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
-	},
 	instructor_problem_editor_withset => {
 		name    => '$setID',
 		parent  => 'instructor_problem_editor',
@@ -508,15 +459,6 @@ our %pathTypes = (
 		produce => '$setID/',
 		display => undef,
 	},
-	instructor_problem_editor2_withset => {
-		name    => '$setID',
-		parent  => 'instructor_problem_editor2',
-		kids    => [ qw/instructor_problem_editor2_withset_withproblem/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => undef,
-	},
 	instructor_problem_editor_withset_withproblem => {
 		name    => '$problemID',
 		parent  => 'instructor_problem_editor_withset',
@@ -526,15 +468,6 @@ our %pathTypes = (
 		produce => '$problemID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
-	instructor_problem_editor2_withset_withproblem => {
-		name    => '$problemID',
-		parent  => 'instructor_problem_editor2_withset',
-		kids    => [ qw// ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/problemID/ ],
-		produce => '$problemID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
-	},
 	instructor_scoring => {
 		name    => 'Scoring Tools',
 		parent  => 'instructor_tools',
@@ -610,7 +543,40 @@ our %pathTypes = (
 		produce => 'student/$userID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
 	},
-	
+ 	
+	################################################################################
+
+        instructor_achievement_list => {
+                name    =>  'Achievement Editor',
+                parent  =>  'instructor_tools', 
+                kids    =>  [ qw/instructor_achievement_editor instructor_achievement_user_editor/ ],
+                match   =>  qr|^achievement_list/|,
+                capture =>  [ qw// ],
+                produce =>  'achievement_list/',
+                display =>  'WeBWorK::ContentGenerator::Instructor::AchievementList',
+        },
+
+        instructor_achievement_editor => {
+	        name    => 'Achievement Evaluator Editor',
+                parent  => 'instructor_achievement_list', 
+                kids => [ qw// ],
+                match => qr|^([^/]+)/editor/|,
+		capture => [ qw/achievementID/ ],
+                produce => '$achievementID/editor/',
+		display => 'WeBWorK::ContentGenerator::Instructor::AchievementEditor',
+	},
+
+        instructor_achievement_user_editor => {
+	        name    => 'Achievement User Editor',
+                parent  => 'instructor_achievement_list', 
+                kids => [ qw// ],
+		match   => qr|^([^/]+)/users/|,
+		capture => [ qw/achievementID/ ],
+		produce => '$achievementID/users/',
+		display => 'WeBWorK::ContentGenerator::Instructor::AchievementUserEditor',
+	},
+
+
 	################################################################################
 	
 	instructor_progress => {
diff --git a/lib/WeBWorK/Utils.pm b/lib/WeBWorK/Utils.pm
index 76a55986aa..ead76e8e12 100644
--- a/lib/WeBWorK/Utils.pm
+++ b/lib/WeBWorK/Utils.pm
@@ -78,6 +78,7 @@ our @EXPORT_OK = qw(
 	ref2string
 	removeTempDirectory
 	runtime_use
+        sortAchievements
 	sortByName
 	surePathToFile
 	textDateTime
@@ -270,7 +271,7 @@ sub surePathToFile($$) {
 	}
 	# use the permissions/group on the start directory itself as a template
 	my ($perms, $groupID) = (stat $start_directory)[2,5];
-	#warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
+	# warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
 	
 	# if the path starts with $start_directory (which is permitted but optional) remove this initial segment
 	$path =~ s|^$start_directory|| if $path =~ m|^$start_directory|;
@@ -1031,6 +1032,35 @@ sub sortByName($@) {
 	return map{$itemsByIndex{$_}} @sKeys;
 }
 
+
+################################################################################
+# Sort Achievements by category and id
+################################################################################
+
+sub sortAchievements {
+	my @Achievements = @_;
+	
+	# First sort by achievement id
+
+	@Achievements = sort {uc($a->{achievement_id}) cmp uc($b->{achievement_id})}  @Achievements;
+
+	# Next sort by categoyr, but secret comes first and level last
+
+	@Achievements = sort {
+	    if ($a->{category} eq $b->{category}) {
+		return 0; 
+	    } elsif ($a->{category} eq "secret" or $b->{category} eq "level") {
+		return -1;
+	    } elsif ($a->{category} eq "level" or $b->{category} eq "secret") {
+		return 1;
+	    } else {
+		return $a->{category} cmp $b->{category};
+	    } } @Achievements;
+
+	return @Achievements;
+       
+}
+
 ################################################################################
 # Validate strings and labels
 ################################################################################

From 04b53bbcd982d72211220de4ec988bdf07cef71d Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 15:40:56 -0400
Subject: [PATCH 38/73] Take 2: committing new files needed for achievements

---
 .../achievements/blankachievement.at          |   74 +
 htdocs/images/defaulticon.png                 |  Bin 0 -> 9929 bytes
 lib/WeBWorK/AchievementEvaluator.pm           |  222 +++
 lib/WeBWorK/ContentGenerator/Achievements.pm  |  226 +++
 .../Instructor/AchievementEditor.pm           |  656 ++++++++
 .../Instructor/AchievementList.pm             | 1319 +++++++++++++++++
 .../Instructor/AchievementUserEditor.pm       |  242 +++
 lib/WeBWorK/DB/Record/Achievement.pm          |   43 +
 .../DB/Record/GlobalUserAchievement.pm        |   43 +
 lib/WeBWorK/DB/Record/UserAchievement.pm      |   42 +
 10 files changed, 2867 insertions(+)
 create mode 100644 courses.dist/modelCourse/templates/achievements/blankachievement.at
 create mode 100644 htdocs/images/defaulticon.png
 create mode 100644 lib/WeBWorK/AchievementEvaluator.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Achievements.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
 create mode 100644 lib/WeBWorK/DB/Record/Achievement.pm
 create mode 100644 lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
 create mode 100644 lib/WeBWorK/DB/Record/UserAchievement.pm

diff --git a/courses.dist/modelCourse/templates/achievements/blankachievement.at b/courses.dist/modelCourse/templates/achievements/blankachievement.at
new file mode 100644
index 0000000000..bbb82ab420
--- /dev/null
+++ b/courses.dist/modelCourse/templates/achievements/blankachievement.at
@@ -0,0 +1,74 @@
+# This is an "Achievement Evaluator".  Its basic job is to test, or evaluate, 
+# whether or not an achievement has been earned.  The code is run every time a
+# student submits an answer to a homework question as long as the achievement 
+# is unearned.  
+#
+# -The code should be written in perl and should return 1 if the achievement 
+#  was earned and 0 if it was not earned. 
+#
+# You have access to a variety of variables:
+#  - $problem : the problem data (changes to this variable will not be saved!)
+#      This variable contains the problem data.  It is a hash pointer with the
+#      following values (not all values shown)
+#      - $problem->status : the score of the current problem
+#      - $problem->problem_id : the id of the current problem
+#      - $problem->set_id : the id of the set containing the problem
+#      - $problem->num_correct : the number of correct attempts
+#      - $problem->num_incorrect : the number of incorrect attempts
+#      - $problem->max_attempts : the maximum number of allowed attempts
+#   
+#  - $set : the set data (changes to this variable will not be saved!)
+#      This variable contains the set data.  it is a hash pointer with the
+#      following values. (not all values shown)
+#      - $set->open_date : when the set was open
+#      - $set->due_date : when the set is due
+#    
+#  - @setProblems : the problem data for all the problems from this set.  
+#      (changes to this variable will not be saved!)
+#      This is an array of problem hashes.  Each element of the array has the
+#      save hash keys as the $problem variable above
+#
+#  - $counter : the users counter associated to this achievement
+#      (changes to this variable *will* be saved!)
+#      If this achievement has a counter associated to it 
+#      (i.e. solve 20 problems) then this is where you store 
+#      the students counter for this achievement. 
+#      This variable will initally start as ''
+#
+#  - $maxCounter : the goal for the $counter variable for this achievement
+#      (changes to this variable will not be saved!)
+#      If this achievement has a counter associated to it then this variable 
+#      contains the goal for the counter.  Your achievement should return 1 
+#      when $counter >= $maxCounter.  These two variables are used to show a 
+#      progress bar for the achievement.  
+#
+#  - $localData : this is a hash which stores data for this user and 
+#      achievement (changes to this variable *will* be saved!)
+#      This hash will persist from evaluation to evaluation.  You can 
+#      store whatever you like in here and it can be accessed next time 
+#      this evaluator is run. Two things to keep in mind. First, The data 
+#      in this hash will *not* be accessible by other achievements.  Second, 
+#      the first time a variable is accessed it will have the value ''.   
+#
+#   - $globalData : this is a hash which stores data for all achievements
+#       (changes to this variable *will* be saved!)
+#       This hash will persist from evaluation to evaluation and, like
+#       $localData, you can store whatever you like in here.  This data 
+#       will be accessable from *every* achievement and is unique to the 
+#       user.  There are two variables stored in this hash that are 
+#       maintained by the system. 
+#       - $globalData->completeSets : This is the number of sets which 
+#         the student has earned 100% on
+#       - $globalData->complete Problems : This is the number of problems 
+#         which the student has earned 100% on
+#       Warning: The achievements are always evaluated in the order they 
+#       are listed the Instructors achievement editor page.  To make matters
+#       more complicated, achievements which have already been earned are 
+#       not evaluated at all.  The up-shot of this is that when modifying 
+#       variables in $globalData you need to either write your code so it 
+#       doesnt matter which order the evaluators are run, or you need to 
+#       pay very close attention to which evaluators are run and when. 
+
+
+#the blank achievement can never be earned
+return  0;
\ No newline at end of file
diff --git a/htdocs/images/defaulticon.png b/htdocs/images/defaulticon.png
new file mode 100644
index 0000000000000000000000000000000000000000..31331d50d6aa5c41e2770bd7750ca79a2e335d25
GIT binary patch
literal 9929
zcmV;)CN|lLP)<h;3K|Lk000e1NJLTq004LZ004jp1^@s6z@@FG00004b3#c}2nYxW
zd<bNS00009a7bBm000gm000gm0bLTJ?f?J)8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1AOJ~3K~#90<(+waR7JM<Pu;EW?b~}6AR!whfh0gckX`m&90X_d
zjmx~x4;)-Z92_MoZg0k!(HTbIAv&UrxXp+#>hREUd7!d{RR~)kkc5yB$kv^t*Sp{P
z{SgzAkc3XsopgNP&&QAC-nvz%`*hW<I(5z|gfWI6I|u<u5c(ZSNy;xN3aiD%>?U1@
z9T>xp{==gmvw{%<3(w2HN=d;B?zu-#m_D6L0s#2t8(-mj?~xZTTrm7i*NK1rm=*n_
zR4_u25)~z_%E-W@moJCZ^mNwIR=NHAeZ^b0kQXmppx;vz>O+h{>uFiT&5ugK2*ITI
zc=55ZWAWhS%c%^zoi+sX+~LFiOPe>N;tLn(e@GJj9>$=CTh^YU&np-qpeRbeGdWpa
zI)A<vcjuj422B%Ps_Xc1U+Jbz#KnRFYP%#cn=u9@#NzfieOAE;fz4!+Rtz4j&%O6v
zJ>iyH_{31ved?62{Eat=;(`M5(?G!R2F4(Ts_veq&nXxoNR5dRS7m1EqaJtwr41Uy
z*}~P<*|YwuufL9p&YdGZ^ZVJ27=sY5w!%f9Q7}R<H6cM*IexsJa{vAGP^*;*>irrD
z&Y$;Jz5Y77aP}<umDg)nk1_ars_pI)(F#TgXqwjUPDzpe^VVCnxS#%%A3~B{d%uQ)
zl9E96h7I`q>C@CMpU<!!WAOBvFhLTL3PuPVX0!NcTADuVzWcP~2@}lmy)9F7%E|&&
z>(}G+Cr{Gf`Tfi~jG?}_WonOzQZPa=BsyAre8dPX`+)~gT2hkH-rF*DM0vTtYTY_G
zmzT%n1_JatjKS60GPNcm6pRqe95_&Tc=BW|dD${1%WUqs_iHGqs0dW9U5n2iJH{Li
z1nBh`Lv?S<)JU%>7$IOtQonc5AnC5fi`Do=i}<YGe7}Z*%E~~++O;_U$Pwn4DANCp
zF;w)nOg*k(gdoOfRDLyNh&pxIGBtV37;|!u3eW@8)C4MCc?F+7bjWZ@6sZju!{y$R
zrN<PE5M(+W(xanBX~Q0V7>2~h8>4%q;a<e$3S52V6@2o*0rs3Ik{dCGlAe|!><UH*
z=ETK`%cf1!l9nx_NANtug|)#jfH4MLS3yw}H4soFNy4Hefh-6hi6T}70m-6>6hQzr
z5CBaOKobO{iy{V51hTePB2J#P5neB4(KKQV#^CKK*~6k>gn%UoxOdPXVey@Js&NY!
z^4SDIpitDU>i~kFfhek25L6`)&}2zMvM7Sm@E=k|5mZqGO%RYK2%w81!lH;lmNAkf
zAaxxB#(*)#I>rb?!)_tQ7z1jO5+j5F0RRvLAOHd=iohI4fYAuRvY6mFAXpYtMk6L!
z7ATGb`iK8B9EWJ5kz#nBCOM9T6DNF^)~-dKix-V$7^4R;hO43YK5j%v6^syM0>Da&
z(xRqKtKm{pIbKl+Mp2MKQ4l3b2#X?sC}M;$ZfqMjeAx}(FhbYl!59D`-1sFE2mvBV
zzzhSr(TH?|fxtYEfa8GVI83lCrZ^5LqY)^U1)60s-SA}-jL}FNj7E}VSqeh*TMHUN
zP?Y=c7f*cj5i|0hdjf}@PS#si#;w8_^26OW72^7~#m0)lV~@!U$8i+LVVY$%ie-T@
z8i6(#z`$`N!*LW#Q8XgSP&Xf$JolV%a?Ki|pVexh?RJe@zg|vVu|ivmkm)6i;k$6Q
z9kOp2A^4futkjPjDQi5B(e&xo5uvKPFSC2MyJ+A*tPdY<Ndy46`))n<^Us-rciy39
z=H%292-yZ;3?GK8{g5m?5dw?D;afU<xD;5q(l}w=I!5sO#fZ1lh8vGZ7T<lBsQ>M6
zEjKq_n>Wvt@ZEPhOOiDCm%mtNEnVt-kR<gd!X-mU6wEN%3&Vy5*tv66GeuGK<BzNT
zAAejv7K*z2GS56Coms!07}$J*i4Z`1JTf?)(p7{ItXvsA<@x7bcN&fAdW3)swG7=>
zFhX$i#EC+7MFmHW9!+Hd0HmjzQ>|7+@80b`-hC1KCZB!gDHu6YMQLe#|JL`GFGopl
zzpWKE{=H;L%*`7%cxG9x^1BFuF_dz2OTh>MX|u`C+<UJ+79p%NjLF=1Z^a7ZgjZjs
zMW65g-cVgzD+NCO82MJMvW;%*{)iErqp(nCn_n9@&XKici!eDRM*0vThz*r2-Bs|4
z<;%r^7cOX}qekHt9*HDLlE3+l9=B?he4=|I_B~dwmJ2p+BnKhX{&H;ONW`5#A2{Fq
zT575_Y1=k+Vq&8B9zu{F3R$|WV1ytcGcz!M#0bmiy?g2UdGqvvt;?jPnUbTTfcfgH
z`u{UZ-n!MDKVybQCMFu&bk%L-!3XKIx8H`E*4Lw=_~`B1Val*!{?`zKN!^vF%L?Xs
z<@YOApiuw-PN#<B;w)|c;vRa)G<MS_M)Y{Z9y8DN7S+|F``d3peCQ!t_KnK+>&I{&
zk8Z$Nzs?t%<5=$f_YKo$%y7Sm5ZuunnYyH4gkaI4MZzGHiHoVPcRTHNLP4nQ2_Qib
z#1l{8_*JW<)7=rYFR*&GQoL~^lNN0GxpTp?XODEUt$QR%k?Yo3rvKs>wJT{_`*l}k
z>a>Cp0#jU^^uYZ2rbz$*2M^-n*|W6{HxN=%_=Eui5cS0ub!~o_9|Lc{?K$<+pK5IX
z{+uP)XYRe1OWVF3%kAAq2*DFiI3_>!l;>WaSN?)f=k?X;2WVP-?$^Io(-CS|+Z{hn
z$>Yb9nKydwm%lXKym>PtyWOI%vu#E?moE#od3jj7=N{V)zlY|qEJ-j7rbJN<bX4xn
zJMClEt_{q$TIDSW0ozg8)^tk22*Icc6QnWm@%&%_0E|^#(==dNv-O4z5d_M~AqM8;
zNM}0JW?$g>=hf1U8x2Fd^6WkL;Mk8pR!-fh+{B62%(vf`rbb80TM>e&VCxTB!3Y6i
zv&qjdUCK;oymtP)w<s%%2s*qYF_9aPkU&tMeOC9Qc^|*}s^{d=rJBj%V7s)>J$J4t
zanBw-C<|6vnmK9fR&{b>qWE`&U{Em6bVk7sE?XuhQWV|vLH6#YoO9<Y1A?ss0ASfN
z)0p?(W8}Izq0bN17cT~?N=tQo`|Y-%CswUN2w=bfOxDy$&S1*N#u}qO`Up+Q$_l)N
z5ZrvD@<AyWAs8@psIYj{D9cUFuUAxHJvrGjB$zsy)ds6pp~NSjl+ShUxyVA-G5q$o
zTIGff#!kI=+v1^z$fS4P(TjpD&+`WEgAWYTrcCj!K?rW^sBBOQ=6UrGk3I@5)^>is
z*TeHjB?zk16SaW@jWL4<6V#3!^?mkzyk?E}#IJv?Tg_&M>26)ahH+6vMOvq}Zb_0P
zHf}Uez58zW(=@F<++MjGDhDB$zi^?DZZ>l<&95ImtQAh5u65ae`4_)1kJ`GGQe3XS
zH>*B-)_>LO)zR$P*5pvtnVpT8f`UM4XP<lODeHvCANMacndFxnU5uL3p@I<tE-p@b
zbm2mNV(WWHj!?qn$wViI=a#HmMI}D{v~;06b@Vi<s_QSmtUK4P<%fl`-UlC~)82Up
zs=D&*J@;5gzx=X%o6RP_jS#dLQ94vG!>G@$SfQphu6Y~5SO-~Fk=bnN(B66@1`J@M
zh72L-Pd=$T+nsuPl0W{@cXIV=h~hXpq<goqu?**S>!hxC%|~wPR8!_#Zz(fkV&sny
zf~Jt#b`^{e3>!OEo|ur(u;y(}S(*FN;K5`_qTlbn+dTY}PiV#E5+gn&^Vl(e8A+=2
zq)FikhMPYhjNg4Hbb0bQWC)-5;fMMy2?^3xgdh>19R(u<$ZnT^cmMtLxVG-^*+W&#
zo2SOKb+0Qt@dT6n)KgN>v&h~+mNj+52F?AaKUuTF)y6&da6>-*6nE=~9vjO>ZQDlN
zl93_2ix7-#Q^5oQ_y6aAO3BUFyv@0E3F9F{OkJ|vv_-#ujCJ^Mg5JKpwjfk>hME^%
z@SlG1MbwX`$*}p{8Vn>s)0hxNwO#vkFz`HW{QKVxw~QR=fB8BEBLuPO>B3!O#+XO7
z^{^xb1eOJjAVT{N`q|ISnLBqfs?!;HLv?PhuQ(<~HH;c%4w<J#d)#*)c5L4+cY97k
zQ3PqV5>eMF*kn@w@aUtc-TlmC$K(r>CgG4fhXDYrTE!$i{j}8M@jD$62&mFqZ|TB|
zFWS3p&<KXvv(3r5xw;;Tx?~xPEfkCp%$++|%(Ph8b_2r>9H4yDra_lYa~%;K&6r1x
zBI&JLT@kZ%diGf%|IdFW;(Ib0V!!|l)zxyhec2=lwN$XlBt3Hb?Zyf1Jph0~5LCi$
zw}xzj)tbeNO+&u?(x6mV_r3w->#x1%($f_~Muw?JGYvfS5Sj4qyK1*5osxv5778|-
zHM#Ygw>cFR?kn-}RJSGo!LVwTA$j#`u~&y`k4Fyt;~!XFz1kkOS#x`2W*TFPi?wbK
z8KMY63k5R_>Tol8?_Q#O?p&o?#*JWbIB0&%7>auTeOIp;K%RO^JiBfkF|Z@g$Z#@p
zB%rfrh03lzk1>EK;y?=p(=>EwTP`d_`iK#H$d*SPv1pMgW7jT&Qdt@3@eDQ}f9yVa
z^UVsCnraGqV?ES7@Bowk{`<JgA*OD(2BL^7TPwKT9;_&mOi>t<Btv(#(aw^S!wh=r
zDfv=QwFdy;bc%I5cY^Zx<BpL%*=}oMVhl#NTO+y}-CI*5i5?GI(xhO7z+yJzcE_Vr
zr-Z_>V|zBAhr_{`Cr+fOEn8}D=+Y7@R;`jRY}`mB_twzdoCOOI{q48@F3m-%t5u((
zP%V0Jl+~)Y`>AqsDbK7~`gL~caC6&jreWWG$Ea7X_`{xq>fLwU-_M;ZlSxVDh{zxE
z^Ph7=KmD|8N!DC0A^-rc77BJa+BaZ$JSq_#ZSU8W#=1*R4wL%ilj@~#<`cPkHBj~K
zw^)Ao;ixfTYowDH3?xa@Iu-=A)A_4wYCwcm3XZnh^)|f|YHQujn3(V{kJ`iGU@X(7
zA!^g6+OR|`VvO+<PiRG(Hj$~3Ff=#kzWczsZCmF}mrf^A0KnOz2it7W=H|k_eW+yi
zZ1sk&vEk&_TP@iK4lwHF%ib<+ig(1ujqZa#`<Y0_#f9J2+*xMNHV@9t)jQpTolZgn
zfZA3H#-_Fk=jS7B%ow&?-W#Fd>8F|WoE*Ir<B*tY0RZ6QMSodd9+H<XjT#@aN<&Os
z9M&o;#ZJA81p#D?L2WjR#?e+Qx-RTO*Hs-M3>3xodj3e8&0w1~3sD<4)*lH)eY&n`
zIXU>!n{T2Ff{5HSiog05k+5Y;@Lrby4I2#r%{Kg5R*vO)_PQQ?_N=!!I~zjRWxC0N
z1(utR9HEs<mpoUxTi44kdvlj93!r}eEWI*$43>-xzJGCX=MIEXl!ol|O$z3D)l3kE
z>t-1H_tVbVv-PBIOBq5|uck9{a!{$RYhC`~ojKz!EH1|4-FHXd5=z;^#h5V&pFHUg
z+UrsjTlHXuY1@kBa%p6IyfvZ{a@%aIWBz=NUccUbuq)3iiXyFEO_gunOpb`;p}9HB
zms3OEdk+Pjy;c;VrGgEH>lN(rcs*7tp~Cg<w!O~0dA6I6AE&jVB6p{KiC=gjko(wU
zUKAZ|xh_FUq!Js;nmry3scLY}0D{n}2h%jVZW49qkX}4vhQ^0Z%+T`Ob5v$d4slu2
z)SzEb-+y0s#_81kOP0h=3!`XZVbLNmeDzh}hS4BiuLgpEssLIj`1&54mq*Cs#u<8j
zdDI>j3m3g;kw&gr<Jlifc~KPo&p*#pY~GB<^p&BxId|Q~X6@L4Zs@aCT`dS+FMA2#
z2L&Sp299f))(~SIbX`Xr$8{>;xTl#j$2Q^gX<9pfzW#>Gh$o+v4m|s;8`<r)PDMmU
z3LHn%1_K7KSL)E)#p%?&s!CP^T<gKnHe1V~y{O1@Y3NX*Pn_ZR{PWcCoE)lL)0B42
zseAUgj>@v`zV+7rvwBjtP_t~AZvV$W)DGjTtE<5e08W5w3XZbdaf=?jZy#ATXO4DV
zYNSZSV&P(zEK#UG{?Xg!Q0?;tYX9&D&iUq>XhL5cnwv9org`Xr10Bb=IGuz5&~O4w
zGX=NYXsD>riR5H!$j$={H*@CLCl?e@N`8Lrb%y!J9#ap$^imzN*=!ND-0KPmAxKUJ
zTvq09*U;m1A{kouV5=23y=w!3K)_@|TBPl)+=v%mpt7HQ(omr&a?=@upMPGH%d)C#
z)~x<>dsDVh@~dA#;^xh$xV`%|HG~eWdvNoOhNDN7qA62wuiKtGi`i`Kf7e|S_2P^E
zeE<NpwZ6(%UNO1ec!QWm5aA0s>1i@E%?TwXD$(BlxZjWE#uHNs004r(F;**TN+f#p
zC@D^!Oot>_Vox(`mSbvRA*JNy)tp?h0)M|@gNw9SY<*%b(HSO9Ld5sq``VmrNfHtp
z|4je@u&fwoHXDEF!59=pBY55zu?CJC@n8Q%jC$}vn@*ByVB*C73wm3gaIkziIdsbw
zqD?m@QN&HJC<*|;WKu08*|67t`LgF~N=n~Y9yLc*0djN2%3Zs#%j?A|&ugs3qT6n}
zEwJBUKqx7Rp=Zs~ZBwR@DK=a8^J?@qv9U%+AmAlrSr!<k<xxeF1T7WJFhtV?Ywup-
z%Dj16pRmzN5{5l{q|4uatGfk3)6&y5b=E8<gQ85v{rkOVrc9yZlaef17^~Rr_LLqv
zgsyDfOjYT+Kv^sdF@8L-vt~g;W+vBb{?Favr$5!%ojawxJMLgwq}XV*LjyD^_?nrr
zv=kFVhgy<*Ov+9Y2<Uj%F6mNkuI`g%UCqqYh+A*vh9YEaF)6g!u)*oX^+`zp2vNvp
zb0klj2FcT=HQZNKudk>`E&B7H$um_|ih*Sj8a$XLXU^24Zn=d{G?_vh9vcqsx{Dot
z#~sSSJ6h$V_4}bIHDU_|%d#Z1Ea(VDmNCHNQMIqWl1q*p(FIMzN_MtJ-*y|Hfe_tp
z>LIHY^G+wx?kS)YWi|~R3L}U95T}8$2DP>BvORl<tAG8gT8XirwA&dpaUwR(oCyhO
zX?)O0Mtcg5GjL|JjOywFRd&0v9{_;YD<~ch)8w~C0RT``L&!>Ao>(+~e8|sI>Jl!O
zqWt^c%Ec2WG?^ek8Z}DeZ@=A?1rS_bF0&a~%gRvDyG#g?5EbP}oG}9uXUu50Cd*#`
zg$wG%-~Em{RafU>Sr#BIjV5Q!(qbk~<l;H5_m^J3{G}H4?z<>|<x1!W08mq-xD|zK
zifN({0&?_d!~g&sIz;+%a!^KZ30qMiiJyI@T|9SAQ)wFHF=JHgk|oyRT}f+gHXC`j
zTj<tWo?*=VuwgKK*bfPlFxH^D+Ef0;7sQnf8~ha*V<IYwM7P`m{EQi7LUJ+}(gQVu
zVa5#eu$Nv6e7ACC!{06!@&a5tsG0%*yVa@_004rZQdX<Y+*U>5qO45t?cAxA78U6l
z$06zFo3)rb?yx3z*U5k+DUjvRW+Fg{gns?(1Lw?vfpg|GT$3b!prAl0dFB~>+U@qx
z9EXXlEQ**uU5lA8!8Cwj!uz@-2$D!oN2sXCeJ(ZCno(1On>HE%8WbF5wdz!LwZ}PN
zKxk4U-H5_MU)|1~_{!zWST~!IG<K{$VB|<^$c+)Y9{#g)4F=wroef#pKP0`tSci%V
z&((kZi@36Ot-k^x9YsYEFl7p`GiDG82?>0guF2iukw?_Tzx;(RTC)Z+s;dbRTJ_*4
zhXd35_7SDCXNN8|Qftnf@j5^M94aa*bnI{t;@Gh$Y1}w-n7tX>52gzj2oVq$XN!xA
zgSf_Pq8JeJ^VO1^9Q~Zv>n2$i(6C{oK69oPJ$9@y!C;`f)y=cAY=cWny(OBa%GK2k
z5e<#^C;*7E+kriN7{ukvEh*h;s5uw|96#=<{Nf9!si^_Ie}6(6GX@Pd8qGbn=EN9B
z#BzXTjoj$bkU9E?Q<N~);mQ^7)$QBK%0K-{av~Ifm>8tbn1Pw8Qz0QC!P@B{`)SjF
z+P~lbeRVaBp;Zr#Hko9erVaHZ*}YjI#uyG9@Lu`f|3$94I*bz&kvwS<na(iAUI}}_
zm_)iR=>%bj2t_x75CH=RTH^)|yw=P8enHI7S4wy6ATRp;o)VVDI6IqAX3timZn}v}
zVOh4rxa<cWfQ<X^r;gJ!VZ<1k+<GX2&|}KWW#8!0*ZV{VgQDn=o9ipxwF}kze1KC@
z2yN<AYAD07y>81k8cF2!iuG2jA?#@<x(m;9?AWo~kg;PM{>B(XX{o2`gAeG6-~V1a
ziBLU`jYZ1LnV6n74G)Zuw+(2%o!hUUxt}b1X+cm0Xy#r=8I4lHnKQh1#R?R3?5`wg
z_`C1?C42TDUm$?gAwv+FJ=>5$QA|YnZ&|H6Szixss}&+%!L4c7*thmePKKs=ipL{L
z`T0uer=OBn{eJIdmeui1Hz9G(9MzGX&8Ggxe`xHp&stmL^`J~9)$a2lh>7X=V2waP
z)pqR?iVqwBL6VR*Y#7k<=d+mv(Y`gQx3SqU>vR(Sq=<^k=sFe)YnU*BO`q^XqAOj;
zP*UQpe&-!SWl0H~(KKwp7!7a!3?<7X85M=w+&%JmWckZ4<>I49v8?Mz9Wero3l|!P
zBSc2jJFPveR%~*)kh{0#2p0r_VDMl|?BKx=>vSr<S6(4JF)?+22e_8ji>j?Pnr6?g
zZ^|$1a!Jw`UnoT<PhtgtP;a^kTW`Oe&j`^`!##@CN?6Luh|9e#N4Uw$^Ot}5C6Xu#
z`>tNK=QO`ZF^rZH7YF_S_Ba3OvuAaUVF+dPXo$Z3c5}#<OuYrq8+o@|=&`Ioy}^ec
zdM@~U6lF9bzOK%98$ipsEv4%yX5BivWXcq<FIi$v=p{MB0zr_Vs_iG1>B|HHn)2Ff
z!o`dX#vT<#+4t@Zyj@ildtEYdf}-U4Wo1-Sak0`THu*bCPnauvnoF0&nzd`il8F-y
z$pZ$kvHSPSh2`az6>XKJ1c5z{5TqPDh!0-8=t=m=PmD&MkJyQEr_uEY42|ptUw`c>
z&d(>cdGq*mf&j?N6RP}v={Fb~+uTPW001zCI=7q6uBb44wQZZ^J9*OEYZ-MyO{ADB
zyNjk_`0HQ21uhpwPo3JJ+(1Cn3k&r_PN)5=_MU6{@EC*S^&0MQx#+j@^NITH+x<R4
z=v>->NCY7u^w8wj?loL4#rN{df%EC<%zz<7j7`xdd-h1@D=Yc`*U_^re%%-Y_W79K
zl$TR4V+^IAe4+-<obih7J=_=II8ya`1*x~?=qe{p_%FZtrhIkQEH=$<H#8ZeN=gFN
zPA7g1W2o!s`8J2IK)|rBu+Z=v#`4*+GLHKAW1m+P`(`h&S`k@Sr}lWp+EDP}hu(t2
zhp{|&E}u@**NjW5is8r+I9FTCzjmWK+I>GM3iWAmvH6iJSLCAu2Xe-L{!{jyJLeVJ
zD<7#em@84QXOHg;f}qN4*7yo|p0wV4v+24$g4|r+xvDDTFN3M8!|5`{a2O%ueUc=;
zJ$W)Y=Hf+)I(N?NUbxU?WthG(IknlaskXN52!KfB(j~F_{r9!{>C+8KM&tFz8o6A7
zx=WYH&oPF=VCuW!3=?B0cDdL)_UzI3#l|Y0_;|B*+cwdA{=7Hhj=yOOiv`(SuHd~Z
zdy`$eyoH~9qSnu!Z%l7Xxc~s)d;{m*ZsW7T))~|i0%LI2*Bch^+ehwJlt9^t5uCZO
zkfr|hFHfD)BVJrx$7nQiZa0qTg}tU>{MWyF&s9|s^t5TF^!848$;)$}tFAUa(-=7z
z3_-6EF$TfwWqyA6FuAk3+Fy{ENE`b1x7fFC72L(eo``+NAw+_zMy@rhwpRAO^pgL4
zS{l<YBZE(Fubd!AfzziAd8!KEbf*4J838Z`-Rm_xa_kuW?xjn<lSU&zb~b0t&*#Yh
z`5(74QhT$eMW%vJo(x=i;|=BN?ActJ!_l$V$?n~1etkXr>&~{(rJ+j@n3oL(DE0Zg
zzZo{nJSI7r<^lmLw{@#fH+ix`rleRRD$FCCiNw3g)~()ib#;iEH_vp#G*zXg-jXX<
z3|lb1<}Dd4T{h!M67ykUq4}|+NBsu@bp40kY(I61C3o(uuTs^B`cfli%KyU>=q$&P
zmT}`uH#|X3*EN0re!57Km^Zr8UbpPD7{mVZa(?N)ebRniR|EinloW=Kj<)vu@I%2>
zTI!7u0|Q2p(1}Y+#i})Hq>JOnGsy`F#-I|y?AsSO<#MqrF@`REf^Hk)F@^%Cle=@z
z9(}(oOLYJMJda?+2xC-U9z%Tgnft1y_3pQ8G!klkz1XWk?Ynk)FZ}bLO5K75#-TjV
z1Qo;Nb_bjnFEYC^hAtlv7LuJ7jG?N&-mrM@Uii-MZ%FTh5Wt{828+XCj{E!Hh3e8$
zPi-jL>IxPMLDbbrz2cjtX&Ar$x+lM)0+G|Fn}>Ghkjt;XhC;8`5cHb2Ekd@HhB5fP
zUc=9FbLoFOo&Kh@f+iCI+1bX}<Hrr;zyDo#xi@xp>~@{4ttGrY-EM8I?D@kV0tKn5
zbpNcZ>rIXwaq5((pt{=lTa2Mwn>``jE5#TzpO0Do{rA)dWo6egz#s%Lc(B20wOZmo
z_&}(vsBm|BHrO4kR%~`UQIFcuPoEByy#Bg!b?#h4YIJnxQbb6SES@;QoKjV2cb_*{
z!m=422pE2Q=8R$8xpTf2$KaUFB$1uX_djsJKz{K>T}e;%W{ZWgxm>8n-oab9dh_?~
z)8qvU_@OjSb=v7~_ip7(SJu335jJlJQKYvN7MgO79rGUnxRzTHA%L_r)^2~;(CPpH
z20BSZK~%9=lHPw`xKdT+X*bP6sNgt`^?1T_YI$=6L6!gXCvQH>lIHQ_&0R{vTwd-i
zD=()$z!<uG@@R9y>dvC7u)C~`UzVFI<?6cH!VTz$-W<PgA47cobzO0IjS)oHty!g|
zV%4AjEEP|fU`R?#G<GS+ryxkaef#JFQ8a7_m0V#r!eb0)5aRx0?_TM>Nt5(3G|e<w
zxd;LvJ)MpAcxdZ;?*+=|&)1pQ*zg=qrD@@NAMD=kJ%8*N(ibc+4kgLXp9NoA>#sa;
zfGDY|B9Hq0hTnB{&D$2Jr_6W=fyH8xKbSB<8*4Oj*9Cs-IzVBeP;Ik`?pd>JX`xPp
zx?_j?^vadi;WsWBJer2_rcK^_lL;Ay4Kv@+D%F~c7rhsbAEzs7YRH|6LT|ztLcVF!
zW7}vLg9jnzjzfn6e~gOq&d$oB(kSX$(h`CI7&3&5b-QWX`|tb97A(MAbhJ5S83!;9
zZM1)Ft?YU2HMxA;I65{unhSc=(KJoX%aigiTp+GGo#wXyU<bzGJC~|Q_en7Z1;Drp
zAsFCv3NJ)O`Nn2t5veq7Y)brMwNlK85vIg%z6n&u#MGXjKHWYf6sBZ^8lv$!V`ylP
zQ>OwYJ9g;e?AeA?hM|K>ix>z<o<oQ9g3FhQBDdSP4rBPf+kyl^j}6gnHjW_HY!;q#
zIJAjbSwyPAU~I7qRbQ`&moABw3l|cc!@+kepU19U-V;lfkXcbt#%{$bee{w0Oic|U
zCr-2km2Rr0CUE88K~!2(Lmu+`nY9>0w@+;A485x0CLs_wOeXOeheMs3m4ybeEZ-FW
zsA&M_&j+p!7$CT(PIY8-wKpF<>ODPblpdFsX6;gr5J6C-S6>wiQ&W*CIl29f`9_M0
zd<DmkQxz^3wL?*;&CSy)^du3X;6@Mv8_$bRIvnb(tSpqmaeR|9YHMYGS(#L|Xc1|$
zT8*8aX%`lHimX<k#*OQI9?r{`#mc|^O{<+blN`wNY`c5inx-koj!9<<3yG^P7rO}n
zJ`3fHxGO}If*U~y%sekVVYlmZv$F6YqtO%t(9oL;3IgQ=2a29sZgFIGrq1eWca_sg
z)ZTilxl@_^cJ1<>J9Z4|GiDew+gk$p{ZjqGgZlaMa^k$lV_1hVoajs&;Uppz+z3Lz
zbDa2?!=c@pm4#Dy-qa5Oz~z#>moLkeix!bKtJN6POj{8A(y?Q>@V@&@!-6TVX*%At
z$#<IP5j%Xixy|hN)zyL0g9pjW)z#>LATaAOhM><D>?tBz!HpmU9LI@|*zMZltSo(y
z$z<-QssIHAfzqTT!8>VER1iwT@a32OvkyIFx?#_+tCQWYzN(au8;7D|VvH@qYB9$6
z!iB(@ygahn<)S~<H1ZvcAz}jp`h<cTK?n>iD?a3KXm@62>M3TkxqnTKSbz1ZT(x*H
z<uI8#?#-Wn?#X}T5ldD_Wlo*)U;Nj<urOziA(dh1revn7ssxT4QO^_=5m)N#4Q~O!
zm%aUd4TgyJ7j8|1KQOx<A$YB>PI|y*^Zz_EQ%}jtG7s6YBT$l>>Z%wwE^0)3&+B@}
zXTxvX<~~(fiO7Wuul)#oKA~#=epGnn3Q^$qa~m**4o@A6H2PEzZVf^}v8=e%Zr6S>
zbf`W^QD~;3LaJK4n2zOnV|45C?U^e@QI-Dtzl95FX~>kEY)SzDsHpH496U%~t*)kW
zWtrNDF@$~BD;)Hx9^4v?K?PvnL<lz5*Gs>!+0^?74@QGO{S>>04z0a1W{e}dW%=vP
zm6tDz6`MC}wKHc@2|Ul3&YbZdJ$aIH*46Q!=sJARU5|?1rcW!lkp^3?;T?nw@4DUM
z&n*`1!IBa*@cent=_O0(IF4)Zs36IPNcqN;oZo!oJ$v{t=yT_i@kfv1(?vzvRj-$S
z8)NvoS3gh)>C;1WN06kx$Zi)NAqXvQ!US0yH7fe1Z@%#!|H)5?5m8Ybv1ya<w5rOu
zzTQ+@UQQNB61@>)xGqagU*|`w;6@OF`3S+o(a}=E@Zmmj$PkF%zTNB!1ke>xBoFF3
z@kUo72Kov=dIdLv5G(<J^(3hinnwH)05)R`KbmAS?eYHsnP@iL9pCWW00000NkvXX
Hu0mjf0*hPT

literal 0
HcmV?d00001

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
new file mode 100644
index 0000000000..8772ce7375
--- /dev/null
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -0,0 +1,222 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/PG.pm,v 1.76 2009/07/18 02:52:51 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementEvaluator;
+use base qw(WeBWorK);
+=head1 NAME
+
+    WeBWorK::Cheevos - Cheevo code
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(before after readFile sortAchievements);
+
+use Safe;
+#FreezeThaw is not part of the standard webwork installation.  It could be replaced by a more standard hash->string module (if there is one).  
+use FreezeThaw qw(freeze thaw);
+
+sub checkForAchievements {
+
+    our $problem = shift;
+    my $pg = shift;
+    my $db = shift;
+    my $ce = shift;
+
+    #set up variables and get achievements
+    my $cheevoMessage = '';
+    my $user_id = $problem->user_id;
+    my $set_id = $problem->set_id;
+    our $set = $db->getGlobalSet($problem->set_id);
+    my @allAchievementIDs = $db->listAchievements; 
+    my @achievements = $db->getAchievements(@allAchievementIDs);
+    @achievements = sortAchievements(@achievements);
+    my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
+
+    #update the problem with stuff from the pg. 
+    # this is kind of a hack.  The achievement checking happens *before* the system has
+    # updated $problem with the new results from $pg.  So we cheat and update the 
+    # important bits here.  The only thing that gets left behind is last_answer, which is
+    # still the previous last answer. 
+    # 
+    $problem->status($pg->{state}->{recorded_score});
+    $problem->sub_status($pg->{state}->{sub_recorded_score});
+    $problem->attempted(1);
+    $problem->num_correct($pg->{state}->{num_of_correct_ans});
+    $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
+
+    #These need to be "our" so that they can share to the safe container
+    our $counter;
+    our $maxCounter;
+    our $achievementPoints = $globalUserAchievement->achievement_points;
+    our $nextLevelPoints = $globalUserAchievement->next_level_points;
+    our $localData = {};
+    our $globalData = {};
+
+    my $compartment = new Safe;
+
+    #Methods alowed in the safe container
+    $compartment->permit(qw(time localtime));
+
+    #Thaw globalData hash
+    if ($globalUserAchievement->frozen_hash) {       
+	%$globalData = thaw($globalUserAchievement->frozen_hash);
+    }
+
+    #Update a couple of "standard" variables in globalData hash.
+    my $allcorrect = 0;
+    if ($problem->status == 1 && $problem->num_correct == 1) {
+	$globalUserAchievement->achievement_points(
+	    $globalUserAchievement->achievement_points + 
+	    $ce->{achievementPointsPerProblem});
+	#this variable is shared and should be considered iffy
+	$achievementPoints += $ce->{achievementPointsPerProblem};
+	$globalData->{'completeProblems'} += 1;
+	$allcorrect = 1;
+    }
+
+    our @setProblems = $db->getAllUserProblems( $user_id, $problem->set_id);
+    
+    #check and see of all problems are correct.  (also update the current
+    # problem in setProblems, since the database might be out of date)
+    my $index = 0;
+    foreach my $thisProblem (@setProblems) {
+	if ($thisProblem->problem_id eq $problem->problem_id) {
+	    $setProblems[$index] = $problem;
+	} elsif ($thisProblem->status != 1) {
+	    $allcorrect = 0;
+	}
+	$index++;
+    }
+    
+    if ($allcorrect) {
+	$globalData->{'completeSets'}++;
+    }
+
+    #These variables are shared with the safe compartment.  The achievement evaulators
+    # have access too 
+    # $problem - the problem data;
+    # @setProblems - the problem data for everything from this set;
+    # $localData - the hash that is used only for this achievement
+    # $globalData - the hash that is shared between all achievements
+    # $maxCounter - the "max counter" associated with this achievement (if there is one);
+    # $counter - the "counter" associated with this achievement (used in level bars)
+    # $nextLevelPoints - only should be used by 'level' achievements
+    # $set - the set data
+    # $achievementPoints - the number of achievmeent points
+
+    $compartment->share(qw($problem @setProblems $localData $maxCounter 
+             $globalData $counter $nextLevelPoints $set $achievementPoints));
+
+    #loop through the various achievements, see if they have been obtained, 
+    foreach my $achievement (@achievements) {
+	#skip achievements not assigned, not enabled, and that are already earned
+	next unless $achievement->enabled;
+	my $achievement_id = $achievement->achievement_id;
+	next unless ($db->existsUserAchievement($user_id,$achievement_id));
+	my $userAchievement = $db->getUserAchievement($user_id,$achievement_id);
+	next if ($userAchievement->earned);
+	
+	#thaw localData hash
+	if ($userAchievement->frozen_hash) {
+	    %$localData = thaw($userAchievement->frozen_hash);
+	}
+
+	#recover counter information (for progress bar achievements)
+	$counter = $userAchievement->counter;
+	$maxCounter = $achievement->max_counter;
+
+	#check the achievement using Safe
+	my $sourceFilePath = $ce->{courseDirs}->{achievements}.'/'.$achievement->test;
+	my $earned = $compartment->rdo($sourceFilePath);
+	warn "There were errors in achievement $achievement_id\n".$@ if $@;
+
+	#if we have a new achievement then update achievement points
+	if ($earned) {
+	    $userAchievement->earned(1);
+	
+	    if ($achievement->category eq 'level') {
+		$globalUserAchievement->level_achievement_id($achievement_id);
+		$globalUserAchievement->next_level_points($nextLevelPoints);
+	    }
+
+	    #build the cheevo message. New level messages are slightly different
+	    $cheevoMessage .=  CGI::start_div({class=>'cheevopopupouter'});
+	    $cheevoMessage .=  CGI::img({src=>"$ce->{courseURLs}->{achievements}/$achievement->{icon}", alt=>'Achievement Icon'});
+	    $cheevoMessage .= CGI::start_div({class=>'cheevopopuptext'});  
+	    if ($achievement->category eq 'level') {
+		
+		$cheevoMessage = $cheevoMessage . CGI::h1("Level Up: $achievement->{name}");
+		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!.");
+		$cheevoMessage = $cheevoMessage . CGI::end_div();
+
+	    } else {
+		
+		$cheevoMessage .=  CGI::h1("Mathchievment Unlocked: $achievement->{name}");
+		$cheevoMessage .=  CGI::div("<i>$achievement->{points} Points</i>: $achievement->{description}");
+		$cheevoMessage .= CGI::end_div();
+	    }
+	    
+	    #if facebook integration is enables then create a facebook popup
+	    if ($globalUserAchievement->facebooker) {
+		$cheevoMessage .= CGI::div({id=>'fb-root'},'');
+		$cheevoMessage .= CGI::script({src=>'http://connect.facebook.net/en_US/all.js'},'');
+		$cheevoMessage .= CGI::start_script();
+		#WCU specific appID
+		$cheevoMessage .= "FB.init({appId:'193051384078348', cookie:true,status:true, xfbml:true });\n";
+
+		my $facebookmessage;
+		if ($achievement->category eq 'level') {
+		    $facebookmessage = sprintf("I leveled up and am now a %s",$achievement->{name});
+		} else {
+		    $facebookmessage = sprintf("I earned the Mathchievement %s: %s",$achievement->{name},$achievement->{description});
+		}
+	
+		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$ce->{courseURLs}->{achievements}/$achievement->{icon}', message: '$facebookmessage'});\n";
+		$cheevoMessage .= CGI::end_script();
+
+	    }
+	        
+	    $cheevoMessage .= CGI::end_div();
+	        
+	    my $points = $achievement->points;
+	    #just in case points is an ininitialzied variable
+	    $points = 0 if (not $points);
+
+	    $globalUserAchievement->achievement_points(
+		$globalUserAchievement->achievement_points + $points);
+	    #this variable is shared and should be considered iffy
+	    $achievementPoints += $points;
+	}    
+	
+	#update counter, freeze localData and store
+	$userAchievement->counter($counter);
+	$userAchievement->frozen_hash(freeze(%$localData));	
+	$db->putUserAchievement($userAchievement);
+	
+    }
+    
+    #freeze globalData and store
+    $globalUserAchievement->frozen_hash(freeze(%$globalData));
+    $db->putGlobalUserAchievement($globalUserAchievement);
+
+    return $cheevoMessage;
+}
+
+#Perl magic
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Achievements.pm b/lib/WeBWorK/ContentGenerator/Achievements.pm
new file mode 100644
index 0000000000..11bd5dfaf9
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Achievements.pm
@@ -0,0 +1,226 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Skeleton.pm,v 1.5 2006/07/08 14:07:34 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This module prints out the list of achievements that a student has earned
+package WeBWorK::ContentGenerator::Achievements;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Achievements - Content Generator for achievements list
+This produces a list of earned achievements for each student.  
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use WeBWorK::Utils qw( sortAchievements );
+
+sub head {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	#Print the achievement css file
+	print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$ce->{webworkURLs}->{htdocs}/css/achievements.css\"/>";	
+	return "";
+}
+
+sub initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+
+	# Get user Data
+ 	my $userName = $r->param('user');
+ 	my $effectiveUserName = defined($r->param('effectiveUser') ) ? $r->param('effectiveUser') : $userName;
+	$self->{userName} = $userName;
+	$self->{studentName} = $effectiveUserName;
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($effectiveUserName);
+
+	$self->{globalData} = $globalUserAchievement;
+	
+}
+
+
+sub options {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $globalUserAchievement = $self->{globalData};
+
+	#Print the facebook sidepane.  This allows users to turn facebook integration on and off.
+
+	if (defined($globalUserAchievement)) {
+
+	    my $changeFacebooking = $r->param('changeFacebooking');
+	    
+	    if ($changeFacebooking) {
+		$globalUserAchievement->facebooker(!$globalUserAchievement->facebooker);
+		$db->putGlobalUserAchievement($globalUserAchievement);
+	    }
+
+	    print CGI::start_center();
+	    print CGI::start_div({class=>'facebookbox'});
+	    print CGI::start_form(-method=>'POST', -action=>$r->uri);
+	    print $self->hidden_authen_fields;
+	    print CGI::submit('changeFacebooking', $globalUserAchievement->facebooker 
+			      ? "Disable Facebook \n  Integration" : "Enable Facebook \n Integration");
+	    print CGI::end_form();
+	    print CGI::end_div();
+	    
+	    if ($globalUserAchievement->facebooker) {
+		#Print Facebook stuff (uses WCU specific appID)
+		print CGI::start_div({class=>'facebookbox'});
+		print CGI::div({id=>'fb-root'},'');
+		print CGI::script({src=>'http://connect.facebook.net/en_US/all.js'},"");
+		print CGI::script("FB.init({appId:'193051384078348', cookie:true, status:true, xfbml:true });");
+		print "<fb:login-button perms=\"publish_stream\">";
+		print "Login to FB";
+		print "</fb:login-button>";
+		print CGI::end_div();
+	    }
+	    print CGI::end_center();
+	}
+	
+	return "";
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $globalUserAchievements = $self->{globalData};
+	my $userID = $self->{studentName};
+	my $achievementURL = $ce->{courseURLs}->{achievements};
+
+
+	#If they dont have a globalUserAchievements record then they dont have achievements
+	if (not defined($globalUserAchievements)) {
+	    print CGI::p("You don't have any Achievement data associated to you!");
+	    return "";
+	}
+
+	print CGI::br();
+	print CGI::start_div({class=>'cheevobigbox'});
+	
+	#Print their "level achievement" if there is one and print the progress bar if there is one
+	my $achievement;
+
+	if ($globalUserAchievements->level_achievement_id) {
+	    
+	    $achievement = $db->getAchievement($globalUserAchievements->level_achievement_id);
+
+	}
+
+	if ($achievement) {
+	    
+	    print CGI::start_div({class=>'levelbox'});
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {
+		$imgSrc = $ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
+	    print CGI::img({src=>$imgSrc, alt=>'Level Icon'});
+	    print CGI::start_div({class=>'leveldatabox'});
+	    print CGI::h1($achievement->name);
+	    
+	    if ($globalUserAchievements->next_level_points) {
+		my $levelpercentage = int(100*$globalUserAchievements->achievement_points/$globalUserAchievements->next_level_points);
+		$levelpercentage = $levelpercentage <= 100 ? $levelpercentage : 100;
+
+		print CGI::start_div({class=>'levelouterbar'});
+		print CGI::div({class=>'levelinnerbar', style=>"width:$levelpercentage\%"},'');
+		print CGI::end_div();	
+		print CGI::end_div();
+	    }
+	    print CGI::end_div();
+	    print CGI::end_div();
+	}
+
+	#Get all the achievements
+	my @allAchievementIDs = $db->listAchievements; 
+	my @achievements = $db->getAchievements(@allAchievementIDs);
+
+	@achievements = sortAchievements(@achievements);
+	my $previousCategory = $achievements[0]->category;
+
+	#Loop through achievements and
+	foreach my $achievement (@achievements) {
+	    #skip the level achievements and only show achievements assigned to user
+	    last if ($achievement->category eq 'level');
+	    next unless ($db->existsUserAchievement($userID,$achievement->achievement_id));
+	    next unless $achievement->enabled;
+
+	    #separate categories with whitespace
+	    if ($previousCategory ne $achievement->category) {
+		print CGI::br();
+	    }
+	    $previousCategory = $achievement->category;
+
+	    my $userAchievement = $db->getUserAchievement($userID,$achievement->achievement_id);
+	    
+	    #dont show unearned secret achievements
+	    next if ($achievement->category eq 'secret' and not $userAchievement->earned);
+ 
+	    #print achievement and associated progress bar (if there is one)
+	    print CGI::start_div({class=>sprintf("cheevoouterbox %s", $userAchievement->earned ? 'unlocked':'locked')});
+
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {
+		$imgSrc = $ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
+	    print CGI::img({src=>$imgSrc, alt=>'Achievement Icon'});
+	    print CGI::start_div({class=>'cheevotextbox'});
+	    print CGI::h2($achievement->name);
+	    print CGI::div("<i>$achievement->{points} Points</i>: $achievement->{description}");
+	    
+	    if ($achievement->max_counter and not $userAchievement->earned) {
+		my $userCounter = $userAchievement->counter;
+		$userCounter = 0 unless ($userAchievement->counter);
+		my $percentage = int(100*$userCounter/$achievement->max_counter);
+		$percentage = $percentage <= 100 ? $percentage : 100;
+		print CGI::start_div({class=>'cheevoouterbar'});
+		print CGI::div({class=>'cheevoinnerbar', style=>sprintf("width:%i%%;", $percentage)},'');
+		print CGI::end_div();	
+	    }	
+	    print CGI::end_div();
+	    print CGI::end_div();
+	    
+	}	   
+
+	print CGI::br();
+
+	print CGI::end_div();
+
+	return "";
+	
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
new file mode 100644
index 0000000000..d3cf9c6d0f
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
@@ -0,0 +1,656 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Skeleton.pm,v 1.5 2006/07/08 14:07:34 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementEditor;
+use base qw(WeBWorK);
+use base qw(WeBWorK::ContentGenerator::Instructor);
+use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::AchievementEditor - edit an achevement evaluator file
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(readFile surePathToFile path_is_subdir);
+use HTML::Entities;
+use URI::Escape;
+use WeBWorK::Utils qw(has_aux_files not_blank);
+use File::Copy;
+use WeBWorK::Utils::Tasks qw(fake_user fake_set renderProblems);
+use Data::Dumper;
+use Fcntl;
+
+
+use constant ACTION_FORMS => [qw(save save_as)]; 
+use constant DEFAULT_ICON => "defaulticon.png";
+
+
+sub pre_header_initialize {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $ce             = $r->ce;
+	my $urlpath        = $r->urlpath;
+	my $authz          = $r->authz;
+	my $user           = $r->param('user');
+	$self->{courseID}   = $urlpath->arg("courseID");
+	$self->{achievementID}      = $r->urlpath->arg("achievementID") ; 
+
+	my $submit_button   = $r->param('submit');  # obtain submit command from form
+	my $actionID        = $r->param('action');
+
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "edit_achievements"));
+
+	#get the achievement
+	my $Achievement = $r->db->getAchievement($self->{achievementID});
+
+	if (not $Achievement) {
+	    $self->addbadmessage("Achievement $self->{achievementID} not found!");
+	    die;
+	}
+
+	$self->{achievement} = $Achievement;
+	$self->{sourceFilePath} = $ce->{courseDirs}->{achievements}."/".$Achievement->test;
+	$self->{r_achievementContents}= undef;
+	
+	#perform a save or save_as action
+ 	if ($actionID) {
+ 		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() } ) {
+ 			die "Action $actionID not found";
+ 		}
+ 
+ 
+		my $actionHandler = "${actionID}_handler";
+		my %genericParams =();
+		my %actionParams = $self->getActionParams($actionID);
+		my %tableParams = (); 
+		$self->{action}= $actionID;
+		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+		
+ 	} else {
+	    # we just opened up this file for the first time
+ 		$self->{action}='fresh_edit';
+ 		my $actionHandler = "fresh_edit_handler";
+ 		my %genericParams;
+ 		my %actionParams = (); 
+ 		my %tableParams = (); 
+		my $achievementContents = '';
+		$self->{r_achievementContents}=\$achievementContents;
+ 		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+ 	}
+ 
+	
+	##############################################################################
+	# Return 
+	#   If  file saving fails or 
+	#   if no redirects are required. No further processing takes place in this subroutine.
+	#   Redirects are required only for the following submit values
+	#        'Save'
+	#        'Save as'
+	# 
+	#########################################
+	
+	return if $self->{failure};
+	# FIXME: even with an error we still open a new page because of the target specified in the form
+	my $action = $self->{action};
+	return ;
+	
+}
+
+
+sub initialize  {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $sourceFilePath = $self->{sourceFilePath};
+	
+
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "edit_achievements"));
+	
+	
+	$self->addmessage($r->param('status_message') ||'');  # record status messages carried over if this is a redirect
+
+	# Check source file path
+	if ( not( -e $sourceFilePath) ) {
+	    $self->addbadmessage("The file '".$self->shortPath($sourceFilePath)."' cannot be found.");
+	}
+}
+
+sub path {
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $courseName  = $urlpath->arg("courseID");
+	my $achievementName = $r->urlpath->arg("achievementID") || '';
+
+	# we need to build a path to the achievement being edited by hand, since it is not the same as the urlpath
+	# For this page the bread crum path leads back to the problem being edited, not to the Instructor tool.
+	my @path = ( 'WeBWork', $r->location,
+	          "$courseName", $r->location."/$courseName",
+		  'Achievement', $r->location."/$courseName/instructor/achievement_list",
+	          "$achievementName",    $r->location."/$courseName/instructor/achievement_list",
+	);
+	
+	#print "\n<!-- BEGIN " . __PACKAGE__ . "::path -->\n";
+	print $self->pathMacro($args, @path);
+	#print "<!-- END " . __PACKAGE__ . "::path -->\n";
+	
+	return "";
+}
+
+sub title {
+	my $self = shift;
+	my $r = $self->r;
+	my $courseName    = $r->urlpath->arg("courseID");
+	my $achievementID  = $r->urlpath->arg("achievementID");
+
+	return "Achievement Evaluator for achievement $achievementID";
+
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+ 
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	# Gathering info
+	my $sourceFilePath    = $self->{sourceFilePath}; # path to the permanent file to be edited
+	my $achievementID     = $self->{achievementID} ;
+	my $Achievement       = $self->{achievement};
+
+
+	#########################################################################
+	# Find the text for the achievement 
+	#########################################################################
+	
+	my $achievementContents = ${$self->{r_achievementContents}};
+
+	unless ( $achievementContents =~/\S/)   { # non-empty contents
+	    die "Path is Unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{achievements}, 1);
+	    
+	    eval { $achievementContents = WeBWorK::Utils::readFile($sourceFilePath) };
+	    
+	    $achievementContents = $@ if $@;
+		       
+	} else {
+	    #warn "obtaining input from r_problemContents";
+	}
+
+	my $header = CGI::i("Editing achievement in file '".$self->shortPath($sourceFilePath)."'");
+	
+	#########################################################################
+	# Format the page
+	#########################################################################
+	
+	# Define parameters for textarea
+	my $rows            = 20;
+	my $columns         = 90;
+	my $mode_list       = $ce->{pg}->{displayModes};
+	my $uri             = $r->uri;
+	
+	my $force_field = (not_blank( $self->{sourceFilePath}) ) ? # path is  a non-blank string
+		CGI::hidden(-name=>'sourceFilePath',
+		            -default=>$self->{sourceFilePath}) : '';
+
+	print CGI::p($header),
+
+		CGI::start_form({method=>"POST", id=>"editor", name=>"editor", action=>"$uri", enctype=>"application/x-www-form-urlencoded"}),
+
+		$self->hidden_authen_fields,
+		$force_field,
+
+		CGI::p(
+			CGI::textarea(
+				-name => 'achievementContents', -default => $achievementContents,
+				-rows => $rows, -cols => $columns, -override => 1,
+			),
+		);
+
+
+	
+######### print action forms
+		
+	print CGI::start_table({});
+	
+	my @formsToShow = @{ ACTION_FORMS() };
+	my $default_choice = $formsToShow[0];
+	my $i = 0;
+	foreach my $actionID (@formsToShow) {
+	    my $actionForm = "${actionID}_form";
+	    my %actionParams = $self->getActionParams($actionID);
+	    my $line_contents = $self->$actionForm(%actionParams);
+	    my $radio_params = {-type=>"radio", -name=>"action", -value=>$actionID};
+	    $radio_params->{checked}=1 if ($actionID eq $default_choice) ;
+	    $radio_params->{id} = "action$i";
+	    print CGI::Tr({-valign=>"top"},
+			  CGI::td({}, CGI::input($radio_params)),
+			  CGI::td({}, $line_contents)
+		) if $line_contents;
+	    
+	    $i++;
+	}
+	
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select above then:",
+				  CGI::submit(-name=>'submit', -value=>"Take Action!"),
+				  ));
+	
+	print CGI::end_table();	
+	
+	
+	print  CGI::end_form();
+
+	print CGI::script("updateTarget()");
+	return "";
+
+
+}
+
+#
+#  Convert long paths to [ACHEVDIR]
+#
+sub shortPath {
+  my $self = shift; my $file = shift;
+  my $ache = $self->r->ce->{courseDirs}{achievements};
+  $file =~ s|^$ache|[ACHEVDIR]|; 
+  return $file;
+}
+
+################################################################################
+# Utilities
+################################################################################
+
+sub getRelativeSourceFilePath {
+	my ($self, $sourceFilePath) = @_;
+	
+	my $achievementsDir = $self->r->ce->{courseDirs}->{achievements};
+	$sourceFilePath =~ s|^${achievementsDir}/*||; # remove templates path and any slashes that follow
+	
+	return $sourceFilePath;
+}
+
+sub saveFileChanges {
+
+################################################################################
+# saveFileChanges does most of the work. it is a separate method so that it can
+# be called from either pre_header_initialize() or initilize(), depending on
+# whether a redirect is needed or not.
+# 
+# it actually does a lot more than save changes to the file being edited, and
+# sometimes less.
+################################################################################
+
+	my ($self, $outputFilePath, $achievementContents ) = @_;
+ 	my $r             = $self->r;
+ 	my $ce            = $r->ce;
+
+	my $action          = $self->{action}||'no action';
+	
+	if (defined($achievementContents) and ref($achievementContents) ) {
+		$achievementContents = ${$achievementContents};
+	} elsif( ! not_blank($achievementContents)  ) {      # if the AchievementContents is undefined or empty
+		$achievementContents = ${$self->{r_achievementContents}};
+	}
+	
+
+	unless (not_blank($outputFilePath) ) {
+	    $self->addbadmessage("You must specify an file name in order to save a new file.");
+	    return "";
+	}
+	my $do_not_save    = 0 ;       # flag to prevent saving of file
+	my $editErrors = '';	
+	
+	##############################################################################
+	# write changes to the approriate files
+	# FIXME  make sure that the permissions are set correctly!!!
+	# Make sure that the warning is being transmitted properly.
+	##############################################################################
+   
+	my $writeFileErrors;
+	if ( not_blank($outputFilePath)  ) {   # save file
+	    
+	    # make sure any missing directories are created
+	    WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements},
+					   $outputFilePath);
+	    die "outputFilePath is unsafe!" unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{achievements}, 1); # 1==path can be relative to dir
+	    
+	    eval {
+		local *OUTPUTFILE;
+		open OUTPUTFILE,  ">$outputFilePath"
+		    or die "Failed to open $outputFilePath";
+		print OUTPUTFILE $achievementContents;
+		close OUTPUTFILE;		
+		# any errors are caught in the next block
+	    };
+	    
+	    $writeFileErrors = $@ if $@;
+	} 
+	
+	###########################################################
+	# Catch errors in saving files,
+	###########################################################
+	
+	$self->{saveError} = $do_not_save;    # don't do redirects if the file was not saved.
+	                                    # don't unlink files or send success messages
+	
+	if ($writeFileErrors) {
+	    # get the current directory from the outputFilePath
+	    $outputFilePath =~ m|^(/.*?/)[^/]+$|;
+	    my $currentDirectory = $1;
+	    
+	    my $errorMessage;
+	    # check why we failed to give better error messages
+	    if ( not -w $ce->{courseDirs}->{achievements} ) {
+		$errorMessage = "Write permissions have not been enabled in the templates directory.  No changes can be made.";
+	    } elsif ( not -w $currentDirectory ) {
+		$errorMessage = "Write permissions have not been enabled in '".$self->shortPath($currentDirectory)."'.  Changes must be saved to a different directory for viewing.";
+	    } elsif ( -e $outputFilePath and not -w $outputFilePath ) {
+		$errorMessage = "Write permissions have not been enabled for '".$self->shortPath($outputFilePath)."'.  Changes must be saved to another file for viewing.";
+	    } else {
+		$errorMessage = "Unable to write to '".$self->shortPath($outputFilePath)."': $writeFileErrors";
+	    }
+	    
+	    $self->{failure} = 1;
+	    $self->addbadmessage(CGI::p($errorMessage));
+	    
+	} 
+	
+	unless( $writeFileErrors or $do_not_save) {  # everything worked!  unlink and announce success!
+
+		if ( defined($outputFilePath) and ! $self->{failure} ) {  
+		            # don't announce saving of temporary editing files
+			my $msg = "Saved to file '".$self->shortPath($outputFilePath)."'.";
+
+			$self->addgoodmessage($msg);
+		}
+
+	}
+
+
+}  # end saveFileChanges
+
+
+
+
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams=();
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub fixAchievementContents {
+		#NOT a method
+		my $AchievementContents = shift;
+		# Handle the problem of line endings.  
+		# Make sure that all of the line endings are of unix type.  
+		# Convert \r\n to \n
+		$AchievementContents =~ s/\r\n/\n/g;
+		$AchievementContents =~ s/\r/\n/g;
+		$AchievementContents;
+}
+
+sub save_form {
+	my ($self, %actionParams) = @_;
+	my $r => $self->r;
+
+	if (-w $self->{sourceFilePath}) {
+
+		return "Save ".CGI::b($self->shortPath($self->{sourceFilePath}));	
+
+	} else {
+		return ""; #"Can't save -- No write permission";
+	}
+
+}
+
+sub save_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r= $self->r;
+	my $courseName      =  $self->{courseID};
+	my $achievementName         =  $self->{achievementID};
+	
+	#################################################
+	# grab the achievementContents from the form in order to save it to the source path
+	#################################################
+	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
+	$self->{r_achievementContents} = \$achievementContents;
+	
+	#################################################
+	# Construct the output file path
+	#################################################
+	$self->saveFileChanges($self->{sourceFilePath});	
+
+	return;
+
+}
+
+
+
+sub save_as_form {  # calls the save_as_handler 
+	my ($self, %actionParams) = @_;
+	my $sourceFilePath  = $self->{sourceFilePath};
+	my $achievementsDir  =  $self->r->ce->{courseDirs}->{achievements};
+	my $achievementID    = $self->{achievementID};	
+	my $sourceFileName = getRelativeSourceFilePath($self,$sourceFilePath);
+
+	#There are three things you can do with a new achievement editor
+	#you can replace the editior in the current achievement
+	my $use_in_current_achievement  =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => "use_in_current",
+		-label     => '',
+		-checked   => 'checked',
+			 },"and use in achievement ".CGI::b("$achievementID"));
+		       
+	#Use can use it in a new achievement
+	my $create_new_achievement      =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => 'use_in_new',
+    			 -label     => '',
+		       },"and use in new achievement ",).CGI::textfield(
+		-name => "action.save_as.id",
+		-value => "",
+		-width => "50",
+			   );  
+	
+	#you can not use it at all
+	my $dont_use_in_achievement  =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => "dont_use",
+		-label     => '',
+		       },"and don't use in an achievement");
+	
+	my $andRelink = CGI::br(). $use_in_current_achievement.CGI::br().
+	    $create_new_achievement.CGI::br().$dont_use_in_achievement;
+	    
+	return 'Save as '.
+	    CGI::textfield(
+		-name=>'action.save_as.target_file', -size=>80, -value=>"$sourceFileName",  
+	    ).",".
+	    CGI::hidden(-name=>'action.save_as.source_file', -value=>$sourceFilePath ).
+	    $andRelink;
+}
+
+
+
+sub save_as_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	$self->{status_message} = ''; ## DPVC -- remove bogus old messages
+	my $courseName      =  $self->{courseID};
+	my $achievementName         =  $self->{achievementID};
+	my $effectiveUserName = $self->r->param('effectiveUser');
+	
+	my $do_not_save = 0;
+	my $saveMode       = $actionParams->{'action.save_as.saveMode'}->[0] || 'no_save_mode_selected';
+	my $new_file_name  = $actionParams->{'action.save_as.target_file'}->[0] || '';
+	my $sourceFilePath = $actionParams->{'action.save_as.source_file'}->[0] || '';
+	my $targetAchievementID  =  $actionParams->{'action.save_as.id'}->[0] || '';
+
+	$self ->{sourceFilePath} = $sourceFilePath;  # store for use in saveFileChanges
+	$new_file_name =~ s/^\s*//;  #remove initial and final white space
+	$new_file_name =~ s/\s*$//;
+	if ( $new_file_name !~ /\S/) { # need a non-blank file name
+		# setting $self->{failure} stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("Please specify a file to save to."));
+	}
+	
+	#################################################
+	# grab the achievementContents from the form in order to save it to a new permanent file
+	#################################################
+	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
+	$self->{r_achievementContents} = \$achievementContents;
+	warn "achievement contents is empty" unless $achievementContents;
+	#################################################
+	# Rescue the user in case they forgot to end the file name with .at
+	#################################################
+	
+	$new_file_name =~ s/\.at$//; # remove it if it is there
+	$new_file_name .= '.at'; # put it there
+	
+       	
+	#################################################
+	# Construct the output file path
+	#################################################
+	my $outputFilePath = $self->r->ce->{courseDirs}->{achievements} . '/' . 
+								 $new_file_name; 		
+	if (defined $outputFilePath and -e $outputFilePath) {
+		# setting $do_not_save stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("File '".$self->shortPath($outputFilePath)."' exists.  
+		File not saved. No changes have been made."));
+	} elsif ($saveMode eq 'use_in_new' && not $targetAchievementID) {
+	    $self->addbadmessage("No new Achievement ID specified.  No new achievement created.  File not saved.");
+	    $do_not_save = 1;
+	    
+	} elsif ($saveMode eq 'use_in_new' && $db->existsAchievement($targetAchievementID)) {
+	    $self->addbadmessage("Achievement ID exists!  No new achievement created.  File not saved.");
+	    $do_not_save = 1;
+	} else {
+	    $self->{editFilePath} = $outputFilePath;
+	    $self->{inputFilePath} = '';
+	}
+
+	return "" if $do_not_save;
+	
+
+	#Save changes
+	$self->saveFileChanges($outputFilePath);
+	
+	if ($saveMode eq 'use_in_current' and -r $outputFilePath) { 
+	    #################################################
+	    # Modify evaluator path in current achievement
+	    #################################################
+	    my $achievement = $self->r->db->getAchievement($achievementName);
+	    $achievement->test($new_file_name);
+	    if ($self->r->db->putAchievement($achievement)) {
+		$self->addgoodmessage("The evaluator for $achievementName has been renamed to '".$self->shortPath($outputFilePath)."'.") ;
+	    } else {
+		$self->addbadmessage("Unable to change the evaluator for set $achievementName. Unknown error.");
+	    }
+	    
+	} elsif ($saveMode eq 'use_in_new') {
+	    #Create a new achievement to use the evaluator in
+	    my $achievement = $self->r->db->newAchievement();
+	    $achievement->achievement_id($targetAchievementID);
+	    $achievement->test($new_file_name);
+	    $achievement->icon(DEFAULT_ICON());
+	    
+	    $self->r->db->addAchievement($achievement);
+	    $self->addgoodmessage("Achievement $targetAchievementID created with evaluator '".$self->shortPath($outputFilePath)."'.") ;			    
+	    
+	} elsif ($saveMode eq 'dont_use') {
+	    #################################################
+	    # Don't change any achievements - just report 
+	    #################################################
+	    $self->addgoodmessage("A new file has been created at '".$self->shortPath($outputFilePath)."'");
+	} else {
+	    $self->addbadmessage("Don't recognize saveMode: |$saveMode|. Unknown error.");
+	}
+	
+      
+	
+	#################################################
+	# Set up redirect
+	# The redirect gives the server time to detect that the new file exists.
+	#################################################
+	my $problemPage;
+
+	if ($saveMode eq 'dont_use' ) {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $achievementName);
+	} elsif ($saveMode eq 'use_in_current') {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $achievementName);
+	} elsif ($saveMode eq 'use_in_new') {
+	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $targetAchievementID);
+	} else {
+		$self->addbadmessage(" Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |$saveMode|.");
+		# can't continue since paths have not been properly defined.
+		return "";
+	}
+	
+	#warn "save mode is $saveMode";
+
+	my $relativeOutputFilePath = $self->getRelativeSourceFilePath($outputFilePath);
+	
+	my $viewURL = $self->systemLink($problemPage, 
+					params=>{
+					    sourceFilePath     => $relativeOutputFilePath,
+					    status_message     => uri_escape($self->{status_message})}
+					
+	    );
+	
+	$self->reply_with_redirect($viewURL);
+    return "";  # no redirect needed
+}
+
+sub fresh_edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	#$self->addgoodmessage("fresh_edit_handler called");
+}
+
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
new file mode 100644
index 0000000000..2345728966
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
@@ -0,0 +1,1319 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementList;
+use base qw(WeBWorK);
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::ProblemAchievementList - Entry point for achievement specific
+data editing/viewing
+
+=cut
+
+=for comment
+
+What do we want to be able to do here?
+
+-select achievements to edit and then edit their "basic data".  We should also be presented with 
+links to edit the evaluator and the individual user data.  
+
+-assign users to achievements "en masse"
+
+-import achievements from a file
+
+-export achievements form a file
+
+-collect achievement "scores" and output to a file
+
+-create and copy achievements
+
+-delete achievements
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(timeToSec readFile listFilesRecursive cryptPassword sortAchievements);
+use DateTime;
+
+#constants for forms and the various handlers
+use constant BLANK_ACHIEVEMENT => "blankachievement.at";
+use constant DEFAULT_ENABLED_STATE => 0;
+
+use constant EDIT_FORMS => [qw(cancelEdit saveEdit)];
+use constant VIEW_FORMS => [qw(edit assign import export score create delete)];
+use constant EXPORT_FORMS => [qw(cancelExport saveExport)];
+
+use constant VIEW_FIELD_ORDER => [ qw( select enabled achievement_id category name users ) ];
+use constant EDIT_FIELD_ORDER => [ qw( icon achievement_id name category enabled points max_counter description icon_file test_file) ];
+use constant EXPORT_FIELD_ORDER => [ qw( select achievement_id name) ];
+
+use constant STATE_PARAMS => [qw(user effectiveUser key editMode exportMode)];
+
+#properites for the fields shown in the tables
+use constant  FIELD_PROPERTIES => {
+	achievement_id => {
+		type => "text",
+		size => 8,
+		access => "readonly",
+	},
+	name => {
+		type => "text",
+		size => 30,
+		access => "readwrite",
+	},
+	category => {
+		type => "text",
+		size => 30,
+		access => "readwrite",
+	},
+	icon => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+	test => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+
+	description => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+
+	enabled => {
+		type => "checked",
+		size => 8,
+		access => "readwrite",
+	},	
+
+	points => {
+		type => "text",
+		size => 8,
+		access => "readwrite",
+	},	
+
+	max_counter => {
+	        type => "text",
+		size => 8,
+		access => "readwrite",
+	},
+};
+
+sub initialize {
+
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $achievementID= $urlpath->arg("achievementID");       
+	my $user         = $r->param('user');
+	
+
+	my $root = $ce->{webworkURLs}->{root};
+
+	#check permissions
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	########## set initial values for state fields
+	my @allAchievementIDs = $db->listAchievements;
+	# DBFIXME count would suffice here :P
+	my @users = $db->listUsers;
+	$self->{allAchievementIDs} = \@allAchievementIDs;
+	$self->{totalUsers} = scalar @users;
+	
+	if (defined $r->param("selected_achievements")) {
+		$self->{selectedAchievementIDs} = [ $r->param("selected_achievements") ];
+	} else {
+		$self->{selectedAchievementIDs} = [];
+	}
+	
+	$self->{editMode} = $r->param("editMode") || 0;
+	
+	#########################################
+	#  call action handler  
+	#########################################
+	
+	my $actionID = $r->param("action");
+	$self->{actionID} = $actionID;
+	if ($actionID) {
+		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
+			die "Action $actionID not found";
+		}
+
+		my $actionHandler = "${actionID}_handler";
+		my %genericParams;
+		foreach my $param (qw(selected_achievements)) {
+		    $genericParams{$param} = [ $r->param($param) ];
+		}
+		my %actionParams = $self->getActionParams($actionID);
+		my %tableParams = $self->getTableParams();
+		$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
+		$self->addmessage(
+		       $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
+			       CGI::hr()
+		    );
+		
+	} else {
+	    
+	    $self->addgoodmessage("Please select action to be performed.");
+	}
+		
+	
+}
+
+sub info {
+	my ($self) = @_;
+	my $r            = $self->r;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $urlpath      = $r->urlpath;
+	my $courseName   = $urlpath->arg("courseID");
+	
+	my $evalpath = $ce->{courseDirs}{achievements};
+	$evalpath =~ s/$ce->{courseDirs}{root}/$courseName/;
+	my $iconpath = $ce->{courseURLs}{achievements};
+	$iconpath =~ s/$ce->{courseURLs}{html}/$ce->{courseDirs}{html}/;
+	$iconpath =~ s/$ce->{courseDirs}{root}/$courseName/;
+
+	print CGI::div("This is the Achievent Editor.  It is used to edit the achievements available to students.  Please keep in mind the following facts:");
+	print CGI::start_ul();
+	print CGI::li("The achievements are always sorted by category and then by name.");
+	print CGI::li("Achievments are displayed, and evaluated, in the order they are listed.");
+	print CGI::li('The "secret" category always comes first and creates achievements which are not visible to students until they are earned.');
+	print CGI::li('The "level" category is used for the achievements associated to a users level.');
+	print CGI::li("The evaluator files are stored in $evalpath");
+	print CGI::li("The icons are stored in $iconpath");
+	print CGI::end_ul();
+	
+	return "";
+}
+
+
+sub body {
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $achievementID= $urlpath->arg("achievementID");       
+	my $user         = $r->param('user');
+	
+	my $root = $ce->{webworkURLs}->{root};
+
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	my $actionID = $self->{actionID};
+	
+	########## retrieve possibly changed values for member fields
+	
+	my @allAchievementIDs = @{ $self->{allAchievementIDs} }; # do we need this one? YES, deleting or importing a achievement will change this.
+	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
+	my $editMode = $self->{editMode};
+	my $exportMode = $self->{exportMode};
+	
+	########## get achievements
+	
+	# DBFIXME use an iterator
+	my @Achievements = $db->getAchievements(@allAchievementIDs);
+	
+	# sort Achievments.  Achievements are always sorted by in the order they are evaluated
+	if (@Achievements) {
+	    @Achievements = sortAchievements(@Achievements);
+	}
+
+
+	########## print beginning of form
+
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"achievementlist"});
+	print $self->hidden_authen_fields();
+	
+	########## print state data
+	
+	print "\n<!-- state data here -->\n";
+	
+	print CGI::hidden(-name=>"editMode", -value=>$editMode);
+	print CGI::hidden(-name=>"exportMode", -value=>$exportMode);
+	
+	print "\n<!-- state data here -->\n";
+	
+	########## print action forms
+	
+	print CGI::p(CGI::b("Any changes made below will be reflected in the achievement for ALL students.")) if $editMode;
+
+	print CGI::start_table({});
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+
+	my @formsToShow;
+	if ($editMode) {
+		@formsToShow = @{ EDIT_FORMS() };
+	} else {
+		@formsToShow = @{ VIEW_FORMS() };
+	}
+	
+	if ($exportMode) {
+		@formsToShow = @{ EXPORT_FORMS() };
+	}
+	
+	my $i = 0;
+	foreach my $actionID (@formsToShow) {
+
+		my $actionForm = "${actionID}_form";
+		my $onChange = "document.achievementlist.action[$i].checked=true";
+		my %actionParams = $self->getActionParams($actionID);
+		
+		print CGI::Tr({-valign=>"top"},
+			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		);
+		
+		$i++;
+	}
+	
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all',
+	       onClick => "for (i in document.achievementlist.elements)  { 
+	                       if (document.achievementlist.elements[i].name =='selected_achievements') { 
+	                           document.achievementlist.elements[i].checked = true
+	                       }
+	                    }" });
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all',
+	       onClick => "for (i in document.achievementlist.elements)  { 
+	                       if (document.achievementlist.elements[i].name =='selected_achievements') { 
+	                          document.achievementlist.elements[i].checked = false
+	                       }
+	                    }" });
+	unless ($editMode or $exportMode) {
+		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+			$selectAll." ". $selectNone
+			)
+		);
+	}
+	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
+		CGI::submit(-value=>"Take Action!"))
+	);
+	print CGI::end_table();
+	
+	########## print table
+
+	$self->printTableHTML(\@Achievements,
+		editMode => $editMode,
+		exportMode => $exportMode,
+		selectedAchievementIDs => \@selectedAchievementIDs,
+	);
+	
+	
+	########## print end of form
+	
+ 	print CGI::end_form();
+
+	return "";
+}
+
+################################################################################
+# extract particular params and put them in a hash (values are ARRAYREFs!)
+################################################################################
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub getTableParams {
+	my ($self) = @_;
+	my $r = $self->{r};
+	
+	my %tableParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^(?:achievement)\./;
+		$tableParams{$param} = [ $r->param($param) ];
+	}
+	return %tableParams;
+}
+
+################################################################################
+# actions and action triggers
+################################################################################
+
+# edit, cancelEdit, and saveEdit should stay with the display module and
+# not be real "actions". that way, all actions are shown in view mode and no
+# actions are shown in edit mode.
+
+
+#form for edition achievements
+sub edit_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Edit ",
+		CGI::popup_menu(
+			-name => "action.edit.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+#handler for editing achievements.  Just changes the view mode
+sub edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.edit.scope"}->[0];
+	if ($scope eq "all") {
+	        $self->{selectedAchievementIDs} = $self->{allAchievementIDs};
+		$result = "editing all achievements";
+	} elsif ($scope eq "selected") {
+		$result = "editing selected achievements";
+	}
+	$self->{editMode} = 1;
+	
+	return $result;
+}
+
+#form for assigning achievemetns to users
+sub assign_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Assign ",
+		CGI::popup_menu(
+			-name => "action.assign.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.assign.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+		" to all users, create global data, and ",
+   		CGI::popup_menu(
+			-name => "action.assign.overwrite",
+			-values => [qw(everything new_only)],
+			-default => $actionParams{"action.assign.overwrite"}->[0] || "new_only",
+			-labels => {
+				everything => "overwrite all data",
+				new_only => "preserve existing data",
+			},
+			-onchange => $onChange,
+		),
+
+	);
+}
+
+#handler for assigning achievements to users
+sub assign_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+
+	my $scope = $actionParams->{"action.assign.scope"}->[0];
+	my $overwrite = (($actionParams->{"action.assign.overwrite"}->[0] eq 'everything') ? 1 : 0);
+	
+	my @achievementIDs;
+	my @users = $db->listUsers;
+
+
+	if ($scope eq "all") {
+	        @achievementIDs = @{$self->{allAchievementIDs}};
+	} else {
+	    	@achievementIDs = @{$self->{selectedAchievementIDs}};
+	}
+	
+	#Enable all achievements
+	my @achievements = $db->getAchievements(@achievementIDs);
+	
+	foreach my $achievement (@achievements) {
+	    $achievement->enabled(1);
+	    $db->putAchievement($achievement);
+	}
+
+	#Assign globalUserAchievement data, overwriting if necc
+
+	foreach my $user (@users) {
+	    if (not $db->existsGlobalUserAchievement($user)) {
+		my $globalUserAchievement = $db->newGlobalUserAchievement();
+		$globalUserAchievement->user_id($user);
+		$db->addGlobalUserAchievement($globalUserAchievement);
+	    } elsif ($overwrite) {
+		my $globalUserAchievement = $db->newGlobalUserAchievement();
+		$globalUserAchievement->user_id($user);
+		$db->putGlobalUserAchievement($globalUserAchievement);
+	    }
+	}
+		
+
+	#Assign userAchievement data, overwriting if necc
+
+	foreach my $achievementID (@achievementIDs) {
+	    foreach my $user (@users) {
+		if (not $db->existsUserAchievement($user,$achievementID)) {
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievementID);
+		    $db->addUserAchievement($userAchievement);
+		} elsif ($overwrite) {
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievementID);
+		    $db->putUserAchievement($userAchievement);
+		}
+	    }
+	}
+     
+
+	return "Assigned $scope achievements to users";
+}
+
+#form for scoring
+sub score_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join ("",
+		"Score ",
+		CGI::popup_menu(
+			-name => "action.score.scope",
+			-values => [qw(none all selected)],
+			-default => $actionParams{"action.score.scope"}->[0] || "none",
+			-labels => {
+				none => "no achievements.",
+				all => "all achievements.",
+				selected => "selected achievements.",
+			},
+			-onchange => $onChange,
+		),
+	);
+	
+}
+
+#handler for scoring
+sub score_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+
+	my $scope = $actionParams->{"action.score.scope"}->[0];	
+	my @achievementsToScore;
+	
+	if ($scope eq "none") { 
+		@achievementsToScore = ();
+		return "No achievements selected for scoring.";
+	} elsif ($scope eq "all") {
+		@achievementsToScore = @{ $self->{allAchievementIDs} };
+	} elsif ($scope eq "selected") {
+		@achievementsToScore = @{ $genericParams->{selected_achievements} };
+	}
+
+	#define file name
+	my $scoreFileName = $courseName."_achievement_scores.csv";
+	my $scoreFilePath = $ce->{courseDirs}->{scoring}.'/'.$scoreFileName;
+	
+	# back up existing file
+	if(-e $scoreFilePath) {
+	    rename($scoreFilePath, "$scoreFilePath.bak") or 
+		warn "Existing file $scoreFilePath could not be backed up and was lost.";
+	}
+
+	# check path and open the file
+	$scoreFilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{scoring}, $scoreFilePath);
+
+	local *SCORE;
+	open SCORE, ">$scoreFilePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $scoreFilePath");
+
+	#print out header info
+	print SCORE "username, last name, first name, section, achievement level, achievement score, ";
+	
+	my @achievementIDs = $db->listAchievements;
+	my @achievements = $db->getAchievements(@achievementIDs);
+	@achievements = sortAchievements(@achievements);
+
+	foreach my $achievement (@achievements) {
+	    print SCORE $achievement->achievement_id.", ";
+	}
+	print SCORE "\n";
+
+	my @users = $db->listUsers;
+	
+	# get user records
+	my @userRecords  = ();
+	foreach my $currentUser ( @users) {
+		my $userObj = $db->getUser($currentUser); #checked
+		die "Unable to find user object for $currentUser. " unless $userObj;
+		push (@userRecords, $userObj );
+	}
+	
+	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
+	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+
+	
+	#print out achievement information for each user
+	foreach my $userRecord (@userRecords) {
+	    my $user_id = $userRecord->user_id;
+	    next unless $db->existsGlobalUserAchievement($user_id);
+	    print SCORE "$user_id, $userRecord->{last_name}, $userRecord->{first_name}, $userRecord->{section}, ";
+	    my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
+	    my $level_id = $globalUserAchievement->level_achievement_id;
+	    $level_id = ' ' unless $level_id;
+	    my $points = $globalUserAchievement->achievement_points;
+	    $points = 0 unless $points;
+	    print SCORE "$level_id, $points, ";
+
+	    foreach my $achievement (@achievements) {
+		my $achievement_id = $achievement->achievement_id;
+		if ($db->existsUserAchievement($user_id,$achievement_id)) {
+		    my $userAchievement = $db->getUserAchievement($user_id,$achievement_id);
+		    print SCORE $userAchievement->earned ? "1, ": "0, ";
+		} else {
+		    print SCORE ", ";
+		}
+	    }
+
+	    print SCORE "\n";
+	}
+	
+	close SCORE;
+		    
+	return CGI::div({class=>"ResultsWithoutError"},  "Achievement scores saved to $scoreFileName")
+}
+
+
+#form for delete action
+sub delete_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		CGI::div({class=>"ResultsWithError"}, 
+			"Delete ",
+			CGI::popup_menu(
+				-name => "action.delete.scope",
+				-values => [qw(none selected)],
+				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
+				-labels => {
+					none => "no achievements.",
+					selected => "selected achievements.",
+				},
+				-onchange => $onChange,
+			),
+			CGI::em(" Deletion destroys all achievement-related data and is not undoable!"),
+		)
+	);
+}
+
+#handler for delete action
+sub delete_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+
+	my $scope = $actionParams->{"action.delete.scope"}->[0];
+
+	
+	my @achievementIDsToDelete = ();
+
+	if ($scope eq "selected") {
+		@achievementIDsToDelete = @{ $self->{selectedAchievementIDs} };
+	}
+	
+	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
+	my %selectedAchievementIDs = map { $_ => 1 } @{ $self->{selectedAchievementIDs} };
+	
+	#run through selected achievements and delete
+	foreach my $achievementID (@achievementIDsToDelete) {
+		delete $allAchievementIDs{$achievementID};
+		delete $selectedAchievementIDs{$achievementID};
+		
+		$db->deleteAchievement($achievementID);
+	}
+	
+	#update local fields
+	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
+	$self->{selectedAchievementIDs} = [ keys %selectedAchievementIDs ];
+	
+	my $num = @achievementIDsToDelete;
+	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num achievement" .
+	                                           ($num == 1 ? "" : "s")
+	);
+}
+
+#form for creating achievement
+sub create_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	my $r      = $self->r;
+	
+	return "Create a new achievement with ID: ", 
+		CGI::textfield(
+			-name => "action.create.id",
+			-value => $actionParams{"action.create.name"}->[0] || "",
+			-width => "60",
+			-onchange => $onChange,
+		),
+		" as ",
+		CGI::popup_menu(
+			-name => "action.create.type",
+			-values => [qw(empty copy)],
+			-default => $actionParams{"action.create.type"}->[0] || "empty",
+			-labels => {
+				empty => "a new empty achievement.",
+				copy => "a duplicate of the first selected achievement.",
+			},
+			-onchange => $onChange,
+		);
+			
+}
+
+#handler for creating an ahcievement
+sub create_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+     
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+	
+	#create achievement
+	my $newAchievementID = $actionParams->{"action.create.id"}->[0];
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new achievement: no achievement ID specified!") unless $newAchievementID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, "Achievement $newAchievementID exists.  No achievement created") if $db->existsAchievement($newAchievementID);
+	my $newAchievementRecord = $db->newAchievement;
+	my $oldAchievementID = $self->{selectedAchievementIDs}->[0];
+
+	my $type = $actionParams->{"action.create.type"}->[0];
+
+	#either assign empty data or copy over existing data
+	if ($type eq "empty") {
+		$newAchievementRecord->achievement_id($newAchievementID);
+		$newAchievementRecord->enabled(0);
+		$newAchievementRecord->test(BLANK_ACHIEVEMENT());
+		$db->addAchievement($newAchievementRecord);
+	} elsif ($type eq "copy") {
+		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate achievement: no achievement selected for duplication!") unless $oldAchievementID =~ /\S/;
+		$newAchievementRecord = $db->getAchievement($oldAchievementID);
+		$newAchievementRecord->achievement_id($newAchievementID);
+		$db->addAchievement($newAchievementRecord);
+
+	}
+
+	#add to local list of achievements
+	push @{ $self->{allAchievementIDs} }, $newAchievementID;
+	
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new achievement: $@") if $@;
+	
+	return CGI::div({class=>"ResultsWithoutError"},"Successfully created new achievement $newAchievementID" );
+	
+}
+
+#form for importing achievements
+sub import_form {
+	my ($self, $onChange, %actionParams) = @_;
+	
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+
+	return join(" ",
+		"Import achievements from ",
+		CGI::popup_menu(
+			-name => "action.import.source",
+			-values => [ "", $self->getAxpList() ],
+			-labels => { "" => "the following file" },
+			-default => $actionParams{"action.import.source"}->[0] || "",
+		        -onchange => $onChange,
+		),
+		    "assigning the achievements to " .
+		    CGI::popup_menu(
+			-name => "action.import.assign",
+			-value => [qw(none all)],
+			-default => $actionParams{"action.import.assign"}->[0] || "none",
+			-labels => {
+			    all => "all current users.",
+			    none => "no users.",
+			},
+			-onchange => $onChange,
+		   ) );
+}
+
+# handler for importing achievements
+sub import_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $ce          = $r->ce;
+	my $db          = $r->db;
+
+	my $fileName = $actionParams->{"action.import.source"}->[0];
+	my $assign = $actionParams->{"action.import.assign"}->[0];
+	my @users = $db->listUsers;
+	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
+	my $filePath = $ce->{courseDirs}->{achievements}.'/'.$fileName;
+	
+	#open file name
+	local *IMPORT;
+	open EXPORT, "$filePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $filePath");
+
+	#read in lines from file
+	my $count = 0;
+	while (my $line = <EXPORT>) {
+	    chomp $line;
+	    my @data = split(', ',$line);
+	    my $achievement_id = $data[0];
+	    #skip achievements that already exist
+	    next if $db->existsAchievement($achievement_id);
+
+	    #write achievement data.  The "format" for this isn't written down anywhere (!)
+	    my $achievement = $db->newAchievement();
+	    $achievement->achievement_id($achievement_id);
+	    $achievement->name($data[1]);
+	    $achievement->category($data[2]);
+	    $data[3] =~ s/\;/,/;
+	    $achievement->description($data[3]);
+	    $achievement->points($data[4]);
+	    $achievement->max_counter($data[5]);
+	    $achievement->test($data[6]);
+	    $achievement->icon($data[7]);
+	    $achievement->enabled($assign eq "all"?1:0);
+	    
+	    #add achievement
+	    $db->addAchievement($achievement);
+	    $count++;
+	    $allAchievementIDs{$achievement_id} = 1;
+	    
+	    #assign to usesrs if necc
+	    if ($assign eq "all") {
+		foreach my $user (@users) {
+		    if (not $db->existsGlobalUserAchievement($user)) {
+			my $globalUserAchievement = $db->newGlobalUserAchievement();
+			$globalUserAchievement->user_id($user);
+			$db->addGlobalUserAchievement($globalUserAchievement);
+		    }
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievement_id);
+		    $db->addUserAchievement($userAchievement);
+		}
+	    }
+	}
+
+	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
+		    
+	return CGI::div(
+	    {class=>"ResultsWithoutError"}, "Imported $count achievement".(($count >1 || $count == 0)?"s":""));
+}
+
+#form for exporting 
+sub export_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Export ",
+		CGI::popup_menu(
+			-name => "action.export.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.export.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+# export handler
+# this does not actually export any files, rather it sends us to a new page in order to export the files
+sub export_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.export.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "exporting all achievements";
+		$self->{selectedAchievementIDs} = $self->{allAchievementIDs};
+	} elsif ($scope eq "selected") {
+		$result = "exporting selected achievements";
+		$self->{selectedAchievementIDs} = $genericParams->{selected_achievements}; # an arrayref
+	}
+	$self->{exportMode} = 1;
+	
+	return   CGI::div({class=>"ResultsWithoutError"},  $result);
+}
+
+
+#form and hanlder for leaving the export page
+sub cancelExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon export";
+}
+
+sub cancelExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
+	
+	$self->{exportMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
+}
+
+#handler and form for actually exporting
+sub saveExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Export selected achievements.";
+}
+
+sub saveExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $ce          = $r->ce;
+	my $db          = $r->db;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+
+	my @achievementIDsToExport = @{ $self->{selectedAchievementIDs} };
+
+	#get file path
+	my $FileName = $courseName."_achievements.axp";
+	my $FilePath = $ce->{courseDirs}->{achievements}.'/'.$FileName;
+	
+	# back up existing file
+	if(-e $FilePath) {
+	    rename($FilePath, "$FilePath.bak") or 
+		warn "Existing file $FilePath could not be backed up and was lost.";
+	}
+
+	$FilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements}, $FilePath);
+	#open file
+	local *EXPORT;
+	open EXPORT, ">$FilePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $FilePath");
+
+	my @achievements = $db->getAchievements(@achievementIDsToExport);
+	#run through achievements outputing data as csv list.  This format is not documented anywhere
+	foreach my $achievement (@achievements) {
+	    print EXPORT $achievement->achievement_id.", ";
+	    print EXPORT $achievement->name.", ";
+	    print EXPORT $achievement->category.", ";
+	    my $description = $achievement->description;
+	    $description =~ s/,/\;/;
+	    print EXPORT $description.", ";
+	    print EXPORT $achievement->points.", ";
+	    print EXPORT $achievement->max_counter.", ";
+	    print EXPORT $achievement->test.", ";
+	    print EXPORT $achievement->icon.", ";
+	    print EXPORT "\n";
+	}
+
+	close EXPORT;
+	
+	$self->{exportMode} = 0;
+	
+	return 	CGI::div( {class=>"resultsWithoutError"}, "Exported achievements to $FileName");
+
+}
+
+#form and handler for cancelling edits
+sub cancelEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon changes";
+}
+
+sub cancelEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
+	
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
+}
+
+#form and handler for saving edits
+sub saveEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Save changes";
+}
+
+sub saveEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	
+	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
+	
+	#run through selected achievements
+	foreach my $achievementID (@selectedAchievementIDs) {
+		my $Achievement = $db->getAchievement($achievementID); # checked
+		# FIXME: we may not want to die on bad sets, they're not as bad as bad users
+		die "record for achievement $achievementID not found" unless $Achievement;
+
+		#update fields
+		foreach my $field ($Achievement->NONKEYFIELDS()) {
+			my $param = "achievement.${achievementID}.${field}";
+			if (defined $tableParams->{$param}->[0]) {
+			    $Achievement->$field($tableParams->{$param}->[0]);
+			}
+		}
+		
+		$db->putAchievement($Achievement);
+	}
+	
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+}
+
+################################################################################
+# "display" methods
+################################################################################
+
+#write out a particular field
+sub fieldEditHTML {
+	my ($self, $fieldName, $value, $properties) = @_;
+	my $size = $properties->{size};
+	my $type = $properties->{type};
+	my $access = $properties->{access};
+	my $items = $properties->{items};
+	my $synonyms = $properties->{synonyms};
+	my $headerFiles = $self->{headerFiles};
+	
+	if ($access eq "readonly") {
+		return $value;
+	}
+	
+	if ($type eq "number" or $type eq "text") {
+		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+	}
+	
+	if ($type eq "checked") {
+		
+		# FIXME: kludge (R)
+		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
+		# in which case the hidden field overrides the parameter with a 0
+		return CGI::checkbox(
+			-name => $fieldName,
+			-checked => $value,
+			-label => "",
+			-value => 1
+		) . CGI::hidden(
+			-name => $fieldName,
+			-value => 0
+		);
+	}
+}
+
+#write out a row of the table
+sub recordEditHTML {
+	my ($self, $Achievement, %options) = @_;
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $ce          = $r->ce;
+	my $db		= $r->db;
+	my $authz	= $r->authz;
+	my $user	= $r->param('user');
+	my $root        = $ce->{webworkURLs}->{root};
+	my $courseName  = $urlpath->arg("courseID");
+	
+	my $editMode = $options{editMode};
+	my $exportMode = $options{exportMode};
+	my $achievementSelected = $options{achievementSelected};
+
+	my $users = $db->countAchievementUsers($Achievement->achievement_id);
+	my $totalUsers = $self->{totalUsers};
+
+	my @tableCells;
+	my $achievement_id = $Achievement->achievement_id;
+	my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",  $r, courseID => $courseName, achievementID => $achievement_id);
+	my $editorURL = $self->systemLink($editorPage, params => {
+	    sourceFilePath => $ce->{courseDirs}->{achievements}."/".$Achievement->test});
+
+	my $userEditorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementUserEditor", $r, courseID=>$courseName, achievementID =>$achievement_id);
+	my $userEditorURL = $self->systemLink($userEditorPage, params => {});
+
+	# the formats are "hard coded" below.  Making them more modular would be good
+	#format for export row
+	if ($exportMode) {
+	    # selection checkbox
+	    push @tableCells, CGI::checkbox(
+		-type => "checkbox",
+		-name => "selected_achievements",
+		-value => $achievement_id,
+		-label => "",
+		-checked => $achievementSelected,
+					    );
+	
+    
+	    my @fields = ("achievement_id", "name");
+	    
+	    foreach my $field (@fields) {
+		
+		my $fieldName = "achievement.".$achievement_id .".". $field;
+		my $fieldValue = $Achievement->$field;
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
+		$properties{access} = "readonly";
+		$fieldValue =~ s/ /&nbsp;/g;
+		push @tableCells, CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+	    }
+	    
+	    #format for edit mode
+	} elsif ($editMode) {
+
+	    return unless $achievementSelected;
+
+	    my $tableCell;
+
+	    if ($Achievement->{icon}) {
+		$tableCell = CGI::img({-src=>$ce->{courseURLs}->{achievements}."/".$Achievement->{icon},-alt=>"Achievement Icon",-height=>60,-vspace=>10});
+	    } else {
+		$tableCell = CGI::img({-src=>$ce->{webworkURLs}->{htdocs}."/images/defaulticon.png"
+					   ,-alt=>"Achievement Icon",-height=>60,-vspace=>10});
+	    }
+	    $tableCell = $tableCell.CGI::br().CGI::center(CGI::a({href=>$editorURL},"Edit"));
+
+	    push @tableCells, $tableCell;
+
+	    my $fieldName;
+	    my $fieldValue;
+	    my %properties;
+	    my $field;
+
+	    $tableCell = CGI::hidden(
+		-name => "selected_achievements",
+		-value => $achievement_id,
+		);
+	    
+	    $field = "achievement_id";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "name";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "category";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    $field = "enabled";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "points";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "max_counter";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    $field = "description";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "test";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "icon";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    #format for regular viewing mode
+	} else {
+	 
+	    # selection checkbox
+	    push @tableCells, CGI::checkbox({
+		name => "selected_achievements",
+		value => $achievement_id,
+		checked => $achievementSelected,
+		label => "",
+		});
+	    
+	    my @fields = ("enabled", "achievement_id", "category", "name");
+	    my $AchievementEditURL = $self->systemLink($urlpath->new(type=>'instructor_achievement_list', args=>{courseID => $courseName})) . "&editMode=1&selected_achievements=" . $achievement_id;
+	    my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/edit.gif";
+	    my $imageLink = CGI::a({href => $AchievementEditURL}, CGI::img({src=>$imageURL, border=>0}));
+
+
+	    foreach my $field (@fields) {
+		
+		my $fieldName = "achievement.".$achievement_id.".".$field;
+		my $fieldValue = $Achievement->$field;
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
+		$properties{access} = "readonly";
+		$fieldValue =~ s/ /&nbsp;/g;
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enabled/;
+		if ($field =~ /achievement_id/) {
+		    $fieldValue .= " ".$imageLink;
+		}
+		push @tableCells, CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+	    }
+
+	    push @tableCells, CGI::a({href=>$userEditorURL}, "$users/$totalUsers");
+
+	    push @tableCells, CGI::a({href=>$editorURL}, "Edit Evaluator");
+
+	}
+
+	return CGI::Tr({}, CGI::td({}, \@tableCells));
+}
+
+#this prints out the whole table
+sub printTableHTML {
+	my ($self, $AchievementsRef, %options) = @_;
+	my $r                       = $self->r;
+	my $authz                   = $r->authz;
+	my $user                    = $r->param('user');
+	my @Achievements                    = @$AchievementsRef;
+  
+	
+	my $editMode                = $options{editMode};
+	my $exportMode              = $options{exportMode};
+	my %selectedAchievementIDs          = map { $_ => 1 } @{ $options{selectedAchievementIDs} };
+	
+	# names of headings:
+
+	if ($editMode and not %selectedAchievementIDs) {
+	    print CGI::p(
+		CGI::i("No achievements shown.  Select an achievement to edit!"));
+	    return;
+	}
+	    
+
+	my @tableHeadings; 
+	    
+	#hardcoded headings.  making htis more modular would be good
+	if ($exportMode) {
+	    @tableHeadings = ("Select",
+			      "Achievement ID",
+			      "Name");
+	} elsif ($editMode) {
+	    @tableHeadings = ("Icon",
+			      "Achievement ID <br> Name <br> Category",
+			      "Enabled <br> Points <br> Counter",
+			      "Description <br> Evaluator File <br> Icon File"
+		);
+	} else {
+	    @tableHeadings = ("Select",
+			      "Enabled",
+			      "Achievement ID",
+			      "Category",
+			      "Name",
+			      "Edit <br> Users",
+			      "Edit <br> Evaluator"
+		);
+	}
+	
+	# print the table
+	if ($exportMode) {
+	    print CGI::start_table({});
+	} else {
+	    print CGI::start_table({-border=>1, -cellpadding=>5});
+	}
+	
+	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
+
+	for (my $i = 0; $i < @Achievements; $i++) {
+		my $Achievement = $Achievements[$i];
+
+		print $self->recordEditHTML($Achievement,
+			editMode => $editMode,
+			exportMode => $exportMode,
+			achievementSelected => exists $selectedAchievementIDs{
+			    $Achievement->achievement_id}
+		);
+	}
+	
+	print CGI::end_table();
+	#########################################
+	# if there are no users shown print message
+	# 
+	##########################################
+	
+	print CGI::p(
+                      CGI::i("No achievements shown.  Create an achievement!")
+	    ) unless @Achievements;
+}
+
+#get list of files that can be imported.  
+sub getAxpList {
+	my ($self) = @_;
+	my $ce = $self->{ce};
+	my $dir = $ce->{courseDirs}->{achievements};
+	return $self->read_dir($dir, qr/.*\.axp/);
+}
+
+1;
+
+=head1 AUTHOR
+
+Written by Robert Van Dam, toenail (at) cif.rochester.edu
+
+=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
new file mode 100644
index 0000000000..f30788596d
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
@@ -0,0 +1,242 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm,v 1.23 2006/09/25 22:14:53 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementUserEditor;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::AchievementUserEditor - List and edit the
+users assigned to an achievement.
+
+=cut
+
+use strict;
+use warnings;
+use CGI qw(-nosticky );
+use WeBWorK::Debug;
+
+sub initialize {
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $authz      = $r->authz;
+	my $db         = $r->db;	
+	my $achievementID = $urlpath->arg("achievementID");
+	my $user       = $r->param('user');
+	
+	# Check permissions
+	return unless $authz->hasPermissions($user, "edit_achievements");	
+
+	my @users = $db->listUsers;
+	my %selectedUsers = map {$_ => 1} $r->param('selected');
+	
+	my $doAssignToSelected = 0;
+	
+	#Check and see if we need to assign or unassign things
+	if (defined $r->param('assignToAll')) {
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been assigned to all users."));
+		%selectedUsers = map {$_ => 1} @users;
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param('unassignFromAll') and defined($r->param('unassignFromAllSafety')) and $r->param('unassignFromAllSafety')==1) {
+		%selectedUsers = ( );
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been unassigned to all students."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param('assignToSelected')) {
+	   	$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been assigned to selected users."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param("unassignFromAll")) {
+	   # no action taken
+	   $self->addmessage(CGI::div({class=>'ResultsWithError'}, "No action taken"));
+	}
+	
+	#do actual assignment and unassignment
+	if ($doAssignToSelected) {
+		
+		my %achievementUsers = map { $_ => 1 } $db->listAchievementUsers($achievementID);
+		foreach my $selectedUser (@users) {
+			if (exists $selectedUsers{$selectedUser} && $achievementUsers{$selectedUser}) {
+			    # update existing user data (in case fields were changed)
+			    my $userAchievement = $db->getUserAchievement($selectedUser,$achievementID); 
+
+			    my $updatedEarned = $r->param("$selectedUser.earned") ? 1:0;
+			    my $earned = $userAchievement->earned ? 1:0;
+			    if ($updatedEarned != $earned) {
+				
+				$userAchievement->earned($updatedEarned);
+				my $globalUserAchievement = $db->getGlobalUserAchievement($selectedUser);
+				my $achievement = $db->getAchievement($achievementID);
+				#add the correct number of points if we 
+				# are saying that the user now earned the
+				# achievement, or remove them otherwise
+				if ($updatedEarned) {
+				    $globalUserAchievement->achievement_points(
+					$globalUserAchievement->achievement_points +
+					$achievement->points);
+				} else {
+				    $globalUserAchievement->achievement_points(
+					$globalUserAchievement->achievement_points -
+					$achievement->points);
+				}
+
+				$db->putGlobalUserAchievement($globalUserAchievement);
+			    }
+				    
+
+			    $userAchievement->counter($r->param("$selectedUser.counter"));
+			    $db->putUserAchievement($userAchievement);
+			
+			} elsif (exists $selectedUsers{$selectedUser}) {
+			    # add users that dont exist
+			    my $userAchievement = $db->newUserAchievement();
+			    $userAchievement->user_id($selectedUser);
+			    $userAchievement->achievement_id($achievementID);
+			    $db->addUserAchievement($userAchievement);
+
+			    #If they dont have global achievement data, then add that too
+			    if (not $db->existsGlobalUserAchievement($selectedUser)) {
+				my $globalUserAchievement = $db->newGlobalUserAchievement();
+				$globalUserAchievement->user_id($selectedUser);
+				$db->addGlobalUserAchievement($globalUserAchievement);
+			    }
+
+			} else {
+			    # delete users who are not selected
+			    # but dont delete users who dont exist
+			    next unless $achievementUsers{$selectedUser};
+			    $db->deleteUserAchievement($selectedUser, $achievementID);
+			}
+		}
+	}
+}
+
+sub body {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $urlpath        = $r->urlpath;
+	my $db             = $r->db;
+	my $ce             = $r->ce;
+	my $authz          = $r->authz;
+	my $webworkRoot    = $ce->{webworkURLs}->{root};
+	my $courseName     = $urlpath->arg("courseID");
+	my $achievementID  = $urlpath->arg("achievementID");
+	my $user           = $r->param('user');
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to edit achievements."))
+		unless $authz->hasPermissions($user, "edit_achievements");
+		
+	# DBFIXME duplicate call
+	my @users = $db->listUsers;
+	print CGI::start_form({method=>"post", action => $self->systemLink( $urlpath, authen=>0) });
+	 
+	# Assign to everyone message
+	print CGI::p(
+		    CGI::submit({name=>"assignToAll", value => "Assign to All Current Users"}), CGI::i("This action will not overwrite existing users.")
+		  ),
+		  CGI::div({-style=>"color:red"}, "Do not uncheck students, unless you know what you are doing.",CGI::br(),
+	           "There is NO undo for unassigning students. "),
+	      CGI::p("When you unassign
+				        by unchecking a student's name, you destroy all
+				        of the data for achievement ".CGI::b($achievementID)." for this student. You will then need to
+				        reassign the set to these students and they will receive new versions of the problems.
+				        Make sure this is what you want to do before unchecking students."
+	);
+				    
+	# Print table
+	print CGI::start_table({});
+	print CGI::Tr({-valign=>"top"}, CGI::th(["Assigned","Login Name","&nbsp;","Student Name","&nbsp;","Section","&nbsp;","Earned","&nbsp;","Counter"]));
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"&nbsp;"]));
+
+	# get user records
+	my @userRecords  = ();
+	foreach my $currentUser ( @users) {
+		my $userObj = $db->getUser($currentUser); #checked
+		die "Unable to find user object for $currentUser. " unless $userObj;
+		push (@userRecords, $userObj );
+	}
+	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
+	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+	
+	#print row for user
+	foreach my $userRecord (@userRecords) {
+
+		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || "";
+
+		my $user = $userRecord->user_id;
+		my $userAchievement = $db->getUserAchievement($user, $achievementID); 
+		my $prettyName = $userRecord->last_name
+			. ", "
+			. $userRecord->first_name;
+		my $earned  = $userAchievement->earned if ref($userAchievement);
+		my $counter = $userAchievement->counter if ref($userAchievement);
+
+		print CGI::Tr({}, 
+			CGI::td({-align=>"center"},
+				CGI::checkbox({
+						type=>"checkbox",
+						name=>"selected",
+						checked=>(
+							defined($userAchievement)
+							? "on" : ""
+						    ), value=>$user,
+						label=>"",
+					      })
+			      ),CGI::td({},[
+				CGI::div($user),
+				"",
+				"($prettyName)", " ", $userRecord->section, " ",
+				(
+					defined $userAchievement
+					? (
+					    CGI::checkbox({type=>"checkbox",
+							name=>"$user.earned",
+							value=>"1",
+							checked=>($earned ? "on" : ""),
+							label=>"",}), " ",
+					    CGI::input({type=>"text",
+							name=>"$user.counter",
+							value=>$counter,
+							size=>6,})
+					)
+				      : ()
+				),
+			])
+		);
+	}
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr()]));
+	print CGI::end_table();
+	print $self->hidden_authen_fields;
+	print CGI::submit({name=>"assignToSelected", value=>"Save"});
+
+	#Print unassign from everyone stuff
+	print CGI::p( CGI::hr(),
+				  CGI::div( {class=>'ResultsWithError'},
+						"There is NO undo for this function.  
+				        Do not use it unless you know what you are doing!  When you unassign
+				        a student using this button, or by unchecking their name, you destroy all
+				        of the data for achievement $achievementID for this student.",
+						CGI::br(),
+						CGI::submit({name=>"unassignFromAll", value=>"Unassign from All Users"}),
+						CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Read only', 1=>'Allow unassign'}),
+				  ),
+				  CGI::hr(),
+	);
+	print CGI::end_form();
+	
+	return "";
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Achievement.pm b/lib/WeBWorK/DB/Record/Achievement.pm
new file mode 100644
index 0000000000..d2814a2bcd
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/Achievement.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::Achievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::Achievement - represent a record from the achievement
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		achievement_id            => { type=>"TINYBLOB NOT NULL", key=>1 },
+		name                      => { type=>"TEXT" },
+		description               => { type=>"TEXT" },
+		points                    => { type=>"INT"  },
+		test                      => { type=>"TEXT" },
+		icon                      => { type=>"TEXT" },
+		category                  => { type=>"TEXT" },
+  	        enabled                   => { type=>"INT"  },
+	        max_counter               => { type=>"INT"  },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
new file mode 100644
index 0000000000..f5a92b3963
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::GlobalUserAchievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::GlobalUserAchievement - represent a record from the achievement table
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id             => { type=>"TINYBLOB NOT NULL", key=>1 },
+		achievement_points  => { type=>"INT" },
+                next_level_points   => { type=>"INT" },
+	        level_achievement_id => { type=>"VARCHAR(100)" },
+	    # VARCHAR(1024) is only supported by MySQL version 5.0.3 and 
+	    # later, but it makes freezing and thawing safer to have 
+	    # more available characters
+  	        frozen_hash         => { type=>"VARCHAR(1024)" },
+                facebooker          => { type=>"INT" },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/UserAchievement.pm b/lib/WeBWorK/DB/Record/UserAchievement.pm
new file mode 100644
index 0000000000..fe554e6b3e
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/UserAchievement.pm
@@ -0,0 +1,42 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::UserAchievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::UserAchievement - represent a record from the achievement table
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id                   => { type=>"TINYBLOB NOT NULL", key=>1 },
+		achievement_id            => { type=>"TINYBLOB NOT NULL", key=>1 },
+		earned                    => { type=>"INT" },
+		counter                   => { type=>"INT" },
+	    # VARCHAR(1024) is only supported by MySQL version 5.0.3 and 
+	    # later, but it makes freezing and thawing safer to have 
+	    # more available characters
+  	        frozen_hash               => { type=>"VARCHAR(1024)" },
+	);
+}
+
+1;

From 23804860cf7f4e40b86ae5b178a357101512768e Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 16:31:20 -0400
Subject: [PATCH 39/73] Take 3: One last file

---
 htdocs/css/achievements.css | 123 ++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 htdocs/css/achievements.css

diff --git a/htdocs/css/achievements.css b/htdocs/css/achievements.css
new file mode 100644
index 0000000000..4e9c9d4095
--- /dev/null
+++ b/htdocs/css/achievements.css
@@ -0,0 +1,123 @@
+.facebookbox {
+    margin-top:7px;
+}
+
+.facebookbox form {
+    margin-bottom:0px;
+}
+
+.cheevobigbox {
+    width:700px;
+}
+
+.levelbox {
+    height:100px;
+    margin-bottom:30px;
+}
+
+.levelbox img {
+    float:left;
+    height:100px;
+    width:100px;
+}
+
+.leveldatabox {
+    margin-left:20px;
+    float:left;
+}
+
+.leveldatabox h1 {
+    font-size:35px;
+    font-weight:bold;
+}
+
+.levelouterbar {
+    height:20px;
+    border-style:solid;
+    border-width:2px;
+    width:400px;
+}
+
+.levelinnerbar {
+    height:20px;
+    background-color:#88D;
+}
+
+.cheevoouterbox {
+    height:50px;
+    margin-bottom:15px;
+}
+
+.cheevoouterbox img {
+    float:left;
+    height:50px;
+    width:50px;
+    
+}
+
+.unlocked {
+    color:black;
+}
+
+.locked { 
+    color:grey;
+}
+
+.locked img {
+    opacity:0.4;
+    filter:alpha(opacity=40);
+}
+
+.locked h2 {
+    color:grey;
+}
+
+.cheevotextbox {
+    margin-left:15px;
+    float:left;
+}
+
+.cheevotextbox h2 {
+    line-height:15px;
+    font-size:15px;
+    margin-bottom:5px;
+    margin-top:2px;
+    font-weight:bold;
+}
+
+/*width of cheevo progress bar controlled by perl code*/
+.cheevoouterbar {
+    height:10px;
+    border-style:solid;
+    border-width:2px;
+    width:200px;
+}
+
+.cheevoinnerbar {
+    height:10px;
+    background-color:#88D;
+}
+
+.cheevopopupouter {
+    height:75px;
+    margin-bottom:10px;
+    margin-left:15px;
+}
+
+.cheevopopupouter img {
+    float:left;
+    height:75px;
+    width:75px;
+}
+
+.cheevopopuptext {
+    margin-left:15px;
+    float:left;
+}
+
+.cheevopopuptext h1 {
+    margin-top:0px;
+    margin-bottom:5px;
+    font-size:20px;
+    font-weight:bold;
+}
\ No newline at end of file

From c5bf6f6baf3541b020c745c9c5e60255cd634360 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Fri, 25 May 2012 10:02:47 -0400
Subject: [PATCH 40/73] Fixed Facebook Integration

---
 lib/WeBWorK/AchievementEvaluator.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 8772ce7375..5855ec6af1 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -156,13 +156,20 @@ sub checkForAchievements {
 	    }
 
 	    #build the cheevo message. New level messages are slightly different
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{server_root_url}.$ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {           
+		$imgSrc = $ce->{server_root_url}.$ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
 	    $cheevoMessage .=  CGI::start_div({class=>'cheevopopupouter'});
-	    $cheevoMessage .=  CGI::img({src=>"$ce->{courseURLs}->{achievements}/$achievement->{icon}", alt=>'Achievement Icon'});
+	    $cheevoMessage .=  CGI::img({src=>$imgSrc, alt=>'Achievement Icon'});
 	    $cheevoMessage .= CGI::start_div({class=>'cheevopopuptext'});  
 	    if ($achievement->category eq 'level') {
 		
 		$cheevoMessage = $cheevoMessage . CGI::h1("Level Up: $achievement->{name}");
-		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!.");
+		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!");
 		$cheevoMessage = $cheevoMessage . CGI::end_div();
 
 	    } else {
@@ -184,10 +191,10 @@ sub checkForAchievements {
 		if ($achievement->category eq 'level') {
 		    $facebookmessage = sprintf("I leveled up and am now a %s",$achievement->{name});
 		} else {
-		    $facebookmessage = sprintf("I earned the Mathchievement %s: %s",$achievement->{name},$achievement->{description});
+		    $facebookmessage = sprintf("%s: %s",$achievement->{name},$achievement->{description});
 		}
 	
-		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$ce->{courseURLs}->{achievements}/$achievement->{icon}', message: '$facebookmessage'});\n";
+		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$imgSrc', description: '$facebookmessage'});\n";
 		$cheevoMessage .= CGI::end_script();
 
 	    }

From 552162c0e71e6925e9fe92d330e4313fa8213331 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Sun, 27 May 2012 15:07:28 -0400
Subject: [PATCH 41/73] Removed dependency of code on Freeze Thaw.  Now uses
 Storable.

---
 htdocs/css/achievements.css         |  1 +
 lib/WeBWorK/AchievementEvaluator.pm | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/css/achievements.css b/htdocs/css/achievements.css
index 4e9c9d4095..0f4ff428f8 100644
--- a/htdocs/css/achievements.css
+++ b/htdocs/css/achievements.css
@@ -52,6 +52,7 @@
     float:left;
     height:50px;
     width:50px;
+    margin-top:5px;
     
 }
 
diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 5855ec6af1..7f06c40973 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -28,8 +28,7 @@ use WeBWorK::CGI;
 use WeBWorK::Utils qw(before after readFile sortAchievements);
 
 use Safe;
-#FreezeThaw is not part of the standard webwork installation.  It could be replaced by a more standard hash->string module (if there is one).  
-use FreezeThaw qw(freeze thaw);
+use Storable qw(freeze thaw);
 
 sub checkForAchievements {
 
@@ -75,7 +74,7 @@ sub checkForAchievements {
 
     #Thaw globalData hash
     if ($globalUserAchievement->frozen_hash) {       
-	%$globalData = thaw($globalUserAchievement->frozen_hash);
+	$globalData = thaw($globalUserAchievement->frozen_hash);
     }
 
     #Update a couple of "standard" variables in globalData hash.
@@ -134,7 +133,7 @@ sub checkForAchievements {
 	
 	#thaw localData hash
 	if ($userAchievement->frozen_hash) {
-	    %$localData = thaw($userAchievement->frozen_hash);
+	    $localData = thaw($userAchievement->frozen_hash);
 	}
 
 	#recover counter information (for progress bar achievements)
@@ -213,13 +212,13 @@ sub checkForAchievements {
 	
 	#update counter, freeze localData and store
 	$userAchievement->counter($counter);
-	$userAchievement->frozen_hash(freeze(%$localData));	
+	$userAchievement->frozen_hash(freeze($localData));	
 	$db->putUserAchievement($userAchievement);
 	
     }
     
     #freeze globalData and store
-    $globalUserAchievement->frozen_hash(freeze(%$globalData));
+    $globalUserAchievement->frozen_hash(freeze($globalData));
     $db->putGlobalUserAchievement($globalUserAchievement);
 
     return $cheevoMessage;

From efa2ae3db8fe09a22389ce985f15c961dabf9bdd Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Mon, 28 May 2012 00:35:56 -0400
Subject: [PATCH 42/73] Change "warn" to "die" in the definition of the
 subroutine "include"

This insures  that error messages about compile errors are sent
to the command line when the webwork server is initialized.
This facilitates debugging the .conf files
---
 lib/WeBWorK/CourseEnvironment.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/WeBWorK/CourseEnvironment.pm b/lib/WeBWorK/CourseEnvironment.pm
index eb4865a376..72fabd317a 100644
--- a/lib/WeBWorK/CourseEnvironment.pm
+++ b/lib/WeBWorK/CourseEnvironment.pm
@@ -133,11 +133,11 @@ sub new {
 			local @INC = ();
 			my $result = do $fullPath;
 			if ($!) {
-				warn "Failed to read include file $fullPath (has it been created from the corresponding .dist file?): $!";
+				die "Failed to read include file $fullPath (has it been created from the corresponding .dist file?): $!";
 			} elsif ($@) {
-				warn "Failed to compile include file $fullPath: $@";
+				die "Failed to compile include file $fullPath: $@";
 			} elsif (not $result) {
-				warn "Include file $fullPath did not return a true value.";
+				die "Include file $fullPath did not return a true value.";
 			}
 		}
 	} ];

From fa4bafa39fbac55d2264442b2f654a6952f8a33b Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Mon, 28 May 2012 00:40:39 -0400
Subject: [PATCH 43/73] Define webwork version in file VERSION and print it on
 footer of each page

The file VERSION contains two variables
$WW_VERSION = "  put version number here e.g. 2.5.0"
$WW_COPYRIGHT_YEARS = " for example 1996-2010"

The file is read in global.conf.dist and the footer is defined in ContentGenerator.pm
---
 VERSION                         |  3 +++
 conf/global.conf.dist           |  2 +-
 lib/WeBWorK/ContentGenerator.pm | 13 +++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 VERSION

diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..6de8f83c5c
--- /dev/null
+++ b/VERSION
@@ -0,0 +1,3 @@
+$WW_VERSION  ='2.5.1';
+$WW_COPYRIGHT_YEARS = '1996-2012';
+1;
diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 1788b1e1a4..e066795271 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -26,7 +26,7 @@
 ################################################################################
 
 include("conf/prelocal.conf");
-
+include("VERSION");
 ################################################################################
 # prelocal.conf  should contain basic information about 
 # certain directories on your server
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 0c9f8bef80..342b143556 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -968,11 +968,12 @@ Print links to siblings of the current object.
 sub footer(){
 	my $self = shift;
 	my $r = $self->r;
-	
+	my $ce = $r->ce;
+	my $version = $ce->{WW_VERSION}||"unknown -- set version in global.conf.dist";
+	my $copyright_years = $ce->{WW_COPYRIGHT_YEARS}||"1996-2011";
 	print CGI::p({-id=>"last-modified"}, $r->maketext("Page generated at [_1]", timestamp($self)));
-	print CGI::div({-id=>"copyright"}, "WeBWorK &#169; 1996-2011", CGI::a({-href=>"http://webwork.maa.org/"}, $r->maketext("The WeBWorK Project")));
-	
-	return "";
+	print CGI::div({-id=>"copyright"}, "WeBWorK &#169; $copyright_years", "| version: $version |", CGI::a({-href=>"http://webwork.maa.org/"}, $r->maketext("The WeBWorK Project"), ));
+	return ""
 }
 
  
@@ -998,10 +999,6 @@ can be done in the template itself.
 # }
 sub timestamp {
 	my ($self, $args) = @_;
-# 	my $r = $self->r;
-# 	my $ce = $r->ce;
-# 	my $tz = $ce->{siteDefaults}{timezone};
-# 	warn "testing", $r, $ce, $tz;
     # need to use the formatDateTime in this file (some subclasses access Util's version.
 	return( $self->formatDateTime( time() ) );
 }

From 4ed66584b212ffc3542ea6eafca9ff44ced29015 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Mon, 28 May 2012 23:20:19 -0400
Subject: [PATCH 44/73] continued move to models and templates (well i guess
 better models anyway)

---
 htdocs/js/LibraryBrowser/library_browser.js   | 601 +++++++++++-------
 .../ContentGenerator/Instructor/SetMaker3.pm  |  41 +-
 2 files changed, 388 insertions(+), 254 deletions(-)

diff --git a/htdocs/js/LibraryBrowser/library_browser.js b/htdocs/js/LibraryBrowser/library_browser.js
index f4babaf0cc..a834b8494f 100644
--- a/htdocs/js/LibraryBrowser/library_browser.js
+++ b/htdocs/js/LibraryBrowser/library_browser.js
@@ -178,91 +178,80 @@ $(document).ready(function() {
 
 
 	// some window set up:
-	$tabs = $("#problems_container")
-			.tabs(
-					{
-						closable : true,
-						add : function(event, ui) {
-							document
-									.getElementById(
-											"library_link")
-									.removeChild(
-											document
-													.getElementById("library_link").lastChild);
-							console.log("adding a tab");
-							$tabs.tabs('select', '#'
-									+ ui.panel.id);
-							$(".ww_selected").removeClass(
-									"ww_selected");// probably reduntant but I want to make sure nothing stays selected
-						},
-						create : function(event, ui) {
-							document
-									.getElementById(
-											"library_link")
-									.removeChild(
-											document
-													.getElementById("library_link").lastChild);
-							$(".ww_selected").removeClass(
-									"ww_selected");
-						},
-						select : function(event, ui) {
-							$(".ww_selected").removeClass(
-									"ww_selected");
-						},
-						remove : function(event, ui) {
-							document
-									.getElementById(
-											"library_link")
-									.removeChild(
-											document
-													.getElementById("library_link").lastChild);
-							$(".ww_selected").removeClass(
-									"ww_selected");
-						}
-					});//MOVE
-
-	$("#problems_container").removeClass("ui-corner-all");//MOVE
-
-	listLibRequest.xml_command = "listLibraries";//MOVE
-
-	updateMessage("Loading libraries... may take some time");//MOVE
-
-	$.post(webserviceURL, listLibRequest,
-			function(data) {
-				console.log(data);
-				try {
-					var response = $.parseJSON(data);
-					console.log("result: " + response.server_response);
-					updateMessage(response.server_response);
-					cardCatalog = new CardCatolog(response.result_data.split(","));
-				} catch (err) {
-					console.log(err);
-					var myWindow = window.open('', '',
-							'width=500,height=800');
-					myWindow.document.write(data);
-					myWindow.focus();
-				}
-			});//MOVE
+    $tabs = $("#problems_container")
+        .tabs(
+        {
+            closable:true,
+            add:function (event, ui) {
+                document
+                    .getElementById(
+                    "library_link")
+                    .removeChild(
+                    document
+                        .getElementById("library_link").lastChild);
+                console.log("adding a tab");
+                $tabs.tabs('select', '#'
+                    + ui.panel.id);
+                $(".ww_selected").removeClass(
+                    "ww_selected");// probably reduntant but I want to make sure nothing stays selected
+            },
+            create:function (event, ui) {
+                document
+                    .getElementById(
+                    "library_link")
+                    .removeChild(
+                    document
+                        .getElementById("library_link").lastChild);
+                $(".ww_selected").removeClass(
+                    "ww_selected");
+            },
+            select:function (event, ui) {
+                $(".ww_selected").removeClass(
+                    "ww_selected");
+            },
+            remove:function (event, ui) {
+                document
+                    .getElementById(
+                    "library_link")
+                    .removeChild(
+                    document
+                        .getElementById("library_link").lastChild);
+                $(".ww_selected").removeClass(
+                    "ww_selected");
+            }
+        });//MOVE
 
 
-});//include everything in the onload command, add templates
+});
 
-//becomes the main app view
-function CardCatolog(libNames) {
-	this.searchBox = new Search();
-	this.displayBox = document.getElementById("library_list");
-	this.listBox = document.getElementById("library_list_box");
+var CardCatalog = Library.extend({
 
-	//this.library = new Library(libName);
-	//this.working_library = this.library;
-	var topLibraries = new Array();
-	for(var i = 0; i < libNames.length; i++){
-		topLibraries.push(new Library(libNames[i]));
-	}
+    loadChildren:function (callback) {
 
+        var self = this;
+        listLibRequest.xml_command = "listLibraries";//MOVE
 
-	// set up unobtrusive controlls:
+        updateMessage("Loading libraries... may take some time");//MOVE
 
+        $.post(webserviceURL, listLibRequest,
+            function(data) {
+                console.log(data);
+                try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                    var libraries = response.result_data.split(",");
+                    libraries.forEach(function(lib){
+                        self.get('children').add({name:lib});
+                    });
+                } catch (err) {
+                    showErrorResponse(data);
+                }
+            });
+    }
+});
+
+    /*
 	this.searchButton = document.getElementById("run_search");
 
 	this.nextButton = document.getElementById("nextList");
@@ -304,8 +293,9 @@ function CardCatolog(libNames) {
 			workAroundTheClosure.topProbIndex = 0;
 		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
 	}, false);
-}
+	*/
 
+/*
 CardCatolog.prototype.updateMoveButtons = function() {
 	if (this.topProbIndex + parseInt(this.probsPerPage.options[this.probsPerPage.selectedIndex].value) < this.working_library.problems.length) {
 		this.nextButton.removeAttribute("disabled");
@@ -318,40 +308,8 @@ CardCatolog.prototype.updateMoveButtons = function() {
 		this.prevButton.setAttribute("disabled", true);
 	}
 }
-
-CardCatolog.prototype.buildLibraryBox = function(topLibraries){
-	var newLibList = document.createElement("select");
-	newLibList.id = "topLibList" + (this.displayBox.childNodes.length + 1);
-	//newLibList.setAttribute("data-propName", currentLibrary.path);
-	var workAroundTheClosure = this;
-
-	for (var i = 0; i < topLibraries.length; i++) {
-		var option = document.createElement("option")
-		option.value = topLibraries[i].name;
-		option.innerHTML = topLibraries[i].name;
-		newLibList.add(option, null);
-	}
-
-	newLibList.addEventListener("change", function(event) {
-		var changedLib = event.target;// should be the select we just created
-		var listBox = event.target.parentNode;
-
-		var count = 1;
-		//get rid of all other select boxes
-		while (listBox.childNodes.length > count + 1) {
-			listBox.removeChild(listBox.lastChild);
-		}
-		//interesting, this should let topLibraries always exist without it being global
-		workAroundTheClosure.working_library = topLibraries[changedLib.selectedIndex];
-		workAroundTheClosure.working_library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.working_library)});
-	}, false);
-
-	this.listBox.appendChild(newLibList);
-	this.working_library = topLibraries[0];
-	this.working_library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.working_library)});
-
-}
-
+*/
+/*
 CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
 	var newLibList = document.createElement("select");
 	newLibList.id = "libList" + (this.displayBox.childNodes.length + 1);
@@ -428,7 +386,7 @@ CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
 		this.working_library = currentLibrary;
 	}
 };
-
+*/
 function Search(){
 	this.problems = new Array();
 	this.subjectBox = document.getElementById("subjectBox");
@@ -674,95 +632,129 @@ Search.prototype.update = function(box, blankName){
 /*******************************************************************************
  * The library object
  ******************************************************************************/
-// object
-function Library(name, parent) {
-	this.name = name;
-	this.parent = false;
 
-	if(parent){
-		this.parent = parent;
-		this.path = parent.path + "/" + name;
-	} else {
-		this.path = name;
-	}
-	this.children = new Object();
+var Library = Backbone.Model.extend({
+    defaults:function () {
+        return{
+            name:"",
+            parent:false,
+            problems:new ProblemList,
+            children:new LibraryList
+        }
+    },
 
-	this.problems = new Array();
-}
+    initalize:function () {
+        if (this.get("parent")) {
+            this.set("path", this.get('parent').get('path') + "/" + this.get('name'));
+        } else {
+            this.set("path", this.get("name"));
+        }
+    },
 
+    loadChildren:function (callback) {
 
+        var self = this;
 
-Library.prototype.loadChildren = function(callback){
-	listLibRequest.xml_command = "listLib";
-	listLibRequest.command = "dirOnly";
-	listLibRequest.maxdepth = 0;
-	listLibRequest.library_name = this.path;
-
-	updateMessage("Loading libraries... may take some time");
-
-	var workAroundLibrary = this;
-	$.post(webserviceURL, listLibRequest,
-			function(data) {
-				//console.log(data);
-				try {
-					var response = $.parseJSON(data);
-					console.log("result: " + response.server_response);
-					updateMessage(response.server_response);
-					for(var key in response.result_data){
-						workAroundLibrary.children[key] = new Library(key, workAroundLibrary);
-					}
-					callback();
-				} catch (err) {
-					console.log(err);
-					var myWindow = window.open('', '',
-							'width=500,height=800');
-					myWindow.document.write(data);
-					myWindow.focus();
-				}
-			});
-}
+        listLibRequest.xml_command = "listLib";
+        listLibRequest.command = "dirOnly";
+        listLibRequest.maxdepth = 0;
+        listLibRequest.library_name = self.get('path');
 
-/*
-Right now this is going to store all the files under each library.
-This is reduntant!  The benifits of this should be discussed at a later date
-and a fix (or not) should be decided on.
-*/
-Library.prototype.loadProblems = function(callback){
-	listLibRequest.xml_command = "listLib";
-	listLibRequest.command = "files";
-	listLibRequest.maxdepth = 0;
-	listLibRequest.library_name = this.path+"/";
-
-	updateMessage("Loading problems");
-	console.log(listLibRequest.library_name);
-	var workAroundLibrary = this;
-	$.post(webserviceURL, listLibRequest,
-			function(data) {
-				console.log(data);
-				try {
-					var response = $.parseJSON(data);
-					console.log("result: " + response.server_response);
-					updateMessage(response.server_response);
-					//for(var key in response.result_data){
-					//	workAroundLibrary.children[key] = new Library(key, workAroundLibrary);
-					//}
-					var problemList = response.result_data.split(",");
-					workAroundLibrary.problems = new Array();
-					for(var i = 0; i < problemList.length; i++){
-						workAroundLibrary.problems.push(new Problem(problemList[i]));
-					}
-					//console.log("Problems:");
-					//console.log(workAroundLibrary.problems);
-					callback();
-				} catch (err) {
-					console.log(err);
-					var myWindow = window.open('', '',
-							'width=500,height=800');
-					myWindow.document.write(data);
-					myWindow.focus();
-				}
-			});
-}
+        updateMessage("Loading libraries... may take some time");
+
+
+        $.post(webserviceURL, listLibRequest,
+            function (data) {
+                //console.log(data);
+                try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                    for (var key in response.result_data) {
+                        self.children.add({name:key, parent:self});
+                    }
+                    callback();
+                } catch (err) {
+                    showErrorResponse(data);
+                }
+            });
+    },
+    /*
+     Right now this is going to store all the files under each library.
+     This is reduntant!  The benifits of this should be discussed at a later date
+     and a fix (or not) should be decided on.
+     */
+    loadProblems:function (callback) {
+
+        var self = this;
+        listLibRequest.xml_command = "listLib";
+        listLibRequest.command = "files";
+        listLibRequest.maxdepth = 0;
+        listLibRequest.library_name = self.get('path') + "/";
+
+        updateMessage("Loading problems");
+        console.log(listLibRequest.library_name);
+
+        $.post(webserviceURL, listLibRequest,
+            function (data) {
+                console.log(data);
+                try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                    //for(var key in response.result_data){
+                    //	workAroundLibrary.children[key] = new Library(key, workAroundLibrary);
+                    //}
+                    var problemList = response.result_data.split(",");
+                    self.problems.reset();
+                    for (var i = 0; i < problemList.length; i++) {
+                        self.problems.add({name:problemList[i]});
+                    }
+                    //console.log("Problems:");
+                    //console.log(workAroundLibrary.problems);
+                    callback();
+                } catch (err) {
+                    showErrorResponse(data);
+                }
+            });
+    }
+});
+
+var LibraryList = Backbone.Collection.extend({
+    model: Library
+});
+
+var LibraryView = Backbone.View.extend({
+    el:$('#library_tab')
+});
+
+var LibraryListView = Backbone.View.extend({
+    tagName: 'span',
+    template:_.template($('#LibraryList-template').html()),
+    initialize: function(){
+
+    },
+
+    render: function(){
+        var self = this;
+        this.$el.html(this.template(this.model.toJSON));
+        this.model.get('children').each(function(lib){
+            var option = document.createElement("option")
+            option.value = lib.get('cid');
+            option.innerHTML = lib.get('name');
+            self.$('.list').add(option, null);//what's the null?
+        });
+
+        return this;
+    },
+
+    lib_selected: function(event){
+        var selectedLib = this.model.get('children').getByCid(event.target.value);
+        var view = new LibraryListView({model: selectedLib});
+        this.$(".children").html(view.render().el);
+    }
+
+});
 
 
 
@@ -782,7 +774,7 @@ function Set(setName) {// id might not exist..use date if nessisary
 }
 */
 var ProblemList = Backbone.Collection.extend({
-    model:Problem,
+    model:Problem
 /*
     comparator: function(todo) {
         return todo.get('order');
@@ -834,6 +826,7 @@ var Set = Backbone.Model.extend({
 
     removeProblem: function(problem) {
         var self = this;
+
         listLibRequest.set = self.get('name');// switch to data attribute
         listLibRequest.problemPath = problem.get('path');
         listLibRequest.xml_command = "deleteProblem";
@@ -952,11 +945,15 @@ var Set = Backbone.Model.extend({
 
 });
 
+//full set view, renders all problems etc
 var SetView = Backbone.View.extend({
+    tagName: "div",
+    template: _.template($('#setList-template').html()),
+    events:{
+    },
 
     initialize: function(){
 
-
     },
 
     render:function(){
@@ -999,11 +996,30 @@ var SetView = Backbone.View.extend({
         }*/
 
         //Template and fix up, that was just ugly
+        var self = this;
+        this.$el.id = this.model.get('name');
+
+        this.$el.sortable({
+            axis: 'y',
+            start : function(event, ui) {
+                //self.previousOrder = $(this).sortable('toArray');
+            },
+            update : function(event, ui) {
+                //self.reorderProblems($(this).sortable('toArray'));
+            }
+        });
+
+        this.$el.html(this.template(this.model.toJSON()));
+
+        this.model.get('problems').each(function(problem){
+           var view = new ProblemView({model: problem});
+           self.$(".list").append(view.render().el);
+        });
 
         return this;
     }
 });
-
+/*
 Set.prototype.renderProblem = function(problem) {
 	var newSetItem = problem.render(this.displayBox);
 	newSetItem.addEventListener("click", function(event) {
@@ -1014,35 +1030,102 @@ Set.prototype.renderProblem = function(problem) {
 	}, false);
 	$(this.displayBox).sortable("refresh");
 }
+*/
 
-//not sure how this is gonna work...
-Set.createSet = function(refreshList, callback) {//change callback to work with strings..
-	listLibRequest.xml_command = "createNewSet";
-	listLibRequest.new_set_name = document.getElementById("dialog_text").value;
-	$.post(webserviceURL, listLibRequest, function(data) {
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			updateMessage(response.server_response);
-		} catch (err) {
-			showErrorResponse(data);
-		}
-		if(refreshList){
-			refreshList.refresh(problemPlaceholder);
-			problemPlaceholder = false;
-		}
-		if(callback){
-			callback();
-		}
 
-	});
-}
+var SetNameView = Backbone.Collection.extend({
+    tagName: "li",
+    template: _.template($('#setName-template').html()),
+
+    events:{
+        'click' : 'view'
+    },
+
+    initalize: function(){
+        this.bigView = false;
+    },
+
+    render: function(){
+        var self = this;
+
+        self.$el.html(self.template(self.model.toJSON()));
+
+        self.$el.droppable({
+                tolerance : 'pointer',
+
+                hoverClass: 'drophover',
+
+                drop : function(event, ui) {
+                    self.model.addProblem(ui.draggable.attr("data-path"));
+                }
+            });
+
+        return this;
+    },
+
+    view: function() {
+        console.log("clicked " + this.model.get('name'));
+        if ($('#problems_container #'+this.model.get('name'))) {
+            $('#problems_container').tabs('select', this.model.get('name'));
+        } else {
+            $('#problems_container').tabs('add', this.model.get('name'), this.model.get('name') + " (" + this.model.get('problems').length + ")"); //could move to an after?
+            var view = new SetView({model:this.model});
+            $('#problems_container').append(view.render().el);
+        }
+        //render the full tab thing, or switch to it
+    }
+});
 
 /*******************************************************************************
  * SetList object needed variables: sets, displaybox, needed functions: create
  * set
  */
 
+var SetList = Backbone.Collection.extend({
+    model: Set,
+
+    //think it's fetch I want to replace:
+    fetch: function(){
+        var self = this;
+
+        listLibRequest.xml_command = "listSets";
+
+        console.log("starting set list");
+        $.post(webserviceURL, listLibRequest, function(data) {
+            try {
+                var response = $.parseJSON(data);
+                console.log("result: " + response.server_response);
+                var setNames = response.result_data.split(",");
+                setNames.sort();
+                console.log("found these sets: " + setNames);
+                for ( var i = 0; i < setNames.length; i++) {
+                    //workAroundSetList.renderList(workAroundSetList.setNames[i]);
+                    self.add({name: setNames[i]});
+                }
+            } catch (err) {
+                showErrorResponse(data);
+            }
+        });
+    },
+
+    //different from add I hope
+    create: function(model){
+        this.add(model);
+        listLibRequest.xml_command = "createNewSet";
+        listLibRequest.new_set_name = model.name?model.name:model.get("name");
+        $.post(webserviceURL, listLibRequest, function(data) {
+            try {
+                var response = $.parseJSON(data);
+                console.log("result: " + response.server_response);
+                updateMessage(response.server_response);
+            } catch (err) {
+                showErrorResponse(data);
+            }
+        });
+    }
+});
+
+/*
 function SetList() {
 	this.setNames = new Array();
 	this.sets = new Object();
@@ -1095,7 +1178,42 @@ SetList.prototype.refresh = function(problemPath) {
 	});
 	// how do we check if we already have the set?
 }
+*/
 
+var SetListView = Backbone.View.extend({
+    tagName: "ul",
+    template: _.template($('#setList-template').html()),
+
+    initialize: function(){
+        this.model.bind('add', this.addOne, this);
+        this.model.bind('reset', this.addAll, this);
+        this.model.bind('all', this.render, this);
+    },
+
+    render: function(){
+        var self = this;
+
+        self.$el.html(self.template());
+
+        return this;
+    },
+
+    addOne: function(newSet){
+        var view = new SetNameView({model: newSet});
+        self.$el.append(view.render().el);
+    },
+
+    addAll: function() {
+        this.model.each(this.addOne);
+    }
+/*
+    startCreate: function(){
+        this.$("#dialog").dialog('open');
+    }
+*/
+});
+
+/*
 SetList.prototype.renderList = function(setName) {
 
 	var addingSet = document.createElement("li");
@@ -1131,10 +1249,8 @@ SetList.prototype.renderList = function(setName) {
 	return newSet;
 
 };
+*/
 
-SetList.prototype.createSet = function() {
-	$("#dialog").dialog('open');
-};
 
 /*******************************************************************************
  * The problem object
@@ -1153,7 +1269,7 @@ var Problem = Backbone.Model.extend({
 
     },
     //this is a server render, different from a view render
-    render: function() {
+    render: function(callback) {
         var problem = this;
 
         listLibRequest.set = problem.path;
@@ -1165,12 +1281,15 @@ var Problem = Backbone.Model.extend({
             //if we haven't gotten this problem yet, ask for it
             $.post(webserviceURL, listLibRequest, function(data) {
                 problem.data = data;
+                callback(data);
             });
         }
     }
 });
 
 var ProblemView = Backbone.View.extend({
+    tagName:"li",
+    template: _.template($('#probem-template').html()),
 
     initialize: function(){
         this.model.on('change:data', this.render, this);
@@ -1178,26 +1297,13 @@ var ProblemView = Backbone.View.extend({
 
     render: function(){
         var problem = this.model;
-        problem.render();
-        //template all of this
-        var workAroundDisplayBox = displayBox;
-        var newItem = document.createElement('li');
-        newItem.setAttribute("data-path", problem.path);
-        newItem.setAttribute("data-uid", problem.id);
-        newItem.id = problem.path + problem.id;
-        //set a loading image while we wait for the problem
-        var loadingImage = document.createElement("img");
-        loadingImage.src = '/webwork2_files/images/ajax-loader-small.gif';
-        //add the item to the box so that we dont lose our place
-        workAroundDisplayBox.appendChild(newItem);
-
-        var handle = document.createElement("div");
-        handle.className = "handle";
-        var container = document.createElement("div");
-        container.innerHTML = problem.data?problem.data:loadingImage;
-        newItem.appendChild(handle);
-        newItem.appendChild(container);
-        $(newItem).draggable({
+        var self = this;
+
+        this.$el.html('<img src="/webwork2_files/images/ajax-loader.gif" alt="loading"/>');
+
+        this.el.setAttribute('data-path', problem.get('path'));
+
+        this.$el.draggable({
             helper : 'clone',
             revert : true,
             handle : 'div.handle',
@@ -1209,10 +1315,11 @@ var ProblemView = Backbone.View.extend({
             opacity : 0.35
         });
 
-        newItem.addEventListener("mouseover", highlightSets, false);
+        this.el.addEventListener("mouseover", highlightSets, false);
         //newItem.addEventListener("mouseout", unHighlightSets, false);
+        //nice async loading call :)
+        problem.render(function(){self.$el.html(self.template(problem.toJSON()))});
 
-        this.setElement(newItem);
         return this;
     }
 });
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index bf7f436bdc..638d9354f1 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -159,7 +159,7 @@ sub body {
 	
 	  	print '<div class="break"></div>';
 	  	print '<table>';
-		print '<tr><td><b>Library directories:</b></td><td><span id="library_list_box"></span><button class="button" id="load_problems" type="button">Load Problems</button></td>';
+		print '<tr><td><b>Library directories:</b></td><td><span id="CardCatalog"><!--Gonna put the lists of libraries and sublibraries here--></span><button class="button" id="load_problems" type="button">Load Problems</button></td>';
 		print '<tr><td><b>Library search:</b></td><td><span id="library_search_box"><select id="subjectBox"></select><select id="chaptersBox"></select><select id="sectionsBox"></select><select  style="display:none;"  id="textbooksBox"></select><select style="display:none;" id="textChaptersBox"></select><select style="display:none;" id="textSectionsBox"></select><input type="text" id="keywordsBox"  style="display:none;"  placeholder="keywords"></input><button class="button" id="run_search" type="button">Search</button><span></td>';
 		print '</table>';
 		###########################################
@@ -186,15 +186,15 @@ sub body {
 		  	print '<ul>',
         			'<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
     			  '</ul>';
-    	    print '<div id="library_tab">';
-		    	print '<h1>Problems</h1>';
+    	    print '<div id="library_tab">',
+		            '<h1>Problems</h1>',
 	        	########## Now print problems
-	        	print '<ul id="library_list">';
+	        	    '<ul class="list">',
 	          
-	        	print '</ul>';
+	        	    '</ul>',
 #<button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span>
-            	print '<p><select id="prob_per_page"><option value=10>10</option><option value=20>20</option><option value=30>30</option><option value=40>40</option><option value=50>50</option></select><button type="button" disabled=true id="prevList">Previous</button><button disabled=true type="button" id="nextList">Next</button></p>';#might be a better way to do the perpage
-	      	print '</div>';
+            	    '<p><select class="prob_per_page"><option value=10>10</option><option value=20>20</option><option value=30>30</option><option value=40>40</option><option value=50>50</option></select><button type="button" disabled=true class="prevList">Previous</button><button disabled=true type="button" class="nextList">Next</button></p>',#might be a better way to do the perpage
+	      	    '</div>';
 	      print '</div>';
 	        ########## Finish things off
 	   	print '</div>';
@@ -202,6 +202,33 @@ sub body {
   print '</div>';
   print $self->hidden_authen_fields;
   print CGI::hidden({id=>'hidden_courseID',name=>'courseID',default=>$courseID });
+
+
+  print '<script type="text/template", id="problem-template">',
+        '    <div class="handel"></div>',
+        '    <div><%= data %></div>',
+        '</script>';
+
+  print '<script type="text/template", id="setList-template">',
+            '<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
+
+          '</script>';
+
+  print '<script type="text/template", id="setName-template">',
+              '<%= name %>',
+         '</script>';
+
+  print '<script type="text/template", id="setList-template">',
+           '<h1>Problems</h1>',
+           '<ul class=list">',
+           '</ul>',
+        '</script>';
+
+  print '<script type="text/template", id="LibraryList-template">',
+             '<select class="list"></select>',
+             '<span class="children></children>'
+          '</script>';
+
 	return "";	
 }
 

From d3c099eea8c01938bc85e3045398eb17ed2c03f0 Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Tue, 29 May 2012 13:30:12 -0400
Subject: [PATCH 45/73] git add lib/WeBWorK/Authen/Basic_TheLastOption.pm git
 add lib/WeBWorK/Authen/LTIBasic.pm

---
 conf/global.conf.dist                 | 250 +++++++++++++++++++-------
 lib/WeBWorK/Authen.pm                 | 176 +++++++++++++++---
 lib/WeBWorK/ContentGenerator/Login.pm |  13 +-
 lib/WeBWorK/DB.pm                     |  10 +-
 4 files changed, 347 insertions(+), 102 deletions(-)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 4626b9be0c..bcff371551 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -23,14 +23,27 @@
 # configuration file (webwork.apache-config) and is available for use here. In
 # addition, the $courseName variable holds the name of the current course.
 
+################################################################################
+# Seed variables
 ################################################################################
 
-include("conf/prelocal.conf");
+# Set these variables to correspond to your configuration and preferences. You
+# will need to restart the webserver to reset the variables in this section.
+
+# URL of WeBWorK handler. If WeBWorK is to be on the web server root, use "". Note 
+# that using "" may not work so we suggest sticking with "/webwork2".
+$webwork_url         = "/webwork2";
+
+
+$server_root_url   = "";  # e.g.  http://webwork.yourschool.edu
+$server_userID     = "";  # e.g.  www-data    
+$server_groupID    = "";  # e.g.  wwdata
+
+
+# In the apache configuration file (often called httpd.conf) you will find
+# User wwadmin   --- this is the $server_userID -- of course it may be wwhttpd or some other name
+# Group wwdata   --- this is the $server_groupID -- this will have different names also
 
-################################################################################
-# prelocal.conf  should contain basic information about 
-# certain directories on your server
-################################################################################
 # Root directory of PG.
 $pg_dir              = "/opt/webwork/pg";
 
@@ -43,6 +56,47 @@ $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
 
+################################################################################
+# Paths to external programs 
+################################################################################
+
+# system utilities
+$externalPrograms{mv}    = "/bin/mv";
+$externalPrograms{cp}    = "/bin/cp";
+$externalPrograms{rm}    = "/bin/rm";
+$externalPrograms{mkdir} = "/bin/mkdir";
+$externalPrograms{tar}   = "/bin/tar";
+$externalPrograms{gzip}  = "/bin/gzip";
+
+# equation rendering/hardcopy utiltiies
+$externalPrograms{latex}    = "/usr/bin/latex";
+$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
+$externalPrograms{dvipng}   = "/usr/bin/dvipng";
+$externalPrograms{tth}      = "/usr/bin/tth";
+
+####################################################
+# NetPBM - basic image manipulation utilities
+# Most sites only need to configure $netpbm_prefix.
+####################################################
+my $netpbm_prefix = "/usr/bin";
+$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
+$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
+$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
+$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
+$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
+
+# url checker
+$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
+
+# image conversions utiltiies
+# the source file is given on stdin, and the output expected on stdout.
+$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
+
+# mysql clients
+$externalPrograms{mysql}     = "/usr/bin/mysql";
+$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
 
 ################################################################################
 # Mail settings
@@ -124,11 +178,6 @@ $mail{editor_window_columns} = 100;
 # Customizing the action of the "Email your instructor" button
 ###################################################
 
-# This is best done by copying the lines below, entering them
-# in the postlocal.conf file and making the desired modifications. 
-# Then you will not need to update these modifications
-# when you download a new version of WeBWorK.
-
 # Use this to customize the text of the feedback button.
 $feedback_button_name = "Email instructor";
 
@@ -213,9 +262,7 @@ $webworkURLs{root}          = "$webwork_url";
 $webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs";
 $webworkURLs{htdocs}        = "$webwork_htdocs_url";
 
-
 # Location of web-accessible temporary files, such as equation images.
-# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
 $webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
 $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 
@@ -275,8 +322,8 @@ $courseDirs{html_images} = "$courseDirs{html}/images";
 
 # Location of web-accessible, course-specific temporary files, like static and
 # dynamically-generated PG graphics.
-$courseDirs{html_temp}   =  "$courseDirs{html}/tmp";
-$courseURLs{html_temp}   =  "$courseURLs{html}/tmp";
+$courseDirs{html_temp}   = "$courseDirs{html}/tmp";
+$courseURLs{html_temp}   = "$courseURLs{html}/tmp";
 
 # Location of course-specific logs, like the transaction log.
 $courseDirs{logs}        = "$courseDirs{root}/logs";
@@ -451,18 +498,20 @@ $default_status = "Enrolled";
 # GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
 # GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-################################################################################
-# set these variables in prelocal.conf
-#
-# $database_dsn = "dbi:mysql:webwork";
-# $database_username = "webworkWrite";
-# #$database_password = ""; #set this in prelocal.conf
-################################################################################
+$database_dsn = "dbi:mysql:webwork";
+$database_username = "webworkWrite";
+$database_password = "";
+$database_debug = 0;
 
-# $database_debug = 0;
+# Variables for sql_moodle database layout.
+$moodle_dsn = "dbi:mysql:moodle";
+$moodle_username = $database_username;
+$moodle_password = $database_password;
+$moodle_table_prefix = "mdl_";
+$moodle17 = 0;
 
-# Database schemas are defined in the file conf/database.conf and stored in the
-# hash %dbLayouts. The standard schema is called "sql_single";
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
 include "conf/database.conf";
 
 # Select the default database layout. This can be overridden in the course.conf
@@ -498,6 +547,8 @@ $problemLibrary_db = {
 # Logs
 ################################################################################
 
+# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
+# top-level hash.
 
 # Logs data about how long it takes to process problems. (Do not confuse this
 # with the /other/ timing log which can be set by WeBWorK::Timing and is used
@@ -525,7 +576,7 @@ $courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
 $courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Site defaults (Usually overridden in postlocal.conf)
+# Site defaults (FIXME: what other things could be "site defaults"?)
 ################################################################################
 
 # Set the default timezone of courses on this server. To get a list of valid
@@ -565,9 +616,10 @@ $siteDefaults{default_templates_course} ="modelCourse";
 # current database layout is found.
 # 
 $authen{user_module} = {
-	# sql_moodle => "WeBWorK::Authen::Moodle",
+	sql_moodle => "WeBWorK::Authen::Moodle",
 	# sql_ldap   => "WeBWorK::Authen::LDAP",
-	"*" => "WeBWorK::Authen",
+	#"*" => "WeBWorK::Authen",
+	"*" => "WeBWorK::Authen::Basic_TheLastOption",
 };
 
 # Select the authentication module to use for proctor logins.
@@ -576,12 +628,15 @@ $authen{user_module} = {
 # 
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-################################################################################
 # Options for particular authentication modules
-################################################################################
 
-# If you are using ldap this next snippet should be copied and entered into postlocal.conf.
-# Make modifications there so that it works with your local LDAP protocol
+# $authen{moodle_options} = {
+# 	dsn => $moodle_dsn,
+# 	username => $moodle_username,
+# 	password => $moodle_password,
+# 	table_prefix => $moodle_table_prefix,
+# 	moodle17 => $moodle17,
+# };
 
 $authen{ldap_options} = {
 	# hosts to attempt to connect to, in order. For example:
@@ -632,7 +687,7 @@ $authen{ldap_options} = {
 };
 
 ################################################################################
-# Authorization system (Make local overrides in postlocal.conf )
+# Authorization system
 ################################################################################
 
 # this section lets you define which groups of users can perform which actions.
@@ -649,7 +704,6 @@ $authen{ldap_options} = {
 	grade_proctor => 3,
 	ta => 5,
 	professor => 10,
-	admin     => 20,
 );
 
 # this hash maps operations to the roles that are allowed to perform those
@@ -1029,44 +1083,112 @@ $webworkRoot    = $webworkDirs{root};
 $webworkURLRoot = $webworkURLs{root};
 $pgRoot         = $pg{directories}{root};
 
+
 ################################################################################
-# Temporary hack for displaying the different versions of the editors
 ################################################################################
-# These behaviors can be overridden in postlocal.conf
-# These configurations can be placed in CourseConfig to tune the behavior for individual courses
-%showeditors = (
-	classlisteditor1   => 1,
-	classlisteditor2   => 0,
-	
-	homeworkseteditor1 => 1,
-	homeworkseteditor2 => 0,
-	
-	librarybrowser1    => 1,
-	librarybrowser2    => 0,
-	librarybrowser3    => 1,
-	
-	pgproblemeditor1   => 1,
-	pgproblemeditor2   => 0,
-);
+# LTI Basic parameters
+################################################################################
+
 
 ################################################################################
-# Webservices
+# Reasonable Number of Problems for Late Adds to do per day to catch up
 ################################################################################
-$webservices = {
-	enableCourseActions => 0, # enable createCourse, addUser, dropUser
-	enableCourseActionsLog => 0,# enable logging of course actions
-								# will log when courses are created and 
-								# when students are added or dropped
-	courseActionsLogfile => "$webworkDirs{logs}/courseactions.log",
-	# enable this to assign all visible homework sets to new students
-	# added by webservices
-	courseActionsAssignHomework => 0, 
-};
+
+# Uncomment the following line to adjust due dates for late adds
+# who authenticate via LTIBasic
+$adjustDueDatesForLateAdds = "1";
+
+$reasonableProblemsPerDayMakeup = 15;
+
+################################################################################
+# Authentication system
+################################################################################
+
+# To use a sequence of Authentication modules, e.g.,
+# LTIBasic with a fallback to Password Authentication,
+# then uncomment the section below.
+# One can add additional module hashes if one
+# has additional login authentication options, e.g.,
+# an institutions Central Authentication Service.
+
+#$authen{user_module} = [ 
+#	{
+#		# sql_moodle => "WeBWorK::Authen::Moodle",
+#		# sql_ldap   => "WeBWorK::Authen::LDAP",
+#		"*" => "WeBWorK::Authen::LTIBasic", 
+#	},
+#	{
+#		# sql_moodle => "WeBWorK::Authen::Moodle",
+#		# sql_ldap   => "WeBWorK::Authen::LDAP",
+#		"*" => "WeBWorK::Authen::Basic_TheLastOption",
+#	}
+#];
+
+#The purpose of the LTI nonces is to prevent man-in-the-middle attacks.
+#The NonceLifeTime (in seconds) must be short enought to prevent
+#at least casual man-in-the-middle attacks but
+#long enough to accommodate normal server and networking delays
+#(and perhaps non-synchronization of server time clocks).
+#
+
+$NonceLifeTime=10; # in seconds
+
+
+################################################################################
+# Session Management
+################################################################################
+
+## For session management using session_cookies, uncomment the first of the 
+## following lines.  For session management using keys stored
+## in the  key  database and, possibly, enduring cookies,
+## uncomment the second line.
+
+$session_management_via = "session_cookie";
+#$session_management_via = "key";
+
+################################################################################
+# Authorization system   LTI:  LMS Roles Mapped to WeBWorK Roles
+################################################################################
+
+## Each institution will need to customize these correspondences
+## to take into account the roles that are used in its
+## Learning Management System.
+
+%LMSrolesToWeBWorKroles = (
+	"AI/TA" => "ta",
+	"assistant" => "empowered_AI",
+	"instructor" => "professor",
+	"librarian" => "guest",
+	"librarian+" => "empoweredAI",
+	"observer" => "guest",
+    "student" => "student",
+	"visitor" => "guest",
+	"Instructor" => "professor",
+    "Student" => "student",
+    "Learner" => "student",
+	"Teaching Assistant" => "ta",
+);
 
 ################################################################################
-# Site wide overrides are entered into the file postlocal.conf
+# Local routine to analyze the context_id forwarded to LTIBasic
 ################################################################################
 
-include("conf/postlocal.conf");
+# An example from Indiana University, Bloomington
+#
+#$analyze_context_id = 
+#	sub {my $self = shift;
+#		if (! (defined($self -> {semester}) && defined($self -> {section})) ) {
+#    		my @course_id=split /-/, $self -> {"context_id"};
+#      		$self -> {"semester"} = "4" . substr($course_id[0],2,2)
+#  						. (substr($course_id[0],0,2) eq "FA") ? "8"
+#          				: substr($course_id[0],0,2) eq "SP"? "2" : "5";
+#      		$self -> {"section"} = $course_id[4];
+#	        }
+#		};
+#
+
+$analyze_context_id = sub {my $self = shift; $self -> {section} = "0000";};
+
+################################################################################
+################################################################################
 
-1; #final line of the file to reassure perl that it was read properly.
diff --git a/lib/WeBWorK/Authen.pm b/lib/WeBWorK/Authen.pm
index 81c0968a53..ca2ca6deb0 100644
--- a/lib/WeBWorK/Authen.pm
+++ b/lib/WeBWorK/Authen.pm
@@ -54,7 +54,7 @@ use WeBWorK::Cookie;
 use Date::Format;
 use Socket qw/unpack_sockaddr_in inet_ntoa/; # for logging
 use WeBWorK::Debug;
-use WeBWorK::Utils qw/writeCourseLog/;
+use WeBWorK::Utils qw/writeCourseLog runtime_use/;
 use WeBWorK::Localize;
 use URI::Escape;
 
@@ -108,22 +108,59 @@ sub class {
 	my ($ce, $type) = @_;
 	
 	if (exists $ce->{authen}{$type}) {
-		if (ref $ce->{authen}{$type} eq "HASH") {
+		if (ref $ce->{authen}{$type} eq "ARRAY") {
+			my $authen_type = shift @{$ce ->{authen}{$type}};
+			#debug("ref of authen_type = |" . ref($authen_type) . "|");
+			if (ref ($authen_type) eq "HASH") {
+				if (exists $authen_type->{$ce->{dbLayoutName}}) {
+					return $authen_type->{$ce->{dbLayoutName}};
+				} elsif (exists $authen_type->{"*"}) {
+					return $authen_type->{"*"};
+				} else {
+					die "authentication type '$type' in the course environment has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
+				}
+			} else {
+					return $authen_type;
+			}
+		} elsif (ref $ce->{authen}{$type} eq "HASH") {
 			if (exists $ce->{authen}{$type}{$ce->{dbLayoutName}}) {
 				return $ce->{authen}{$type}{$ce->{dbLayoutName}};
 			} elsif (exists $ce->{authen}{$type}{"*"}) {
 				return $ce->{authen}{$type}{"*"};
 			} else {
-				die "authentication type '$type' in %authen hash in course environemnt has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
+				die "authentication type '$type' in the course environment has no entry for db layout '", $ce->{dbLayoutName}, "' and no default entry (*)";
 			}
 		} else {
 			return $ce->{authen}{$type};
 		}
 	} else {
-		die "authentication type '$type' not found in course environment \%authen hash";
+		die "authentication type '$type' not found in course environment";
 	}
 }
 
+sub call_next_authen_method {
+	my $self = shift;
+	my $r = $self -> {r};
+	my $ce = $r -> {ce};
+
+	my $user_authen_module = WeBWorK::Authen::class($ce, "user_module");
+	#debug("user_authen_module = |$user_authen_module|");	
+	if (!defined($user_authen_module or $user_authen_module eq "")) {
+		$self->{error} = $r->maketext("No authentication method found for your request.  "
+			. "If this recurs, please speak with your instructor.");
+		$self->{log_error} .= "None of the specified authentication modules could handle the request.";
+		return(0);
+	} else {
+		runtime_use $user_authen_module;
+		my $authen = $user_authen_module->new($r);
+		#debug("Using user_authen_module $user_authen_module: $authen\n");
+		$r->authen($authen);
+
+		return $authen -> verify;
+	}
+}
+
+
 =back
 
 =cut
@@ -160,11 +197,18 @@ sub new {
 
 =cut
 
+sub  request_has_data_for_this_verification_module {
+		return(1);
+}
+
 sub verify {
 	debug("BEGIN VERIFY");
 	my $self = shift;
 	my $r = $self->{r};
-	
+
+	if (! ($self-> request_has_data_for_this_verification_module)) {
+		return ( $self -> call_next_authen_method());
+	}
 	my $result = $self->do_verify;
 	my $error = $self->{error};
 	my $log_error = $self->{log_error};
@@ -281,6 +325,53 @@ sub get_credentials {
 		return 0;
 	}
 	
+	my ($cookieUser, $cookieKey, $cookieTimeStamp) = $self->fetchCookie;
+
+	if (defined $cookieUser and defined $r->param("user") ) {
+		if ($cookieUser ne $r->param("user")) {
+			croak ("cookieUser = $cookieUser and paramUser = ". $r->param("user") . " are different.");
+		}
+		if (defined $cookieKey and defined $r->param("key")) {
+			if ($cookieKey ne $r->param("key")) {
+				croak ("cookieKey = $cookieKey and param key = " . $r -> param("key") . "are different.");
+			}
+			$self -> {user_id} = $cookieUser;
+			$self -> {session_key} = $cookieKey;
+			$self -> {password} = $r->param("passwd");
+			$self -> {cookie_timestamp} = $cookieTimeStamp;
+			$self -> {login_type} = "normal";
+			$self -> {credential_source} = "params_and_cookie";
+			debug("params and cookie user '", $self->{user_id}, "' params and cookie session key = '",
+				 $self->{session_key}, "' cookie_timestamp '", $self->{cookieTimeStamp}, "'");
+			return 1;
+		} elsif (defined $r -> param("key")) {
+			$self->{user_id} = $r->param("user");
+			$self->{session_key} = $r->param("key");
+			$self->{password} = $r->param("passwd");
+			$self->{login_type} = "normal";
+			$self->{credential_source} = "params";
+			debug("params user '", $self->{user_id}, "' password '", $self->{password}, "' key '", $self->{session_key}, "'");
+			return 1;
+		} elsif (defined $cookieKey) {
+			$self->{user_id} = $cookieUser;
+			$self->{session_key} = $cookieKey;
+			$self->{cookie_timestamp} = $cookieTimeStamp;
+			$self->{login_type} = "normal";
+			$self->{credential_source} = "cookie";
+			debug("cookie user '", $self->{user_id}, "' key '", $self->{session_key}, "' cookie_timestamp '", $self->{cookieTimeStamp}, "'");
+			return 1;
+		} else {
+			$self -> {user_id} = $cookieUser;
+			$self -> {session_key} = $cookieKey; # will be undefined
+			$self -> {password} = $r->param("passwd");
+			$self -> {cookie_timestamp} = $cookieTimeStamp;
+			$self -> {login_type} = "normal";
+			$self -> {credential_source} = "params_and_cookie";
+			debug("params and cookie user '", $self->{user_id}, "' params and cookie session key = '",
+				 $self->{session_key}, "' cookie_timestamp '", $self->{cookieTimeStamp}, "'");
+			return 1;
+		}	
+	}
 	# at least the user ID is available in request parameters
 	if (defined $r->param("user")) {
 		$self->{user_id} = $r->param("user");
@@ -292,13 +383,13 @@ sub get_credentials {
 		return 1;
 	}
 	
-	my ($cookieUser, $cookieKey) = $self->fetchCookie;
 	if (defined $cookieUser) {
 		$self->{user_id} = $cookieUser;
 		$self->{session_key} = $cookieKey;
+		$self->{cookie_timestamp} = $cookieTimeStamp;
 		$self->{login_type} = "normal";
 		$self->{credential_source} = "cookie";
-		debug("cookie user '", $self->{user_id}, "' key '", $self->{session_key}, "'");
+		debug("cookie user '", $self->{user_id}, "' key '", $self->{session_key}, "' cookie_timestamp '", $self->{cookieTimeStamp}, "'");
 		return 1;
 	}
 }
@@ -398,7 +489,7 @@ sub verify_normal_user {
 	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 1);
 	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
 	
-	if ($keyMatches and $timestampValid) {
+	if ($sessionExists and $keyMatches and $timestampValid) {
 		return 1;
 	} else {
 		my $auth_result = $self->authenticate;
@@ -440,8 +531,9 @@ sub authenticate {
 sub maybe_send_cookie {
 	my $self = shift;
 	my $r = $self->{r};
+	my $ce = $r -> {ce};
 	
-	my ($cookie_user, $cookie_key) = $self->fetchCookie;
+	my ($cookie_user, $cookie_key, $cookie_timestamp) = $self->fetchCookie;
 	
 	# we send a cookie if any of these conditions are met:
 	
@@ -458,10 +550,15 @@ sub maybe_send_cookie {
 	# (c) the user asked to have a cookie sent and is not a guest user.
 	my $user_requests_cookie = ($self->{login_type} ne "guest"
 		and $r->param("send_cookie"));
+
+	# (d) session management is done via cookies.
+	my $session_management_via_cookies = 
+		$ce -> {session_management_via} eq "session_cookie";
 	
-	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie, "'");
+	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie, 
+			"' session_management_via_cookies ='", $session_management_via_cookies, "'");
 	
-	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie) {
+	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie or $session_management_via_cookies) {
 		$self->sendCookie($self->{user_id}, $self->{session_key});
 	} else {
 		$self->killCookie;
@@ -600,6 +697,10 @@ sub create_session {
 	# DBFIXME this should be a REPLACE
 	eval { $db->deleteKey($userID) };
 	$db->addKey($Key);
+
+	#if ($ce -> {session_management_via} eq "session_cookie"),
+	#    then the subroutine maybe_send_cookie should send a cookie.
+
 	return $newKey;
 }
 
@@ -609,18 +710,21 @@ sub check_session {
 	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
 	my $ce = $self->{r}->ce;
 	my $db = $self->{r}->db;
-	
+
 	my $Key = $db->getKey($userID); # checked
 	return 0 unless defined $Key;
-	
 	my $keyMatches = (defined $possibleKey and $possibleKey eq $Key->key);
-	my $timestampValid = (time <= $Key->timestamp()+$ce->{sessionKeyTimeout});
 	
-	if ($keyMatches and $timestampValid and $updateTimestamp) {
-		$Key->timestamp(time);
-		$db->putKey($Key);
+	my $timestampValid=0;
+	if ($ce -> {session_management_via} eq "session_cookie" and defined($self->{cookie_timestamp})) {
+		$timestampValid = (time <= $self -> {cookie_timestamp} + $ce->{sessionKeyTimeout});
+	} else {
+		$timestampValid = (time <= $Key->timestamp()+$ce->{sessionKeyTimeout});
+		if ($keyMatches and $timestampValid and $updateTimestamp) {
+			$Key->timestamp(time);
+			$db->putKey($Key);
+		}
 	}
-	
 	return (1, $keyMatches, $timestampValid);
 }
 
@@ -652,7 +756,7 @@ sub fetchCookie {
      			$jar = $@->jar; # table of successfully parsed cookies
   		};
 		if ($jar) {
-			$cookie = uri_unescape( $jar->get("WeBWorKCourseAuthen.$courseID") );
+			$cookie = uri_unescape($jar->get("WeBWorKCourseAuthen.$courseID"));
 		};
 	} else {
 		my %cookies = WeBWorK::Cookie->fetch();
@@ -668,10 +772,10 @@ sub fetchCookie {
         #debug("cookie has this value: '", $cookie->value, "'");
         #my ($userID, $key) = split "\t", $cookie->value;
         debug("cookie has this value: '", $cookie, "'");
-        my ($userID, $key) = split "\t", $cookie;
+        my ($userID, $key, $timestamp) = split "\t", $cookie;
 		if (defined $userID and defined $key and $userID ne "" and $key ne "") {
 			debug("looks good, returning userID='$userID' key='$key'");
-			return $userID, $key;
+ 			return $userID, $key, $timestamp;
 		} else {
 			debug("malformed cookie. returning nothing.");
 			return;
@@ -689,18 +793,26 @@ sub sendCookie {
 	
 	my $courseID = $r->urlpath->arg("courseID");
 	
-	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
+ 	my $timestamp = time();
+	
 	my $cookie = WeBWorK::Cookie->new($r,
 		-name    => "WeBWorKCourseAuthen.$courseID",
-		-value   => "$userID\t$key",
-		-expires => $expires,
-		-domain  => $r->hostname,
+ 		-value   => "$userID\t$key\t$timestamp",
 		-path    => $ce->{webworkURLRoot},
 		-secure  => 0,
 	);
+
+	if ($ce->{session_management_via} ne "session_cookie") {
+		my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
+		$cookie -> expires($expires);
+	}
+ 	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
+ 		$cookie -> domain($r->hostname);    # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted.
+	}
 	
 	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
-	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+ 	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
+ 	if ($@) {croak $@; }
 }
 
 sub killCookie {
@@ -715,13 +827,20 @@ sub killCookie {
 		-name => "WeBWorKCourseAuthen.$courseID",
 		-value => "\t",
 		-expires => $expires,
-		-domain => $r->hostname,
 		-path => $ce->{webworkURLRoot},
 		-secure => 0,
 	);
+	if ($ce->{session_management_via} ne "session_cookie") {
+		my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
+		$cookie -> expires($expires);
+	}
+ 	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
+ 		$cookie -> domain($r->hostname);  # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted.
+	}
 	
 	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
-	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+ 	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
+ 	if ($@) {croak $@; }
 }
 
 ################################################################################
@@ -754,3 +873,4 @@ sub write_log_entry {
 }
 
 1;
+
diff --git a/lib/WeBWorK/ContentGenerator/Login.pm b/lib/WeBWorK/ContentGenerator/Login.pm
index d77c846a71..b31b11cac9 100644
--- a/lib/WeBWorK/ContentGenerator/Login.pm
+++ b/lib/WeBWorK/ContentGenerator/Login.pm
@@ -145,15 +145,14 @@ sub body {
 		);
 	}
 
-	print CGI::start_div({-class=>"p_content"});
-	
 	if ( $externalAuth ) {
 	    print CGI::p({}, $r->maketext("_EXTERNAL_AUTH_MESSAGE", CGI::strong($r->maketext($course))));
-		print CGI::end_div();
+
 	} else {
 		print CGI::p($r->maketext("Please enter your username and password for [_1] below:", CGI::b($r->maketext($course))));
-		print CGI::p($r->maketext("_LOGIN_MESSAGE", CGI::b($r->maketext("Remember Me"))));
-		print CGI::end_div();
+		if ($ce -> {session_management_via} ne "session_cookie") {
+			print CGI::p($r->maketext("_LOGIN_MESSAGE", CGI::b($r->maketext("Remember Me"))));
+		}
 	
 		print CGI::startform({-method=>"POST", -action=>$r->uri, -id=>"login_form"});
 
@@ -201,7 +200,9 @@ sub body {
 		print CGI::br();
 		print WeBWorK::CGI_labeled_input(-type=>"password", -id=>"pswd", -label_text=>$r->maketext("Password").": ", -input_attr=>{-name=>"passwd", -value=>"$passwd"}, -label_attr=>{-id=>"pswd_label"});
 		print CGI::br();
-		print WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"rememberme", -label_text=>$r->maketext("Remember Me"), -input_attr=>{-name=>"send_cookie", -value=>"on"});
+		if ($ce -> {session_management_via} ne "session_cookie") {
+			print WeBWorK::CGI_labeled_input(-type=>"checkbox", -id=>"rememberme", -label_text=>$r->maketext("Remember Me"), -input_attr=>{-name=>"send_cookie", -value=>"on"});
+		}
 		print CGI::br();
 		print WeBWorK::CGI_labeled_input(-type=>"submit", -input_attr=>{-value=>$r->maketext("Continue")});
 		print CGI::br();
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index ed899a2e81..c3417ce503 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -777,12 +777,15 @@ sub addKey {
 	if ($Key->user_id =~ /([^,]+)(?:,([^,]*))?(,g)?/) {
 		my ($userID, $proctorID) = ($1, $2);
 		croak "addKey: user $userID not found"
-			unless $self->{user}->exists($userID);
+#			unless $self->{user}->exists($userID);
+			unless $Key -> key eq "nonce" or $self->{user}->exists($Key->user_id);
 		croak "addKey: proctor $proctorID not found"
-			unless $self->{user}->exists($proctorID);
+#			unless $self->{user}->exists($proctorID);
+			unless $Key -> key eq "nonce" or $self->{user}->exists($Key->user_id);
 	} else {
 		croak "addKey: user ", $Key->user_id, " not found"
-			unless $self->{user}->exists($Key->user_id);
+#			unless $self->{user}->exists($Key->user_id);
+			unless $Key -> key eq "nonce" or $self->{user}->exists($Key->user_id);
 	}
 	
 	eval {
@@ -1181,7 +1184,6 @@ sub addUserSet {
 		unless $self->{user}->exists($UserSet->user_id);
 	croak "addUserSet: set ", $UserSet->set_id, " not found"
 		unless $self->{set}->exists($UserSet->set_id);
-	
 	eval {
 		return $self->{set_user}->add($UserSet);
 	};

From cb931949636d1960a6acece9f91705657034fca8 Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Tue, 29 May 2012 13:35:06 -0400
Subject: [PATCH 46/73] git add lib/WeBWorK/Authen/Basic_TheLastOption.pm

---
 lib/WeBWorK/Authen/LTIBasic.pm | 879 +++++++++++++++++++++++++++++++++
 1 file changed, 879 insertions(+)
 create mode 100644 lib/WeBWorK/Authen/LTIBasic.pm

diff --git a/lib/WeBWorK/Authen/LTIBasic.pm b/lib/WeBWorK/Authen/LTIBasic.pm
new file mode 100644
index 0000000000..575f64576a
--- /dev/null
+++ b/lib/WeBWorK/Authen/LTIBasic.pm
@@ -0,0 +1,879 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2012 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: /webwork/cvs/system/webwork2/lib/WeBWorK/Authen/LTIBasic.pm,v 1.1 2012/05/17 18:50:11 wheeler Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::LTIBasic;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::LTIBasic - Authenticate from a Learning Management System
+via the IMS LTI Basic/OAuth protocol.
+
+=cut
+
+use strict;
+use warnings;
+use Carp;
+use WeBWorK::Debug;
+use DBI;
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(formatDateTime);
+use WeBWorK::Localize;
+use URI::Escape;
+use Net::OAuth;
+use mod_perl;
+use constant MP2 => ( exists $ENV{MOD_PERL_API_VERSION} and $ENV{MOD_PERL_API_VERSION} >= 2 );
+
+$Net::OAuth::PROTOCOL_VERSION = Net::OAuth::PROTOCOL_VERSION_1_0A;
+
+#$WeBWorK::Debug::Enabled = 1;
+
+BEGIN {
+	if (MP2) {
+		require APR::SockAddr;
+		APR::SockAddr->import();
+		require Apache2::Connection;
+		Apache2::Connection->import();
+		require APR::Request::Error;
+		APR::Request::Error->import;
+	}
+}
+
+our $GENERIC_ERROR_MESSAGE = 
+	"Your authentication failed.  Please return to "
+	. "your Course Management System (e.g., Oncourse, Moodle, "
+	. "Blackboard, Canvas, Sakai, etc.)  and login again.";
+our $GENERIC_MISSING_USER_ID_ERROR_MESSAGE = 
+	"Your authentication failed.  Please return to "
+	. "your Course Management System (e.g., Oncourse, Moodle, "
+	. "Blackboard, Canvas, Sakai, etc.)  and login again.";
+our $GENERIC_DENIED_LOGIN_ERROR_MESSAGE = 
+	"You are not permitted to login into this site at this time. "
+	. "Please speak with your instructor.";
+our $GENERIC_UNKNOWN_USER_ERROR_MESSAGE = 
+	"This username does not appear on the roster for this WeBWorK site." ;
+our $GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE = 
+	"You have attemped to access this site as an instructor without prior authorization.";
+
+=head1 CONSTRUCTOR
+
+=over
+
+=item new($r)
+
+Instantiates a new WeBWorK::Authen object for the given WeBWorK::Requst ($r).
+
+=cut
+
+sub new {
+	my ($invocant, $r) = @_;
+	my $class = ref($invocant) || $invocant;
+	my $self = {
+		r => $r,
+	};
+	#initialize
+#	our $GENERIC_ERROR_MESSAGE = $r->maketext(
+#	"Your authentication failed.  Please return to "
+#	. "your Course Management System (e.g., Oncourse, Moodle, "
+#	. "Blackboard, Canvas, Sakai, etc.)  and login again.");
+#	our $GENERIC_MISSING_USER_ID_ERROR_MESSAGE = $r->maketext(
+#	"Your authentication failed.  Please return to "
+#	. "your Course Management System (e.g., Oncourse, Moodle, "
+#	. "Blackboard, Canvas, Sakai, etc.)  and login again.");
+#	our $GENERIC_DENIED_LOGIN_ERROR_MESSAGE = $r->maketext(
+#	"You are not permitted to login into this site at this time. "
+#	. "Please speak with your instructor.");
+#	our $GENERIC_UNKNOWN_USER_ERROR_MESSAGE = $r->maketext(
+#	"This username does not appear on the roster for this WeBWorK site.") ;
+#	our $GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE = $r -> maketext(
+#	"You have attemped to access this site as an instructor without prior authorization.");
+	bless $self, $class;
+	return $self;
+}
+
+=back
+
+=cut
+
+
+
+
+## this is only overridden for debug logging
+#sub verify {
+#	debug("BEGIN LTIBasic VERIFY");
+#	my $result = $_[0]->SUPER::verify(@_[1..$#_]);
+#	debug("END LTIBasic VERIFY");
+#	return $result;
+#}
+
+# This module is similar to the base class, with these differences:
+#  1. no WeBWorK guest/practice logins
+#  2. uses the Key database to store nonces, where
+#     the $Key -> username = the nonce
+#         $Key -> key = "nonce"
+#         $Key -> timestamp = the nonce's timestamp
+#  3. when this method is used, there needs to be a CRON job
+#     to delete old nonce records 
+#  4. A program ww_purge_old_nonces is available for
+#     deleting old nonce records.  It should be placed
+#     in webwork2/system/bin
+
+########
+#  Example of parameters forwarded by a Course Management System
+#user_id=wheeler
+#roles=Instructor
+#
+#lis_person_name_full=William+H.+Wheeler
+#lis_person_name_family=Wheeler
+#lis_person_contact_email_primary=wheeler%40indiana.edu
+#lis_person_sourcedid=wheeler
+#lis_person_name_given=William+H.
+#
+#basiclti_submit=Press+to+continue+to+external+tool.
+#lti_version=LTI-1p0
+#lti_message_type=basic-lti-launch-request
+#
+#context_id=a75a6608-3698-4b62-803d-063040fce113
+#context_title=Math+Tools+Pages
+#context_label=Math+Tools+Pages
+#
+#resource_link_description=Linking+to+WeBWorK%40IU
+#resource_link_id=109f9125-c711-4151-8601-4567518aed82
+#resource_link_title=WeBWorK+LTI
+#
+#launch_presentation_locale=en_US
+#
+#ext_sakai_serverid=esappo06
+#ext_sakai_server=https%3A%2F%2Foncourse.iu.edu
+#ext_sakai_session=8991b6d6c83c085f5ebb8707048e6631c946310870d6147e9e5e619b0686dafc736891ace760a6b8
+#
+#oauth_version=1.0
+#oauth_consumer_key=webwork
+#oauth_signature=fxcs0nuFgvSGQGnJck59Y2w8VHs%3D
+#oauth_nonce=201683935212232
+#oauth_signature_method=HMAC-SHA1
+#oauth_callback=about%3Ablank
+#oauth_timestamp=1309888775
+#
+#custom_semster=?
+#custom_section=?
+
+sub  request_has_data_for_this_verification_module {
+	#debug("LTIBasic has been called for data verification");
+	my $self = shift;
+	my $r = $self -> {r};
+	if (!(defined $r->param("oauth_consumer_key"))
+			or !(defined $r -> param("oauth_signature"))
+			or !(defined $r -> param("oauth_nonce"))
+			or !(defined $r -> param("oauth_timestamp")) ) {
+	#debug("LTIBasic returning that it has insufficent data");
+		return(0);
+	} else {
+		return(1);
+	}
+}
+
+sub get_credentials {
+	my ($self) = @_;
+	my $r = $self->{r};
+	my $ce = $r -> {ce};
+	
+	#disable password login
+	$self->{external_auth} = 1;
+	
+	# if at least the user ID is available in request parameters
+	if (defined $r->param("user_id")) 
+		{
+		map {$self -> {$_ -> [0]} = $r -> param($_ -> [1]);} 
+						(['user_id', 'lis_person_sourcedid'],
+						['role', 'roles'],
+						['last_name' , 'lis_person_name_family'],
+						['first_name', 'lis_person_name_given'],
+						['context_id', 'context_id'],
+						['oauth_consumer_key', 'oauth_consumer_key'],
+						['oauth_signature', 'oauth_signature'],
+						['oauth_nonce', 'oauth_nonce'],
+						['oauth_timestamp', 'oauth_timestamp'],
+						['semester', 'custom_semester'],
+						['section', 'custom_section'],
+						);
+		$self -> {email} = uri_unescape($r -> param("lis_person_contact_email_primary"));
+		if (!defined($self->{user_id})) {
+			$self->{user_id} = $self -> {email};
+		}
+		if (defined $ce -> {analyze_context_id}) {
+			$ce -> {analyze_context_id} ($self) ;
+		}
+		if (!defined($self -> {section})) {
+			$self -> {section} = "unknown";
+		}
+		$self->{login_type} = "normal";
+		$self -> {credential_source} = "LTIBasic";
+		return 1;
+		}
+	return 0;
+}
+
+# minor modification of method in superclass
+sub check_user {
+	my $self = shift;
+	my $r = $self->{r};
+	my ($ce, $db, $authz) = map {$r -> $_ ;} ('ce', 'db', 'authz');
+	
+	my $user_id = $self->{user_id};
+	
+	if (defined $user_id and $user_id eq "") {
+		$self->{log_error} = "no user id specified";
+		$self->{error} = $r->maketext($GENERIC_MISSING_USER_ID_ERROR_MESSAGE);
+		return 0;
+	}
+	
+	my $User = $db->getUser($user_id);
+	
+	if (!$User) {
+		if ( defined($r -> param("lis_person_sourcedid"))) {
+			return 1;  #This may be a new user coming in from a LMS via LTI.
+		} else {
+		$self->{log_error} .= "LOGIN FAILED $user_id - user unknonw";
+		$self->{error} = $r->maketext("Username presented:  " . $user_id . "<br />" . $GENERIC_UNKNOWN_USER_ERROR_MESSAGE);
+		return 0;
+		}
+	}
+
+	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
+		$self->{error} = $r->maktext($GENERIC_DENIED_LOGIN_ERROR_MESSAGE);
+		return 0;
+	}
+	
+	unless ($authz->hasPermissions($user_id, "login")) {
+		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
+		$self->{error} = $r->maketext($GENERIC_DENIED_LOGIN_ERROR_MESSAGE);
+		return 0;
+	}
+	
+	return 1;
+}
+
+# disable practice users
+sub verify_practice_user { return(0) ;}
+
+sub verify_normal_user 
+{
+	my $self = shift;
+	my ($r, $user_id, $session_key) 
+			= map {$self -> {$_};} ('r', 'user_id', 'session_key');
+	
+    # Call check_session in order to destroy any existing session cookies and Key table sessions
+	my ($sessionExists, $keyMatches, $timestampValid) = $self->check_session($user_id, $session_key, 0);
+	debug("sessionExists='", $sessionExists, "' keyMatches='", $keyMatches, "' timestampValid='", $timestampValid, "'");
+	
+	#debug("Mark D");
+	my $auth_result = $self->authenticate;
+	#debug("Mark E");
+	#debug("auth_result=|${auth_result}|");	
+
+	if ($auth_result eq "1") 
+		{
+		#debug("Mark F");
+		#debug("About to call create_session.");
+		$self->{session_key} = $self->create_session($user_id);
+		#debug("Mark G");
+		#debug("session_key=|" . $self -> {session_key} . "|.");
+		return 1;
+		}
+	else  
+		{
+		$self->{error} = $r->maketext($auth_result);
+		$self-> {log_error} .= "LOGIN FAILED $user_id - authentication failed: ". $self->{error};
+		return 0;
+		} 
+}
+
+sub authenticate
+{
+	my $self = shift;
+	my ($r, $user ) = map {$self -> {$_};} ('r', 'user_id');
+	#debug("user=|${user}|");
+	#debug "ref(r) = |". ref($r) . "|";
+	#debug "ref of r->{paramcache} = |" . ref($r -> {paramcache}) . "|";
+	#debug "request_method = |" . $r -> request_method . "|";
+	my $ce = $r -> ce;
+	my $db = $r -> db;
+	my $courseName = $r -> ce -> {'courseName'};
+	my $webmaster= $ce ->{Local_Email_Addresses} -> {Webmaster};
+	my $verify_code=0;
+	my $timestamp=0;
+
+	# Check nonce to see whether request is legitimate
+	#debug("Nonce = |" . $self-> {oauth_nonce} . "|");
+	my $nonce = WeBWorK::Authen::LTIBasic::Nonce -> new($r, $self -> {oauth_nonce}, $self -> {oauth_timestamp}); 
+	if (!($nonce -> ok ) )
+		{
+		#croak ($r->maketext("Bad Nonce for user " . $self->{user_id} . ": Nonce = " . $self -> {oauth_nonce} . ", Nonce_timestamp = " . $self -> {oauth_timestamp} .  ", at time " . time()));
+		#debug( "eval failed: ", $@, "<br /><br />"; print_keys($r);); 
+		$self -> {error} .= $r->maketext($GENERIC_ERROR_MESSAGE
+				. ":  Something was wrong with your Nonce LTI parameters.  "
+				. "If this recurs, please speak with your instructor");
+		return 0;
+		}
+	#debug( "r->param(oauth_signature) = |" . $r -> param("oauth_signature") . "|");
+	my %request_hash;
+	my @keys = keys %{$r-> {paramcache}};
+	foreach my $key (@keys) {
+		$request_hash{$key} =  $r -> param($key); 
+	}
+	my $requestHash = \%request_hash;
+	#foreach my $key (@keys) {
+	#	debug( "$key -> |" . $requestHash->{$key} . "|");
+	#}
+
+	my $request;
+	eval 
+		{ 
+		$request = Net::OAuth -> request("request token") -> from_hash($requestHash,
+        		request_url => $ce -> {LTIBasicToThisSiteURL},
+        		request_method => "POST",                                    
+        		consumer_secret => $ce -> {LTIBasicConsumerSecret},
+        	);
+		};
+
+	if ($@) 
+		{
+		#debug("construction of Net::OAuth object failed: $@");
+		#debug( "eval failed: ", $@, "<br /><br />"; print_keys($r);); 
+		$self -> {error} = $r->maketext("Your authentication failed.  Please return to Oncourse and login again.");
+		$self -> {error} = $r->maketext("Something was wrong with your LTI parameters.  "
+				. "If this recurs, please speak with your instructor");
+		return 0;
+		}
+	else
+		{
+		if (! $request -> verify) 
+			{
+			#debug("request-> verify failed");
+			#debug("<h2> oauthTest2: OAuth verification Failed</h2> "; print_keys($r));
+			$self -> {error} = $r->maketext("Your authentication failed.  Please return to Oncourse and login again.");
+			$self -> {error} = $r->maketext("Your LTI OAuth verification failed.  "
+				. "If this recurs, please speak with your instructor");
+			return 0;
+			}
+		else
+			{
+			#debug("<h2> oauthTest2: OAuth verification SUCCEEDED !! </h2>");
+			my $userID = $self->{user_id};
+			my $LTIrolesString = $r -> param("roles");
+			my @LTIroles = split /,/, $LTIrolesString;
+			my $nr = scalar(@LTIroles);
+			if (! defined($ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[0]}})) {
+				croak("Cannot find a WeBWorK role that corresponds to the LMS role of "
+						. $LTIroles[0] .".");
+			}
+			my $LTI_webwork_permissionLevel 
+				= $ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[0]}};
+			if ($nr > 1) {
+				for (my $j =1; $j < $nr; $j++) {
+					if ($LTI_webwork_permissionLevel 
+						< $ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[$j]}}) {
+						$LTI_webwork_permissionLevel 
+							= $ce -> {userRoles} -> {$ce -> {LMSrolesToWeBWorKroles} -> {$LTIroles[$j]}};
+					}	
+				}
+			}		
+			if (! $db -> existsUser($userID) )
+				{ # New User. Create User record 
+				if ($LTI_webwork_permissionLevel > $ce ->{userRoles} -> {"ta"}) {
+					croak $r->maketext($GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE);
+				}
+				my $newUser = $db -> newUser();
+					$newUser -> user_id($userID);
+					$newUser -> last_name($self -> {last_name});
+					$newUser -> first_name($self -> {first_name});
+					$newUser -> email_address($self -> {email});
+					$newUser -> status("C");
+					$newUser ->  section(($LTI_webwork_permissionLevel > $ce -> {userRoles} -> {"student"}) ?
+						"Admin" : (defined($self -> {section})) ? $self -> {section} : "");
+					$newUser -> comment(formatDateTime(time, "local"));
+				$db -> addUser($newUser);
+				$self->write_log_entry("New user $userID added via LTIBasic login");
+				  # Assign permssion level
+				my $newPermissionLevel = $db -> newPermissionLevel();
+					$newPermissionLevel -> user_id($userID);
+					$newPermissionLevel -> permission($LTI_webwork_permissionLevel);
+				$db -> addPermissionLevel($newPermissionLevel);
+				$r -> authz -> {PermissionLevel} = $newPermissionLevel;  #cache the Permission Level Record.
+				  # Assign existing sets
+				  # This module is not a subclass of WeBWorK::ContentGenerator::Instuctor,
+				  #  do the methods defined therein for assigning problem sets and problems
+				  #  to users are not available for use here.  
+				  #  Therefore, we have to resort to the lower level methods in WeBWorK::DB.
+				my $numberOfProblemsAssigned = 0;
+				my %globalProblemsBySet=();
+				my @globalSetIDs = $db->listGlobalSets;
+				my @GlobalSets = $db->getGlobalSets(@globalSetIDs);
+				my $open_cut = time() + 24*3600;
+				my $globalSet;
+				foreach $globalSet (@GlobalSets) {
+					if (defined($globalSet) and $globalSet -> open_date < $open_cut) {
+					    my @GlobalProblems = grep { defined $_ } $db->getAllGlobalProblems($globalSet -> set_id);
+						$globalProblemsBySet{$globalSet->set_id} = \@GlobalProblems;
+						$numberOfProblemsAssigned += scalar(@GlobalProblems);
+					}
+				}
+				my $reasonableNumberOfDays = int($numberOfProblemsAssigned / $ce->{reasonableProblemsPerDayMakeup}) +1;
+				if ($reasonableNumberOfDays < 2) {$reasonableNumberOfDays = 2;}
+				my ($sec, $min, $day, $monthDay, $month, $year, $weekDay, $yearDay, $isdst) = localtime();
+				my $niceDueDay = $yearDay + 1 + $reasonableNumberOfDays;
+				my $niceDueTime = Time::Local::timelocal_nocheck(0,30,8,$niceDueDay,0,$year);
+				   ($sec, $min, $day, $monthDay, $month, $year, $weekDay, $yearDay, $isdst) = localtime($niceDueTime);
+				if ($weekDay == 0) {$niceDueDay +=1;}
+				elsif ($weekDay == 6) {$niceDueDay += 2;}
+				my $niceAnswerTime = $niceDueTime + 600;
+				my $due_cut = time() + 2*24*3600;
+				my $userSet;
+				my $userProblem;
+				foreach $globalSet (@GlobalSets) 
+					{
+					if (defined($globalSet)) 
+						{
+						if (defined($ce -> {"adjustDueDatesForLateAdds"}) and $ce -> {"adjustDueDatesForLateAdds"}
+							and $globalSet -> open_date < $open_cut and $globalSet -> due_date < $due_cut
+							) 
+							{
+							if (not $db -> existsUserSet($userID, $globalSet -> set_id ) ) 
+								{
+								$userSet = $db -> newUserSet();
+								$userSet -> user_id($userID);
+								$userSet -> set_id($globalSet -> set_id);
+								# $userSet -> psvn(int(10**12 * rand()));
+								# $userSet -> open_date(0);
+								$userSet -> due_date($niceDueTime);
+								$userSet -> answer_date($niceAnswerTime);
+								$db -> addUserSet($userSet);
+								}
+							}
+						else
+							{
+							if (not $db -> existsUserSet($userID, $globalSet -> set_id ) ) {
+								$userSet = $db -> newUserSet();
+								$userSet -> user_id($userID);
+								$userSet -> set_id($globalSet -> set_id);
+								# $userSet -> psvn(int(10**12 * rand()));
+								# $userSet -> open_date(0);
+								# $userSet -> due_date(0);
+								# $userSet -> answer_date(0);
+								$db -> addUserSet($userSet);
+							}
+						}
+						foreach my $globalProblem (  @{$globalProblemsBySet{$globalSet -> set_id}} ) {
+							if (defined($globalProblem)) {
+								if (not $db -> existsUserProblem($userID, $globalSet -> set_id, $globalProblem -> problem_id)) {
+									$userProblem = $db -> newUserProblem();
+									$userProblem -> user_id($userID);
+									$userProblem -> set_id($globalSet -> set_id);
+									$userProblem -> problem_id($globalProblem -> problem_id);
+									$userProblem -> problem_seed(int(10**4 * rand()));
+									$userProblem -> {status} = 0;
+									$userProblem -> {attempted} = 0;
+									$userProblem -> {num_correct} = 0;
+									$userProblem -> {num_incorrect} = 0;
+									$userProblem -> {last_answer} = "";
+
+									$db -> addUserProblem($userProblem);
+								}
+							}
+						}
+					}
+				}
+			}
+		else 
+			{ # Existing user.  Possibly modify demographic information and permission level.
+			my $user = $db -> getUser($userID);
+			my $permissionLevel = $db -> getPermissionLevel($userID);
+			if (($user -> last_name() eq "Teacher" and $user -> first_name() eq "The")
+					or (defined($permissionLevel -> permission) 
+							and $permissionLevel -> permission > $ce -> {userRoles} -> {professor})) 
+				{  #This is the instructor of record or an administrator.  No changes permitted via LTI.	
+				}
+			else 
+				{
+				my $change_made = 0;
+				if ($user -> last_name ne $self -> {last_name}) 
+					{
+					$user -> last_name($self -> {last_name});
+					$change_made = 1;
+					}
+				if ($user -> first_name ne $self -> {first_name}) 
+					{
+					$user -> first_name($self -> {first_name});
+					$change_made = 1;
+					}
+				if ($user -> email_address ne $self -> {email}) 
+					{
+					$user -> email_address($self -> {email});
+					$change_made = 1;
+					}
+				if ($user -> status ne "C")
+					{
+					$user -> status("C");
+					$change_made = 1;
+					}
+				if (defined($permissionLevel -> permission)
+					and $permissionLevel -> permission > $ce ->{userRoles} -> {"student"})
+						{if ($user -> section ne "Admin") 
+							{
+							$user -> section("Admin");
+							$change_made = 1;
+							}
+						}
+				elsif ($LTI_webwork_permissionLevel > $ce -> {userRoles}->{"student"} 
+					and (!defined($user -> section) or $user -> section ne "Admin") )
+						{
+						$user -> section("Admin");
+						$change_made = 1;
+						}
+				elsif (defined ($self -> {"section"}) 
+					and (! defined($user -> section) 
+						or ($user -> section ne $self -> {"section"}
+							and $self -> {"section"} ne "" 
+							and $user -> section ne "Admin"
+							)
+						)
+					  )
+						{
+						$user -> section($self -> {"section"});
+						$change_made = 1;
+						}
+				if ($change_made) 
+					{
+					$user -> comment(formatDateTime(time, "local"));
+					$db -> putUser($user);
+					$self->write_log_entry("Demographic data for user $userID modified via LTIBasic login");
+				}
+				  # Assign permission level
+######## Change due to faulty roles from Oncourse LTIBasic ######
+#				if (!defined($permissionLevel -> permission) or $permissionLevel -> permission != $LTI_webwork_permissionLevel)
+				if (!defined($permissionLevel -> permission) )
+#################################################################
+					{
+					$permissionLevel -> permission($LTI_webwork_permissionLevel);
+					$db -> putPermissionLevel($permissionLevel);
+					$self->{PermissionLevel} = $permissionLevel;  #cache the revised Permission Level Record.
+					$self->write_log_entry("Permission level for user $userID changed to $LTI_webwork_permissionLevel via LTIBasic login");
+				}
+			}
+			}
+			return 1;
+		}
+	}
+	$self -> {error} = $r->maketext($GENERIC_ERROR_MESSAGE);
+	return(0);
+}
+
+#sub maybe_send_cookie {
+#	my $self = shift;
+#	my $r = $self->{r};
+#	
+#	my ($cookie_user, $cookie_key) = $self->fetchCookie;
+#	
+#	# we send a cookie if any of these conditions are met:
+#	
+#	# (a) a cookie was used for authentication
+#	my $used_cookie = ($self->{credential_source} eq "cookie");
+#	
+#	# (b) a cookie was sent but not used for authentication, and the
+#	#     credentials used for authentication were the same as those in
+#	#     the cookie
+#	my $unused_valid_cookie = ($self->{credential_source} ne "cookie"
+#		and defined $cookie_user and $self->{user_id} eq $cookie_user
+#		and defined $cookie_key and $self->{session_key} eq $cookie_key);
+#	
+#	# (c) the user asked to have a cookie sent and is not a guest user.
+#	my $user_requests_cookie = ($self->{login_type} ne "guest"
+#		and $r->param("send_cookie"));
+#	
+#	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie, "'");
+#	
+#	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie) {
+#		$self->sendCookie($self->{user_id}, $self->{session_key});
+#	} else {
+#		$self->killCookie;
+#	}
+#}
+
+
+#sub set_params {
+#	my $self = shift;
+#	my $r = $self->{r};
+#	
+#	# A2 - params are not non-modifiable, with no explanation or workaround given in docs. WTF!
+#   # Response: The local copy is modifiable but the underlying C table is not.
+#   #           See the perl documentation on Apache2::Request at the end of the subsection
+#   #           on "param".
+#
+#	$r->param("user", $self->{user_id});
+#	
+#	#debug("params user='", $r->param("user"), "' key='", $r->param("key"), "' passwd='", $r->param("passwd"), "'");
+#}
+
+
+################################################################################
+# Session key management
+################################################################################
+
+# # clobbers any existing session for this $userID
+# # the key is returned
+# sub create_session {
+# 	my $self = shift;
+# 	my ($r, $userID, $newKey) = map {$self -> {$_};}
+# 		('r', 'user_id', 'session_key');
+# 	my ($ce, $db) = map {$r -> $_ ;} ('ce', 'db');
+# 	
+# 	my $timestamp = time;
+# 	unless ($newKey) {
+# 		my @chars = @{ $ce->{sessionKeyChars} };
+# 		my $length = $ce->{sessionKeyLength};
+# 		
+# 		srand;
+# 		$newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
+# 	}
+# 
+# 	debug("Mark K");
+# 	debug("userID = |$userID|.");	
+# 	my $Key = $db->newKey(user_id=>$userID, key=>$newKey, timestamp=>$timestamp);
+# 	debug("Session Key constructed.");
+# 	debug("Mark L");
+# 	eval { $db->deleteKey($userID) };
+# 	debug("return from deleteKey = |$@|.");
+# 	debug("Mark M");
+# 	debug("Process has returned from calling deleteKey.");
+#   if ($db->{key}->exists($userID)) 
+# 	{
+# 		debug("putting key");
+# 		$db -> putKey($Key);
+# 	}
+# 	else
+# 	{
+# 		debug("adding key");
+# 		$db->addKey($Key);
+# 	}
+# 	debug("Mark N");
+# 	debug("Key as been added to database.");
+# 	$self->sendCookie($userID, $newKey);
+# 	return $newKey;
+# }
+# 
+# # Must kill any existing session for this user
+# # by killing any cookie and any session key.
+# sub check_session {
+# 	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
+# 	my $ce = $self->{r}->ce;
+# 	my $db = $self->{r}->db;
+# 
+# 	my ($cookie_user, $cookie_key) = $self->fetchCookie();
+# 
+# 	if (defined($cookie_user) && $userID eq $cookie_user) {
+# 		$self -> killCookie(); 
+# 	}
+# 	my $Key = $db->getKey($userID); # checked
+# 	if ($Key) {
+# 		$Key -> timestamp(-1);
+# 		$Key -> key("");
+# 		$db -> putKey($Key);
+# 		}
+# 	return 0;
+# }
+
+################################################################################
+# Cookie management
+################################################################################
+
+#sub fetchCookie {
+#	my $self = shift;
+#	my $r = $self->{r};
+#	my $ce = $r->ce;
+#	my $urlpath = $r->urlpath;
+#	
+#	my $courseID = $urlpath->arg("courseID");
+#	
+#	# AP2 - Apache2::Cookie needs $r, Apache::Cookie doesn't
+#    #my %cookies = WeBWorK::Cookie->fetch( MP2 ? $r : () );
+#    #my $cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
+#	
+#	my $cookie = undef;
+#	if (MP2) {
+#		
+#		my $jar = undef;
+# 		eval {
+#       			$jar = $r->jar; #table of cookies
+#  		};
+#  		if (ref $@ and $@->isa("APR::Request::Error") ) {
+#			debug("Error parsing cookies, will use a partial result");
+#     			$jar = $@->jar; # table of successfully parsed cookies
+#  		};
+#		if ($jar) {
+#			$cookie = uri_unescape($jar->get("WeBWorKCourseAuthen.$courseID"));
+#		};
+#	} else {
+#		my %cookies = WeBWorK::Cookie->fetch();
+#		$cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
+#		if ($cookie) {
+#			debug("found a cookie for this course: '", $cookie->as_string, "'");
+#			$cookie = $cookie->value;
+#		}
+#	}
+#
+#	if ($cookie) {
+#        debug("cookie has this value: '", $cookie, "'");
+#        my ($userID, $key, $timestamp) = split "\t", $cookie;
+#		if (defined $userID and defined $key and $userID ne "" and $key ne "") {
+#			debug("looks good, returning userID='$userID' key='$key'");
+#			return $userID, $key, $timestamp;
+#		} else {
+#			debug("malformed cookie. returning nothing.");
+#			return;
+#		}
+#	} else {
+#		debug("found no cookie for this course. returning nothing.");
+#		return;
+#	}
+#}
+#
+#sub sendCookie {
+#	my ($self, $userID, $key) = @_;
+#	my $r = $self->{r};
+#	my $ce = $r->ce;
+#	
+#	my $courseID = $r->urlpath->arg("courseID");
+##	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
+#	my $timestamp = time();
+#	my $cookie = WeBWorK::Cookie->new($r,
+#		-name    => "WeBWorKCourseAuthen.$courseID",
+#		-value   => "$userID\t$key\t$timestamp",
+##		-expires => $expires,              # Want a session cookie, not a persistent cookie
+##		-domain  => $r->hostname,          # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted. See Below.
+#		-path    => $ce->{webworkURLRoot},
+#		-secure  => 0,
+#	);
+#
+#	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
+#		$cookie -> domain($r->hostname);
+#	}
+#	
+#	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
+#	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
+#	if ($@) {warn $@; }
+#}
+#
+#sub killCookie {
+#	my ($self) = @_;
+#	my $r = $self->{r};
+#	my $ce = $r->ce;
+#	
+#	my $courseID = $r->urlpath->arg("courseID");
+#	
+##	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time-60*60*24, "GMT");
+#	my $cookie = WeBWorK::Cookie->new($r,
+#		-name => "WeBWorKCourseAuthen.$courseID",
+#		-value => "\t",
+##		-expires => $expires,              # Session Cookies only.
+##		-domain  => $r->hostname,          # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted. See Below.
+#		-path => $ce->{webworkURLRoot},
+#		-secure => 0,
+#	);
+#	
+#	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
+#		$cookie -> domain($r->hostname);
+#	}
+#	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
+#	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
+#}
+
+################################################################################
+################################################################################
+# NONCE SUB-PACKAGE
+################################################################################
+################################################################################
+
+package WeBWorK::Authen::LTIBasic::Nonce;
+
+sub new {
+	my ($invocant, $r, $nonce, $timestamp) = @_;
+	my $class = ref($invocant) || $invocant;
+	my $self = {
+		r => $r,
+		nonce => $nonce,
+		timestamp => $timestamp,
+	};
+	bless $self, $class;
+	return $self;
+}
+
+sub ok {
+	my $self = shift;
+	my $r = $self -> {r};
+	my $ce = $r -> {ce};
+	if ($self -> {timestamp} < time() - $ce->{NonceLifeTime}) {
+		return 0;
+	}
+	my $db = $self -> {r} -> {db};
+	my $Key = $db -> getKey($self -> {nonce});
+	if (! defined($Key) ) {
+		# nonce, timestamp are ok
+		$Key = $db -> newKey(user_id=>$self->{nonce}, 
+							key=>"nonce", 
+							timestamp=>$self->{"timestamp"},
+					);
+		$db -> addKey($Key);
+		return 1;
+	}
+	elsif ( $Key -> timestamp <  $self ->{"timestamp"} ) {
+		# nonce, timestamp pair is OK
+		$Key -> timestamp($self -> {"timestamp"});
+		$db -> put($Key);
+		return 1;
+	}
+	else {
+		return 0;
+	}
+}
+
+#sub ok { #### For Testing Purposes only
+#	return 1;
+#}
+
+################################################################################
+# END NONCE SUB-PACKAGE
+################################################################################
+
+sub print_keys {
+	my ($self, $r) = @_;
+	my @keys = keys %{$r-> {paramcache}};
+	my %request_hash;
+	my $key;
+	foreach $key (@keys) {
+		$request_hash{$key} =  $r -> param($key); 
+	}
+	my $requestHash = \%request_hash;
+	foreach $key (@keys) {
+		warn "$key -> |" . $requestHash->{$key} . "|";
+	}
+}
+
+
+
+1;
+

From db878876dc9be7aa3dbc7e61f6b9613f081440b4 Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Tue, 29 May 2012 13:45:58 -0400
Subject: [PATCH 47/73] WeBWorK::Authen::Basic_TheLastOption.pm provides the
 basic functionality that is in WeBWorK::Authen.pm and should in the last
 Authen hash in global.conf if one wants to support Password Authentication
 and guest users.

---
 lib/WeBWorK/Authen/Basic_TheLastOption.pm | 34 +++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 lib/WeBWorK/Authen/Basic_TheLastOption.pm

diff --git a/lib/WeBWorK/Authen/Basic_TheLastOption.pm b/lib/WeBWorK/Authen/Basic_TheLastOption.pm
new file mode 100644
index 0000000000..d4fbcd4390
--- /dev/null
+++ b/lib/WeBWorK/Authen/Basic_TheLastOption.pm
@@ -0,0 +1,34 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/Authen/Basic.pm,v 1.0 2012/05/26 17:25:00 wheeler Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::Authen::Basic_TheLastOption;
+use base qw/WeBWorK::Authen/;
+
+=head1 NAME
+
+WeBWorK::Authen::Basic_TheLastOption - Use only the functionality in WeBWorK::Authen.
+
+This module provides only the functionality that is in the base
+module WeBWor::Authen.  That module supports password
+authentication and permits guest logins.  If one wants
+to provide those options, then this module should
+be the last one in the array of the Authen module hashes.
+
+=cut
+
+
+
+1;

From f6435ac3c4efd0097f7fec59c816b097e3ba3c86 Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Tue, 29 May 2012 13:54:02 -0400
Subject: [PATCH 48/73] The LTIBasic.pm authentication module provides support
 for LTI 1.0 authentication from a Course Management System.

---
 lib/WeBWorK/Authen/LTIBasic.pm | 234 ---------------------------------
 1 file changed, 234 deletions(-)

diff --git a/lib/WeBWorK/Authen/LTIBasic.pm b/lib/WeBWorK/Authen/LTIBasic.pm
index 575f64576a..0376085194 100644
--- a/lib/WeBWorK/Authen/LTIBasic.pm
+++ b/lib/WeBWorK/Authen/LTIBasic.pm
@@ -84,22 +84,6 @@ sub new {
 	my $self = {
 		r => $r,
 	};
-	#initialize
-#	our $GENERIC_ERROR_MESSAGE = $r->maketext(
-#	"Your authentication failed.  Please return to "
-#	. "your Course Management System (e.g., Oncourse, Moodle, "
-#	. "Blackboard, Canvas, Sakai, etc.)  and login again.");
-#	our $GENERIC_MISSING_USER_ID_ERROR_MESSAGE = $r->maketext(
-#	"Your authentication failed.  Please return to "
-#	. "your Course Management System (e.g., Oncourse, Moodle, "
-#	. "Blackboard, Canvas, Sakai, etc.)  and login again.");
-#	our $GENERIC_DENIED_LOGIN_ERROR_MESSAGE = $r->maketext(
-#	"You are not permitted to login into this site at this time. "
-#	. "Please speak with your instructor.");
-#	our $GENERIC_UNKNOWN_USER_ERROR_MESSAGE = $r->maketext(
-#	"This username does not appear on the roster for this WeBWorK site.") ;
-#	our $GENERIC_UNKNOWN_INSTRUCTOR_ERROR_MESSAGE = $r -> maketext(
-#	"You have attemped to access this site as an instructor without prior authorization.");
 	bless $self, $class;
 	return $self;
 }
@@ -583,224 +567,6 @@ sub authenticate
 	return(0);
 }
 
-#sub maybe_send_cookie {
-#	my $self = shift;
-#	my $r = $self->{r};
-#	
-#	my ($cookie_user, $cookie_key) = $self->fetchCookie;
-#	
-#	# we send a cookie if any of these conditions are met:
-#	
-#	# (a) a cookie was used for authentication
-#	my $used_cookie = ($self->{credential_source} eq "cookie");
-#	
-#	# (b) a cookie was sent but not used for authentication, and the
-#	#     credentials used for authentication were the same as those in
-#	#     the cookie
-#	my $unused_valid_cookie = ($self->{credential_source} ne "cookie"
-#		and defined $cookie_user and $self->{user_id} eq $cookie_user
-#		and defined $cookie_key and $self->{session_key} eq $cookie_key);
-#	
-#	# (c) the user asked to have a cookie sent and is not a guest user.
-#	my $user_requests_cookie = ($self->{login_type} ne "guest"
-#		and $r->param("send_cookie"));
-#	
-#	debug("used_cookie='", $used_cookie, "' unused_valid_cookie='", $unused_valid_cookie, "' user_requests_cookie='", $user_requests_cookie, "'");
-#	
-#	if ($used_cookie or $unused_valid_cookie or $user_requests_cookie) {
-#		$self->sendCookie($self->{user_id}, $self->{session_key});
-#	} else {
-#		$self->killCookie;
-#	}
-#}
-
-
-#sub set_params {
-#	my $self = shift;
-#	my $r = $self->{r};
-#	
-#	# A2 - params are not non-modifiable, with no explanation or workaround given in docs. WTF!
-#   # Response: The local copy is modifiable but the underlying C table is not.
-#   #           See the perl documentation on Apache2::Request at the end of the subsection
-#   #           on "param".
-#
-#	$r->param("user", $self->{user_id});
-#	
-#	#debug("params user='", $r->param("user"), "' key='", $r->param("key"), "' passwd='", $r->param("passwd"), "'");
-#}
-
-
-################################################################################
-# Session key management
-################################################################################
-
-# # clobbers any existing session for this $userID
-# # the key is returned
-# sub create_session {
-# 	my $self = shift;
-# 	my ($r, $userID, $newKey) = map {$self -> {$_};}
-# 		('r', 'user_id', 'session_key');
-# 	my ($ce, $db) = map {$r -> $_ ;} ('ce', 'db');
-# 	
-# 	my $timestamp = time;
-# 	unless ($newKey) {
-# 		my @chars = @{ $ce->{sessionKeyChars} };
-# 		my $length = $ce->{sessionKeyLength};
-# 		
-# 		srand;
-# 		$newKey = join ("", @chars[map rand(@chars), 1 .. $length]);
-# 	}
-# 
-# 	debug("Mark K");
-# 	debug("userID = |$userID|.");	
-# 	my $Key = $db->newKey(user_id=>$userID, key=>$newKey, timestamp=>$timestamp);
-# 	debug("Session Key constructed.");
-# 	debug("Mark L");
-# 	eval { $db->deleteKey($userID) };
-# 	debug("return from deleteKey = |$@|.");
-# 	debug("Mark M");
-# 	debug("Process has returned from calling deleteKey.");
-#   if ($db->{key}->exists($userID)) 
-# 	{
-# 		debug("putting key");
-# 		$db -> putKey($Key);
-# 	}
-# 	else
-# 	{
-# 		debug("adding key");
-# 		$db->addKey($Key);
-# 	}
-# 	debug("Mark N");
-# 	debug("Key as been added to database.");
-# 	$self->sendCookie($userID, $newKey);
-# 	return $newKey;
-# }
-# 
-# # Must kill any existing session for this user
-# # by killing any cookie and any session key.
-# sub check_session {
-# 	my ($self, $userID, $possibleKey, $updateTimestamp) = @_;
-# 	my $ce = $self->{r}->ce;
-# 	my $db = $self->{r}->db;
-# 
-# 	my ($cookie_user, $cookie_key) = $self->fetchCookie();
-# 
-# 	if (defined($cookie_user) && $userID eq $cookie_user) {
-# 		$self -> killCookie(); 
-# 	}
-# 	my $Key = $db->getKey($userID); # checked
-# 	if ($Key) {
-# 		$Key -> timestamp(-1);
-# 		$Key -> key("");
-# 		$db -> putKey($Key);
-# 		}
-# 	return 0;
-# }
-
-################################################################################
-# Cookie management
-################################################################################
-
-#sub fetchCookie {
-#	my $self = shift;
-#	my $r = $self->{r};
-#	my $ce = $r->ce;
-#	my $urlpath = $r->urlpath;
-#	
-#	my $courseID = $urlpath->arg("courseID");
-#	
-#	# AP2 - Apache2::Cookie needs $r, Apache::Cookie doesn't
-#    #my %cookies = WeBWorK::Cookie->fetch( MP2 ? $r : () );
-#    #my $cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
-#	
-#	my $cookie = undef;
-#	if (MP2) {
-#		
-#		my $jar = undef;
-# 		eval {
-#       			$jar = $r->jar; #table of cookies
-#  		};
-#  		if (ref $@ and $@->isa("APR::Request::Error") ) {
-#			debug("Error parsing cookies, will use a partial result");
-#     			$jar = $@->jar; # table of successfully parsed cookies
-#  		};
-#		if ($jar) {
-#			$cookie = uri_unescape($jar->get("WeBWorKCourseAuthen.$courseID"));
-#		};
-#	} else {
-#		my %cookies = WeBWorK::Cookie->fetch();
-#		$cookie = $cookies{"WeBWorKCourseAuthen.$courseID"};
-#		if ($cookie) {
-#			debug("found a cookie for this course: '", $cookie->as_string, "'");
-#			$cookie = $cookie->value;
-#		}
-#	}
-#
-#	if ($cookie) {
-#        debug("cookie has this value: '", $cookie, "'");
-#        my ($userID, $key, $timestamp) = split "\t", $cookie;
-#		if (defined $userID and defined $key and $userID ne "" and $key ne "") {
-#			debug("looks good, returning userID='$userID' key='$key'");
-#			return $userID, $key, $timestamp;
-#		} else {
-#			debug("malformed cookie. returning nothing.");
-#			return;
-#		}
-#	} else {
-#		debug("found no cookie for this course. returning nothing.");
-#		return;
-#	}
-#}
-#
-#sub sendCookie {
-#	my ($self, $userID, $key) = @_;
-#	my $r = $self->{r};
-#	my $ce = $r->ce;
-#	
-#	my $courseID = $r->urlpath->arg("courseID");
-##	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time+COOKIE_LIFESPAN, "GMT");
-#	my $timestamp = time();
-#	my $cookie = WeBWorK::Cookie->new($r,
-#		-name    => "WeBWorKCourseAuthen.$courseID",
-#		-value   => "$userID\t$key\t$timestamp",
-##		-expires => $expires,              # Want a session cookie, not a persistent cookie
-##		-domain  => $r->hostname,          # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted. See Below.
-#		-path    => $ce->{webworkURLRoot},
-#		-secure  => 0,
-#	);
-#
-#	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
-#		$cookie -> domain($r->hostname);
-#	}
-#	
-#	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
-#	eval {$r->headers_out->set("Set-Cookie" => $cookie->as_string);};
-#	if ($@) {warn $@; }
-#}
-#
-#sub killCookie {
-#	my ($self) = @_;
-#	my $r = $self->{r};
-#	my $ce = $r->ce;
-#	
-#	my $courseID = $r->urlpath->arg("courseID");
-#	
-##	my $expires = time2str("%a, %d-%h-%Y %H:%M:%S %Z", time-60*60*24, "GMT");
-#	my $cookie = WeBWorK::Cookie->new($r,
-#		-name => "WeBWorKCourseAuthen.$courseID",
-#		-value => "\t",
-##		-expires => $expires,              # Session Cookies only.
-##		-domain  => $r->hostname,          # if $r->hostname = "localhost" or "127.0.0.1", then this must be omitted. See Below.
-#		-path => $ce->{webworkURLRoot},
-#		-secure => 0,
-#	);
-#	
-#	if ($r->hostname ne "localhost" && $r->hostname ne "127.0.0.1") {
-#		$cookie -> domain($r->hostname);
-#	}
-#	debug("about to add Set-Cookie header with this string: '", $cookie->as_string, "'");
-#	$r->headers_out->set("Set-Cookie" => $cookie->as_string);
-#}
 
 ################################################################################
 ################################################################################

From 1602097e953384045725b66c3bbab70a24b2669b Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Tue, 29 May 2012 15:48:14 -0400
Subject: [PATCH 49/73] Support for LTI 1.0 authentication to WeBWorK from a
 Course Mangement System

---
 conf/global.conf.dist | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index bcff371551..cdb51a581b 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -1089,6 +1089,23 @@ $pgRoot         = $pg{directories}{root};
 # LTI Basic parameters
 ################################################################################
 
+################################################################################
+# LTI Basic Authentication Parameters to be put into a site's course.conf file
+################################################################################
+
+#The following paramters should be put into site's course.conf file.
+
+#$LTIBasicToThisSiteURL = "URL to site", e.g.,
+#$LTIBasicToThisSiteURL = "https://localserver/webwork2/DemoCourse";
+#$LTIBasicConsumerSecret = "Consumer Secret - shared with the Course Management Site, e.g.";
+#$LTIBasicConsumerSecret = "webworkLTIB";
+
+
+################################################################################
+# LTI Basic Authentication Parameters for global.conf
+################################################################################
+
+# The following parameters should be in global.conf:
 
 ################################################################################
 # Reasonable Number of Problems for Late Adds to do per day to catch up
@@ -1173,6 +1190,17 @@ $session_management_via = "session_cookie";
 # Local routine to analyze the context_id forwarded to LTIBasic
 ################################################################################
 
+#The section number/identifier should be passed a "custom" parameter
+#by the Course Management System, usually by adding a parameter
+#of the form
+#  section=1234
+#in the parameters section of the Course Management Systems
+#LTI configuration for a site.  (LTI should automatically
+#convert this to  "custom_section=1234".
+#However, if no custom_section paramter is passed to WeBWorK,
+#then a site can optionally attempt to parse the context_id
+#to determine a section name.
+
 # An example from Indiana University, Bloomington
 #
 #$analyze_context_id = 

From 4d09e5d70716f5104bb1f81d49a96d4c26ba9b8c Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Tue, 29 May 2012 21:18:19 -0400
Subject: [PATCH 50/73] =?UTF-8?q?OK=20move=20to=20backbone=20is=20almost?=
 =?UTF-8?q?=20done,=20almost=20all=20of=20the=20functionality=20is=20back?=
 =?UTF-8?q?=E2=80=A6looks=20can=20wait=20for=20tomorrow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/js/LibraryBrowser/Search.js            |  225 ++
 htdocs/js/LibraryBrowser/json2.js             |  487 ++++
 htdocs/js/LibraryBrowser/library_browser.js   | 2204 ++++++++---------
 .../ContentGenerator/Instructor/SetMaker3.pm  |   82 +-
 lib/WebworkWebservice/SetActions.pm           |    2 +-
 5 files changed, 1779 insertions(+), 1221 deletions(-)
 create mode 100644 htdocs/js/LibraryBrowser/Search.js
 create mode 100755 htdocs/js/LibraryBrowser/json2.js

diff --git a/htdocs/js/LibraryBrowser/Search.js b/htdocs/js/LibraryBrowser/Search.js
new file mode 100644
index 0000000000..2cefe18c0f
--- /dev/null
+++ b/htdocs/js/LibraryBrowser/Search.js
@@ -0,0 +1,225 @@
+function Search() {
+    this.problems = new Array();
+    this.subjectBox = document.getElementById("subjectBox");
+    this.chaptersBox = document.getElementById("chaptersBox");
+    this.sectionsBox = document.getElementById("sectionsBox");
+    this.textbooksBox = document.getElementById("textbooksBox");
+    this.textChaptersBox = document.getElementById("textChaptersBox");
+    this.textSectionsBox = document.getElementById("textSectionsBox");
+    this.keywordsBox = document.getElementById("keywordsBox");
+
+
+    var workAroundTheClosure = this;
+    subjectBox.addEventListener("change", function () {
+        //update inputs
+        workAroundTheClosure.updateInputs();
+        //update lists
+        workAroundTheClosure.updateChaptersBox();
+        workAroundTheClosure.updateSectionsBox();
+    }, false);
+    chaptersBox.addEventListener("change", function () {
+        //update inputs
+        workAroundTheClosure.updateInputs();
+        //update lists
+        workAroundTheClosure.updateSectionsBox();
+    }, false);
+    sectionsBox.addEventListener("change", function () {
+        //update inputs
+        workAroundTheClosure.updateInputs();
+    }, false);
+    /*textbooksBox.addEventListener("change", function() {
+     //update inputs
+     workAroundTheClosure.updateInputs();
+     //update lists
+     workAroundTheClosure.updateAll();
+     }, false);*/
+    this.updateSubjectBox();
+    this.updateChaptersBox();
+    this.updateSectionsBox();
+
+}
+
+function SearchResult() {
+    this.searchName = "search" + generateUniqueID();
+    this.displayBox;
+    this.problems;
+}
+
+SearchResult.prototype.createPageControls = function () {
+
+    this.nextButton = document.createElement("button");
+    //<button type="button" disabled=true id="nextList">Next</button>
+    this.nextButton.id = this.searchName + "nextList";
+    this.nextButton.type = "button";
+    this.nextButton.innerHTML = "Next";
+    this.nextButton.setAttribute("disabled", true);
+
+    this.prevButton = document.createElement("button");
+    //<button type="button" disabled=true id="prevList">Previous</button>
+    this.prevButton.id = this.searchName + "prevList";
+    this.prevButton.type = "button";
+    this.prevButton.innerHTML = "Previous";
+    this.prevButton.setAttribute("disabled", true);
+
+    var thisContainer = document.getElementById(this.searchName);
+    thisContainer.appendChild(this.prevButton);
+    thisContainer.appendChild(this.nextButton);
+
+
+    //hard coded for now
+    this.probsPerPage = 10;//document.getElementById("prob_per_page");
+    this.topProbIndex = 0;
+
+    //attach event listeners:
+    var workAroundTheClosure = this;
+    this.nextButton.addEventListener('click', function () {
+        console.log("Next Button was clicked");
+        // then load new problems? yes because we shouldn't
+        // even be able to click on it if we can't
+        workAroundTheClosure.topProbIndex += workAroundTheClosure.probsPerPage;
+        workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, workAroundTheClosure.probsPerPage);
+    }, false);
+    this.prevButton.addEventListener('click', function () {
+        workAroundTheClosure.topProbIndex -= workAroundTheClosure.probsPerPage;
+        if (workAroundTheClosure.topProbIndex < 0)
+            workAroundTheClosure.topProbIndex = 0;
+        workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, workAroundTheClosure.probsPerPage);
+    }, false);
+
+
+}
+
+
+Search.prototype.go = function () {
+    this.updateInputs();
+    listLibRequest.xml_command = "searchLib";
+    listLibRequest.subcommand = "getDBListings";
+    var workAroundTheClosure = this;
+    $.post(webserviceURL, listLibRequest, function (data) {
+        console.log(data);
+        //try {
+        var response = $.parseJSON(data);
+        console.log("result: " + response.server_response);
+        updateMessage(response.server_response);
+        var results = response.result_data.split(",");
+
+        var newSearchResult = new SearchResult();
+
+        $('#problems_container').tabs("add", "#" + newSearchResult.searchName, "Search (" + results.length + ")");
+        var thisContainer = document.getElementById(newSearchResult.searchName);
+        var displayList = document.createElement("ul");
+        thisContainer.appendChild(displayList);
+
+
+        newSearchResult.createPageControls();
+
+        newSearchResult.displayBox = displayList;
+        newSearchResult.problems = new Array();
+        for (var i = 0; i < results.length; i++) {
+            newSearchResult.problems.push(new Problem(results[i]));
+        }
+        newSearchResult.renderProblems(newSearchResult.topProbIndex, newSearchResult.probsPerPage);
+        //callback();
+        /*} catch (err) {
+         console.log(err);
+         var myWindow = window.open('', '', 'width=500,height=800');
+         myWindow.document.write(data);
+         myWindow.focus();
+         }*/
+    });
+};
+
+SearchResult.prototype.renderProblems = function (start, limit) {
+    //$('#'+this.searchName+' a').text("Other text");
+    $('a[href="#' + this.searchName + '"] span').text("Search (" + start + " - " + (start + limit) + " of " + this.problems.length + ") ");
+    console.log($('#' + this.searchName + ' a'));
+    while (this.displayBox.hasChildNodes()) {
+        this.displayBox.removeChild(this.displayBox.lastChild);
+    }
+    for (var i = start; i < start + limit && i < this.problems.length; i++) {
+        this.problems[i].render(this.displayBox);
+    }
+    this.updateMoveButtons();
+};
+
+SearchResult.prototype.updateMoveButtons = function () {
+    if ((this.topProbIndex + this.probsPerPage) < this.problems.length) {
+        this.nextButton.removeAttribute("disabled");
+    } else {
+        this.nextButton.setAttribute("disabled", true);
+    }
+    if (this.topProbIndex > 0) {
+        this.prevButton.removeAttribute("disabled");
+    } else {
+        this.prevButton.setAttribute("disabled", true);
+    }
+};
+
+Search.prototype.updateInputs = function () {
+    listLibRequest.library_subjects = this.subjectBox.options[this.subjectBox.selectedIndex].value;
+    listLibRequest.library_chapters = this.chaptersBox.options[this.chaptersBox.selectedIndex].value;
+    listLibRequest.library_sections = this.sectionsBox.options[this.sectionsBox.selectedIndex].value;
+//	listLibRequest.library_textbook = this.textbooksBox.options[this.textbooksBox.selectedIndex].value;
+//	listLibRequest.library_textchapter = this.textChaptersBox.options[this.textChaptersBox.selectedIndex].value;
+//	listLibRequest.library_textsection = this.textSectionsBox.options[this.textSectionsBox.selectedIndex].value;
+//	listLibRequest.library_keywords = this.keywordsBox.value;
+};
+
+
+Search.prototype.updateSubjectBox = function () {
+    listLibRequest.xml_command = "searchLib";
+    listLibRequest.subcommand = "getAllDBsubjects";
+    this.update(this.subjectBox, "All Subjects");
+};
+
+Search.prototype.updateChaptersBox = function () {
+    listLibRequest.xml_command = "searchLib";
+    listLibRequest.subcommand = "getAllDBchapters";
+    this.update(this.chaptersBox, "All Chapters");
+};
+
+Search.prototype.updateSectionsBox = function () {
+    listLibRequest.xml_command = "searchLib";
+    listLibRequest.subcommand = "getSectionListings";
+    this.update(this.sectionsBox, "All Sections");
+};
+
+Search.prototype.updateTextbookBox = function () {
+    listLibRequest.xml_command = "searchLib";
+    listLibRequest.subcommand = "getDBTextbooks";
+    this.update(this.textbooksBox, "All Textbooks");
+};
+
+Search.prototype.update = function (box, blankName) {
+    $.post(webserviceURL, listLibRequest, function (data) {
+        console.log(data);
+        try {
+            var response = $.parseJSON(data);
+            console.log("result: " + response.server_response);
+            updateMessage(response.server_response);
+
+            box.options.length = 0;
+            var options = response.result_data.split(",");
+            for (var i = 0; i < options.length; i++) {
+                if (!name.match(/\./)) {
+                    var option = document.createElement("option")
+                    option.value = options[i];
+                    option.innerHTML = options[i];
+                    box.add(option, null);
+                }
+            }
+            if (box.childNodes.length > 0) {
+                var emptyOption = document.createElement("option");
+                emptyOption.innerHTML = blankName;
+                emptyOption.value = "";
+                box.add(emptyOption, box.firstChild);
+            }
+            //callback();
+        } catch (err) {
+            console.log(err);
+            var myWindow = window.open('', '', 'width=500,height=800');
+            myWindow.document.write(data);
+            myWindow.focus();
+        }
+    });
+};
\ No newline at end of file
diff --git a/htdocs/js/LibraryBrowser/json2.js b/htdocs/js/LibraryBrowser/json2.js
new file mode 100755
index 0000000000..3b0c872d13
--- /dev/null
+++ b/htdocs/js/LibraryBrowser/json2.js
@@ -0,0 +1,487 @@
+/*
+    json2.js
+    2011-10-19
+
+    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, regexp: true */
+
+/*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.
+
+var JSON;
+if (!JSON) {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    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) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        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.prototype.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.prototype.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/htdocs/js/LibraryBrowser/library_browser.js b/htdocs/js/LibraryBrowser/library_browser.js
index a834b8494f..86e6f24181 100644
--- a/htdocs/js/LibraryBrowser/library_browser.js
+++ b/htdocs/js/LibraryBrowser/library_browser.js
@@ -6,1320 +6,1160 @@ var COURSE = "course-needs-to-be-defined-in-hidden-variable-id=hidden_courseID";
 var SESSIONKEY = "session-key-needs-to-be-defined-in-hidden-variable-id=hidden_key"
 var PASSWORD = "who-cares-what-the-password-is";
 // request object, I'm naming them assuming there may be different versions
-var listLibRequest = {
-	"xml_command" : "listLib",
-	"pw" : "",
-	"password" : PASSWORD,
-	"session_key" : SESSIONKEY,
-	"user" : "user-needs-to-be-defined",
-	"library_name" : "Library",
-	"courseID" : COURSE,
-	"set" : "set0",
-	"new_set_name" : "new set",
-	"command" : "buildtree",
-}
+var globalRequestObject = {
+    "xml_command":"listLib",
+    "pw":"",
+    "password":PASSWORD,
+    "session_key":SESSIONKEY,
+    "user":"user-needs-to-be-defined",
+    "library_name":"Library",
+    "courseID":COURSE,
+    "set":"set0",
+    "new_set_name":"new set",
+    "command":"buildtree",
+};
+var webserviceURL = "../../instructorXMLHandler";
+
+//abstract the post request thing, to take an object of options that extends what is now listLibRequest
 
+/**
+ * Global stuff
+ */
+// undo and redo functions
 var undoing = false;
 var undo_stack = new Array();
 var redo_stack = new Array();
 
-var cardCatalog;
-var setList;
-var webserviceURL = "../../../instructorXMLHandler";
-var tabs;
 
-var problemPlaceholder = false;
 
-/**
- * Utilities
- */
-var uniqueCounter = 0;
-function generateUniqueID() {
-	uniqueCounter++;
-	return uniqueCounter.toString(16);
+//SMOKE or jquery UI alert
+function updateMessage(message) {
+    var messageBox = document.getElementById("messages");
+    messageBox.innerHTML = message;
+    $(messageBox).effect("pulsate", {
+        times:3
+    }, 500);
 }
 
-Object.size = function(obj) {
-	var size = 0, key;
-	for (key in obj) {
-		if (obj.hasOwnProperty(key))
-			size++;
-	}
-	return size;
-};
-
-/**
- * Global stuff
- */
-// undo and redo functions
-function undo() {
-	// pop the stack and call the function, that's it
-	var undoFunc = undo_stack.pop();
-	undoing = true;
-	undoFunc();
+//might be able to move this to LibraryBrowser later with event listeners
+function showErrorResponse(data) {
+    var myWindow = window.open('', '', 'width=500,height=800');
+    myWindow.document.write(data);
+    myWindow.focus();
 }
 
-function redo() {
-	var redoFunc = redo_stack.pop();
-	redoFunc();
-}
+$(function () {
+    // get usernames and keys from hidden variables:
+    var myUser = document.getElementById("hidden_user").value;
+    var mySessionKey = document.getElementById("hidden_key").value;
+    var myCourseID = document.getElementById("hidden_courseID").value;
+    // check to make sure that our credentials are available.
+    if (myUser && mySessionKey && myCourseID) {
+        globalRequestObject.user = myUser;
+        globalRequestObject.session_key = mySessionKey;
+        globalRequestObject.courseID = myCourseID;
+    } else {
+        updateMessage("missing hidden credentials: user "
+            + myUser + " session_key " + mySessionKey
+            + " courseID" + myCourseID);
+    }
 
+    /*
+     // attach function for deleting selected problems
+     document.getElementById("delete_problem").addEventListener("click", function(event) {
+     var currentTabId = $("#problems_container div.ui-tabs-panel:not(.ui-tabs-hide)")[0].id;
+     console.log(currentTabId);
+     // only care if it's a set
+     if (currentTabId != "library_tab") {
+
+     var problems = $(".ww_selected");
+     var set = setList.sets[document
+     .getElementById(
+     currentTabId)
+     .getAttribute("data-uid")];
+     console.log(problems);
+     problems.each(function(index) {
+     set.removeProblem($(this).attr(
+     "data-path"));
+     });
+     }
+     }, false);//REMOVE
+     */
 
-//MOVE
-function highlightSets(event) {
-	//console.log(this.getAttribute("data-path"));
-	var problemID = this.getAttribute("data-path");
-	$(".contains_problem").removeClass("contains_problem");
-	for ( var key in setList.sets) {
-		if (setList.sets[key].problems.hasOwnProperty(problemID)) {
-			//console.log("found one " + setList.sets[key].name + setList.sets[key].id);
-			$(
-					document.getElementById(setList.sets[key].name
-							+ setList.sets[key].id)).addClass(
-					"contains_problem");
-		}
-	}
-}
-function unHighlightSets(event) {
-	$(".contains_problem").removeClass("contains_problem");
-}
 
-//SMOKE
-function updateMessage(message) {
-	var messageBox = document.getElementById("messages");
-	messageBox.innerHTML = message;
-	$(messageBox).effect("pulsate", {
-		times : 3
-	}, 500);
-}
+    /*******************************************************************************
+     * The problem object
+     ******************************************************************************/
+// object
 
-function showErrorResponse(data){
-	var myWindow = window.open('', '', 'width=500,height=800');
-	myWindow.document.write(data);
-	myWindow.focus();
-}
+    var Problem = Backbone.Model.extend({
+        defaults:function () {
+            return{
+                path:"",
+                data:false,
+                place: 0
+            };
+        },
+
+        initialize:function () {
+
+        },
+        //this is a server render, different from a view render
+        render:function () {
+            var problem = this;
+            var requestObject = {
+                    set: this.get('path'),
+                    problemSource: this.get('path'),
+                    xml_command: "renderProblem"
+                };
+            _.defaults(requestObject, globalRequestObject);
+
+
+            if (!problem.get('data')) {
+                //if we haven't gotten this problem yet, ask for it
+                $.post(webserviceURL, requestObject, function (data) {
+                    problem.set('data', data);
+                });
+            }
+        },
+        clear: function() {
+            this.destroy();
+        }
+    });
 
-/**
- * unobtrusively start up our javascript
- */
-$(document).ready(function() {
-
-	// get usernames and keys from hidden variables:
-	var myUser = document.getElementById("hidden_user").value;
-	var mySessionKey = document.getElementById("hidden_key").value;
-	var myCourseID = document.getElementById("hidden_courseID").value;
-	// check to make sure that our credentials are available.
-	if (myUser && mySessionKey && myCourseID) {
-		listLibRequest.user = myUser;
-		listLibRequest.session_key = mySessionKey;
-		listLibRequest.courseID = myCourseID;
-	} else {
-		updateMessage("missing hidden credentials: user "
-				+ myUser + " session_key " + mySessionKey
-				+ " courseID" + myCourseID);
-	}
-
-	// get our sets
-	setList = new SetList();//REMOVE
-
-	// attach function for deleting selected problems
-	document.getElementById("delete_problem").addEventListener("click", function(event) {
-		var currentTabId = $("#problems_container div.ui-tabs-panel:not(.ui-tabs-hide)")[0].id;
-		console.log(currentTabId);
-		// only care if it's a set
-		if (currentTabId != "library_tab") {
-
-			var problems = $(".ww_selected");
-			var set = setList.sets[document
-					.getElementById(
-							currentTabId)
-					.getAttribute("data-uid")];
-			console.log(problems);
-			problems.each(function(index) {
-				set.removeProblem($(this).attr(
-						"data-path"));
-			});
-		}
-	}, false);//REMOVE
-
-	// attach undo and redo
-	document.getElementById("undo_button").addEventListener("click", undo, false);
-	document.getElementById("redo_button").addEventListener("click", redo, false);
-
-	$("#dialog").dialog({
-		autoOpen : false,
-		modal : true
-	});//MOVE
-	// create set button listner
-	document.getElementById("create_set").addEventListener("click", function() {
-		Set.createSet(setList, false);
-		$("#dialog").dialog('close');
-	});//MOVE
-
-	document.getElementById("new_problem_set").addEventListener("click", function() {
-		setList.createSet();
-	}, false);//MOVE
-
-	// this stil doesn't work
-	$("#new_problem_set").droppable({
-		tolerance : 'pointer',
-		drop : function(event, ui) {
-			problemPlaceholder = ui.draggable.attr("data-path")
-			$("#dialog").dialog('open');
-		}
-	});//MOVE
-//   setup  slider for side bar
-	$("#problem_sets_container").resizable({
-		cursor: 'move',
-		//animate: true,
-		//ghost: true,
-		delay: 0,
-	});//MOVE
-
-
-	// some window set up:
-    $tabs = $("#problems_container")
-        .tabs(
-        {
-            closable:true,
-            add:function (event, ui) {
-                document
-                    .getElementById(
-                    "library_link")
-                    .removeChild(
-                    document
-                        .getElementById("library_link").lastChild);
-                console.log("adding a tab");
-                $tabs.tabs('select', '#'
-                    + ui.panel.id);
-                $(".ww_selected").removeClass(
-                    "ww_selected");// probably reduntant but I want to make sure nothing stays selected
-            },
-            create:function (event, ui) {
-                document
-                    .getElementById(
-                    "library_link")
-                    .removeChild(
-                    document
-                        .getElementById("library_link").lastChild);
-                $(".ww_selected").removeClass(
-                    "ww_selected");
-            },
-            select:function (event, ui) {
-                $(".ww_selected").removeClass(
-                    "ww_selected");
-            },
-            remove:function (event, ui) {
-                document
-                    .getElementById(
-                    "library_link")
-                    .removeChild(
-                    document
-                        .getElementById("library_link").lastChild);
-                $(".ww_selected").removeClass(
-                    "ww_selected");
+    var ProblemView = Backbone.View.extend({
+        tagName:"li",
+        className: "problem",
+        template: _.template($('#problem-template').html()),
+
+        events:{
+            "click .remove": 'clear'
+        },
+
+        initialize:function () {
+            this.model.on('change:data', this.render, this);
+            if(!this.options.remove_display){
+                this.options.remove_display = "block";
+            }
+            this.model.on('destroy', this.remove, this);
+        },
+
+        render:function () {
+            var problem = this.model;
+            var self = this;
+
+            if(problem.get('data')){
+                var jsonInfo = this.model.toJSON();
+                _.extend(jsonInfo, self.options);
+                this.$el.html(this.template(jsonInfo));
+            } else {
+                this.$el.html('<img src="/webwork2_files/images/ajax-loader.gif" alt="loading"/>');
+                problem.render();
             }
-        });//MOVE
 
+            this.el.setAttribute('data-path', problem.get('path'));
+            this.el.id = this.model.cid;
+            this.$el.draggable({
+                helper:'clone',
+                revert:true,
+                handle:'.handle',
+                appendTo:'body',
+                cursorAt:{
+                    top:0,
+                    left:0
+                },
+                opacity:0.35
+            });
 
-});
 
-var CardCatalog = Library.extend({
+            return this;
+        },
+
+        clear: function(){
+            this.model.clear();
+        }
+    });
+
+    var ProblemList = Backbone.Collection.extend({
+        model:Problem,
+
+        initialize: function(){
+            this.defaultRequestObject = {
+
+            };
+            _.defaults(this.defaultRequestObject, globalRequestObject);
+        },
 
-    loadChildren:function (callback) {
+        comparator: function(problem) {
+            return problem.get("place");
+        },
 
-        var self = this;
-        listLibRequest.xml_command = "listLibraries";//MOVE
+        //maybe move to problem list as fetch (with a set name argument)
+        fetch:function () {
+            var self = this;
 
-        updateMessage("Loading libraries... may take some time");//MOVE
+            //command needs to be set in the higher model since there are several versions of problem lists
 
-        $.post(webserviceURL, listLibRequest,
-            function(data) {
-                console.log(data);
-                try {
+            var requestObject = {};
+            _.defaults(requestObject, this.defaultRequestObject);
+
+            $.post(webserviceURL, requestObject,
+                function (data) {
+                    //try {//this is the wrong way to be error checking
+                    var response = $.parseJSON(data);
+
+                    var problems = response.result_data.split(",");
+
+                    var newProblems = new Array();
+                    for (var i = 0; i < problems.length; i++) {
+                        if (problems[i] != "") {
+                            newProblems.push({path:problems[i], place:i});
+                        }
+                    }
+                    self.reset(newProblems);
+                    //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
+                    /*} catch (err) {
+                     showErrorResponse(data);
+                     }*/
+                }
+            );
+        },
+
+        //move to problemlist
+        addProblem :function (problem) {
+            this.add(problem);
+            var self = this;
+
+            var requestObject = {
+                xml_command: "addProblem",
+                problemPath: problem.get('path')
+            };
+            _.defaults(requestObject, this.defaultRequestObject);
+
+            $.post(webserviceURL, requestObject, function (data) {
+                //try {
                     var response = $.parseJSON(data);
                     console.log("result: " + response.server_response);
                     updateMessage(response.server_response);
-                    var libraries = response.result_data.split(",");
-                    libraries.forEach(function(lib){
-                        self.get('children').add({name:lib});
-                    });
-                } catch (err) {
+                    // still have to test for success..everywhere
+                    if (undoing) {// might be a better way to do this later
+                        redo_stack.push(function () {
+                            self.removeProblem(problem);
+                        });
+                        undoing = false;
+                    } else {
+                        undo_stack.push(function () {
+                            self.removeProblem(problem);
+                        });
+                    }
+                    //hopfully I can get rid of this
+                    //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
+                /*} catch (err) {
                     showErrorResponse(data);
-                }
+                }*/
             });
-    }
-});
+        },
 
-    /*
-	this.searchButton = document.getElementById("run_search");
-
-	this.nextButton = document.getElementById("nextList");
-	this.prevButton = document.getElementById("prevList");
-	this.probsPerPage = document.getElementById("prob_per_page");
-	this.topProbIndex = 0;
-
-	var workAroundTheClosure = this;
-
-	this.buildLibraryBox(topLibraries);
-	//this.library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.library)});
-
-	this.searchButton.addEventListener('click', function() {workAroundTheClosure.searchBox.go();}, false);
-
-	document.getElementById("load_problems").addEventListener('click', function(){
-		if(workAroundTheClosure.working_library.problems > 0){
-			console.log("loaded");
-			console.log(workAroundTheClosure.working_library.problems);
-			workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-		}
-		else {
-			workAroundTheClosure.working_library.loadProblems(function() {
-				console.log("callback!");
-				workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-				});
-			}
-	}, false);
-
-	this.nextButton.addEventListener('click', function() {
-		console.log("Next Button was clicked");
-		// then load new problems? yes because we shouldn't
-		// even be able to click on it if we can't
-		workAroundTheClosure.topProbIndex += parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
-		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-	}, false);
-	document.getElementById("prevList").addEventListener('click', function() {
-		workAroundTheClosure.topProbIndex -= parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
-		if (workAroundTheClosure.topProbIndex < 0)
-			workAroundTheClosure.topProbIndex = 0;
-		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-	}, false);
-	*/
-
-/*
-CardCatolog.prototype.updateMoveButtons = function() {
-	if (this.topProbIndex + parseInt(this.probsPerPage.options[this.probsPerPage.selectedIndex].value) < this.working_library.problems.length) {
-		this.nextButton.removeAttribute("disabled");
-	} else {
-		this.nextButton.setAttribute("disabled", true);
-	}
-	if (this.topProbIndex > 0) {
-		this.prevButton.removeAttribute("disabled");
-	} else {
-		this.prevButton.setAttribute("disabled", true);
-	}
-}
-*/
-/*
-CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
-	var newLibList = document.createElement("select");
-	newLibList.id = "libList" + (this.displayBox.childNodes.length + 1);
-	newLibList.setAttribute("data-propName", currentLibrary.path);
-	var workAroundTheClosure = this;
-	newLibList.addEventListener("change", function(event) {
-		workAroundTheClosure.onLibSelect(event, currentLibrary);
-	}, false);
-
-	for ( var name in currentLibrary.children) {
-		if (!name.match(/\./)) {
-			var option = document.createElement("option")
-			option.value = name;
-			option.innerHTML = name;
-			newLibList.add(option, null);
-		}
-	}
-	if (newLibList.childNodes.length > 0) {
-		var emptyOption = document.createElement("option");
-		newLibList.add(emptyOption, newLibList.firstChild);
-		this.listBox.appendChild(newLibList);
-	}
-}
 
-// start:index to start at, limit:number of problems to list
-CardCatolog.prototype.renderProblems = function(start, limit) {
-	$('a[href="#library_tab"] span').text("Library ("+start+" - "+ (start+limit) +" of " + this.working_library.problems.length + ") ");
-	while (this.displayBox.hasChildNodes()) {
-		this.displayBox.removeChild(this.displayBox.lastChild);
-	}
-	for(var i = start; i < start+limit && i < this.working_library.problems.length; i++){
-		this.working_library.problems[i].render(this.displayBox);
-	}
-	this.updateMoveButtons();
-};
+        removeProblem:function (problem) {
 
+            var self = this;
 
-CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
-	this.topProbIndex = 0;
-	//this.library.problems.list = new Object();
-	//this.updateLibrary();
-	var changedLib = event.target;// should be the select
-	var listBox = event.target.parentNode;
-	var libChoices = listBox.childNodes;
-	//var currentObject = this.treeRoot;
-
-	var count = 0;
-	var key;
-	for ( var i = 0; i < libChoices.length; i++) {
-		if (libChoices[i].tagName == "SELECT") {
-			count = i;
-			if (libChoices[i] == changedLib)
-				break;
-		}
-	}
-	while (listBox.childNodes.length > count + 1) {
-		listBox.removeChild(listBox.lastChild);
-	}
-
-	if (currentLibrary.children.hasOwnProperty(changedLib.options[changedLib.selectedIndex].value)) {
-		var child = currentLibrary.children[changedLib.options[changedLib.selectedIndex].value];
-		this.working_library = child;
-		//right now this reloads if there are no subdirectories, can be fixed by a count on serverside.
-		if(Object.size(child.children) > 0){
-			console.log("didn't have to build");
-			this.buildSelectBox(child);
-		} else {
-			var workAroundTheClosure = this;
-			child.loadChildren(function() {
-				workAroundTheClosure.buildSelectBox(child);
-			});
-		}
-	} else {
-		this.working_library = currentLibrary;
-	}
-};
-*/
-function Search(){
-	this.problems = new Array();
-	this.subjectBox = document.getElementById("subjectBox");
-	this.chaptersBox = document.getElementById("chaptersBox");
-	this.sectionsBox = document.getElementById("sectionsBox");
-	this.textbooksBox = document.getElementById("textbooksBox");
-	this.textChaptersBox = document.getElementById("textChaptersBox");
-	this.textSectionsBox = document.getElementById("textSectionsBox");
-	this.keywordsBox = document.getElementById("keywordsBox");
-
-
-
-	var workAroundTheClosure = this;
-	subjectBox.addEventListener("change", function() {
-		//update inputs
-		workAroundTheClosure.updateInputs();
-		//update lists
-		workAroundTheClosure.updateChaptersBox();
-		workAroundTheClosure.updateSectionsBox();
-	}, false);
-	chaptersBox.addEventListener("change", function() {
-		//update inputs
-		workAroundTheClosure.updateInputs();
-		//update lists
-		workAroundTheClosure.updateSectionsBox();
-	}, false);
-	sectionsBox.addEventListener("change", function() {
-		//update inputs
-		workAroundTheClosure.updateInputs();
-	}, false);
-	/*textbooksBox.addEventListener("change", function() {
-		//update inputs
-		workAroundTheClosure.updateInputs();
-		//update lists
-		workAroundTheClosure.updateAll();
-	}, false);*/
-	this.updateSubjectBox();
-	this.updateChaptersBox();
-	this.updateSectionsBox();
+            var requestObject = {
+                xml_command: "deleteProblem",
+                problemPath: problem.get("path") //notice the difference from create
+            };
+            _.defaults(requestObject, this.defaultRequestObject);
 
-}
+            $.post(webserviceURL, requestObject, function (data) {
+                //try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                    // still have to test for success....
+                    if (undoing) {
+                        redo_stack.push(function () {
+                            self.addProblem(problem);
+                        });
+                        undoing = false;
+                    } else {
+                        undo_stack.push(function () {
+                            self.addProblem(problem);
+                        });
+                    }
+                    /*workAroundSet.loadProblems($.contains(document
+                     .getElementById("problems_container"), document
+                     .getElementById(self.name)));*/
+                /*} catch (err) {
+                    showErrorResponse(data);
+                }*/
+            });
+            problem.destroy();
+        },
+
+        reorder: function(){
+            var self = this;
+            self.sort();
+
+            var probList = self.pluck("path");
+            var probListString = probList.join(",");
+            console.log(probListString);
+            var requestObject = {
+                probList: probListString,
+                xml_command: "reorderProblems"
+            };
+
+            _.defaults(requestObject, this.defaultRequestObject);
+            console.log(requestObject.set);
+
+            $.post(webserviceURL, requestObject, function (data) {
+                //try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                /*} catch (err) {
+                    showErrorResponse(data);
+                }*/
+            });
+        }
 
-function SearchResult(){
-	this.searchName = "search" + generateUniqueID();
-	this.displayBox;
-	this.problems;
-}
+    });
 
-SearchResult.prototype.createPageControls = function(){
-
-	this.nextButton = document.createElement("button");
-	//<button type="button" disabled=true id="nextList">Next</button>
-	this.nextButton.id = this.searchName + "nextList";
-	this.nextButton.type = "button";
-	this.nextButton.innerHTML = "Next";
-	this.nextButton.setAttribute("disabled", true);
-
-	this.prevButton = document.createElement("button");
-	//<button type="button" disabled=true id="prevList">Previous</button>
-	this.prevButton.id = this.searchName + "prevList";
-	this.prevButton.type = "button";
-	this.prevButton.innerHTML = "Previous";
-	this.prevButton.setAttribute("disabled", true);
-
-	var thisContainer = document.getElementById(this.searchName);
-	thisContainer.appendChild(this.prevButton);
-	thisContainer.appendChild(this.nextButton);
-
-
-	//hard coded for now
-	this.probsPerPage = 10;//document.getElementById("prob_per_page");
-	this.topProbIndex = 0;
-
-	//attach event listeners:
-	var workAroundTheClosure = this;
-	this.nextButton.addEventListener('click', function() {
-		console.log("Next Button was clicked");
-		// then load new problems? yes because we shouldn't
-		// even be able to click on it if we can't
-		workAroundTheClosure.topProbIndex += workAroundTheClosure.probsPerPage;
-		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, workAroundTheClosure.probsPerPage);
-	}, false);
-	this.prevButton.addEventListener('click', function() {
-		workAroundTheClosure.topProbIndex -= workAroundTheClosure.probsPerPage;
-		if (workAroundTheClosure.topProbIndex < 0)
-			workAroundTheClosure.topProbIndex = 0;
-		workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, workAroundTheClosure.probsPerPage);
-	}, false);
 
 
-}
+    /*
+     this.searchButton = document.getElementById("run_search");
 
+     this.nextButton = document.getElementById("nextList");
+     this.prevButton = document.getElementById("prevList");
+     this.probsPerPage = document.getElementById("prob_per_page");
+     this.topProbIndex = 0;
 
-Search.prototype.go = function() {
-	this.updateInputs();
-	listLibRequest.xml_command = "searchLib";
-	listLibRequest.subcommand = "getDBListings";
-	var workAroundTheClosure = this;
-	$.post(webserviceURL, listLibRequest,function(data) {
-		console.log(data);
-		//try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			updateMessage(response.server_response);
-			var results = response.result_data.split(",");
-
-			var newSearchResult = new SearchResult();
-
-			$tabs.tabs("add", "#"+newSearchResult.searchName, "Search (" + results.length + ")");
-			var thisContainer = document.getElementById(newSearchResult.searchName);
-			var displayList = document.createElement("ul");
-			thisContainer.appendChild(displayList);
-
-
-
-			newSearchResult.createPageControls();
-
-			newSearchResult.displayBox = displayList;
-			newSearchResult.problems = new Array();
-			for(var i = 0; i < results.length; i++){
-				newSearchResult.problems.push(new Problem(results[i]));
-			}
-			newSearchResult.renderProblems(newSearchResult.topProbIndex, newSearchResult.probsPerPage);
-			//callback();
-		/*} catch (err) {
-			console.log(err);
-				var myWindow = window.open('', '', 'width=500,height=800');
-				myWindow.document.write(data);
-				myWindow.focus();
-		}*/
-	});
-};
+     var workAroundTheClosure = this;
 
-SearchResult.prototype.renderProblems = function(start, limit) {
-	//$('#'+this.searchName+' a').text("Other text");
-	$('a[href="#'+this.searchName+'"] span').text("Search ("+start+" - "+ (start+limit) +" of " + this.problems.length + ") ");
-	console.log($('#'+this.searchName+' a'));
-	while (this.displayBox.hasChildNodes()) {
-		this.displayBox.removeChild(this.displayBox.lastChild);
-	}
-	for(var i = start; i < start+limit && i < this.problems.length; i++){
-		this.problems[i].render(this.displayBox);
-	}
-	this.updateMoveButtons();
-};
+     this.buildLibraryBox(topLibraries);
+     //this.library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.library)});
 
-SearchResult.prototype.updateMoveButtons = function() {
-	if ((this.topProbIndex + this.probsPerPage) < this.problems.length) {
-		this.nextButton.removeAttribute("disabled");
-	} else {
-		this.nextButton.setAttribute("disabled", true);
-	}
-	if (this.topProbIndex > 0) {
-		this.prevButton.removeAttribute("disabled");
-	} else {
-		this.prevButton.setAttribute("disabled", true);
-	}
-};
+     this.searchButton.addEventListener('click', function() {workAroundTheClosure.searchBox.go();}, false);
 
-Search.prototype.updateInputs = function(){
-	listLibRequest.library_subjects = this.subjectBox.options[this.subjectBox.selectedIndex].value;
-	listLibRequest.library_chapters = this.chaptersBox.options[this.chaptersBox.selectedIndex].value;
-	listLibRequest.library_sections = this.sectionsBox.options[this.sectionsBox.selectedIndex].value;
-//	listLibRequest.library_textbook = this.textbooksBox.options[this.textbooksBox.selectedIndex].value;
-//	listLibRequest.library_textchapter = this.textChaptersBox.options[this.textChaptersBox.selectedIndex].value;
-//	listLibRequest.library_textsection = this.textSectionsBox.options[this.textSectionsBox.selectedIndex].value;
-//	listLibRequest.library_keywords = this.keywordsBox.value;
-};
+     document.getElementById("load_problems").addEventListener('click', function(){
+     if(workAroundTheClosure.working_library.problems > 0){
+     console.log("loaded");
+     console.log(workAroundTheClosure.working_library.problems);
+     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
+     }
+     else {
+     workAroundTheClosure.working_library.loadProblems(function() {
+     console.log("callback!");
+     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
+     });
+     }
+     }, false);
+
+     this.nextButton.addEventListener('click', function() {
+     console.log("Next Button was clicked");
+     // then load new problems? yes because we shouldn't
+     // even be able to click on it if we can't
+     workAroundTheClosure.topProbIndex += parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
+     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
+     }, false);
+     document.getElementById("prevList").addEventListener('click', function() {
+     workAroundTheClosure.topProbIndex -= parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
+     if (workAroundTheClosure.topProbIndex < 0)
+     workAroundTheClosure.topProbIndex = 0;
+     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
+     }, false);
+     */
+
+    /*
+     CardCatolog.prototype.updateMoveButtons = function() {
+     if (this.topProbIndex + parseInt(this.probsPerPage.options[this.probsPerPage.selectedIndex].value) < this.working_library.problems.length) {
+     this.nextButton.removeAttribute("disabled");
+     } else {
+     this.nextButton.setAttribute("disabled", true);
+     }
+     if (this.topProbIndex > 0) {
+     this.prevButton.removeAttribute("disabled");
+     } else {
+     this.prevButton.setAttribute("disabled", true);
+     }
+     }
+     */
+    /*
+     CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
+     var newLibList = document.createElement("select");
+     newLibList.id = "libList" + (this.displayBox.childNodes.length + 1);
+     newLibList.setAttribute("data-propName", currentLibrary.path);
+     var workAroundTheClosure = this;
+     newLibList.addEventListener("change", function(event) {
+     workAroundTheClosure.onLibSelect(event, currentLibrary);
+     }, false);
+
+     for ( var name in currentLibrary.children) {
+     if (!name.match(/\./)) {
+     var option = document.createElement("option")
+     option.value = name;
+     option.innerHTML = name;
+     newLibList.add(option, null);
+     }
+     }
+     if (newLibList.childNodes.length > 0) {
+     var emptyOption = document.createElement("option");
+     newLibList.add(emptyOption, newLibList.firstChild);
+     this.listBox.appendChild(newLibList);
+     }
+     }
+
+     // start:index to start at, limit:number of problems to list
+     CardCatolog.prototype.renderProblems = function(start, limit) {
+     $('a[href="#library_tab"] span').text("Library ("+start+" - "+ (start+limit) +" of " + this.working_library.problems.length + ") ");
+     while (this.displayBox.hasChildNodes()) {
+     this.displayBox.removeChild(this.displayBox.lastChild);
+     }
+     for(var i = start; i < start+limit && i < this.working_library.problems.length; i++){
+     this.working_library.problems[i].render(this.displayBox);
+     }
+     this.updateMoveButtons();
+     };
+
+
+     CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
+     this.topProbIndex = 0;
+     //this.library.problems.list = new Object();
+     //this.updateLibrary();
+     var changedLib = event.target;// should be the select
+     var listBox = event.target.parentNode;
+     var libChoices = listBox.childNodes;
+     //var currentObject = this.treeRoot;
+
+     var count = 0;
+     var key;
+     for ( var i = 0; i < libChoices.length; i++) {
+     if (libChoices[i].tagName == "SELECT") {
+     count = i;
+     if (libChoices[i] == changedLib)
+     break;
+     }
+     }
+     while (listBox.childNodes.length > count + 1) {
+     listBox.removeChild(listBox.lastChild);
+     }
 
+     if (currentLibrary.children.hasOwnProperty(changedLib.options[changedLib.selectedIndex].value)) {
+     var child = currentLibrary.children[changedLib.options[changedLib.selectedIndex].value];
+     this.working_library = child;
+     //right now this reloads if there are no subdirectories, can be fixed by a count on serverside.
+     if(Object.size(child.children) > 0){
+     console.log("didn't have to build");
+     this.buildSelectBox(child);
+     } else {
+     var workAroundTheClosure = this;
+     child.loadChildren(function() {
+     workAroundTheClosure.buildSelectBox(child);
+     });
+     }
+     } else {
+     this.working_library = currentLibrary;
+     }
+     };
+     */
 
+    //search was here
 
-Search.prototype.updateSubjectBox = function(){
-	listLibRequest.xml_command = "searchLib";
-	listLibRequest.subcommand = "getAllDBsubjects";
-	this.update(this.subjectBox, "All Subjects");
-};
 
-Search.prototype.updateChaptersBox = function(){
-	listLibRequest.xml_command = "searchLib";
-	listLibRequest.subcommand = "getAllDBchapters";
-	this.update(this.chaptersBox, "All Chapters");
-};
+    /*
+     * needed functions: Both: getProblems
+     *
+     * Library: markInSet markRemovedFromSet
+     *
+     * Set: addProblem removeProblem reorderProblem view
+     *
+     * Problem: (not sure about this yet) view source view problem
+     *
+     * we're kind of following an mvc, check out pure for templating should make
+     * life easy
+     */
 
-Search.prototype.updateSectionsBox = function(){
-	listLibRequest.xml_command = "searchLib";
-	listLibRequest.subcommand = "getSectionListings";
-	this.update(this.sectionsBox, "All Sections");
-};
+    /*******************************************************************************
+     * The library object
+     ******************************************************************************/
 
-Search.prototype.updateTextbookBox = function(){
-	listLibRequest.xml_command = "searchLib";
-	listLibRequest.subcommand = "getDBTextbooks";
-	this.update(this.textbooksBox, "All Textbooks");
-};
+    var Library = Backbone.Model.extend({
+        defaults:function () {
+            return{
+                name:"",
+                path: ""
+            }
+        },
 
-Search.prototype.update = function(box, blankName){
-	$.post(webserviceURL, listLibRequest,function(data) {
-		console.log(data);
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			updateMessage(response.server_response);
-
-			box.options.length = 0;
-			var options = response.result_data.split(",");
-			for (var i = 0; i < options.length; i++) {
-				if (!name.match(/\./)) {
-					var option = document.createElement("option")
-					option.value = options[i];
-					option.innerHTML = options[i];
-					box.add(option, null);
-				}
-			}
-			if (box.childNodes.length > 0) {
-				var emptyOption = document.createElement("option");
-				emptyOption.innerHTML = blankName;
-				emptyOption.value = "";
-				box.add(emptyOption, box.firstChild);
-			}
-			//callback();
-		} catch (err) {
-			console.log(err);
-				var myWindow = window.open('', '', 'width=500,height=800');
-				myWindow.document.write(data);
-				myWindow.focus();
-		}
-	});
-};
+        initialize:function () {
+            var self = this;
+            this.set({problems:new ProblemList, children:new LibraryList});
 
-/*
- * needed functions: Both: getProblems
- * 
- * Library: markInSet markRemovedFromSet
- * 
- * Set: addProblem removeProblem reorderProblem view
- * 
- * Problem: (not sure about this yet) view source view problem
- * 
- * we're kind of following an mvc, check out pure for templating should make
- * life easy
- */
+            this.get('children').url = self.get('path')
+            this.get('children').defaultRequestObject.library_name = this.get("path");
 
-/*******************************************************************************
- * The library object
- ******************************************************************************/
-
-var Library = Backbone.Model.extend({
-    defaults:function () {
-        return{
-            name:"",
-            parent:false,
-            problems:new ProblemList,
-            children:new LibraryList
-        }
-    },
+            _.extend(this.get('problems').defaultRequestObject, {
+                xml_command: "listLib",
+                command: "files",
+                maxdepth: 0,
+                library_name: self.get('path') + "/"
+            });
 
-    initalize:function () {
-        if (this.get("parent")) {
-            this.set("path", this.get('parent').get('path') + "/" + this.get('name'));
-        } else {
-            this.set("path", this.get("name"));
         }
-    },
+    });
 
-    loadChildren:function (callback) {
+    var LibraryList = Backbone.Collection.extend({
+        model:Library,
 
-        var self = this;
+        initialize: function(){
+            this.url = "";
+            this.defaultRequestObject = {
+                xml_command: "listLib",
+                command: "dirOnly",
+                maxdepth: 0
+            };
+            _.defaults(this.defaultRequestObject, globalRequestObject);
+        },
 
-        listLibRequest.xml_command = "listLib";
-        listLibRequest.command = "dirOnly";
-        listLibRequest.maxdepth = 0;
-        listLibRequest.library_name = self.get('path');
+        fetch: function(){
 
-        updateMessage("Loading libraries... may take some time");
 
+                var self = this;
 
-        $.post(webserviceURL, listLibRequest,
-            function (data) {
-                //console.log(data);
-                try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                    for (var key in response.result_data) {
-                        self.children.add({name:key, parent:self});
-                    }
-                    callback();
-                } catch (err) {
-                    showErrorResponse(data);
-                }
-            });
-    },
-    /*
-     Right now this is going to store all the files under each library.
-     This is reduntant!  The benifits of this should be discussed at a later date
-     and a fix (or not) should be decided on.
-     */
-    loadProblems:function (callback) {
+                updateMessage("Loading libraries... may take some time");
 
-        var self = this;
-        listLibRequest.xml_command = "listLib";
-        listLibRequest.command = "files";
-        listLibRequest.maxdepth = 0;
-        listLibRequest.library_name = self.get('path') + "/";
+                var requestObject = {};
 
-        updateMessage("Loading problems");
-        console.log(listLibRequest.library_name);
+                _.defaults(requestObject, this.defaultRequestObject);
 
-        $.post(webserviceURL, listLibRequest,
-            function (data) {
-                console.log(data);
-                try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                    //for(var key in response.result_data){
-                    //	workAroundLibrary.children[key] = new Library(key, workAroundLibrary);
-                    //}
-                    var problemList = response.result_data.split(",");
-                    self.problems.reset();
-                    for (var i = 0; i < problemList.length; i++) {
-                        self.problems.add({name:problemList[i]});
-                    }
-                    //console.log("Problems:");
-                    //console.log(workAroundLibrary.problems);
-                    callback();
-                } catch (err) {
-                    showErrorResponse(data);
-                }
-            });
-    }
-});
+                $.post(webserviceURL, requestObject,
+                    function (data) {
+                        //console.log(data);
+                        //try {
+                        var response = $.parseJSON(data);
+                        console.log(response);
+                        console.log("result: " + response.server_response);
+                        updateMessage(response.server_response);
+                        var newLibs = new Array();
 
-var LibraryList = Backbone.Collection.extend({
-    model: Library
-});
+                        //should be either an object of a comma separated list
+                        var libraries = _.isObject(response.result_data)? _.keys(response.result_data):response.result_data.split(",")
 
-var LibraryView = Backbone.View.extend({
-    el:$('#library_tab')
-});
+                        libraries.forEach(function(lib) {
+                            newLibs.push({name:lib, path: self.url +"/"+lib})
+                        });
+                        self.reset(newLibs);
+                        //callback();
+                        /*} catch (err) {
+                         showErrorResponse(data);
+                         }*/
+                    });
+        }
+    });
 
-var LibraryListView = Backbone.View.extend({
-    tagName: 'span',
-    template:_.template($('#LibraryList-template').html()),
-    initialize: function(){
-
-    },
-
-    render: function(){
-        var self = this;
-        this.$el.html(this.template(this.model.toJSON));
-        this.model.get('children').each(function(lib){
-            var option = document.createElement("option")
-            option.value = lib.get('cid');
-            option.innerHTML = lib.get('name');
-            self.$('.list').add(option, null);//what's the null?
-        });
-
-        return this;
-    },
-
-    lib_selected: function(event){
-        var selectedLib = this.model.get('children').getByCid(event.target.value);
-        var view = new LibraryListView({model: selectedLib});
-        this.$(".children").html(view.render().el);
-    }
+    var LibraryView = Backbone.View.extend({
+        template:_.template($('#Library-template').html()),
 
-});
+        events:{
+            "click .next_group": "loadNextGroup"
+        },
 
+        initialize: function(){
+            this.group_size = 25;
+            this.model.get('problems').on('reset', this.render, this);
+        },
 
+        render: function(){
 
-/*******************************************************************************
- * The set object
- ******************************************************************************/
-// object
-/*
-function Set(setName) {// id might not exist..use date if nessisary
-	this.id = generateUniqueID();
-	this.name = setName;
-	this.problems = new Object(); // a hash of problems {id: problemInfo}
-	this.problemArray = new Array();// redunant but I don't have any better
-									// ideas atm for keeping order
-	this.displayBox;
-	this.previousOrder;
-}
-*/
-var ProblemList = Backbone.Collection.extend({
-    model:Problem
-/*
-    comparator: function(todo) {
-        return todo.get('order');
-    }
-*/
-});
+            var self = this;
 
-var Set = Backbone.Model.extend({
-    defaults:{
-        name: "defaultSet",
-        problems: new ProblemList
-    },
-
-    initialize:function(){
-        this.get('problems').on('add', this.addProblem, this);
-        this.get('problems').on('remove', this.removeProblem, this);
-    },
-
-    addProblem: function(problem) {
-        var self = this;
-
-        listLibRequest.set = this.get('name');// switch to data attribute
-        listLibRequest.problemPath = problem.get('path');
-        listLibRequest.xml_command = "addProblem";
-
-        $.post(webserviceURL, listLibRequest, function (data) {
-            try {
-                var response = $.parseJSON(data);
-                console.log("result: " + response.server_response);
-                updateMessage(response.server_response);
-                // still have to test for success..everywhere
-                if (undoing) {// might be a better way to do this later
-                    redo_stack.push(function () {
-                        self.removeProblem(probPath);
-                    });
-                    undoing = false;
-                } else {
-                    undo_stack.push(function () {
-                        self.removeProblem(probPath);
-                    });
-                }
-                //hopfully I can get rid of this
-                //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
-            } catch (err) {
-                showErrorResponse(data);
+            if ($('#problems_container #' + this.model.get('name')).length == 0) {
+                $('#problems_container').tabs('add', "#"+this.model.get('name'), this.model.get('name') + " (" + this.model.get('problems').length + ")"); //could move to an after?
+                this.setElement(document.getElementById(this.model.get('name')));
+            } else {
+                //select
+                $('#problems_container').tabs('select', this.model.get('name'));
+                $("[href=#"+this.model.get('name')+"]").html(this.model.get('name') + " (" + this.model.get('problems').length + ")");
             }
-        });
-    },
-
-    removeProblem: function(problem) {
-        var self = this;
-
-        listLibRequest.set = self.get('name');// switch to data attribute
-        listLibRequest.problemPath = problem.get('path');
-        listLibRequest.xml_command = "deleteProblem";
-
-        $.post(webserviceURL, listLibRequest, function (data) {
-            try {
-                var response = $.parseJSON(data);
-                console.log("result: " + response.server_response);
-                updateMessage(response.server_response);
-                // still have to test for success....
-                if (undoing) {
-                    redo_stack.push(function () {
-                        self.addProblem(probPath);
-                    });
-                    undoing = false;
-                } else {
-                    undo_stack.push(function () {
-                        self.addProblem(probPath);
-                    });
-                }
-                /*workAroundSet.loadProblems($.contains(document
-                 .getElementById("problems_container"), document
-                 .getElementById(self.name)));*/
-            } catch (err) {
-                showErrorResponse(data);
+
+            this.$el.addClass("library_tab");
+
+            this.startIndex = 0;
+
+            var jsonInfo = this.model.toJSON();
+            jsonInfo['group_size'] = this.group_size;
+
+            jsonInfo['enough_problems'] = (this.model.get('problems').length > this.startIndex)? "block" : "none";
+
+            this.$el.html(this.template(jsonInfo));
+
+            this.loadNextGroup();
+
+            return this;
+        },
+
+        loadNextGroup: function(){
+            console.log("load more");
+            console.log(this.startIndex);
+            console.log(this.group_size);
+
+            var problems = this.model.get('problems');
+            console.log(problems.length);
+            for(var i = 0; i < this.group_size && this.startIndex < problems.length; i++, this.startIndex++){
+                console.log("adding a problem");
+                var problem = problems.at(this.startIndex);
+                var view = new ProblemView({model: problem, remove_display: "none"});
+                this.$(".list").append(view.render().el);
             }
-        });
-    },
 
-    loadProblems: function() {
-        var self = this;
+            if(!(this.model.get('problems').length > this.startIndex)){
+                this.$(".next_group").css('display', "none");
+            }
+        }
 
-        listLibRequest.xml_command = "listSetProblems";
-        listLibRequest.set = self.get('name');
-        $.post(webserviceURL, listLibRequest,
-            function (data) {
-                try {//this is the wrong way to be error checking
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    self.problems.reset();
-                    var problems = response.result_data.split(",");
-                    for (var i = 0; i < problems.length; i++) {
-                        if (problems[i] != "") {
-                            self.problems.add({path: problems[i]});
-                        }
-                    }
-                    //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
-                } catch (err) {
-                    showErrorResponse(data);
-                }
+    });
+
+    var LibraryListView = Backbone.View.extend({
+        tagName:'span',
+        template:_.template($('#LibraryList-template').html()),
+
+        events: {
+            'change .list': 'lib_selected'
+        },
+
+        initialize:function () {
+            this.model.on("reset", this.render, this);
+            this.model.on("add", this.render, this);
+        },
+
+        render:function () {
+
+            var self = this;
+
+            if(self.model.length > 0){
+                //should show number of problems in the bar
+
+                this.$el.html(this.template(this.model.toJSON));
+
+                this.model.each(function (lib) {
+                    var option = document.createElement("option")
+                    option.value = lib.cid;
+                    option.innerHTML = lib.get('name');
+                    self.$('.list').append(option);//what's the null?
+                });
             }
-        );
-    }
+            return this;
+        },
+
+        lib_selected:function (event) {
+            var self = this;
+            var selectedLib = this.model.getByCid(event.target.value);
+            console.log(selectedLib);
+            if(selectedLib){
+                selectedLib.get('children').fetch();
+                var view = new LibraryListView({model:selectedLib.get('children')});
+                this.$(".children").html(view.render().el);
+                libToLoad = selectedLib;
+            }
+        }
 
-    //For reroder
-    //http://localtodos.com/javascripts/todos.js (look at sortables in particular)
-    /*
+    });
 
-     reorderProblems = function(setOrder) {
-     var workAroundOrder = this.previousOrder;
-     var workAroundSet = this;
-     if(document.getElementById(workAroundSet.displayBox.id)){
-     if (undoing) {
-     redo_stack.push(function() {
-     // resort the list
-     if(document.getElementById(workAroundSet.displayBox.id)){
-     for ( var i = 0; i < workAroundOrder.length; i++) {
-     var tempProblem = document.getElementById(workAroundOrder[i]);
-     workAroundSet.displayBox.removeChild(tempProblem);
-     workAroundSet.displayBox.appendChild(tempProblem);
-     }
-     $(workAroundSet.displayBox).sortable("refresh");
-     }
-     workAroundSet.reorderProblems(workAroundOrder);
-     });
-     undoing = false;
-     } else {
-     undo_stack.push(function() {
-     // resort the list
-     if(document.getElementById(workAroundSet.displayBox.id)){
-     for ( var i = 0; i < workAroundOrder.length; i++) {
-     var tempProblem = document.getElementById(workAroundOrder[i]);
-     workAroundSet.displayBox.removeChild(tempProblem);
-     workAroundSet.displayBox.appendChild(tempProblem);
-     }
-     $(workAroundSet.displayBox).sortable("refresh");
-     }
-     // $(workAroundSet.displayBox).sortable( "refreshPositions" )
-     workAroundSet.reorderProblems(workAroundOrder);
-     });
-     }
-     // load problems:
-     // var problems = this.displayBox.childNodes;
-     var probList = new Array();
-     for ( var i = 0; i < setOrder.length; i++) {
-     probList.push(document.getElementById(setOrder[i]).getAttribute(
-     "data-path"));
-     }
 
-     var probListString = probList.join(",");
-     listLibRequest.probList = probListString;
-     listLibRequest.xml_command = "reorderProblems";
-     listLibRequest.set = this.name;
-     $.post(webserviceURL, listLibRequest, function(data) {
-     try {
-     var response = $.parseJSON(data);
-     console.log("result: " + response.server_response);
-     updateMessage(response.server_response);
-     } catch (err) {
-     showErrorResponse(data);
-     }
-     });
-     this.previousOrder = $(workAroundSet.displayBox).sortable('toArray');
+    /*******************************************************************************
+     * The set object
+     ******************************************************************************/
+// object
+    /*
+     function Set(setName) {// id might not exist..use date if nessisary
+     this.id = generateUniqueID();
+     this.name = setName;
+     this.problems = new Object(); // a hash of problems {id: problemInfo}
+     this.problemArray = new Array();// redunant but I don't have any better
+     // ideas atm for keeping order
+     this.displayBox;
+     this.previousOrder;
      }
      */
 
-});
 
-//full set view, renders all problems etc
-var SetView = Backbone.View.extend({
-    tagName: "div",
-    template: _.template($('#setList-template').html()),
-    events:{
-    },
 
-    initialize: function(){
+    var Set = Backbone.Model.extend({
+        defaults:{
+            name:"defaultSet"
+        },
+
+        initialize:function () {
+            this.set('problems', new ProblemList);
+            //this.get('problems').url = this.get('name');
+            _.extend(this.get('problems').defaultRequestObject, {
+                set: this.get('name'),
+                xml_command: "listSetProblems"
+            });
 
-    },
 
-    render:function(){
+            //this.get('problems').on('add', this.addProblem, this);
+            //this.get('problems').on('remove', this.removeProblem, this);
+            this.get('problems').fetch();
+        }
+
+
+        //For reroder
+        //http://localtodos.com/javascripts/todos.js (look at sortables in particular)
         /*
-         * sudo code for display stuff: create a tab next to library_box make it's
-         * id setID load in the problems from the set add the nessisary listeners
-         * etc to the problems switch to that tab
-         *//*
-        var self = this;
-        if (document.getElementById(self.get('name'))
-            && $.contains(document.getElementById("problems_container"),
-            document.getElementById(self.get('name')))) {
-            // might as well reload the problems
-            while (this.displayBox.hasChildNodes()) {
-                this.displayBox.removeChild(this.displayBox.lastChild);
-            }
-            for ( var i = 0; i < this.problemArray.length; i++) {
-                this.renderProblem(this.problemArray[i]);
+
+         reorderProblems = function(setOrder) {
+         var workAroundOrder = this.previousOrder;
+         var workAroundSet = this;
+         if(document.getElementById(workAroundSet.displayBox.id)){
+         if (undoing) {
+         redo_stack.push(function() {
+         // resort the list
+         if(document.getElementById(workAroundSet.displayBox.id)){
+         for ( var i = 0; i < workAroundOrder.length; i++) {
+         var tempProblem = document.getElementById(workAroundOrder[i]);
+         workAroundSet.displayBox.removeChild(tempProblem);
+         workAroundSet.displayBox.appendChild(tempProblem);
+         }
+         $(workAroundSet.displayBox).sortable("refresh");
+         }
+         workAroundSet.reorderProblems(workAroundOrder);
+         });
+         undoing = false;
+         } else {
+         undo_stack.push(function() {
+         // resort the list
+         if(document.getElementById(workAroundSet.displayBox.id)){
+         for ( var i = 0; i < workAroundOrder.length; i++) {
+         var tempProblem = document.getElementById(workAroundOrder[i]);
+         workAroundSet.displayBox.removeChild(tempProblem);
+         workAroundSet.displayBox.appendChild(tempProblem);
+         }
+         $(workAroundSet.displayBox).sortable("refresh");
+         }
+         // $(workAroundSet.displayBox).sortable( "refreshPositions" )
+         workAroundSet.reorderProblems(workAroundOrder);
+         });
+         }
+         // load problems:
+         // var problems = this.displayBox.childNodes;
+         var probList = new Array();
+         for ( var i = 0; i < setOrder.length; i++) {
+         probList.push(document.getElementById(setOrder[i]).getAttribute(
+         "data-path"));
+         }
+
+         var probListString = probList.join(",");
+         listLibRequest.probList = probListString;
+         listLibRequest.xml_command = "reorderProblems";
+         listLibRequest.set = this.name;
+         $.post(webserviceURL, listLibRequest, function(data) {
+         try {
+         var response = $.parseJSON(data);
+         console.log("result: " + response.server_response);
+         updateMessage(response.server_response);
+         } catch (err) {
+         showErrorResponse(data);
+         }
+         });
+         this.previousOrder = $(workAroundSet.displayBox).sortable('toArray');
+         }
+         */
+
+    });
+
+//full set view, renders all problems etc
+    var SetView = Backbone.View.extend({
+        template:_.template($('#set-template').html()),
+        events:{
+        },
+
+        initialize:function () {
+            var self = this;
+            this.model.get('problems').on('add', function(model){self.addOne(model)}, this);
+            this.model.get('problems').on('reset', function(){self.addAll();}, this);
+            this.model.get('problems').on('all', function(){
+                $("[href=#"+self.model.get('name')+"]").html(self.model.get('name') + " (" + self.model.get('problems').length + ")");
+            }, this);
+        },
+
+        render:function () {
+            /*
+             * sudo code for display stuff: create a tab next to library_box make it's
+             * id setID load in the problems from the set add the nessisary listeners
+             * etc to the problems switch to that tab
+             */
+            /*
+             var self = this;
+             if (document.getElementById(self.get('name'))
+             && $.contains(document.getElementById("problems_container"),
+             document.getElementById(self.get('name')))) {
+             // might as well reload the problems
+             while (this.displayBox.hasChildNodes()) {
+             this.displayBox.removeChild(this.displayBox.lastChild);
+             }
+             for ( var i = 0; i < this.problemArray.length; i++) {
+             this.renderProblem(this.problemArray[i]);
+             }
+             } else {
+             $('#problems_container').tabs("add", "#" + this.name, this.name + " (" + this.problemArray.length + ")");
+             var thisContainer = document.getElementById(this.name);
+             thisContainer.setAttribute("data-uid", this.id);
+             this.displayBox = document.createElement("ul");
+             this.displayBox.id = this.name + "_list";
+             var workAroundSet = this;
+             $(this.displayBox).sortable({
+             axis: 'y',
+             start : function(event, ui) {
+             workAroundSet.previousOrder = $(this).sortable('toArray');
+             },
+             update : function(event, ui) {
+             workAroundSet.reorderProblems($(this).sortable('toArray'));
+             }
+             });// sortable code
+             thisContainer.appendChild(this.displayBox);
+             for ( var i = 0; i < this.problemArray.length; i++) {
+             this.renderProblem(this.problemArray[i]);
+             }
+             }*/
+
+            //Template and fix up, that was just ugly
+            var self = this;
+            if ($('#problems_container #' + this.model.get('name')).length == 0) {
+                $('#problems_container').tabs('add', "#"+this.model.get('name'), this.model.get('name') + " (" + this.model.get('problems').length + ")"); //could move to an after?
+                this.setElement(document.getElementById(this.model.get('name')));
             }
-        } else {
-            $tabs.tabs("add", "#" + this.name, this.name + " (" + this.problemArray.length + ")");
-            var thisContainer = document.getElementById(this.name);
-            thisContainer.setAttribute("data-uid", this.id);
-            this.displayBox = document.createElement("ul");
-            this.displayBox.id = this.name + "_list";
-            var workAroundSet = this;
-            $(this.displayBox).sortable({
-                axis: 'y',
-                start : function(event, ui) {
-                    workAroundSet.previousOrder = $(this).sortable('toArray');
+
+            this.$el.html(self.template(self.model.toJSON()));
+
+            //this.$el.id = this.model.get('name');
+            //might have to refresh
+            this.$('.list').sortable({
+                //handle: '.handle',
+                axis:'y',
+                start:function (event, ui) {
+                    //self.previousOrder = $(this).sortable('toArray');
                 },
-                update : function(event, ui) {
-                    workAroundSet.reorderProblems($(this).sortable('toArray'));
+                update:function (event, ui) {
+                    //self.reorderProblems($(this).sortable('toArray'));
+                    var newOrder = self.$('.list').sortable('toArray');
+                    console.log(newOrder);
+                    for(var i = 0; i < newOrder.length; i++){
+                        var problem = self.model.get('problems').getByCid(newOrder[i]);
+                        if(problem){
+                            problem.set('place', i);
+                        }
+                    }
+
+                    self.model.get('problems').reorder();
                 }
-            });// sortable code
-            thisContainer.appendChild(this.displayBox);
-            for ( var i = 0; i < this.problemArray.length; i++) {
-                this.renderProblem(this.problemArray[i]);
-            }
-        }*/
-
-        //Template and fix up, that was just ugly
-        var self = this;
-        this.$el.id = this.model.get('name');
-
-        this.$el.sortable({
-            axis: 'y',
-            start : function(event, ui) {
-                //self.previousOrder = $(this).sortable('toArray');
-            },
-            update : function(event, ui) {
-                //self.reorderProblems($(this).sortable('toArray'));
-            }
-        });
+            });
 
-        this.$el.html(this.template(this.model.toJSON()));
+            this.addAll();
+            return this;
+        },
 
-        this.model.get('problems').each(function(problem){
-           var view = new ProblemView({model: problem});
-           self.$(".list").append(view.render().el);
-        });
+        addOne: function(problem){
+            var view = new ProblemView({model:problem});
+            var rendered_problem = view.render().el;
+            console.log(rendered_problem);
+            console.log(this.$(".list"));
+            this.$(".list").append(rendered_problem);
+            this.$('.list').sortable('refresh');
 
-        return this;
-    }
-});
-/*
-Set.prototype.renderProblem = function(problem) {
-	var newSetItem = problem.render(this.displayBox);
-	newSetItem.addEventListener("click", function(event) {
-		if (!event.altKey) {
-			$(".ww_selected").removeClass("ww_selected");
-		}
-		$(this).addClass("ww_selected");
-	}, false);
-	$(this.displayBox).sortable("refresh");
-}
-*/
+        },
 
+        addAll: function(){
+            var self = this;
+            this.model.get('problems').each(function(model){self.addOne(model)});
+        }
+    });
+    /*
+     Set.prototype.renderProblem = function(problem) {
+     var newSetItem = problem.render(this.displayBox);
+     newSetItem.addEventListener("click", function(event) {
+     if (!event.altKey) {
+     $(".ww_selected").removeClass("ww_selected");
+     }
+     $(this).addClass("ww_selected");
+     }, false);
+     $(this.displayBox).sortable("refresh");
+     }
+     */
 
-var SetNameView = Backbone.Collection.extend({
-    tagName: "li",
-    template: _.template($('#setName-template').html()),
 
-    events:{
-        'click' : 'view'
-    },
+    var SetNameView = Backbone.View.extend({
+        tagName:"li",
+        template:_.template($('#setName-template').html()),
 
-    initalize: function(){
-        this.bigView = false;
-    },
+        events:{
+            'click':'view'
+        },
 
-    render: function(){
-        var self = this;
+        initialize:function () {
+            this.bigView = false;
+            var self = this;
+            this.model.get('problems').on('all', function(){self.render()}, this);
+            this.model.on('highlight', function(){self.$el.addClass("contains_problem")});
+        },
 
-        self.$el.html(self.template(self.model.toJSON()));
+        render:function () {
+            var self = this;
 
-        self.$el.droppable({
-                tolerance : 'pointer',
+            self.$el.html(self.template({name: self.model.get('name'), problem_count: self.model.get('problems').length}));
+            self.$el.droppable({
+                tolerance:'pointer',
 
-                hoverClass: 'drophover',
+                hoverClass:'drophover',
 
-                drop : function(event, ui) {
-                    self.model.addProblem(ui.draggable.attr("data-path"));
+                drop:function (event, ui) {
+                    var newProblem = new Problem({path:ui.draggable.attr("data-path")});
+                    self.model.get("problems").addProblem(newProblem);
                 }
             });
 
-        return this;
-    },
-
-    view: function() {
-        console.log("clicked " + this.model.get('name'));
-        if ($('#problems_container #'+this.model.get('name'))) {
-            $('#problems_container').tabs('select', this.model.get('name'));
-        } else {
-            $('#problems_container').tabs('add', this.model.get('name'), this.model.get('name') + " (" + this.model.get('problems').length + ")"); //could move to an after?
-            var view = new SetView({model:this.model});
-            $('#problems_container').append(view.render().el);
+            return this;
+        },
+
+        view:function () {
+            console.log("clicked " + this.model.get('name'));
+            if ($('#problems_container #' + this.model.get('name')).length > 0) {
+                $('#problems_container').tabs('select', this.model.get('name'));
+            } else {
+                console.log("rendering the set");
+                var view = new SetView({model:this.model});
+                //$('#problems_container').append(view.render().el);
+                view.render();
+            }
+            //render the full tab thing, or switch to it
         }
-        //render the full tab thing, or switch to it
-    }
-});
+    });
 
-/*******************************************************************************
- * SetList object needed variables: sets, displaybox, needed functions: create
- * set
- */
-
-var SetList = Backbone.Collection.extend({
-    model: Set,
-
-    //think it's fetch I want to replace:
-    fetch: function(){
-        var self = this;
-
-        listLibRequest.xml_command = "listSets";
-
-        console.log("starting set list");
-        $.post(webserviceURL, listLibRequest, function(data) {
-            try {
-                var response = $.parseJSON(data);
-                console.log("result: " + response.server_response);
-                var setNames = response.result_data.split(",");
-                setNames.sort();
-                console.log("found these sets: " + setNames);
-                for ( var i = 0; i < setNames.length; i++) {
-                    //workAroundSetList.renderList(workAroundSetList.setNames[i]);
-                    self.add({name: setNames[i]});
-                }
-            } catch (err) {
-                showErrorResponse(data);
-            }
-        });
-    },
-
-    //different from add I hope
-    create: function(model){
-        this.add(model);
-        listLibRequest.xml_command = "createNewSet";
-        listLibRequest.new_set_name = model.name?model.name:model.get("name");
-        $.post(webserviceURL, listLibRequest, function(data) {
-            try {
-                var response = $.parseJSON(data);
-                console.log("result: " + response.server_response);
-                updateMessage(response.server_response);
-            } catch (err) {
-                showErrorResponse(data);
-            }
-        });
-    }
-});
+    /*******************************************************************************
+     * SetList object needed variables: sets, displaybox, needed functions: create
+     * set
+     */
 
-/*
-function SetList() {
-	this.setNames = new Array();
-	this.sets = new Object();
-	this.displayBox = document.getElementById("my_sets_list");
-	listLibRequest.xml_command = "listSets";
-	var workAroundSetList = this;
-	console.log("starting set list");
-	$.post(webserviceURL, listLibRequest, function(data) {
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			workAroundSetList.setNames = response.result_data.split(",");
-			workAroundSetList.setNames.sort();
-			console.log("found these sets: " + workAroundSetList.setNames);
-			for ( var i = 0; i < workAroundSetList.setNames.length; i++) {
-				workAroundSetList.renderList(workAroundSetList.setNames[i]);
-			}
-		} catch (err) {
-			showErrorResponse(data);
-		}
-	});
-}
+    var SetList = Backbone.Collection.extend({
+        model:Set,
+
+        initialize: function(){
+            this.defaultRequestObject = {};
+
+            _.defaults(this.defaultRequestObject, globalRequestObject);
+        },
+        //think it's fetch I want to replace:
+        fetch:function () {
+            var self = this;
+
+            var requestObject = {
+                xml_command: "listSets"
+            };
+            _.defaults(requestObject, this.defaultRequestObject);
+            console.log("starting set list");
+            $.post(webserviceURL, requestObject, function (data) {
+                //try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    var setNames = response.result_data.split(",");
+                    setNames.sort();
+                    console.log("found these sets: " + setNames);
+                    var newSets = new Array();
+                    for (var i = 0; i < setNames.length; i++) {
+                        //workAroundSetList.renderList(workAroundSetList.setNames[i]);
+                        newSets.push({name:setNames[i]})
+                    }
+                    self.reset(newSets);
+                /*} catch (err) {
+                    showErrorResponse(data);
+                }*/
+            });
+        },
+
+        //different from add I hope
+        create:function (model) {
+            this.add(model);
+            var requestObject = {
+                xml_command: "createNewSet",
+                new_set_name: model.name ? model.name : model.get("name")
+            };
+            _.defaults(requestObject, this.defaultRequestObject);
+            $.post(webserviceURL, requestObject, function (data) {
+                //try {
+                    var response = $.parseJSON(data);
+                    console.log("result: " + response.server_response);
+                    updateMessage(response.server_response);
+                /*} catch (err) {
+                    showErrorResponse(data);
+                }*/
+            });
+        }
+    });
 
-SetList.prototype.refresh = function(problemPath) {
-	listLibRequest.xml_command = "listSets";
-	var workAroundSetList = this;
-	$.post(webserviceURL, listLibRequest, function(data) {
-		try {
-			var response = $.parseJSON(data);
-			console.log("result: " + response.server_response);
-			var newSetList = response.result_data.split(",");
-			var newSets = new Array();
-			for ( var i = 0; i < newSetList.length; i++) {
-				if ($.inArray(newSetList[i], workAroundSetList.setNames) < 0) {
-					console.log("rendering set " + newSetList[i] + "");
-					newSets.push(newSetList[i]);
-				}
-			}
-			var recievingSet;
-			for ( var j = 0; j < newSets.length; j++) {
-				workAroundSetList.setNames.push(newSets[j]);
-				var recievingSet = workAroundSetList.renderList(newSets[j]);
-			}
-			if (recievingSet && problemPath) {
-				recievingSet.addProblem(problemPath);
-			}
-		} catch (err) {
-			showErrorResponse(data);
-		}
-	});
-	// how do we check if we already have the set?
-}
-*/
 
-var SetListView = Backbone.View.extend({
-    tagName: "ul",
-    template: _.template($('#setList-template').html()),
+    var SetListView = Backbone.View.extend({
+        tagName:"ul",
+        template:_.template($('#setList-template').html()),
 
-    initialize: function(){
-        this.model.bind('add', this.addOne, this);
-        this.model.bind('reset', this.addAll, this);
-        this.model.bind('all', this.render, this);
-    },
+        initialize:function () {
+            var self = this;
+            this.model.bind('add', function(model){self.addOne(model);}, this);
+            this.model.bind('reset', function(){self.addAll()}, this);
+            //this.model.bind('all', this.render, this);
+            this.render();
+        },
 
-    render: function(){
-        var self = this;
+        render:function () {
+            var self = this;
 
-        self.$el.html(self.template());
+            self.$el.html(self.template());
 
-        return this;
-    },
+            /*this.$(".new_problem_set").droppable({
+                tolerance:'pointer',
 
-    addOne: function(newSet){
-        var view = new SetNameView({model: newSet});
-        self.$el.append(view.render().el);
-    },
+                hoverClass:'drophover',
 
-    addAll: function() {
-        this.model.each(this.addOne);
-    }
-/*
-    startCreate: function(){
-        this.$("#dialog").dialog('open');
-    }
-*/
-});
+                drop:function (event, ui) {
+                    //Create a new set
+                }
+            });*/
 
-/*
-SetList.prototype.renderList = function(setName) {
-
-	var addingSet = document.createElement("li");
-
-	var newSet = new Set(setName);
-	newSet.loadProblems(false);
-	addingSet.innerHTML = setName;
-	addingSet.setAttribute("data-uid", newSet.id);
-	addingSet.id = newSet.name + newSet.id;
-	this.sets[newSet.id] = newSet;
-
-	var workAroundSetList = this.sets;
-	addingSet.addEventListener("click", function(event) {
-		var clickedSet = workAroundSetList[this.getAttribute("data-uid")];
-		clickedSet.loadProblems(true);
-		$("#problems_container").tabs("select", clickedSet.name);
-	}, false);
-
-	$(addingSet).insertBefore("#new_problem_set");
-	// this.displayBox.appendChild(addingSet);
-	$(addingSet).droppable(
-			{
-				tolerance : 'pointer',
-
-				hoverClass: 'drophover',
-
-				drop : function(event, ui) {
-					var recievingSet = workAroundSetList[this
-							.getAttribute("data-uid")];
-					recievingSet.addProblem(ui.draggable.attr("data-path"));
-				}
-			});
-	return newSet;
+            //this.addAll();
+            return this;
+        },
 
-};
-*/
+        addOne:function (added_set) {
+            var view = new SetNameView({model: added_set});
+            this.$el.append(view.render().el);
+        },
 
+        addAll:function () {
+            var self = this;
+            this.model.each(function(model){self.addOne(model)});
+        }
+        /*
+         startCreate: function(){
+         this.$("#dialog").dialog('open');
+         }
+         */
+    });
 
-/*******************************************************************************
- * The problem object
- ******************************************************************************/
-// object
 
-var Problem = Backbone.Model.extend({
-    defaults:function(){
-        return{
-           path: "",
-           data: false,
-        };
-    },
+    /*This is global in order not to confuse the poor select boxes..
+      They can never tell who went last :)
+     */
+    var libToLoad = false;
+    $("#load_problems").on("click", function(event){
+        console.log(libToLoad);
+        if(libToLoad){
+            libToLoad.get('problems').fetch();
+            var view = new LibraryView({model: libToLoad});
+            view.render();
+        }
+    });
+
+    //The APP!! yay!!
+    var LibraryBrowser = Backbone.View.extend({
+        el:$('#app_box'),
+
+        events:{
+            "click #undo_button":"undo",
+            "click #redo_button":"redo",
+            "hover .problem": "highlightSets",
+            "click #create_set": "createHomeworkSet"
+        },
+
+        initialize:function () {
+            //Set up the tabbed set lists and libraries:
+            $("#problems_container").tabs(
+                {
+                    closable:true,
+                    add:function (event, ui) {
+                        //document.getElementById("library_link").removeChild(document.getElementById("library_link").lastChild);
+                        console.log("adding a tab");
+                        $('#problems_container').tabs('select', '#' + ui.panel.id);
+                        $(".ww_selected").removeClass("ww_selected");// probably reduntant but I want to make sure nothing stays selected
+                    },
+                    create:function (event, ui) {
+                        //document.getElementById("library_link").removeChild(document.getElementById("library_link").lastChild);
+                        $(".ww_selected").removeClass("ww_selected");
+                    },
+                    select:function (event, ui) {
+                        $(".ww_selected").removeClass("ww_selected");
+                    },
+                    remove:function (event, ui) {
+                        //document.getElementById("library_link").removeChild(document.getElementById("library_link").lastChild);
+                        $(".ww_selected").removeClass("ww_selected");
+                    }
+                });
+            $("#problem_sets_container").resizable({
+                cursor:'move',
+                //animate: true,
+                //ghost: true,
+                delay:0
+            });
 
-    initialize: function(){
 
-    },
-    //this is a server render, different from a view render
-    render: function(callback) {
-        var problem = this;
+            //set up our models
+            this.homeworkSets = new SetList;
+            this.cardCatalog = new LibraryList;
+            this.cardCatalog.defaultRequestObject.xml_command = "listLibraries"
 
-        listLibRequest.set = problem.path;
-        listLibRequest.problemSource = problem.path;
-        listLibRequest.xml_command = "renderProblem";
+            this.homeworkSets.fetch();
+            this.cardCatalog.fetch();
 
+            this.render();
+        },
 
-        if (!problem.data) {
-            //if we haven't gotten this problem yet, ask for it
-            $.post(webserviceURL, listLibRequest, function(data) {
-                problem.data = data;
-                callback(data);
-            });
-        }
-    }
-});
+        createHomeworkSet: function(){
+            if(this.$("#dialog_text").val()){
+                this.homeworkSets.create({name: this.$("#dialog_text").val()});
+            }
+            this.$("#dialog_text").val('');
+        },
+
+        highlightSets: function(event) {
+            switch(event.type){
+                case "mouseenter":
+                    //console.log(this.getAttribute("data-path"));
+                    var problemPath = event.currentTarget.getAttribute("data-path");
+
+                    this.homeworkSets.each(function(set){
+                        if(set.get('problems').find(function(problem){return problem.get('path') == problemPath})){
+                            set.trigger('highlight');
+                        }
+                    });
+                    break;
+                default:
+                    $(".contains_problem").removeClass("contains_problem");
+                    break;
+            }
 
-var ProblemView = Backbone.View.extend({
-    tagName:"li",
-    template: _.template($('#probem-template').html()),
+        },
 
-    initialize: function(){
-        this.model.on('change:data', this.render, this);
-    },
+        render: function(){
+            var homeworkSetsView = new SetListView({model: this.homeworkSets});
+            this.$("#homework_sets_container").append(homeworkSetsView.render().el);
 
-    render: function(){
-        var problem = this.model;
-        var self = this;
+            var cardCatalogView = new LibraryListView({model: this.cardCatalog});
+            this.$("#CardCatalog").append(cardCatalogView.render().el);
+        },
 
-        this.$el.html('<img src="/webwork2_files/images/ajax-loader.gif" alt="loading"/>');
+        undo:function () {
+            // pop the stack and call the function, that's it
+            var undoFunc = undo_stack.pop();
+            undoing = true;
+            undoFunc();
+        },
 
-        this.el.setAttribute('data-path', problem.get('path'));
+        redo:function () {
+            var redoFunc = redo_stack.pop();
+            redoFunc();
+        }
+    });
 
-        this.$el.draggable({
-            helper : 'clone',
-            revert : true,
-            handle : 'div.handle',
-            appendTo : 'body',
-            cursorAt : {
-                top : 0,
-                left : 0
-            },
-            opacity : 0.35
-        });
 
-        this.el.addEventListener("mouseover", highlightSets, false);
-        //newItem.addEventListener("mouseout", unHighlightSets, false);
-        //nice async loading call :)
-        problem.render(function(){self.$el.html(self.template(problem.toJSON()))});
+    var App = new LibraryBrowser;
 
-        return this;
-    }
 });
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 638d9354f1..0b753902a2 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -97,11 +97,14 @@ sub head {
   print '<script src="/webwork2_files/js/jquery-1.7.min.js"></script>';
   print '<script src="/webwork2_files/js/jquery-ui-1.8.16.custom.min.js"></script>';
   print '<script src="/webwork2_files/js/ui.tabs.closable.min.js"></script>';
-  
-  print '<script src="/webwork2_files/js/dnd.js"></script>';
+
+  print '<script src="/webwork2_files/js/LibraryBrowser/json2.js"></script>';
+  print '<script src="/webwork2_files/js/LibraryBrowser/underscore.js"></script>';
+  print '<script src="/webwork2_files/js/LibraryBrowser/backbone.js"></script>';
+  print '<script src="/webwork2_files/js/LibraryBrowser/library_browser.js"></script>';
   #print '<script src="/webwork2_files/js/problem_grid.js"></script>';
   #print '<script src="/webwork2_files/js/form_builder.js"></script>';
-  print '<script src="/webwork2_files/js/library_browser.js"></script>';
+
   print '<script src="/webwork2_files/js/modernizr-2.0.6.js"></script>';
   #my ($self) = @_;
   #my $r = $self->r;
@@ -124,19 +127,18 @@ sub body {
   ##########  Loading Screen
   #print '<div id="loading"></div>';
   
-  ##########  toolbar
-  print '<div id="toolbar">';
-    print '<span id="messages"></span>';
-  	print '<span class="actions">
-	             <button class="button" type="button" id="undo_button">Undo</button>
-	             <button class="button" type="button" id="redo_button">Redo</button>
-	             <button class="button" type="button" id="delete_problem">Remove Selected</button>
-	             <a class="button" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a>
-	       </span>';
-  print '</div>';
-  
   #big wrapper div that will hopefully fix theme issues
   print '<div id="app_box">';
+    ##########  toolbar
+      print '<div class="toolbar">';
+        print '<span id="messages"></span>'; #maybe jquery alerts can go here
+      	print '<span class="actions">
+    	             <button class="button" type="button" id="undo_button">Undo</button>
+    	             <button class="button" type="button" id="redo_button">Redo</button>
+    	             <button class="button" type="button" id="delete_problem">Remove Selected</button>
+    	             <a class="button" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a>
+    	       </span>';
+      print '</div>';
     
 	##########	Top part
 	#print '<button onclick="fullWindowMode();">Full Screen</button>';
@@ -159,7 +161,7 @@ sub body {
 	
 	  	print '<div class="break"></div>';
 	  	print '<table>';
-		print '<tr><td><b>Library directories:</b></td><td><span id="CardCatalog"><!--Gonna put the lists of libraries and sublibraries here--></span><button class="button" id="load_problems" type="button">Load Problems</button></td>';
+		print '<tr><td><b>Library directories:</b></td><td><span id="CardCatalog"><!--Gonna put the lists of libraries and sub-libraries here--></span><button class="button" id="load_problems" type="button">Load Problems</button></td>';
 		print '<tr><td><b>Library search:</b></td><td><span id="library_search_box"><select id="subjectBox"></select><select id="chaptersBox"></select><select id="sectionsBox"></select><select  style="display:none;"  id="textbooksBox"></select><select style="display:none;" id="textChaptersBox"></select><select style="display:none;" id="textSectionsBox"></select><input type="text" id="keywordsBox"  style="display:none;"  placeholder="keywords"></input><button class="button" id="run_search" type="button">Search</button><span></td>';
 		print '</table>';
 		###########################################
@@ -171,30 +173,21 @@ sub body {
 
 	    print '<div id="problem_container">';
 	      print '<div id="dialog">',
-	      			'<input type="text" id="dialog_text"></input>',
+	      			'<input type="text" id="dialog_text" placeholder="default set"></input>',
 	      			'<button type="button" id="create_set">Create Set</button>',
 	      		'</div>';
-	      print '<div id="problem_sets_container">';
-	    	print '<b>Target Sets</b>';
-			print '<ul id="my_sets_list">';
-				print '<li id="new_problem_set">New Problem Set</li>';
-		    print '</ul>';
+	      print '<div id="homework_sets_container">';
+	    	print '<b>Homework Sets</b>';
+			print '<!--homework sets go here-->'; #could be a problem with multiple appends (can I use a replace instead?)
 		  print '</div>';
 		  #print '<div id="size_slider"><p>||</p></div>';
 		  print '<div id="problems_container">';
 		    #List of tabs
 		  	print '<ul>',
-        			'<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
+        			#'<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
     			  '</ul>';
-    	    print '<div id="library_tab">',
-		            '<h1>Problems</h1>',
-	        	########## Now print problems
-	        	    '<ul class="list">',
-	          
-	        	    '</ul>',
-#<button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span>
-            	    '<p><select class="prob_per_page"><option value=10>10</option><option value=20>20</option><option value=30>30</option><option value=40>40</option><option value=50>50</option></select><button type="button" disabled=true class="prevList">Previous</button><button disabled=true type="button" class="nextList">Next</button></p>',#might be a better way to do the perpage
-	      	    '</div>';
+    	    #print '<div id="library_tab">',
+		     #       '</div>';
 	      print '</div>';
 	        ########## Finish things off
 	   	print '</div>';
@@ -205,30 +198,43 @@ sub body {
 
 
   print '<script type="text/template", id="problem-template">',
-        '    <div class="handel"></div>',
+        '    <div class="handle">drag handle</div>',
+            '<button type="button" class="remove" style="display:<%= remove_display %>;">X</button>', #replace with twitter bootstrap icons? yeah font awesome :)
         '    <div><%= data %></div>',
         '</script>';
 
   print '<script type="text/template", id="setList-template">',
-            '<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
+            #'<li class="new_problem_set">New Problem Set</li>',
 
           '</script>';
 
   print '<script type="text/template", id="setName-template">',
-              '<%= name %>',
+              '<a data-problem_count=<%= problem_count %>><%= name %><span class="problem_count" style="float:right"><%= problem_count %></style></a>',#could do this with an :after css tag instead..it would be better
          '</script>';
 
-  print '<script type="text/template", id="setList-template">',
+  print '<script type="text/template", id="set-template">',
            '<h1>Problems</h1>',
-           '<ul class=list">',
+           '<ul class="list">',
            '</ul>',
         '</script>';
 
   print '<script type="text/template", id="LibraryList-template">',
-             '<select class="list"></select>',
-             '<span class="children></children>'
+             '<select class="list">',
+             '<option value=null>Pick a Library</option>',
+             '</select>',
+             '<span class="children"></span>',
           '</script>';
 
+  print '<script type="text/template", id="Library-template">',
+            '<h1>Problems</h1>',
+       	    ########## Now print problems
+       	    '<ul class="list">',
+
+       	    '</ul>',
+            #<button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span>
+            '<button type="button" class="next_group" style="display:<%= enough_problems %>;">Load the next <%= group_size %> problems.</button>',
+       '</script>';
+
 	return "";	
 }
 
diff --git a/lib/WebworkWebservice/SetActions.pm b/lib/WebworkWebservice/SetActions.pm
index 47004bcd1b..e3cfe2dfb1 100644
--- a/lib/WebworkWebservice/SetActions.pm
+++ b/lib/WebworkWebservice/SetActions.pm
@@ -161,7 +161,7 @@ sub reorderProblems {
 	  	die "global $problem not found." unless $problem;
 	  	#print "problem to be reordered: ".$problem."\n";
 	  	$db->putGlobalProblem($problem);
-	  
+
 	  	#need to deal with users?
 	  	foreach $user (@setUsers) {
   			#my $prob1 = $db->getUserProblem($user, $setID, $index);

From 9501d66732df66319ca282f5033c491574e44a42 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Wed, 30 May 2012 17:38:13 -0400
Subject: [PATCH 51/73] OK!  Javascript is structured nicely and the browser
 looks good, almost ready for the camp, just need comments still and i'm sure
 tons of testing as always.

---
 conf/templates/dgage/lbtwo.template           |    2 +-
 conf/templates/math2/lbtwo.template           |  136 +-
 htdocs/css/library_browser.css                |  151 +-
 htdocs/js/{ => apps}/LibraryBrowser/Search.js |    0
 .../LibraryBrowser/library_browser.js         |  504 +-
 .../vendor/FontAwesome/css/font-awesome.css   |  239 +
 .../FontAwesome/font/fontawesome-webfont.eot  |  Bin 0 -> 42272 bytes
 .../FontAwesome/font/fontawesome-webfont.svg  |  175 +
 .../FontAwesome/font/fontawesome-webfont.svgz |  Bin 0 -> 21845 bytes
 .../FontAwesome/font/fontawesome-webfont.ttf  |  Bin 0 -> 41916 bytes
 .../FontAwesome/font/fontawesome-webfont.woff |  Bin 0 -> 23416 bytes
 .../vendor}/backbone.js                       |    0
 .../bootstrap/css/bootstrap-responsive.css    |  808 +++
 .../css/bootstrap-responsive.min.css          |    9 +
 .../js/lib/vendor/bootstrap/css/bootstrap.css | 4960 +++++++++++++++++
 .../vendor/bootstrap/css/bootstrap.min.css    |    9 +
 .../img/glyphicons-halflings-white.png        |  Bin 0 -> 8777 bytes
 .../bootstrap/img/glyphicons-halflings.png    |  Bin 0 -> 13826 bytes
 .../js/lib/vendor/bootstrap/js/bootstrap.js   | 1824 ++++++
 .../lib/vendor/bootstrap/js/bootstrap.min.js  |    6 +
 .../vendor}/jquery-1.7.2.min.js               |    0
 .../{LibraryBrowser => lib/vendor}/json2.js   |    0
 .../vendor}/underscore.js                     |    0
 htdocs/js/lib/webwork/WeBWorK.js              |  182 +
 htdocs/js/lib/webwork/teacher/Library.js      |   76 +
 htdocs/js/lib/webwork/teacher/Problem.js      |   97 +
 htdocs/js/lib/webwork/teacher/Set.js          |   18 +
 htdocs/js/lib/webwork/teacher/teacher.js      |   20 +
 lib/WeBWorK/ContentGenerator.pm               |   12 +-
 .../ContentGenerator/Instructor/SetMaker3.pm  |   90 +-
 30 files changed, 8597 insertions(+), 721 deletions(-)
 rename htdocs/js/{ => apps}/LibraryBrowser/Search.js (100%)
 rename htdocs/js/{ => apps}/LibraryBrowser/library_browser.js (56%)
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/css/font-awesome.css
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.eot
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svg
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svgz
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.ttf
 create mode 100755 htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.woff
 rename htdocs/js/{LibraryBrowser => lib/vendor}/backbone.js (100%)
 create mode 100644 htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.css
 create mode 100644 htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.min.css
 create mode 100644 htdocs/js/lib/vendor/bootstrap/css/bootstrap.css
 create mode 100644 htdocs/js/lib/vendor/bootstrap/css/bootstrap.min.css
 create mode 100644 htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings-white.png
 create mode 100644 htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings.png
 create mode 100644 htdocs/js/lib/vendor/bootstrap/js/bootstrap.js
 create mode 100644 htdocs/js/lib/vendor/bootstrap/js/bootstrap.min.js
 rename htdocs/js/{LibraryBrowser => lib/vendor}/jquery-1.7.2.min.js (100%)
 rename htdocs/js/{LibraryBrowser => lib/vendor}/json2.js (100%)
 rename htdocs/js/{LibraryBrowser => lib/vendor}/underscore.js (100%)
 create mode 100644 htdocs/js/lib/webwork/WeBWorK.js
 create mode 100644 htdocs/js/lib/webwork/teacher/Library.js
 create mode 100644 htdocs/js/lib/webwork/teacher/Problem.js
 create mode 100644 htdocs/js/lib/webwork/teacher/Set.js
 create mode 100644 htdocs/js/lib/webwork/teacher/teacher.js

diff --git a/conf/templates/dgage/lbtwo.template b/conf/templates/dgage/lbtwo.template
index cefb511505..a016fa2a72 100755
--- a/conf/templates/dgage/lbtwo.template
+++ b/conf/templates/dgage/lbtwo.template
@@ -36,7 +36,7 @@
 
 <div style="clear:both;"></div>
 	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
+		<!--#path "-->
 	</div>
 	<div id="content" >
 
diff --git a/conf/templates/math2/lbtwo.template b/conf/templates/math2/lbtwo.template
index cefb511505..d3b0912a1b 100755
--- a/conf/templates/math2/lbtwo.template
+++ b/conf/templates/math2/lbtwo.template
@@ -24,42 +24,66 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
 
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
 
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+	<div id="messages"></div>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +101,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +111,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/htdocs/css/library_browser.css b/htdocs/css/library_browser.css
index 4c2daa296e..bca690891e 100644
--- a/htdocs/css/library_browser.css
+++ b/htdocs/css/library_browser.css
@@ -1,144 +1,47 @@
-body {
-	
-}
-
-#toolbar{
-	position:fixed;
-	top:0px;
-	left:0px;
-	background: black;
-	height:33px;
-	width:100%;
-	z-index: 100;
-} 
-
-#toolbar .button {
-   /*border-top: 1px solid #3d3d3d;*/
-   border: none;
-   cursor: pointer;
-   background: #3d3d3d;
-   background: -webkit-gradient(linear, left top, left bottom, from(#3d3d3d), to(#3d3d3d));
-   background: -webkit-linear-gradient(top, #3d3d3d, #3d3d3d);
-   background: -moz-linear-gradient(top, #3d3d3d, #3d3d3d);
-   background: -ms-linear-gradient(top, #3d3d3d, #3d3d3d);
-   background: -o-linear-gradient(top, #3d3d3d, #3d3d3d);
-   padding: 6px 12px;
-   -webkit-border-radius: 0px;
-   -moz-border-radius: 0px;
-   border-radius: 0px;
-   -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0;
-   -moz-box-shadow: rgba(0,0,0,1) 0 1px 0;
-   box-shadow: rgba(0,0,0,1) 0 1px 0;
-   text-shadow: rgba(0,0,0,.4) 0 1px 0;
-   color: white;
-   font-size: 13px;
-   font-family: 'Lucida Grande', Helvetica, Arial, Sans-Serif;
-   text-decoration: none;
-   vertical-align: middle;
-   }
-#toolbar .button:hover {
-   border-top-color: #545454;
-   background: #545454;
-   color: #ffffff;
-   }
-#toolbar .button:active {
-   border-top-color: #1b435e;
-   background: #1b435e;
-   }
-
-#toolbar .actions{
-	float:right;
-}
-
-#toolbar #messages{
-	color: white;
-	display: block;
-	float: left;
-	margin: 6px;
-}
 
-#app_box ul {
-	list-style: none;
-	padding:0px;
-}
 
-#app_box ul li{
-	margin-left: 0px;
-	margin-bottom: : 4px;
-	border: solid;
-	border-width: 1px;
+select{
+    height:auto;
+    width:auto;
+    margin:0px;
 }
 
-#app_box ul li:hover{
-	background: silver;
+#problems_container{
+    overflow:auto;
+    height:100%;
 }
 
-.handle{
-	background:#AA6600;
-	cursor: pointer;
-	height:20px;
-	width:20px;
+#homework_sets_container{
+    overflow:auto;
+    height:100%;
 }
 
-#app_box #tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
-
-#app_box .contains_problem{
-	background:#00ADEE;
+#homework_sets_container ul li{
+    cursor: pointer;
 }
 
-#app_box .drophover{
-	background:#00FF00;
-}
-#app_box .ww_selected{
-	background: gray;
+#homework_sets_container ul li:hover{
+    text-decoration: underline;
 }
 
-#app_box .ui-selecting {
-	background: silver;
-}
-#app_box .ui-selected {
-	background: gray;
+ul.list{
+    list-style:none;
 }
 
-#app_box #problem_container{
-	width:100%;
-	height:100%;
-	display: box;
-	/* flexbox setup */
-  	display: -webkit-box;
-  	-webkit-box-orient: horizontal;
-
-  	display: -moz-box;
-  	-moz-box-orient: horizontal;
-
-  	display: box;
-  	box-orient: horizontal;
+ul.list li{
+    border-bottom: solid lightgray;
+    margin-bottom: 5px;
 }
 
-#app_box #problems_container{
-	width: outo; 
-	height:100%;
-	border: solid 1px black;
-
-	overflow: scroll;
-	-webkit-box-flex: 1;
-  	-moz-box-flex: 1;
-  	box-flex: 1;
+.next_group{
+    cursor: pointer;
+    color: slategrey;
 }
 
-#app_box #problem_sets_container{
-	width:150px;
-	float: left
-	border: solid 1px black;
-	height:100%;
-	overflow: scroll;
-	-moz-transition: width 0.7s ease-out;
-  	-o-transition: width 0.7s ease-out;
-  	-webkit-transition: width 0.7s ease-out;
-  	transition: width 0.7s ease-out;
-  
+.handle{
+    float:right;
 }
 
-//#app_box #problem_sets_container:hover{
-//	width:250px;
-//}
+.conatains_problem{
+    backbround: aliceblue;
+}
\ No newline at end of file
diff --git a/htdocs/js/LibraryBrowser/Search.js b/htdocs/js/apps/LibraryBrowser/Search.js
similarity index 100%
rename from htdocs/js/LibraryBrowser/Search.js
rename to htdocs/js/apps/LibraryBrowser/Search.js
diff --git a/htdocs/js/LibraryBrowser/library_browser.js b/htdocs/js/apps/LibraryBrowser/library_browser.js
similarity index 56%
rename from htdocs/js/LibraryBrowser/library_browser.js
rename to htdocs/js/apps/LibraryBrowser/library_browser.js
index 86e6f24181..3c712ed481 100644
--- a/htdocs/js/LibraryBrowser/library_browser.js
+++ b/htdocs/js/apps/LibraryBrowser/library_browser.js
@@ -1,26 +1,3 @@
-/**
- * file variables
- */
-var USER = "user-needs-to-be-defined-in-hidden-variable-id=hidden_user";
-var COURSE = "course-needs-to-be-defined-in-hidden-variable-id=hidden_courseID";
-var SESSIONKEY = "session-key-needs-to-be-defined-in-hidden-variable-id=hidden_key"
-var PASSWORD = "who-cares-what-the-password-is";
-// request object, I'm naming them assuming there may be different versions
-var globalRequestObject = {
-    "xml_command":"listLib",
-    "pw":"",
-    "password":PASSWORD,
-    "session_key":SESSIONKEY,
-    "user":"user-needs-to-be-defined",
-    "library_name":"Library",
-    "courseID":COURSE,
-    "set":"set0",
-    "new_set_name":"new set",
-    "command":"buildtree",
-};
-var webserviceURL = "../../instructorXMLHandler";
-
-//abstract the post request thing, to take an object of options that extends what is now listLibRequest
 
 /**
  * Global stuff
@@ -30,17 +7,6 @@ var undoing = false;
 var undo_stack = new Array();
 var redo_stack = new Array();
 
-
-
-//SMOKE or jquery UI alert
-function updateMessage(message) {
-    var messageBox = document.getElementById("messages");
-    messageBox.innerHTML = message;
-    $(messageBox).effect("pulsate", {
-        times:3
-    }, 500);
-}
-
 //might be able to move this to LibraryBrowser later with event listeners
 function showErrorResponse(data) {
     var myWindow = window.open('', '', 'width=500,height=800');
@@ -49,83 +15,28 @@ function showErrorResponse(data) {
 }
 
 $(function () {
-    // get usernames and keys from hidden variables:
+    // get usernames and keys from hidden variables and set up webwork object:
     var myUser = document.getElementById("hidden_user").value;
     var mySessionKey = document.getElementById("hidden_key").value;
     var myCourseID = document.getElementById("hidden_courseID").value;
     // check to make sure that our credentials are available.
     if (myUser && mySessionKey && myCourseID) {
-        globalRequestObject.user = myUser;
-        globalRequestObject.session_key = mySessionKey;
-        globalRequestObject.courseID = myCourseID;
+        webwork.requestObject.user = myUser;
+        webwork.requestObject.session_key = mySessionKey;
+        webwork.requestObject.courseID = myCourseID;
     } else {
-        updateMessage("missing hidden credentials: user "
+        webwork.alert("missing hidden credentials: user "
             + myUser + " session_key " + mySessionKey
-            + " courseID" + myCourseID);
+            + " courseID" + myCourseID, "alert-error");
     }
 
-    /*
-     // attach function for deleting selected problems
-     document.getElementById("delete_problem").addEventListener("click", function(event) {
-     var currentTabId = $("#problems_container div.ui-tabs-panel:not(.ui-tabs-hide)")[0].id;
-     console.log(currentTabId);
-     // only care if it's a set
-     if (currentTabId != "library_tab") {
-
-     var problems = $(".ww_selected");
-     var set = setList.sets[document
-     .getElementById(
-     currentTabId)
-     .getAttribute("data-uid")];
-     console.log(problems);
-     problems.each(function(index) {
-     set.removeProblem($(this).attr(
-     "data-path"));
-     });
-     }
-     }, false);//REMOVE
-     */
-
 
     /*******************************************************************************
      * The problem object
      ******************************************************************************/
 // object
 
-    var Problem = Backbone.Model.extend({
-        defaults:function () {
-            return{
-                path:"",
-                data:false,
-                place: 0
-            };
-        },
 
-        initialize:function () {
-
-        },
-        //this is a server render, different from a view render
-        render:function () {
-            var problem = this;
-            var requestObject = {
-                    set: this.get('path'),
-                    problemSource: this.get('path'),
-                    xml_command: "renderProblem"
-                };
-            _.defaults(requestObject, globalRequestObject);
-
-
-            if (!problem.get('data')) {
-                //if we haven't gotten this problem yet, ask for it
-                $.post(webserviceURL, requestObject, function (data) {
-                    problem.set('data', data);
-                });
-            }
-        },
-        clear: function() {
-            this.destroy();
-        }
-    });
 
     var ProblemView = Backbone.View.extend({
         tagName:"li",
@@ -162,7 +73,7 @@ $(function () {
             this.$el.draggable({
                 helper:'clone',
                 revert:true,
-                handle:'.handle',
+                handle:'.problem',
                 appendTo:'body',
                 cursorAt:{
                     top:0,
@@ -176,154 +87,13 @@ $(function () {
         },
 
         clear: function(){
+            console.log("clear");
+            this.model.collection.removeProblem(this.model);
             this.model.clear();
         }
     });
 
-    var ProblemList = Backbone.Collection.extend({
-        model:Problem,
-
-        initialize: function(){
-            this.defaultRequestObject = {
-
-            };
-            _.defaults(this.defaultRequestObject, globalRequestObject);
-        },
-
-        comparator: function(problem) {
-            return problem.get("place");
-        },
-
-        //maybe move to problem list as fetch (with a set name argument)
-        fetch:function () {
-            var self = this;
-
-            //command needs to be set in the higher model since there are several versions of problem lists
 
-            var requestObject = {};
-            _.defaults(requestObject, this.defaultRequestObject);
-
-            $.post(webserviceURL, requestObject,
-                function (data) {
-                    //try {//this is the wrong way to be error checking
-                    var response = $.parseJSON(data);
-
-                    var problems = response.result_data.split(",");
-
-                    var newProblems = new Array();
-                    for (var i = 0; i < problems.length; i++) {
-                        if (problems[i] != "") {
-                            newProblems.push({path:problems[i], place:i});
-                        }
-                    }
-                    self.reset(newProblems);
-                    //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
-                    /*} catch (err) {
-                     showErrorResponse(data);
-                     }*/
-                }
-            );
-        },
-
-        //move to problemlist
-        addProblem :function (problem) {
-            this.add(problem);
-            var self = this;
-
-            var requestObject = {
-                xml_command: "addProblem",
-                problemPath: problem.get('path')
-            };
-            _.defaults(requestObject, this.defaultRequestObject);
-
-            $.post(webserviceURL, requestObject, function (data) {
-                //try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                    // still have to test for success..everywhere
-                    if (undoing) {// might be a better way to do this later
-                        redo_stack.push(function () {
-                            self.removeProblem(problem);
-                        });
-                        undoing = false;
-                    } else {
-                        undo_stack.push(function () {
-                            self.removeProblem(problem);
-                        });
-                    }
-                    //hopfully I can get rid of this
-                    //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
-                /*} catch (err) {
-                    showErrorResponse(data);
-                }*/
-            });
-        },
-
-
-        removeProblem:function (problem) {
-
-            var self = this;
-
-            var requestObject = {
-                xml_command: "deleteProblem",
-                problemPath: problem.get("path") //notice the difference from create
-            };
-            _.defaults(requestObject, this.defaultRequestObject);
-
-            $.post(webserviceURL, requestObject, function (data) {
-                //try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                    // still have to test for success....
-                    if (undoing) {
-                        redo_stack.push(function () {
-                            self.addProblem(problem);
-                        });
-                        undoing = false;
-                    } else {
-                        undo_stack.push(function () {
-                            self.addProblem(problem);
-                        });
-                    }
-                    /*workAroundSet.loadProblems($.contains(document
-                     .getElementById("problems_container"), document
-                     .getElementById(self.name)));*/
-                /*} catch (err) {
-                    showErrorResponse(data);
-                }*/
-            });
-            problem.destroy();
-        },
-
-        reorder: function(){
-            var self = this;
-            self.sort();
-
-            var probList = self.pluck("path");
-            var probListString = probList.join(",");
-            console.log(probListString);
-            var requestObject = {
-                probList: probListString,
-                xml_command: "reorderProblems"
-            };
-
-            _.defaults(requestObject, this.defaultRequestObject);
-            console.log(requestObject.set);
-
-            $.post(webserviceURL, requestObject, function (data) {
-                //try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                /*} catch (err) {
-                    showErrorResponse(data);
-                }*/
-            });
-        }
-
-    });
 
 
 
@@ -484,79 +254,7 @@ $(function () {
      * The library object
      ******************************************************************************/
 
-    var Library = Backbone.Model.extend({
-        defaults:function () {
-            return{
-                name:"",
-                path: ""
-            }
-        },
 
-        initialize:function () {
-            var self = this;
-            this.set({problems:new ProblemList, children:new LibraryList});
-
-            this.get('children').url = self.get('path')
-            this.get('children').defaultRequestObject.library_name = this.get("path");
-
-            _.extend(this.get('problems').defaultRequestObject, {
-                xml_command: "listLib",
-                command: "files",
-                maxdepth: 0,
-                library_name: self.get('path') + "/"
-            });
-
-        }
-    });
-
-    var LibraryList = Backbone.Collection.extend({
-        model:Library,
-
-        initialize: function(){
-            this.url = "";
-            this.defaultRequestObject = {
-                xml_command: "listLib",
-                command: "dirOnly",
-                maxdepth: 0
-            };
-            _.defaults(this.defaultRequestObject, globalRequestObject);
-        },
-
-        fetch: function(){
-
-
-                var self = this;
-
-                updateMessage("Loading libraries... may take some time");
-
-                var requestObject = {};
-
-                _.defaults(requestObject, this.defaultRequestObject);
-
-                $.post(webserviceURL, requestObject,
-                    function (data) {
-                        //console.log(data);
-                        //try {
-                        var response = $.parseJSON(data);
-                        console.log(response);
-                        console.log("result: " + response.server_response);
-                        updateMessage(response.server_response);
-                        var newLibs = new Array();
-
-                        //should be either an object of a comma separated list
-                        var libraries = _.isObject(response.result_data)? _.keys(response.result_data):response.result_data.split(",")
-
-                        libraries.forEach(function(lib) {
-                            newLibs.push({name:lib, path: self.url +"/"+lib})
-                        });
-                        self.reset(newLibs);
-                        //callback();
-                        /*} catch (err) {
-                         showErrorResponse(data);
-                         }*/
-                    });
-        }
-    });
 
     var LibraryView = Backbone.View.extend({
         template:_.template($('#Library-template').html()),
@@ -685,89 +383,7 @@ $(function () {
 
 
 
-    var Set = Backbone.Model.extend({
-        defaults:{
-            name:"defaultSet"
-        },
-
-        initialize:function () {
-            this.set('problems', new ProblemList);
-            //this.get('problems').url = this.get('name');
-            _.extend(this.get('problems').defaultRequestObject, {
-                set: this.get('name'),
-                xml_command: "listSetProblems"
-            });
-
-
-            //this.get('problems').on('add', this.addProblem, this);
-            //this.get('problems').on('remove', this.removeProblem, this);
-            this.get('problems').fetch();
-        }
-
-
-        //For reroder
-        //http://localtodos.com/javascripts/todos.js (look at sortables in particular)
-        /*
 
-         reorderProblems = function(setOrder) {
-         var workAroundOrder = this.previousOrder;
-         var workAroundSet = this;
-         if(document.getElementById(workAroundSet.displayBox.id)){
-         if (undoing) {
-         redo_stack.push(function() {
-         // resort the list
-         if(document.getElementById(workAroundSet.displayBox.id)){
-         for ( var i = 0; i < workAroundOrder.length; i++) {
-         var tempProblem = document.getElementById(workAroundOrder[i]);
-         workAroundSet.displayBox.removeChild(tempProblem);
-         workAroundSet.displayBox.appendChild(tempProblem);
-         }
-         $(workAroundSet.displayBox).sortable("refresh");
-         }
-         workAroundSet.reorderProblems(workAroundOrder);
-         });
-         undoing = false;
-         } else {
-         undo_stack.push(function() {
-         // resort the list
-         if(document.getElementById(workAroundSet.displayBox.id)){
-         for ( var i = 0; i < workAroundOrder.length; i++) {
-         var tempProblem = document.getElementById(workAroundOrder[i]);
-         workAroundSet.displayBox.removeChild(tempProblem);
-         workAroundSet.displayBox.appendChild(tempProblem);
-         }
-         $(workAroundSet.displayBox).sortable("refresh");
-         }
-         // $(workAroundSet.displayBox).sortable( "refreshPositions" )
-         workAroundSet.reorderProblems(workAroundOrder);
-         });
-         }
-         // load problems:
-         // var problems = this.displayBox.childNodes;
-         var probList = new Array();
-         for ( var i = 0; i < setOrder.length; i++) {
-         probList.push(document.getElementById(setOrder[i]).getAttribute(
-         "data-path"));
-         }
-
-         var probListString = probList.join(",");
-         listLibRequest.probList = probListString;
-         listLibRequest.xml_command = "reorderProblems";
-         listLibRequest.set = this.name;
-         $.post(webserviceURL, listLibRequest, function(data) {
-         try {
-         var response = $.parseJSON(data);
-         console.log("result: " + response.server_response);
-         updateMessage(response.server_response);
-         } catch (err) {
-         showErrorResponse(data);
-         }
-         });
-         this.previousOrder = $(workAroundSet.displayBox).sortable('toArray');
-         }
-         */
-
-    });
 
 //full set view, renders all problems etc
     var SetView = Backbone.View.extend({
@@ -785,44 +401,6 @@ $(function () {
         },
 
         render:function () {
-            /*
-             * sudo code for display stuff: create a tab next to library_box make it's
-             * id setID load in the problems from the set add the nessisary listeners
-             * etc to the problems switch to that tab
-             */
-            /*
-             var self = this;
-             if (document.getElementById(self.get('name'))
-             && $.contains(document.getElementById("problems_container"),
-             document.getElementById(self.get('name')))) {
-             // might as well reload the problems
-             while (this.displayBox.hasChildNodes()) {
-             this.displayBox.removeChild(this.displayBox.lastChild);
-             }
-             for ( var i = 0; i < this.problemArray.length; i++) {
-             this.renderProblem(this.problemArray[i]);
-             }
-             } else {
-             $('#problems_container').tabs("add", "#" + this.name, this.name + " (" + this.problemArray.length + ")");
-             var thisContainer = document.getElementById(this.name);
-             thisContainer.setAttribute("data-uid", this.id);
-             this.displayBox = document.createElement("ul");
-             this.displayBox.id = this.name + "_list";
-             var workAroundSet = this;
-             $(this.displayBox).sortable({
-             axis: 'y',
-             start : function(event, ui) {
-             workAroundSet.previousOrder = $(this).sortable('toArray');
-             },
-             update : function(event, ui) {
-             workAroundSet.reorderProblems($(this).sortable('toArray'));
-             }
-             });// sortable code
-             thisContainer.appendChild(this.displayBox);
-             for ( var i = 0; i < this.problemArray.length; i++) {
-             this.renderProblem(this.problemArray[i]);
-             }
-             }*/
 
             //Template and fix up, that was just ugly
             var self = this;
@@ -836,9 +414,10 @@ $(function () {
             //this.$el.id = this.model.get('name');
             //might have to refresh
             this.$('.list').sortable({
-                //handle: '.handle',
+                //handle: $('.handle'),
                 axis:'y',
                 start:function (event, ui) {
+                    console.log("handle test");
                     //self.previousOrder = $(this).sortable('toArray');
                 },
                 update:function (event, ui) {
@@ -914,7 +493,7 @@ $(function () {
                 hoverClass:'drophover',
 
                 drop:function (event, ui) {
-                    var newProblem = new Problem({path:ui.draggable.attr("data-path")});
+                    var newProblem = new webwork.Problem({path:ui.draggable.attr("data-path")});
                     self.model.get("problems").addProblem(newProblem);
                 }
             });
@@ -941,66 +520,13 @@ $(function () {
      * set
      */
 
-    var SetList = Backbone.Collection.extend({
-        model:Set,
-
-        initialize: function(){
-            this.defaultRequestObject = {};
-
-            _.defaults(this.defaultRequestObject, globalRequestObject);
-        },
-        //think it's fetch I want to replace:
-        fetch:function () {
-            var self = this;
-
-            var requestObject = {
-                xml_command: "listSets"
-            };
-            _.defaults(requestObject, this.defaultRequestObject);
-            console.log("starting set list");
-            $.post(webserviceURL, requestObject, function (data) {
-                //try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    var setNames = response.result_data.split(",");
-                    setNames.sort();
-                    console.log("found these sets: " + setNames);
-                    var newSets = new Array();
-                    for (var i = 0; i < setNames.length; i++) {
-                        //workAroundSetList.renderList(workAroundSetList.setNames[i]);
-                        newSets.push({name:setNames[i]})
-                    }
-                    self.reset(newSets);
-                /*} catch (err) {
-                    showErrorResponse(data);
-                }*/
-            });
-        },
 
-        //different from add I hope
-        create:function (model) {
-            this.add(model);
-            var requestObject = {
-                xml_command: "createNewSet",
-                new_set_name: model.name ? model.name : model.get("name")
-            };
-            _.defaults(requestObject, this.defaultRequestObject);
-            $.post(webserviceURL, requestObject, function (data) {
-                //try {
-                    var response = $.parseJSON(data);
-                    console.log("result: " + response.server_response);
-                    updateMessage(response.server_response);
-                /*} catch (err) {
-                    showErrorResponse(data);
-                }*/
-            });
-        }
-    });
 
 
     var SetListView = Backbone.View.extend({
         tagName:"ul",
         template:_.template($('#setList-template').html()),
+        className:"nav nav-list",
 
         initialize:function () {
             var self = this;
@@ -1102,8 +628,8 @@ $(function () {
 
 
             //set up our models
-            this.homeworkSets = new SetList;
-            this.cardCatalog = new LibraryList;
+            this.homeworkSets = new webwork.SetList;
+            this.cardCatalog = new webwork.LibraryList;
             this.cardCatalog.defaultRequestObject.xml_command = "listLibraries"
 
             this.homeworkSets.fetch();
diff --git a/htdocs/js/lib/vendor/FontAwesome/css/font-awesome.css b/htdocs/js/lib/vendor/FontAwesome/css/font-awesome.css
new file mode 100755
index 0000000000..2e868934e4
--- /dev/null
+++ b/htdocs/js/lib/vendor/FontAwesome/css/font-awesome.css
@@ -0,0 +1,239 @@
+/*  Font Awesome
+    the iconic font designed for use with Twitter Bootstrap
+    -------------------------------------------------------
+    The full suite of pictographic icons, examples, and documentation
+    can be found at: http://fortawesome.github.com/Font-Awesome/
+
+    License
+    -------------------------------------------------------
+    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
+    http://creativecommons.org/licenses/by/3.0/ A mention of
+    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
+    source code is considered acceptable attribution (most common on the web).
+    If human readable source code is not available to the end user, a mention in
+    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
+    or mobile software).
+
+    Contact
+    -------------------------------------------------------
+    Email: dave@davegandy.com
+    Twitter: http://twitter.com/fortaweso_me
+    Work: http://lemonwi.se co-founder
+
+    */
+
+@font-face {
+    font-family: 'FontAwesome';
+    src: url('../font/fontawesome-webfont.eot');
+    src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svgz#FontAwesomeRegular') format('svg'), url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+/* sprites.less reset */
+[class^="icon-"], [class*=" icon-"] {
+    display: inline;
+    width: auto;
+    height: auto;
+    line-height: inherit;
+    vertical-align: baseline;
+    background-image: none;
+    background-position: 0% 0%;
+    background-repeat: repeat;
+}
+li[class^="icon-"], li[class*=" icon-"] {
+    display: block;
+}
+/*  Font Awesome styles
+    ------------------------------------------------------- */
+[class^="icon-"]:before, [class*=" icon-"]:before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit;
+}
+a [class^="icon-"], a [class*=" icon-"] {
+    display: inline-block;
+    text-decoration: inherit;
+}
+/* makes the font 33% larger relative to the icon container */
+.icon-large:before {
+    vertical-align: top;
+    font-size: 1.3333333333333333em;
+}
+.btn [class^="icon-"], .btn [class*=" icon-"] {
+    /* keeps button heights with and without icons the same */
+    line-height: .9em;
+}
+li [class^="icon-"], li [class*=" icon-"] {
+    display: inline-block;
+    width: 1.25em;
+    text-align: center;
+}
+li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
+    /* 1.5 increased font size for icon-large * 1.25 width */
+    width: 1.875em;
+}
+li[class^="icon-"], li[class*=" icon-"] {
+    margin-left: 0;
+    list-style-type: none;
+}
+li[class^="icon-"]:before, li[class*=" icon-"]:before {
+    text-indent: -2em;
+    text-align: center;
+}
+li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
+    text-indent: -1.3333333333333333em;
+}
+/*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+    readers do not read off random characters that represent icons */
+.icon-glass:before              { content: "\f000"; }
+.icon-music:before              { content: "\f001"; }
+.icon-search:before             { content: "\f002"; }
+.icon-envelope:before           { content: "\f003"; }
+.icon-heart:before              { content: "\f004"; }
+.icon-star:before               { content: "\f005"; }
+.icon-star-empty:before         { content: "\f006"; }
+.icon-user:before               { content: "\f007"; }
+.icon-film:before               { content: "\f008"; }
+.icon-th-large:before           { content: "\f009"; }
+.icon-th:before                 { content: "\f00a"; }
+.icon-th-list:before            { content: "\f00b"; }
+.icon-ok:before                 { content: "\f00c"; }
+.icon-remove:before             { content: "\f00d"; }
+.icon-zoom-in:before            { content: "\f00e"; }
+
+.icon-zoom-out:before           { content: "\f010"; }
+.icon-off:before                { content: "\f011"; }
+.icon-signal:before             { content: "\f012"; }
+.icon-cog:before                { content: "\f013"; }
+.icon-trash:before              { content: "\f014"; }
+.icon-home:before               { content: "\f015"; }
+.icon-file:before               { content: "\f016"; }
+.icon-time:before               { content: "\f017"; }
+.icon-road:before               { content: "\f018"; }
+.icon-download-alt:before       { content: "\f019"; }
+.icon-download:before           { content: "\f01a"; }
+.icon-upload:before             { content: "\f01b"; }
+.icon-inbox:before              { content: "\f01c"; }
+.icon-play-circle:before        { content: "\f01d"; }
+.icon-repeat:before             { content: "\f01e"; }
+
+/* \f020 is not a valid unicode character. all shifted one down */
+.icon-refresh:before            { content: "\f021"; }
+.icon-list-alt:before           { content: "\f022"; }
+.icon-lock:before               { content: "\f023"; }
+.icon-flag:before               { content: "\f024"; }
+.icon-headphones:before         { content: "\f025"; }
+.icon-volume-off:before         { content: "\f026"; }
+.icon-volume-down:before        { content: "\f027"; }
+.icon-volume-up:before          { content: "\f028"; }
+.icon-qrcode:before             { content: "\f029"; }
+.icon-barcode:before            { content: "\f02a"; }
+.icon-tag:before                { content: "\f02b"; }
+.icon-tags:before               { content: "\f02c"; }
+.icon-book:before               { content: "\f02d"; }
+.icon-bookmark:before           { content: "\f02e"; }
+.icon-print:before              { content: "\f02f"; }
+
+.icon-camera:before             { content: "\f030"; }
+.icon-font:before               { content: "\f031"; }
+.icon-bold:before               { content: "\f032"; }
+.icon-italic:before             { content: "\f033"; }
+.icon-text-height:before        { content: "\f034"; }
+.icon-text-width:before         { content: "\f035"; }
+.icon-align-left:before         { content: "\f036"; }
+.icon-align-center:before       { content: "\f037"; }
+.icon-align-right:before        { content: "\f038"; }
+.icon-align-justify:before      { content: "\f039"; }
+.icon-list:before               { content: "\f03a"; }
+.icon-indent-left:before        { content: "\f03b"; }
+.icon-indent-right:before       { content: "\f03c"; }
+.icon-facetime-video:before     { content: "\f03d"; }
+.icon-picture:before            { content: "\f03e"; }
+
+.icon-pencil:before             { content: "\f040"; }
+.icon-map-marker:before         { content: "\f041"; }
+.icon-adjust:before             { content: "\f042"; }
+.icon-tint:before               { content: "\f043"; }
+.icon-edit:before               { content: "\f044"; }
+.icon-share:before              { content: "\f045"; }
+.icon-check:before              { content: "\f046"; }
+.icon-move:before               { content: "\f047"; }
+.icon-step-backward:before      { content: "\f048"; }
+.icon-fast-backward:before      { content: "\f049"; }
+.icon-backward:before           { content: "\f04a"; }
+.icon-play:before               { content: "\f04b"; }
+.icon-pause:before              { content: "\f04c"; }
+.icon-stop:before               { content: "\f04d"; }
+.icon-forward:before            { content: "\f04e"; }
+
+.icon-fast-forward:before       { content: "\f050"; }
+.icon-step-forward:before       { content: "\f051"; }
+.icon-eject:before              { content: "\f052"; }
+.icon-chevron-left:before       { content: "\f053"; }
+.icon-chevron-right:before      { content: "\f054"; }
+.icon-plus-sign:before          { content: "\f055"; }
+.icon-minus-sign:before         { content: "\f056"; }
+.icon-remove-sign:before        { content: "\f057"; }
+.icon-ok-sign:before            { content: "\f058"; }
+.icon-question-sign:before      { content: "\f059"; }
+.icon-info-sign:before          { content: "\f05a"; }
+.icon-screenshot:before         { content: "\f05b"; }
+.icon-remove-circle:before      { content: "\f05c"; }
+.icon-ok-circle:before          { content: "\f05d"; }
+.icon-ban-circle:before         { content: "\f05e"; }
+
+.icon-arrow-left:before         { content: "\f060"; }
+.icon-arrow-right:before        { content: "\f061"; }
+.icon-arrow-up:before           { content: "\f062"; }
+.icon-arrow-down:before         { content: "\f063"; }
+.icon-share-alt:before          { content: "\f064"; }
+.icon-resize-full:before        { content: "\f065"; }
+.icon-resize-small:before       { content: "\f066"; }
+.icon-plus:before               { content: "\f067"; }
+.icon-minus:before              { content: "\f068"; }
+.icon-asterisk:before           { content: "\f069"; }
+.icon-exclamation-sign:before   { content: "\f06a"; }
+.icon-gift:before               { content: "\f06b"; }
+.icon-leaf:before               { content: "\f06c"; }
+.icon-fire:before               { content: "\f06d"; }
+.icon-eye-open:before           { content: "\f06e"; }
+
+.icon-eye-close:before          { content: "\f070"; }
+.icon-warning-sign:before       { content: "\f071"; }
+.icon-plane:before              { content: "\f072"; }
+.icon-calendar:before           { content: "\f073"; }
+.icon-random:before             { content: "\f074"; }
+.icon-comment:before            { content: "\f075"; }
+.icon-magnet:before             { content: "\f076"; }
+.icon-chevron-up:before         { content: "\f077"; }
+.icon-chevron-down:before       { content: "\f078"; }
+.icon-retweet:before            { content: "\f079"; }
+.icon-shopping-cart:before      { content: "\f07a"; }
+.icon-folder-close:before       { content: "\f07b"; }
+.icon-folder-open:before        { content: "\f07c"; }
+.icon-resize-vertical:before    { content: "\f07d"; }
+.icon-resize-horizontal:before  { content: "\f07e"; }
+
+.icon-bar-chart:before          { content: "\f080"; }
+.icon-twitter-sign:before       { content: "\f081"; }
+.icon-facebook-sign:before      { content: "\f082"; }
+.icon-camera-retro:before       { content: "\f083"; }
+.icon-key:before                { content: "\f084"; }
+.icon-cogs:before               { content: "\f085"; }
+.icon-comments:before           { content: "\f086"; }
+.icon-thumbs-up:before          { content: "\f087"; }
+.icon-thumbs-down:before        { content: "\f088"; }
+.icon-star-half:before          { content: "\f089"; }
+.icon-heart-empty:before        { content: "\f08a"; }
+.icon-signout:before            { content: "\f08b"; }
+.icon-linkedin-sign:before      { content: "\f08c"; }
+.icon-pushpin:before            { content: "\f08d"; }
+.icon-external-link:before      { content: "\f08e"; }
+
+.icon-signin:before             { content: "\f090"; }
+.icon-trophy:before             { content: "\f091"; }
+.icon-github-sign:before        { content: "\f092"; }
+.icon-upload-alt:before         { content: "\f093"; }
+.icon-lemon:before              { content: "\f094"; }
diff --git a/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.eot b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.eot
new file mode 100755
index 0000000000000000000000000000000000000000..3f669a7eb607c214d66477c7a2c5a454c64c1a98
GIT binary patch
literal 42272
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
ZZDOn%SdGG=iN>m>Yu)%nH2{aA{{kWTCYJyJ

literal 0
HcmV?d00001

diff --git a/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svg b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svg
new file mode 100755
index 0000000000..73c0ad9a91
--- /dev/null
+++ b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : Dave Gandy
+Foundry     : Fort Awesome
+</metadata>
+<defs>
+<font id="FontAwesomeRegular" horiz-adv-x="900" >
+<font-face units-per-em="1000" ascent="750" descent="-250" />
+<missing-glyph horiz-adv-x="250" />
+<glyph unicode="&#xd;" horiz-adv-x="250" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="0" />
+<glyph unicode=" "  horiz-adv-x="250" />
+<glyph unicode="&#x09;" horiz-adv-x="250" />
+<glyph unicode="&#xa0;" horiz-adv-x="250" />
+<glyph unicode="&#x2000;" horiz-adv-x="375" />
+<glyph unicode="&#x2001;" horiz-adv-x="751" />
+<glyph unicode="&#x2002;" horiz-adv-x="375" />
+<glyph unicode="&#x2003;" horiz-adv-x="751" />
+<glyph unicode="&#x2004;" horiz-adv-x="250" />
+<glyph unicode="&#x2005;" horiz-adv-x="187" />
+<glyph unicode="&#x2006;" horiz-adv-x="125" />
+<glyph unicode="&#x2007;" horiz-adv-x="125" />
+<glyph unicode="&#x2008;" horiz-adv-x="93" />
+<glyph unicode="&#x2009;" horiz-adv-x="150" />
+<glyph unicode="&#x200a;" horiz-adv-x="41" />
+<glyph unicode="&#x202f;" horiz-adv-x="150" />
+<glyph unicode="&#x205f;" horiz-adv-x="187" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0v0v0v0v0z" />
+<glyph unicode="&#xf000;" horiz-adv-x="750" d="M3 727q10 23 34 23h675q25 0 35 -23t-8 -41l-298 -298v-313h121q16 0 27 -11t11 -26q0 -16 -11 -27t-27 -11h-375q-15 0 -26 11t-11 27q0 15 11 26t26 11h122v313l-298 298q-18 18 -8 41z" />
+<glyph unicode="&#xf001;" horiz-adv-x="688" d="M0 112q0 24 11 44.5t30 35.5t45 24t55 9q13 0 24.5 -2t22.5 -5v388l500 144v-525q0 -23 -11 -43.5t-30 -36t-45 -24.5t-55 -9t-54.5 9t-44.5 24.5t-30 36t-11 43.5t11 43.5t30 35.5t44.5 24t54.5 9q24 0 47 -6v248l-312 -90v-377q0 -23 -11 -43.5t-30 -35.5t-45 -24 t-55 -9t-55 9t-45 24t-30 35.5t-11 43.5z" />
+<glyph unicode="&#xf002;" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM194 437q0 25 9.5 46.5t25.5 37.5t37.5 25.5t46.5 9.5q10 0 16.5 -7t6.5 -17t-6.5 -16.5t-16.5 -6.5 q-30 0 -51 -21t-21 -51q0 -10 -6.5 -16.5t-16.5 -6.5t-17 6.5t-7 16.5z" />
+<glyph unicode="&#xf003;" d="M0 56v587v32v19q0 23 16.5 39.5t39.5 16.5h19h750h19q23 0 39.5 -16.5t16.5 -39.5v-19v-30v-589q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v416q-15 -15 -28 -24q-29 -21 -61 -46t-64 -49q-19 -14 -36.5 -28t-32.5 -25q-3 -2 -6 -4.5 t-7 -5.5q-14 -11 -29.5 -22.5t-33.5 -22t-37.5 -17t-40.5 -6.5q-20 0 -39.5 6.5t-37 17t-33.5 22t-29 22.5q-4 3 -7 5.5t-6 4.5q-15 11 -32.5 25t-36.5 28q-32 24 -64 49t-61 46q-13 9 -28 24v-416zM75 643q0 -14 6 -30t16.5 -32t23 -30t26.5 -24q23 -17 49 -37l52 -38 q26 -20 50 -39t44 -34l22 -17q14 -11 28.5 -21t29 -17.5t27.5 -7.5h1h1q13 0 27.5 7.5t29 17.5t28.5 21l22 17q20 15 44 34t50 39l52 38q26 20 49 37q13 10 26 24t23.5 30t16.5 32t6 30v32h-750v-32z" />
+<glyph unicode="&#xf004;" horiz-adv-x="846" d="M0 519q0 64 20 108t52.5 71.5t73.5 39.5t83 12q30 0 59 -10t54 -25t45.5 -32.5t35.5 -32.5q15 15 35.5 32.5t45.5 32.5t54 25t59 10q42 0 83 -12t73.5 -39.5t52.5 -71.5t20 -108q0 -44 -16.5 -83.5t-36 -69.5t-37 -48t-18.5 -19l-289 -288q-11 -11 -26 -11t-26 11 l-290 288q-1 1 -18 19t-36.5 48t-36 69.5t-16.5 83.5z" />
+<glyph unicode="&#xf005;" horiz-adv-x="787" d="M0.5 465q4.5 13 25.5 16l238 35l106 215q10 20 23.5 20t22.5 -20l107 -215l237 -35q22 -3 26 -16t-11 -28l-172 -168l40 -236q4 -22 -7 -30t-30 3l-213 111l-212 -111q-20 -11 -31 -3t-7 30l41 236l-172 168q-16 15 -11.5 28z" />
+<glyph unicode="&#xf006;" horiz-adv-x="787" d="M0.5 465q4.5 13 25.5 16l238 34l106 216q9 19 23 19t23 -19l107 -216l237 -34q22 -3 26 -16t-11 -28l-172 -168l40 -236q3 -16 -2 -24.5t-16 -8.5q-7 0 -19 5l-213 112l-212 -112q-12 -5 -19 -5q-11 0 -16 8.5t-3 24.5l41 236l-172 168q-16 15 -11.5 28zM136 421l100 -98 l29 -27l-7 -39l-24 -139l124 66l35 18l35 -18l124 -66l-23 139l-7 39l28 27l101 98l-139 20l-39 6l-18 35l-62 126l-62 -126l-17 -35l-39 -6z" />
+<glyph unicode="&#xf007;" d="M0 34v7q11 19 19.5 40t17.5 42t19.5 40t25.5 34q7 7 15.5 13.5t19.5 10.5t23.5 5t25.5 3q37 6 77.5 12.5t78.5 12.5q4 17 7 34.5t8 33.5q-8 11 -16 21.5t-15.5 23t-13.5 28.5t-9 37q-2 11 -5 32.5t-6 44t-5.5 41t-2.5 22.5q0 25 10.5 56t33 58t58 45.5t84.5 18.5 t84.5 -18.5t58 -45.5t33 -58t10.5 -56q0 -4 -2.5 -22.5t-5.5 -41t-6 -44t-5 -32.5q-3 -21 -9 -37t-13.5 -28.5t-16 -23t-15.5 -21.5q5 -16 8 -33.5t7 -34.5q38 -6 78.5 -12.5t77.5 -12.5q13 -2 25.5 -3t23.5 -5t19.5 -10.5t15.5 -13.5q15 -15 25.5 -34t19.5 -40t17.5 -42 t19.5 -40v-7q-14 -8 -26.5 -18.5t-30.5 -15.5h-786q-18 5 -30.5 15.5t-26.5 18.5z" />
+<glyph unicode="&#xf008;" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM56 75q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5 v-75zM56 250q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM56 425q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM56 600 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM225 75q0 -8 5.5 -13.5t13.5 -5.5h412q8 0 13.5 5.5t5.5 13.5v250q0 8 -5.5 13.5t-13.5 5.5h-412q-8 0 -13.5 -5.5t-5.5 -13.5v-250zM225 425 q0 -8 5.5 -13.5t13.5 -5.5h412q8 0 13.5 5.5t5.5 13.5v250q0 8 -5.5 13.5t-13.5 5.5h-412q-8 0 -13.5 -5.5t-5.5 -13.5v-250zM731 75q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 250 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 425q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75zM731 600 q0 -8 5.5 -13.5t13.5 -5.5h75q8 0 13.5 5.5t5.5 13.5v75q0 8 -5.5 13.5t-13.5 5.5h-75q-8 0 -13.5 -5.5t-5.5 -13.5v-75z" />
+<glyph unicode="&#xf009;" d="M0 38v262q0 16 11 27t27 11h337q16 0 27 -11t11 -27v-262q0 -16 -11 -27t-27 -11h-337q-16 0 -27 11t-11 27zM0 450v263q0 15 11 26t27 11h337q16 0 27 -11t11 -26v-263q0 -16 -11 -26.5t-27 -10.5h-337q-16 0 -27 10.5t-11 26.5zM488 38v262q0 16 10.5 27t26.5 11h338 q15 0 26 -11t11 -27v-262q0 -16 -11 -27t-26 -11h-338q-16 0 -26.5 11t-10.5 27zM488 450v263q0 15 10.5 26t26.5 11h338q15 0 26 -11t11 -26v-263q0 -16 -11 -26.5t-26 -10.5h-338q-16 0 -26.5 10.5t-10.5 26.5z" />
+<glyph unicode="&#xf00a;" d="M0 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM0 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM0 580v133q0 15 11 26t27 11 h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110 q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM325 580v133q0 15 11 26t27 11h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM650 38v132q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-175 q-16 0 -27 11t-11 27zM650 320v110q0 16 11 26.5t27 10.5h175q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27zM650 580v133q0 15 11 26t27 11h175q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-175q-16 0 -27 11t-11 27z" />
+<glyph unicode="&#xf00b;" d="M0 38v132q0 16 11 26.5t27 10.5h145q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM0 320v110q0 16 11 26.5t27 10.5h145q15 0 26 -10.5t11 -26.5v-110q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM0 580v133q0 15 11 26t27 11 h145q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-145q-16 0 -27 11t-11 27zM295 38v132q0 16 11 26.5t27 10.5h530q15 0 26 -10.5t11 -26.5v-132q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27zM295 320v110q0 16 11 26.5t27 10.5h530q15 0 26 -10.5t11 -26.5v-110 q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27zM295 580v133q0 15 11 26t27 11h530q15 0 26 -11t11 -26v-133q0 -16 -11 -27t-26 -11h-530q-16 0 -27 11t-11 27z" />
+<glyph unicode="&#xf00c;" d="M0 312.5q0 16.5 11 27.5l85 85q11 11 27.5 11t27.5 -11l178 -178q11 -11 27.5 -11t27.5 11l364 364q11 11 27.5 11t27.5 -11l85 -85q11 -11 11 -27.5t-11 -27.5l-444 -444q-11 -11 -30.5 -19t-35.5 -8h-43q-17 0 -36.5 8t-30.5 19l-257 258q-11 11 -11 27.5z" />
+<glyph unicode="&#xf00d;" horiz-adv-x="750" d="M0 94q0 19 14 33l248 249l-248 244q-14 14 -14 33t14 33l49 49q14 14 33 14t33 -14l246 -246l246 246q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-248 -249l248 -244q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-246 247l-247 -247 q-14 -14 -32.5 -14t-32.5 14l-49 49q-14 14 -14 33z" />
+<glyph unicode="&#xf00e;" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM188 422v31q0 7 4.5 11.5t10.5 4.5h78v78q0 6 4.5 10.5t11.5 4.5h31q7 0 11.5 -4.5t4.5 -10.5v-78h78 q16 0 16 -16v-31q0 -16 -16 -16h-78v-78q0 -16 -16 -16h-31q-16 0 -16 16v78h-78q-6 0 -10.5 4.5t-4.5 11.5z" />
+<glyph unicode="&#xf010;" horiz-adv-x="750" d="M0 437q0 65 24.5 122t67 99.5t99.5 67t122 24.5q64 0 121 -24.5t99.5 -67t67 -99.5t24.5 -122q0 -48 -13.5 -91t-38.5 -81l168 -167q9 -10 9 -23t-9 -22l-44 -44q-9 -9 -22 -9t-22 9l-168 168q-38 -25 -81 -38.5t-91 -13.5q-65 0 -122 24.5t-99.5 67t-67 99t-24.5 121.5z M125 437q0 -39 14.5 -73t40 -59.5t60 -40t73.5 -14.5t73 14.5t59.5 40t40 59.5t14.5 73t-14.5 73t-40 59.5t-59.5 40.5t-73 15t-73.5 -15t-60 -40.5t-40 -59.5t-14.5 -73zM188 422v31q0 7 4.5 11.5t10.5 4.5h219q16 0 16 -16v-31q0 -16 -16 -16h-219q-6 0 -10.5 4.5 t-4.5 11.5z" />
+<glyph unicode="&#xf011;" horiz-adv-x="713" d="M0 356q0 89 41 166.5t115 128.5q6 3 14 3q7 -1 12 -8l42 -62q10 -16 -5 -26q-51 -35 -78.5 -88t-27.5 -114q0 -50 19 -94.5t52 -77.5t77.5 -52t94.5 -19q51 0 95.5 19t77.5 52t52 77.5t19 94.5q0 61 -28 114t-79 88q-6 3 -8 12q-1 6 3 14l43 62q5 6 12 7.5t14 -2.5 q73 -51 114.5 -128.5t41.5 -166.5q0 -74 -28 -138.5t-76.5 -113t-113.5 -76.5t-139 -28t-138.5 28t-113 76.5t-76.5 113t-28 138.5zM300 394v337q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-337q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19z" />
+<glyph unicode="&#xf012;" d="M0 19v127q0 8 5.5 13.5t13.5 5.5h94q8 0 13 -5.5t5 -13.5v-127q0 -8 -5 -13.5t-13 -5.5h-94q-19 0 -19 19zM192 19v212q0 8 5.5 13.5t13.5 5.5h94q8 0 13 -5.5t5 -13.5v-212q0 -8 -5 -13.5t-13 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5zM384 19v330q0 8 5.5 13.5t13.5 5.5h94 q8 0 13.5 -5.5t5.5 -13.5v-330q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5zM577 19v486q0 8 5 13.5t13 5.5h94q8 0 13.5 -5.5t5.5 -13.5v-486q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13 5.5t-5 13.5zM769 19v712q0 19 19 19h93q19 0 19 -19v-712 q0 -19 -19 -19h-93q-19 0 -19 19z" />
+<glyph unicode="&#xf013;" horiz-adv-x="748" d="M0 320v111q0 7 7 9q19 5 39.5 8t40.5 5q4 0 8 0.5t9 1.5q5 14 10.5 27.5t12.5 27.5q-12 17 -26.5 36.5t-30.5 37.5q-5 5 0 12q19 23 40 44t44 40q5 5 12 0q11 -11 22.5 -20t23.5 -17q7 -5 14 -10.5t14 -10.5q26 14 55 23q3 28 6 51.5t8 45.5q2 8 9 8h111q9 0 9 -8 q4 -19 6.5 -38t5.5 -39l3 -20q14 -5 27.5 -10t26.5 -13q7 5 13 9.5t12 9.5q13 10 26 19t25 20q6 6 12 -1l11 -11q5 -5 11 -10q15 -14 30 -29.5t29 -32.5q4 -6 0 -12q-13 -15 -26 -32.5t-30 -40.5q15 -29 24 -58q12 -3 24.5 -4.5t25.5 -3.5q11 -2 23.5 -3.5t23.5 -3.5 q7 -2 7 -9v-111q0 -7 -7 -9q-18 -5 -38 -7.5t-40 -4.5q-5 -1 -9.5 -1.5t-9.5 -1.5q-5 -14 -10.5 -27.5t-12.5 -27.5q12 -17 26.5 -36.5t30.5 -37.5q5 -5 0 -12q-38 -47 -84 -84q-5 -5 -12 0q-11 11 -22.5 20t-23.5 17q-7 5 -14 10.5t-14 10.5q-26 -14 -55 -23 q-2 -23 -5.5 -48t-9.5 -49q-2 -8 -9 -8h-111q-7 0 -9 8q-3 19 -5.5 38t-5.5 39l-3 20q-14 5 -27.5 10t-26.5 13q-6 -5 -12.5 -9.5t-12.5 -9.5q-26 -18 -51 -39q-6 -6 -12 1q-5 5 -11 10.5t-11 10.5q-15 14 -30 29.5t-29 32.5q-5 6 0 12q15 18 29 37t27 36q-15 29 -24 58 q-12 3 -24.5 4.5t-24.5 3.5t-24.5 3.5t-23.5 3.5q-7 2 -7 9zM261 375q0 -24 9 -44.5t24.5 -35.5t36 -24t43.5 -9t43.5 9t35.5 24t24 35.5t9 44.5q0 23 -9 43.5t-24 35.5t-35.5 24t-43.5 9t-43.5 -9t-36 -24t-24.5 -35.5t-9 -43.5z" />
+<glyph unicode="&#xf014;" horiz-adv-x="648" d="M0 582q0 8 0.5 16t0.5 17q11 6 32.5 10t47 7t52.5 5t49 3q-2 16 -1 32t7 33q1 4 6 11.5t18.5 15t40 13t71.5 5.5t71.5 -5.5t40 -13t18 -15.5t6.5 -12q6 -17 7 -32.5t-1 -31.5q22 -1 49 -3t53 -5t47 -7t32 -10q1 -9 1 -17v-16v-16q0 -8 -1 -17q-10 -6 -30.5 -10t-45.5 -7 t-51 -5t-48 -3t-37 -1.5t-16 -0.5l-95 -1h-13h-28q-19 0 -54 1q-2 0 -16.5 0.5t-36.5 1.5t-48 3t-51 5t-45.5 7t-30.5 10q0 9 -0.5 17t-0.5 16zM67 484q41 -5 84.5 -7.5t75.5 -3.5q9 -1 23 -1h74h73q14 0 23 1q33 1 76.5 3.5t84.5 7.5q-5 -76 -8 -154.5t-7 -154.5 q-1 -19 -1.5 -42.5t-2 -45.5t-6 -40.5t-14.5 -28.5q-12 -11 -42 -14.5t-58 -3.5h-236q-29 0 -58.5 3.5t-41.5 14.5q-10 10 -14.5 28.5t-6 40.5t-2 45.5t-1.5 42.5q-4 76 -7.5 154.5t-7.5 154.5zM147 383q1 -15 1 -28t1 -22q0 -11 1 -19q2 -34 3.5 -68t3.5 -67q1 -8 1 -17 v-20v-12q0 -6 0.5 -14t1.5 -19q1 -8 9.5 -14t13.5 -6q5 -1 10 -1t8 -1h11q5 0 5 19v286q0 8 -5.5 13.5t-13.5 5.5l-33 2q-8 0 -13 -5t-5 -13zM255.5 657q0.5 -6 1.5 -15q9 1 20 1h47l67 -1q1 9 1.5 15t-0.5 11q-11 3 -29.5 4.5t-38.5 1.5t-38.5 -1.5t-29.5 -4.5 q-1 -5 -0.5 -11zM292 94q0 -8 5 -13.5t13 -5.5h28q8 0 13.5 5.5t5.5 13.5v285q0 8 -11 13t-14 5h-15q-3 0 -14 -5t-11 -13v-285zM432 94q0 -19 4 -19h11q3 1 13 1.5t15 0.5q5 1 8.5 6.5t4.5 13.5q0 11 0.5 19t0.5 14q0 7 1 12v20q0 9 1 17q2 33 3 66.5t3 67.5q0 9 1 20 q1 9 1.5 22t1.5 28q0 8 -5 13t-13 5l-33 -2q-8 0 -13 -5.5t-5 -13.5v-286z" />
+<glyph unicode="&#xf015;" d="M1 384.5q3 11.5 13 19.5l412 338q11 8 24 8t24 -8l126 -104v58q0 19 19 19h112q19 0 19 -19v-180l136 -112q10 -8 13 -19.5t-1 -22.5q-10 -24 -36 -24h-75v-300q0 -16 -10.5 -27t-26.5 -11h-206v225h-188v-225h-206q-16 0 -27 11t-11 27v300h-75q-25 0 -35 24 q-4 11 -1 22.5z" />
+<glyph unicode="&#xf016;" horiz-adv-x="600" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h219v-269q0 -23 16.5 -39.5t39.5 -16.5h269v-369q0 -23 -16.5 -39.5t-39.5 -16.5h-488q-23 0 -39.5 16.5t-16.5 39.5zM331 481v266h3l263 -263v-3h-266z" />
+<glyph unicode="&#xf017;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM319 375v150q0 23 16.5 39.5t39.5 16.5t39.5 -16.5t16.5 -39.5v-127l90 -89q17 -17 17 -40t-17 -40q-8 -8 -18.5 -12t-21.5 -4t-21.5 4t-18.5 12l-106 106q-1 1 -1 2t-1 2 q-7 7 -10 14q-4 9 -4 22z" />
+<glyph unicode="&#xf018;" d="M1 17l290 716q3 7 10.5 12t15.5 5h95l-4 -83h84l-4 83h95q8 0 15.5 -5t10.5 -12l290 -716q3 -7 -0.5 -12t-11.5 -5h-361l-13 250h-126l-13 -250h-361q-8 0 -11.5 5t-0.5 12zM394 389h112l-10 202h-92z" />
+<glyph unicode="&#xf019;" d="M0 19v300q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-169h600v169q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-300q0 -19 -19 -19h-862q-19 0 -19 19zM169 461q3 8 19 8h150v244q0 15 10.5 26t26.5 11h150q16 0 27 -11t11 -26v-244h150q15 0 18 -8 t-8 -19l-246 -247q-11 -11 -27 -11t-27 11l-246 247q-11 11 -8 19z" />
+<glyph unicode="&#xf01a;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 83.5t-84 56t-102 20.5t-102 -20.5t-83.5 -56t-56 -83.5t-20.5 -102zM206 349q4 10 24 10h79v185q0 8 5.5 13.5t13.5 5.5h94q8 0 13.5 -5.5t5.5 -13.5v-185h79q20 0 24 -10t-10 -24l-136 -136q-9 -9 -23 -9q-13 0 -23 9l-136 136q-14 14 -10 24z " />
+<glyph unicode="&#xf01b;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 83.5t-84 56t-102 20.5t-102 -20.5t-83.5 -56t-56 -83.5t-20.5 -102zM206 401q-4 10 10 24l136 136q10 9 23 9q12 0 23 -9l136 -136q14 -14 10 -24t-24 -10h-79v-185q0 -8 -5.5 -13.5t-13.5 -5.5h-94q-8 0 -13.5 5.5t-5.5 13.5v185h-79 q-20 0 -24 10z" />
+<glyph unicode="&#xf01c;" d="M0 38v282q0 16 4.5 37t10.5 35l139 324q6 14 21.5 24t30.5 10h488q15 0 30.5 -10t21.5 -24l139 -324q6 -14 10.5 -35t4.5 -37v-282q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM116 339h189l56 -113h187l57 113h179q-1 2 -1 4.5t-1 4.5l-125 290h-414l-125 -291 q-1 -1 -1 -3.5t-1 -4.5z" />
+<glyph unicode="&#xf01d;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM258 220v310q0 9 8 14q8 4 15 0l269 -156q8 -3 8 -13t-8 -13l-269 -156q-4 -2 -8 -2q-3 0 -7 2q-8 5 -8 14z" />
+<glyph unicode="&#xf01e;" horiz-adv-x="747" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5q66 0 127.5 -23t112.5 -65l76 76q16 16 27 11.5t11 -27.5v-217q0 -15 -11 -26q-10 -10 -25 -10l-217 -1q-23 0 -27.5 11.5t11.5 27.5l75 75q-35 26 -75.5 41t-84.5 15q-54 0 -102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102 t20.5 -102t56 -83.5t83.5 -56t102 -20.5q49 0 93.5 17t79.5 47.5t58 72t29 90.5q1 6 7 12q7 5 14 4l75 -10q8 -1 12.5 -7t3.5 -14q-9 -69 -42 -128.5t-83 -103t-113.5 -68.5t-133.5 -25q-78 0 -146 29.5t-119 80.5t-80.5 119t-29.5 146z" />
+<glyph unicode="&#xf021;" d="M3 160l70 206q4 13 18 20q15 6 28 2l206 -70q21 -7 21.5 -19t-19.5 -22l-95 -47q24 -36 57.5 -63t75.5 -41q51 -18 103 -13.5t97.5 26.5t80.5 61t53 90q2 8 8.5 11t14.5 1l71 -24q17 -7 12 -24q-25 -74 -75 -129t-114.5 -86.5t-139 -37.5t-147.5 19q-63 21 -113.5 62 t-84.5 98l-97 -47q-20 -11 -29.5 -2.5t-1.5 29.5zM95 495q25 73 75 128.5t114.5 87.5t138.5 38t148 -19q63 -22 113 -63t85 -98l97 48q20 10 29.5 1.5t1.5 -29.5l-70 -205q-4 -14 -18 -21q-15 -6 -28 -2l-206 70q-21 7 -21.5 19t19.5 22l95 47q-24 36 -58 63t-76 41 q-51 18 -103 13.5t-97 -26.5t-80 -61t-53 -90q-2 -8 -9 -11t-14 -1l-71 25q-8 2 -11 9t-1 14z" />
+<glyph unicode="&#xf022;" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v525h-750v-525zM150 169v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75 q-19 0 -19 19zM150 319v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19zM150 469v37q0 19 19 19h75q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-75q-19 0 -19 19zM338 169v37q0 8 5 13.5t13 5.5h375 q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5zM338 319v37q0 8 5 13.5t13 5.5h375q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5zM338 469v37q0 8 5 13.5t13 5.5h375q19 0 19 -19v-37q0 -19 -19 -19h-375q-8 0 -13 5.5t-5 13.5z" />
+<glyph unicode="&#xf023;" horiz-adv-x="750" d="M0 56v300q0 23 16.5 40t39.5 17h57v85q0 52 20.5 98t56 80t83.5 54t102 20t102 -20t84 -54t56.5 -80t20.5 -98v-85h56q23 0 39.5 -17t16.5 -40v-300q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5zM225 413h300v85q0 29 -12 54.5t-32 44.5t-47.5 30 t-58.5 11t-58.5 -11t-47.5 -30t-32 -44.5t-12 -54.5v-85z" />
+<glyph unicode="&#xf024;" d="M0 675q0 31 22 53t53 22t53 -22t22 -53q0 -20 -10 -36.5t-27 -27.5v-592q0 -8 -5.5 -13.5t-13.5 -5.5h-38q-8 0 -13 5.5t-5 13.5v592q-17 11 -27.5 27.5t-10.5 36.5zM150 203v364q0 16 9.5 32t23.5 24q51 27 92 42t70 22q34 8 61 9q33 0 60.5 -5.5t52.5 -14.5t48.5 -21 t48.5 -25q31 -14 71 -16q34 -2 80 7.5t101 42.5q14 8 23 3t9 -21v-365q0 -15 -9 -31.5t-23 -24.5q-55 -33 -101 -42.5t-80 -7.5q-40 2 -71 16q-25 13 -48.5 25t-48.5 21t-52.5 14.5t-60.5 5.5q-27 -1 -61 -9q-29 -7 -70 -22t-92 -43q-14 -8 -23.5 -2t-9.5 22z" />
+<glyph unicode="&#xf025;" d="M0 356q0 54 18.5 104.5t50 94t75 79.5t93.5 62t104.5 40t108.5 14t108.5 -14t104.5 -40t93.5 -62t75 -79.5t50 -94t18.5 -104.5q0 -87 -36 -165l-13 -28l-81 -12q-13 -49 -52.5 -81t-92.5 -32v-19q0 -8 -5.5 -13.5t-13.5 -5.5h-38q-8 0 -13 5.5t-5 13.5v337q0 8 5 13.5 t13 5.5h38q8 0 13.5 -5.5t5.5 -13.5v-18q42 0 75.5 -21t53.5 -54l19 2q15 43 15 91q0 58 -31 109.5t-80 89.5t-109 60.5t-118 22.5t-118 -22.5t-108.5 -60.5t-79.5 -89.5t-31 -109.5q0 -46 14 -91l19 -2q20 33 53.5 54t75.5 21v18q0 8 5.5 13.5t13.5 5.5h38q8 0 13 -5.5 t5 -13.5v-337q0 -8 -5 -13.5t-13 -5.5h-38q-8 0 -13.5 5.5t-5.5 13.5v19q-53 0 -92.5 32t-52.5 81l-81 12l-13 28q-36 78 -36 165z" />
+<glyph unicode="&#xf026;" horiz-adv-x="425" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5z" />
+<glyph unicode="&#xf027;" horiz-adv-x="600" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5zM482 205q-4 15 4 29q39 67 39 141q0 73 -39 141q-8 14 -4 29t18 23t28.5 4t22.5 -18q49 -87 49 -179t-49 -179 q-11 -19 -33 -19q-8 0 -18 5q-14 8 -18 23z" />
+<glyph unicode="&#xf028;" d="M0 286v178q0 8 5.5 13.5t13.5 5.5h196l153 153q23 23 39.5 16t16.5 -39v-476q0 -32 -16.5 -39t-39.5 16l-153 153h-196q-8 0 -13.5 5.5t-5.5 13.5zM482 205q-4 15 4 29q39 67 39 141q0 73 -39 141q-8 14 -4 29t18 23t28.5 4t22.5 -18q49 -87 49 -179t-49 -179 q-11 -19 -33 -19q-8 0 -18 5q-14 8 -18 23zM603 117q-3 15 5 29q67 105 67 229t-67 229q-8 14 -5 29t17 23t29 5t23 -17q38 -61 58 -129t20 -140t-20 -140t-58 -129q-5 -9 -14 -13.5t-18 -4.5q-11 0 -20 6q-14 8 -17 23zM723.5 30q-2.5 15 5.5 28q48 72 72 152t24 165 t-24 165t-72 152q-8 13 -5.5 28t16.5 24q13 8 28 5t24 -16q54 -81 81 -171.5t27 -186.5t-27 -186.5t-81 -171.5q-12 -17 -32 -17q-11 0 -20 6q-14 9 -16.5 24z" />
+<glyph unicode="&#xf029;" horiz-adv-x="750" d="M0 0v341h341v-341h-341zM0 409v341h341v-341h-341zM68 68h205v205h-205v-205zM68 477h205v205h-205v-205zM136 136v69h69v-69h-69zM136 545v68h69v-68h-69zM409 0v341h204v-68h69v68h68v-205h-205v68h-68v-204h-68zM409 409v341h341v-341h-341zM477 477h205v205h-205 v-205zM545 0v68h68v-68h-68zM545 545v68h68v-68h-68zM682 0v68h68v-68h-68z" />
+<glyph unicode="&#xf02a;" d="M0 0v750h75v-750h-75zM111 0v750h18v-750h-18zM174 0v750h57v-750h-57zM266 0v750h38v-750h-38zM349 0v750h37v-750h-37zM441 0v750h18v-750h-18zM495 0v750h75v-750h-75zM596 0v750h38v-750h-38zM688 0v750h19v-750h-19zM771 0v750h18v-750h-18zM825 0v750h75v-750h-75z " />
+<glyph unicode="&#xf02b;" horiz-adv-x="750" d="M0 474v218q0 24 17 41t41 17h218q24 0 53 -12t46 -29l358 -358q17 -17 17 -41t-17 -41l-252 -252q-17 -17 -41 -17t-41 17l-358 358q-17 17 -29 46t-12 53zM94 600q0 -23 16.5 -39.5t39.5 -16.5t39.5 16.5t16.5 39.5t-16.5 39.5t-39.5 16.5t-39.5 -16.5t-16.5 -39.5z" />
+<glyph unicode="&#xf02c;" horiz-adv-x="898" d="M0 475v217q0 24 17 41t41 17h217q24 0 53.5 -11.5t45.5 -29.5l321 -358q16 -17 16.5 -41t-16.5 -41l-252 -251q-17 -17 -41 -17.5t-41 17.5l-320 358q-16 18 -28.5 46.5t-12.5 52.5zM94 600q0 -23 16.5 -39.5t39.5 -16.5t39.5 16.5t16.5 39.5t-16.5 39.5t-39.5 16.5 t-39.5 -16.5t-16.5 -39.5zM379 749h83q24 0 53.5 -12t45.5 -29l321 -358q16 -18 16.5 -41.5t-16.5 -40.5l-252 -251q-17 -17 -41 -17.5t-41 17.5l-6 7l246 245q17 17 16.5 41t-16.5 41l-320 358q-15 16 -40.5 27t-48.5 13z" />
+<glyph unicode="&#xf02d;" horiz-adv-x="835" d="M5 152q1 8 2 15.5t2 16.5q0 5 -2 10t-1 10q1 8 7.5 15.5t12.5 17.5q11 18 22 44t16 45q2 8 -0.5 15t-0.5 13q2 8 8 13.5t10 11.5q5 9 10.5 20.5t10.5 24t8 24.5t4 20t-1 16t0 14q3 8 10 13t12 12q5 6 10.5 17t11 24t9.5 25.5t5 22.5q1 6 -2 12t-1 13t9 14.5t13 15.5 q8 12 14 28.5t14.5 30t22.5 21t38 0.5l-1 -2q15 5 26 5h381q38 0 58 -28q20 -26 9 -63l-138 -442q-9 -31 -38 -52.5t-62 -21.5h-436q-5 0 -10 -1t-9 -6q-6 -10 0 -27q8 -21 29.5 -37t42.5 -16h462q14 0 28 10.5t18 23.5l151 482q2 8 2.5 14.5t-0.5 13.5q20 -7 30 -21 q20 -26 9 -63l-138 -442q-9 -32 -38 -53t-62 -21h-462q-20 0 -39 7t-36 19t-30 28.5t-20 35.5q-12 33 -1 62zM244 469q-5 -19 13 -19h300q8 0 15 5.5t9 13.5l12 37q2 8 -1.5 13.5t-11.5 5.5h-300q-8 0 -15.5 -5.5t-9.5 -13.5zM278 581q-2 -8 1.5 -13t11.5 -5h300q8 0 15 5 t10 13l11 38q2 8 -1.5 13.5t-11.5 5.5h-300q-8 0 -15 -5.5t-10 -13.5z" />
+<glyph unicode="&#xf02e;" horiz-adv-x="600" d="M0 54v641q0 17 9 30.5t25 20.5q5 2 10 3t11 1h490q5 0 10.5 -1t10.5 -3q16 -7 25 -20.5t9 -30.5v-641q0 -17 -9 -30.5t-25 -19.5q-15 -7 -31.5 -3.5t-27.5 15.5l-207 207l-207 -207q-11 -12 -27.5 -15.5t-31.5 3.5q-16 7 -25 20t-9 30z" />
+<glyph unicode="&#xf02f;" d="M0 19v169q0 23 9 43.5t24.5 35.5t36 24t43.5 9h675q23 0 43.5 -9t35.5 -24t24 -35.5t9 -43.5v-169q0 -19 -19 -19h-862q-19 0 -19 19zM131 94q0 -8 5.5 -13t13.5 -5h600q8 0 13.5 5t5.5 13v19q0 8 -5.5 13.5t-13.5 5.5h-600q-8 0 -13.5 -5.5t-5.5 -13.5v-19zM150 356v357 q0 15 11 26t27 11h318v-187q0 -24 16.5 -40.5t39.5 -16.5h188v-150h-600zM562 563v187l188 -187h-188z" />
+<glyph unicode="&#xf030;" d="M0 56v525q0 23 16.5 40t39.5 17h179l28 61q9 21 32.5 36t46.5 15h216q23 0 46.5 -15t32.5 -36l28 -61h179q23 0 39.5 -17t16.5 -40v-525q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM216 319q0 -49 18.5 -91.5t50 -74.5t74.5 -50.5t91 -18.5 t91 18.5t74.5 50.5t50 74.5t18.5 91.5q0 48 -18.5 91t-50 74.5t-74.5 50t-91 18.5t-91 -18.5t-74.5 -50t-50 -74.5t-18.5 -91zM291 319q0 33 12.5 62t34 50.5t50.5 34t62 12.5t62 -12.5t50.5 -34t34 -50.5t12.5 -62t-12.5 -62t-34 -51t-50.5 -34.5t-62 -12.5t-62 12.5 t-50.5 34.5t-34 51t-12.5 62z" />
+<glyph unicode="&#xf031;" horiz-adv-x="803" d="M0 0l1 39q5 2 14.5 4t23.5 4q45 9 53 16q8 5 24 33l114 300l135 354h36h26l5 -10l99 -235q16 -38 31 -74t29 -71t25.5 -63.5t20.5 -50.5q6 -14 14 -34t18 -46q11 -32 31 -73q12 -24 17 -28q10 -9 33 -12q12 -1 24 -4.5t26 -8.5q3 -18 3 -27v-5q0 -3 -1 -8q-21 0 -44 1 t-48 3q-26 2 -48.5 3t-42.5 1h-39q-16 0 -26 -1l-97 -5l-28 -1q0 10 0.5 19.5t1.5 18.5l63 13q28 7 33 12q6 4 6 13q0 7 -3 15l-23 56l-44 111l-218 1q-6 -14 -18 -47t-32 -87q-11 -31 -11 -41q0 -13 8 -21q7 -5 19.5 -8.5t30.5 -6.5q7 -2 41 -6v-29q0 -8 -1 -13 q-17 0 -59 2.5t-109 7.5l-24 -4q-21 -4 -40.5 -5.5t-39.5 -1.5h-10zM268 320q66 -1 105.5 -2t51.5 0l14 1q-9 25 -20 54.5t-25 63.5t-25 59.5t-19 42.5z" />
+<glyph unicode="&#xf032;" horiz-adv-x="693" d="M0 0l1 46q13 3 33 6q19 3 34 6.5t27 8.5q4 7 6.5 13t3.5 12q3 16 4 39.5t1 54.5l-1 243q-1 19 -1.5 68t-2.5 130q-2 43 -6 53q-2 4 -6 5q-10 7 -34 8q-11 0 -56 6l-2 41l128 3l187 6h22q4 1 8 1h6q3 0 10.5 -0.5t19.5 -0.5h37q45 0 94 -13q9 -2 21 -6.5t26 -12.5 q31 -15 51 -37q22 -23 32 -51q5 -14 7.5 -28.5t2.5 -30.5q0 -35 -16 -63q-15 -28 -46 -51q-8 -6 -26.5 -15t-47.5 -23q87 -20 131 -71q45 -51 45 -115q0 -35 -14 -79q-11 -32 -35 -57q-32 -35 -69 -53q-38 -17 -100 -29q-34 -6 -97 -5l-97 2q-31 1 -67.5 -1t-79.5 -5 q-12 -1 -45.5 -2t-88.5 -3zM262 693q0 -6 0.5 -15.5t1.5 -21.5q1 -25 2 -58.5t0 -77.5v-48v-38q12 -2 25.5 -3t28.5 -1q86 0 130 32t44 110q0 55 -42 91q-41 37 -126 37q-26 0 -64 -7zM266 223l2 -132q0 -8 5 -21q36 -16 69 -16q64 0 107 20q40 19 60 55q9 18 14 40t5 49 q0 55 -21 88q-29 46 -69 61q-39 16 -122 16q-18 0 -30 -1.5t-20 -3.5v-70v-85z" />
+<glyph unicode="&#xf033;" horiz-adv-x="515" d="M0 0l9 41q6 2 15.5 4.5t22.5 5.5q20 5 34.5 9.5t24.5 9.5q14 19 20 50l14 67l28 131l6 31q11 58 20 87t9 31l15 76l8 31l11 66l4 24v19q-22 11 -72 14q-7 0 -11.5 0.5t-8.5 0.5l10 51l159 -7q15 -1 24 -1h13q17 0 43.5 1t64.5 3q20 2 33.5 3t18.5 1q-1 -5 -1.5 -9.5 t-1.5 -9.5q-2 -5 -4 -11l-3 -14q-24 -8 -54 -15q-32 -8 -51 -15q-6 -16 -12 -43q-3 -12 -4.5 -22t-2.5 -18q-11 -49 -19.5 -86t-13.5 -63l-31 -152l-19 -77l-21 -115l-7 -22v-5q0 -3 1 -8q17 -4 31.5 -6.5t28.5 -4.5q2 0 10.5 -1t22.5 -3q-1 -9 -1.5 -16t-1.5 -13 q-1 -3 -2 -8t-3 -11q-4 0 -7 -0.5t-5 -0.5q-9 -1 -14 -1h-7h-5q-4 0 -9 2q-4 0 -22 2t-51 6l-99 1q-30 0 -88 -6q-19 -2 -31 -3t-18 -1z" />
+<glyph unicode="&#xf034;" d="M0 562q7 18 17 54t22 90q4 16 6.5 26.5t4.5 15.5h28q2 -3 3 -5l2 -4q14 -28 20 -35q8 -2 63 -2q17 0 32.5 0.5t29.5 0.5l10 1l55 1l104 -1h141l27 5q5 4 13 26l2 6q1 3 3 8l21 1h5q3 0 8 -1q1 -19 0.5 -47.5t0.5 -67.5v-49v-28q0 -7 -0.5 -13.5t-1.5 -11.5 q-10 -4 -18 -5.5t-15 -3.5q-13 25 -26 63q-14 40 -18 45q-6 7 -13 10q-5 2 -30 2h-67h-15q-8 0 -17 -2q-3 -21 -3 -35l1 -74v-163l1 -175v-72q0 -35 5 -57q4 -2 10.5 -4t16.5 -4q2 0 10.5 -2t24.5 -6q13 -5 24 -9q2 -10 2 -16v-9v-5q0 -4 -1 -9h-17q-23 0 -43 1t-37 3 t-46.5 3t-72.5 1q-8 0 -28 -2t-53 -5q-14 -1 -22 -1.5t-12 -0.5q0 5 -0.5 8t-0.5 5l-1 12v5q9 15 39 24q46 13 66 24q2 5 3 12.5t2 15.5q2 33 3 86t0 125l-2 209q-1 44 -1 69.5t-2 35.5q0 4 -3 7q-2 3 -6 3q-8 2 -31 2h-62q-44 0 -58 -10q-20 -14 -59 -75q-11 -17 -17 -17 q-11 6 -17.5 11.5t-9.5 9.5zM675.5 112.5q2.5 6.5 15.5 6.5h59v512h-59q-13 0 -15.5 6.5t6.5 16.5l90 90q7 6 16 6q7 0 15 -6l90 -90q9 -10 6.5 -16.5t-16.5 -6.5h-58v-512h58q14 0 16.5 -6.5t-6.5 -15.5l-90 -91q-8 -6 -16 -6t-15 6l-90 91q-9 9 -6.5 15.5z" />
+<glyph unicode="&#xf035;" horiz-adv-x="750" d="M0 114q0 9 6 15l91 90q9 10 15.5 7t6.5 -16v-59h512v59q0 13 6.5 16t16.5 -7l90 -90q6 -6 6 -15t-6 -15l-90 -91q-10 -9 -16.5 -6.5t-6.5 16.5v58h-512v-58q0 -14 -6.5 -16.5t-15.5 6.5l-91 91q-6 6 -6 15zM0 602q7 14 16.5 42.5t21.5 71.5q3 13 5.5 21t4.5 13h27 q4 -6 5 -7q13 -23 18 -28q1 0 17.5 -0.5t38.5 -0.5h44h36h60l9 1h53h99h203l26 3q6 5 12 22q1 2 2 4.5t3 6.5h19h14v-92v-39v-22q0 -6 -0.5 -10.5t-1.5 -9.5q-16 -5 -31 -7q-12 18 -25 50q-13 29 -17 36q-6 5 -13 7q-3 1 -20.5 1.5t-41.5 0.5h-50h-48h-14q-8 0 -17 -1 q-1 -9 -1.5 -16t-0.5 -12l2 -217l-1 -58q0 -30 6 -45q6 -3 26 -6q2 0 10 -2t22 -5q7 -2 13 -3.5t11 -3.5q1 -8 1.5 -12.5t0.5 -6.5t-0.5 -5t-0.5 -7h-16q-46 0 -77 3q-32 3 -115 3q-7 0 -26 -1.5t-51 -3.5q-13 -1 -21 -1.5t-12 -0.5q0 8 -1 10v10v4q10 13 36 19q44 10 64 20 q2 4 3 9.5t2 12.5q0 9 0.5 34.5t0.5 58.5t-0.5 69.5t-1 68t-1 52.5t-0.5 23q0 4 -3 6q-1 1 -6 3q-7 1 -29 1h-60q-10 0 -30.5 -0.5t-41.5 -1t-38 -2t-20 -3.5q-20 -12 -57 -60q-10 -14 -16 -14q-11 5 -17 9.5t-9 7.5z" />
+<glyph unicode="&#xf036;" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h525q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h750q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-750q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h450q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-450q-16 0 -27 11t-11 26z" />
+<glyph unicode="&#xf037;" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM38 450v56q0 16 10.5 27t26.5 11h750q16 0 27 -11t11 -27v-56q0 -16 -11 -26.5t-27 -10.5h-750q-16 0 -26.5 10.5t-10.5 26.5zM150 244v56q0 16 11 27t27 11h525 q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM188 656v57q0 15 10.5 26t26.5 11h450q16 0 27 -11t11 -26v-57q0 -15 -11 -26t-27 -11h-450q-16 0 -26.5 11t-10.5 26z" />
+<glyph unicode="&#xf038;" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM75 450v56q0 16 11 27t27 11h750q15 0 26 -11t11 -27v-56q0 -16 -11 -26.5t-26 -10.5h-750q-16 0 -27 10.5t-11 26.5zM300 244v56q0 16 11 27t27 11h525 q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-525q-16 0 -27 11t-11 27zM375 656v57q0 15 11 26t27 11h450q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-450q-16 0 -27 11t-11 26z" />
+<glyph unicode="&#xf039;" d="M0 38v56q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h825q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-825q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h825q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-825q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h825q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-825q-16 0 -27 11t-11 26z" />
+<glyph unicode="&#xf03a;" d="M0 38v56q0 15 11 26t27 11h75q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-75q-16 0 -27 11t-11 27zM0 244v56q0 16 11 27t27 11h75q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-75q-16 0 -27 11t-11 27zM0 450v56q0 16 11 27t27 11h75q15 0 26 -11t11 -27v-56 q0 -16 -11 -26.5t-26 -10.5h-75q-16 0 -27 10.5t-11 26.5zM0 656v57q0 15 11 26t27 11h75q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-75q-16 0 -27 11t-11 26zM225 38v56q0 15 11 26t27 11h600q15 0 26 -11t11 -26v-56q0 -16 -11 -27t-26 -11h-600q-16 0 -27 11 t-11 27zM225 244v56q0 16 11 27t27 11h600q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-600q-16 0 -27 11t-11 27zM225 450v56q0 16 11 27t27 11h600q15 0 26 -11t11 -27v-56q0 -16 -11 -26.5t-26 -10.5h-600q-16 0 -27 10.5t-11 26.5zM225 656v57q0 15 11 26t27 11h600 q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-600q-16 0 -27 11t-11 26z" />
+<glyph unicode="&#xf03b;" d="M0 369v37q0 19 19 19h104v75q0 15 8 18t19 -8l105 -105q8 -8 8 -18q0 -9 -8 -17l-105 -105q-11 -11 -19 -8t-8 19v74h-104q-19 0 -19 19zM300 19v712q0 19 19 19h37q19 0 19 -19v-712q0 -19 -19 -19h-37q-19 0 -19 19zM450 38v56q0 15 11 26t27 11h375q15 0 26 -11 t11 -26v-56q0 -16 -11 -27t-26 -11h-375q-16 0 -27 11t-11 27zM450 244v56q0 16 11 27t27 11h300q15 0 26 -11t11 -27v-56q0 -16 -11 -27t-26 -11h-300q-16 0 -27 11t-11 27zM450 450v56q0 16 11 27t27 11h337q16 0 27 -11t11 -27v-56q0 -16 -11 -26.5t-27 -10.5h-337 q-16 0 -27 10.5t-11 26.5zM450 656v57q0 15 11 26t27 11h262q16 0 27 -11t11 -26v-57q0 -15 -11 -26t-27 -11h-262q-16 0 -27 11t-11 26z" />
+<glyph unicode="&#xf03c;" d="M0 38v56q0 15 11 26t26 11h375q16 0 27 -11t11 -26v-56q0 -16 -11 -27t-27 -11h-375q-15 0 -26 11t-11 27zM0 244v56q0 16 11 27t26 11h300q16 0 27 -11t11 -27v-56q0 -16 -11 -27t-27 -11h-300q-15 0 -26 11t-11 27zM0 450v56q0 16 11 27t26 11h338q15 0 26 -11t11 -27 v-56q0 -16 -11 -26.5t-26 -10.5h-338q-15 0 -26 10.5t-11 26.5zM0 656v57q0 15 11 26t26 11h263q15 0 26 -11t11 -26v-57q0 -15 -11 -26t-26 -11h-263q-15 0 -26 11t-11 26zM525 19v712q0 19 19 19h37q8 0 13.5 -5.5t5.5 -13.5v-712q0 -8 -5.5 -13.5t-13.5 -5.5h-37 q-19 0 -19 19zM637 363q0 8 7 17l106 105q11 11 18.5 8t7.5 -19v-74h105q8 0 13.5 -5.5t5.5 -13.5v-37q0 -8 -5.5 -13.5t-13.5 -5.5h-105v-75q0 -15 -7.5 -18.5t-18.5 7.5l-106 106q-7 9 -7 18z" />
+<glyph unicode="&#xf03d;" d="M-2 113v525q0 23 9 43.5t24.5 35.5t36 24t43.5 9h375q23 0 43.5 -9t36 -24t24.5 -35.5t9 -43.5v-169l251 272q9 9 20 9q5 0 11 -2q18 -8 18 -28v-690q0 -20 -18 -28q-17 -7 -31 7l-251 272v-168q0 -23 -9 -43.5t-24.5 -36t-36 -24.5t-43.5 -9h-375q-23 0 -43.5 9 t-36 24.5t-24.5 36t-9 43.5z" />
+<glyph unicode="&#xf03e;" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 75h750v600h-750v-600zM150 150v51l135 176l92 -76l173 262l200 -207v-206h-600zM150 524q0 32 22 54t54 22q31 0 53 -22 t22 -54q0 -31 -22 -53t-53 -22q-32 0 -54 22t-22 53z" />
+<glyph unicode="&#xf040;" horiz-adv-x="750" d="M0 0l67 204l423 423l137 -137l-423 -423zM140 199q0 -6 5 -11q4 -4 11 -4q6 0 10 4l337 337q10 10 0 21q-5 5 -11 5t-10 -5l-337 -336q-5 -5 -5 -11zM538 675l58 58q17 17 41 17t41 -17l28 -27l27 -28q17 -17 17 -41t-17 -41l-58 -58z" />
+<glyph unicode="&#xf041;" horiz-adv-x="530" d="M0 485q0 55 21 103t57 84t84 57t103 21t103 -21t84 -57t57 -84t21 -103q0 -40 -12 -75t-30 -67l-179 -311q-18 -32 -44 -32t-44 32l-179 311q-18 32 -30 67.5t-12 74.5zM134 485q0 -27 10 -51t28 -42t42 -28t51 -10t51 10t41.5 28t28 42t10.5 51t-10.5 51t-28 41.5 t-41.5 28t-51 10.5t-51 -10.5t-42 -28t-28 -41.5t-10 -51z" />
+<glyph unicode="&#xf042;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5v525q-54 0 -102 -20.5 t-83.5 -56.5t-56 -84t-20.5 -102z" />
+<glyph unicode="&#xf043;" horiz-adv-x="531" d="M0 266q0 39 11 75t31 67q10 16 33 47t50.5 72.5t53.5 90.5t42 102q5 17 17.5 24.5t26.5 5.5q15 2 27.5 -5.5t17.5 -24.5q16 -53 42 -102t53.5 -90.5t50.5 -72.5t33 -47q20 -31 31 -67t11 -75q0 -55 -21 -103.5t-57 -84.5t-84.5 -57t-103.5 -21t-103 21t-84 57t-57 84.5 t-21 103.5zM116 207q0 -28 19.5 -47t47.5 -19q27 0 46.5 19t19.5 47q0 18 -10 36q-3 4 -9 11.5t-12.5 18t-13 23t-10.5 25.5q-4 9 -11 7q-9 2 -11 -7q-4 -13 -11 -25.5t-13.5 -23t-12.5 -18t-8 -11.5q-11 -17 -11 -36z" />
+<glyph unicode="&#xf044;" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h525q2 0 5 -0.5t5 -0.5l-93 -93h-442q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v217l94 94v-311q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-525 q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM308 158l53 161l318 318l108 -108l-318 -318zM423 307q3 -4 8 -4t8 4l250 249q9 9 0 17t-17 0l-249 -249q-9 -9 0 -17zM733 691l45 46q14 14 33 14t32 -14l22 -22l22 -22q13 -14 13.5 -32.5t-13.5 -32.5l-46 -45z" />
+<glyph unicode="&#xf045;" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h408q-3 -15 -3 -31v-25q-80 -10 -151 -38h-254q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v54q8 5 15.5 10.5t15.5 13.5l63 62v-140q0 -31 -12 -58t-32.5 -47.5 t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM188 190v18q0 81 27.5 152.5t84.5 125t143.5 84.5t204.5 32v113q0 28 14 34t34 -14l191 -191q13 -12 13 -32q0 -19 -13 -31l-191 -191q-20 -20 -34 -14t-14 34v127q-101 0 -178 -21t-130 -57t-83 -85 t-38 -105q-2 -13 -15 -13q-12 0 -14 13q-2 11 -2 21z" />
+<glyph unicode="&#xf046;" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h525q13 0 25 -3l-91 -91h-459q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v159l94 94v-253q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12 t-47.5 32.5t-32 47.5t-12 58zM188 472q0 16 11 27l48 48q11 11 27 11t27 -11l166 -166l319 320q11 11 27.5 11t27.5 -11l48 -48q11 -11 11 -27t-11 -27l-347 -347l-48 -48q-11 -11 -27 -11t-27 11l-49 48l-192 193q-11 11 -11 27z" />
+<glyph unicode="&#xf047;" horiz-adv-x="750" d="M0 375q0 12 8 20l121 120q12 13 21 9t9 -21v-80h169v168h-81q-17 0 -21 9t9 21l120 121q8 8 20 8t20 -8l121 -121q12 -12 8.5 -21t-21.5 -9h-81v-168h169v80q0 17 9 21t21 -9l121 -120q8 -8 8 -20t-8 -20l-121 -120q-12 -13 -21 -9.5t-9 21.5v83h-169v-171h81 q18 0 21.5 -9t-8.5 -21l-121 -121q-8 -8 -20 -8t-20 8l-120 121q-13 12 -9 21t21 9h81v171h-169v-83q0 -17 -9 -21t-21 9l-121 120q-8 8 -8 20z" />
+<glyph unicode="&#xf048;" horiz-adv-x="525" d="M0 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675zM150 375q0 13 8 21l319 345q7 9 20 9q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22z" />
+<glyph unicode="&#xf049;" d="M0 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675zM150 375q0 13 8 21l319 345q7 9 20 9q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22zM525 375q0 13 8 21l319 345q7 9 20 9 q3 0 11 -2q17 -9 17 -29v-689q0 -20 -17 -28q-19 -7 -31 7l-319 344q-8 9 -8 22z" />
+<glyph unicode="&#xf04a;" horiz-adv-x="750" d="M0 374.5q0 12.5 8 21.5l319 345q7 9 20 9q5 0 11 -3q17 -7 17 -28v-689q0 -20 -17 -28q-18 -8 -31 7l-319 344q-8 9 -8 21.5zM375 374.5q0 12.5 8 21.5l319 345q7 9 20 9q5 0 11 -3q17 -7 17 -28v-689q0 -20 -17 -28q-18 -8 -31 7l-319 344q-8 9 -8 21.5z" />
+<glyph unicode="&#xf04b;" horiz-adv-x="659" d="M0 34v682q0 19 17 29q18 11 34 0l591 -340q17 -12 17 -30t-17 -30l-591 -340q-8 -5 -17 -5t-17 5q-17 10 -17 29z" />
+<glyph unicode="&#xf04c;" horiz-adv-x="750" d="M0 34v682q0 14 10 24t24 10h239q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-239q-14 0 -24 10t-10 24zM443 34v682q0 14 10 24t24 10h239q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-239q-14 0 -24 10t-10 24z" />
+<glyph unicode="&#xf04d;" horiz-adv-x="750" d="M0 34v682q0 14 10 24t24 10h682q14 0 24 -10t10 -24v-682q0 -14 -10 -24t-24 -10h-682q-14 0 -24 10t-10 24z" />
+<glyph unicode="&#xf04e;" horiz-adv-x="750" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28z" />
+<glyph unicode="&#xf050;" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM750 37q0 -15 11 -26t26 -11h75 q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675z" />
+<glyph unicode="&#xf051;" horiz-adv-x="525" d="M0 30v690q0 19 17 28q19 7 31 -7l319 -344q8 -9 8 -22t-8 -22l-319 -344q-8 -9 -20 -9q-3 0 -11 2q-17 8 -17 28zM375 37q0 -15 11 -26t26 -11h75q16 0 27 11t11 26v675q0 16 -11 27t-27 11h-75q-15 0 -26 -11t-11 -27v-675z" />
+<glyph unicode="&#xf052;" horiz-adv-x="750" d="M0 34v97q0 14 10 24t24 10h682q14 0 24 -10t10 -24v-97q0 -14 -10 -24t-24 -10h-682q-14 0 -24 10t-10 24zM3 290q-9 21 7 37l341 341q10 10 24 10t24 -10l341 -341q16 -16 7 -37q-8 -21 -31 -21h-682q-23 0 -31 21z" />
+<glyph unicode="&#xf053;" horiz-adv-x="471" d="M0 373.5q0 18.5 14 32.5l328 329q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-248 -249l248 -244q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-328 329q-14 14 -14 32.5z" />
+<glyph unicode="&#xf054;" horiz-adv-x="471" d="M0 95q0 19 14 33l248 248l-248 245q-14 14 -14 32.5t14 32.5l49 50q14 14 33 14t33 -14l328 -329q14 -14 14 -33t-14 -33l-328 -328q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14 33z" />
+<glyph unicode="&#xf055;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM159 338q0 -7 4.5 -11.5t10.5 -4.5h147v-161q0 -7 4.5 -11.5t10.5 -4.5h78 q6 0 10.5 4.5t4.5 11.5v161h147q6 0 10.5 4.5t4.5 11.5v74q0 6 -4.5 10.5t-10.5 4.5h-147v162q0 7 -4.5 11.5t-10.5 4.5h-78q-6 0 -10.5 -4.5t-4.5 -11.5v-162h-147q-6 0 -10.5 -4.5t-4.5 -10.5v-74z" />
+<glyph unicode="&#xf056;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM159 338q0 -7 4.5 -11.5t10.5 -4.5h402q6 0 10.5 4.5t4.5 11.5v74q0 6 -4.5 10.5 t-10.5 4.5h-402q-6 0 -10.5 -4.5t-4.5 -10.5v-74z" />
+<glyph unicode="&#xf057;" horiz-adv-x="750" d="M0 376q0 72 27.5 141t82.5 124t124 82t141 27t141 -27t124 -82t82.5 -124t27.5 -141t-27.5 -141t-82.5 -124t-124 -82.5t-141 -27.5t-141 27.5t-124 82.5t-82.5 124t-27.5 141zM185 240l55 -54q5 -5 11 -5t11 5l114 114l103 -104q5 -5 11 -5t11 5l53 53q11 11 0 22 l-104 103l115 115q11 11 0 22l-55 55q-11 11 -22 0l-114 -115l-104 104q-11 11 -22 0l-52 -53q-5 -5 -5 -11t5 -11l103 -103l-114 -115q-10 -10 0 -22z" />
+<glyph unicode="&#xf058;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM112 351.5q0 -9.5 7 -16.5l150 -150q7 -6 18 -11t21 -5h25q10 0 21 5t18 11l259 259 q7 7 7 16.5t-7 15.5l-50 50q-6 7 -15.5 7t-16.5 -7l-212 -213q-7 -7 -16.5 -7t-15.5 7l-104 104q-7 7 -16.5 7t-15.5 -7l-50 -49q-7 -7 -7 -16.5z" />
+<glyph unicode="&#xf059;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM250 531l44 -55q6 -4 10 -5q6 0 10 4q8 6 18 11q8 4 18.5 7.5t21.5 3.5 q20 0 33 -10.5t13 -26.5q0 -17 -11.5 -30.5t-28.5 -28.5q-11 -9 -22 -19.5t-20 -24t-15 -30t-6 -37.5v-30q0 -5 4.5 -9.5t9.5 -4.5h77q6 0 10 4.5t4 9.5v25q0 18 12 31t29 28q12 10 24 21.5t21.5 26.5t16 33t6.5 42q0 32 -13 57t-34.5 41.5t-48.5 25t-54 8.5 q-30 0 -53.5 -7.5t-40 -16.5t-25 -17t-9.5 -9q-9 -9 -1 -18zM315 132q0 -5 4.5 -9.5t9.5 -4.5h77q6 0 10 4.5t4 9.5v74q0 14 -14 14h-77q-5 0 -9.5 -4t-4.5 -10v-74z" />
+<glyph unicode="&#xf05a;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM269 418q0 -14 14 -14h40v-192h-37q-5 0 -9.5 -4.5t-4.5 -9.5v-66q0 -5 4.5 -9.5 t9.5 -4.5h189q5 0 9.5 4.5t4.5 9.5v66q0 5 -4.5 9.5t-9.5 4.5h-36v271q0 6 -4.5 10t-9.5 4h-142q-14 0 -14 -14v-65zM322 555q0 -6 4.5 -10.5t10.5 -4.5h88q5 0 9.5 4.5t4.5 10.5v77q0 6 -4.5 10t-9.5 4h-88q-6 0 -10.5 -4t-4.5 -10v-77z" />
+<glyph unicode="&#xf05b;" horiz-adv-x="750" d="M0 338v75q0 8 5.5 13t13.5 5h80q9 41 29 77.5t48.5 65t65 48.5t77.5 29v80q0 19 19 19h75q8 0 13 -5.5t5 -13.5v-80q41 -9 77.5 -29t65 -48.5t48.5 -65t29 -77.5h80q8 0 13.5 -5t5.5 -13v-75q0 -19 -19 -19h-80q-9 -41 -29 -77.5t-48.5 -65t-65 -48.5t-77.5 -29v-80 q0 -8 -5 -13.5t-13 -5.5h-75q-19 0 -19 19v80q-41 9 -77.5 29t-65 48.5t-48.5 65t-29 77.5h-80q-19 0 -19 19zM178 319q14 -52 51.5 -89.5t89.5 -51.5v85q0 8 5.5 13t13.5 5h75q8 0 13 -5t5 -13v-85q52 14 89.5 51.5t51.5 89.5h-84q-19 0 -19 19v75q0 8 5.5 13t13.5 5h84 q-14 52 -51.5 89.5t-89.5 51.5v-84q0 -8 -5 -13.5t-13 -5.5h-75q-19 0 -19 19v84q-52 -14 -89.5 -51.5t-51.5 -89.5h85q8 0 13 -5t5 -13v-75q0 -8 -5 -13.5t-13 -5.5h-85z" />
+<glyph unicode="&#xf05c;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM212 466q0 8 5 14l53 53q6 5 14 5t13 -5l78 -78l78 78q6 5 14 5t13 -5l53 -53q5 -6 5 -14t-5 -13l-78 -78l78 -78q12 -14 0 -27l-53 -53q-14 -12 -27 0l-78 78l-78 -78 q-5 -5 -13 -5t-14 5l-53 53q-12 13 0 27l79 78l-79 78q-5 5 -5 13z" />
+<glyph unicode="&#xf05d;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -54 20.5 -102t56 -83.5t83.5 -56t102 -20.5t102 20.5t84 56t56.5 83.5 t20.5 102t-20.5 102t-56.5 84t-84 56.5t-102 20.5t-102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM156 352q0 8 5 13l53 53q5 5 13 5t14 -5l83 -84q13 -12 27 0l158 159q6 5 14 5t13 -5l53 -53q5 -5 5 -13t-5 -14l-192 -192q-6 -5 -15 -9t-17 -4h-55q-8 0 -17 4t-15 9 l-117 117q-5 6 -5 14z" />
+<glyph unicode="&#xf05e;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM113 375q0 -39 10.5 -74.5t30.5 -66.5l362 362q-31 20 -66.5 31t-74.5 11 q-54 0 -102 -20.5t-83.5 -56.5t-56 -84t-20.5 -102zM234 154q31 -20 66.5 -30.5t74.5 -10.5q54 0 102 20.5t84 56t56.5 83.5t20.5 102q0 39 -11 74.5t-31 66.5z" />
+<glyph unicode="&#xf060;" horiz-adv-x="750" d="M0 375q0 19 14 33l328 329q14 14 33 14t33 -14l49 -49q14 -14 14 -33t-14 -33l-165 -165h411q20 0 33.5 -13.5t13.5 -33.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-412l165 -165q14 -14 14 -33t-14 -33l-49 -49q-14 -14 -33 -14t-33 14l-328 328q-14 14 -14 33z" />
+<glyph unicode="&#xf061;" horiz-adv-x="750" d="M0 341v70q0 19 13.5 32.5t32.5 13.5h412l-165 165q-14 14 -14 33t14 33l49 49q14 14 33 14t33 -14l328 -329q14 -14 14 -32.5t-14 -32.5l-328 -329q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14 33t14 33l165 165h-412q-19 0 -32.5 13.5t-13.5 33.5z" />
+<glyph unicode="&#xf062;" horiz-adv-x="750" d="M-0.5 375q-0.5 19 13.5 33l329 328q14 14 33 14t33 -14l328 -328q14 -14 14 -33t-14 -33l-49 -49q-14 -14 -32.5 -14t-32.5 14l-166 165v-412q0 -19 -13.5 -32.5t-32.5 -13.5h-70q-20 0 -33 13.5t-13 32.5v412l-165 -165q-14 -14 -33 -14t-33 14l-49 49q-14 14 -14.5 33z " />
+<glyph unicode="&#xf063;" horiz-adv-x="750" d="M0 374q0 19 14 33l49 49q14 14 33 14t33 -14l165 -165v412q0 19 13.5 32.5t32.5 13.5h70q20 0 33 -13.5t13 -32.5v-412l166 165q14 14 32.5 14t32.5 -14l50 -49q14 -14 14 -33t-14 -33l-329 -328q-14 -14 -33 -14t-33 14l-328 328q-14 14 -14 33z" />
+<glyph unicode="&#xf064;" d="M0 66q0 102 35 192t106.5 157.5t181 107t259.5 40.5v143q0 35 17.5 42.5t43.5 -17.5l240 -241q17 -16 17 -40q0 -23 -17 -40l-240 -241q-25 -25 -43 -17.5t-18 42.5v161q-128 -1 -225 -27.5t-164 -72t-105 -107t-48 -132.5q-2 -16 -18 -16h-1q-16 0 -18 16q-3 25 -3 50z " />
+<glyph unicode="&#xf065;" horiz-adv-x="750" d="M0 42v255q0 26 13 31.5t32 -12.5l81 -81l134 134q6 6 15 6t16 -6l78 -78q6 -7 6 -16t-6 -15l-134 -134l81 -81q19 -19 13 -32t-32 -13h-254q-18 0 -30 12q-13 13 -13 30zM375 475q0 9 6 15l134 134l-81 81q-19 19 -13 32t32 13h254q18 0 30 -12q13 -13 13 -30v-255 q0 -26 -13 -31.5t-32 12.5l-81 81l-134 -133q-6 -7 -15 -7t-16 7l-78 77q-6 7 -6 16z" />
+<glyph unicode="&#xf066;" horiz-adv-x="750" d="M0 99q0 9 6 16l134 133l-81 81q-19 19 -13 32t32 13h254q19 0 30 -12q13 -13 13 -30v-255q0 -26 -13 -31.5t-32 13.5l-81 81l-134 -134q-6 -7 -15 -7t-16 7l-78 78q-6 6 -6 15zM375 417v255q0 26 13 31.5t32 -13.5l81 -81l134 134q6 7 15 7t16 -7l78 -78q6 -6 6 -15 t-6 -16l-134 -133l81 -81q19 -19 13 -32t-32 -13h-254q-20 0 -30 12q-13 13 -13 30z" />
+<glyph unicode="&#xf067;" horiz-adv-x="750" d="M0 340v70q0 19 13.5 32.5t32.5 13.5h248v247q0 20 13 33.5t33 13.5h70q19 0 32.5 -13.5t13.5 -32.5v-248h248q19 0 32.5 -13.5t13.5 -32.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-248v-247q0 -20 -13.5 -33.5t-32.5 -13.5h-70q-19 0 -32.5 13.5t-13.5 32.5v248h-247 q-20 0 -33.5 13t-13.5 33z" />
+<glyph unicode="&#xf068;" horiz-adv-x="750" d="M0 340v70q0 19 13.5 32.5t32.5 13.5h658q19 0 32.5 -13.5t13.5 -32.5v-70q0 -19 -13.5 -32.5t-32.5 -13.5h-657q-20 0 -33.5 13t-13.5 33z" />
+<glyph unicode="&#xf069;" horiz-adv-x="697" d="M1 497q-5 18 5 35l35 61q10 17 28.5 21.5t35.5 -4.5l162 -94v187q0 20 13.5 33.5t33.5 13.5h69q20 0 33.5 -13.5t13.5 -32.5v-188l162 94q17 9 35.5 4.5t28.5 -21.5l34 -61q10 -17 5.5 -35t-21.5 -28l-163 -94l163 -94q17 -10 21.5 -28t-4.5 -35l-35 -61 q-10 -17 -28.5 -21.5t-35.5 4.5l-162 94v-187q0 -20 -13.5 -33.5t-33.5 -13.5h-69q-20 0 -33.5 13.5t-13.5 32.5v188l-162 -94q-17 -10 -35.5 -5t-28.5 22l-35 61q-9 17 -4.5 35t21.5 28l163 94l-163 94q-17 10 -22 28z" />
+<glyph unicode="&#xf06a;" horiz-adv-x="750" d="M0 375q0 78 29.5 146t80.5 119t119 80.5t146 29.5t146 -29.5t119 -80.5t80.5 -119t29.5 -146t-29.5 -146t-80.5 -119t-119 -80.5t-146 -29.5t-146 29.5t-119 80.5t-80.5 119t-29.5 146zM316 613l6 -347q2 -14 15 -14h76q14 0 14 14l7 347q1 5 -4 10q-3 4 -10 4h-90 q-7 0 -10 -4q-4 -4 -4 -10zM319 125q0 -14 14 -14h85q5 0 9.5 4t4.5 10v82q0 6 -4.5 10t-9.5 4h-85q-14 0 -14 -14v-82z" />
+<glyph unicode="&#xf06b;" d="M0 281v188q0 8 5.5 13.5t13.5 5.5h258q-27 0 -51 10t-42 28t-28.5 42t-10.5 51t10.5 51t28.5 41.5t42 28t51 10.5q29 0 55 -11.5t43 -33.5l75 -97l75 97q17 22 43 33.5t55 11.5q27 0 51 -10.5t42 -28t28.5 -41.5t10.5 -51t-10.5 -51t-28.5 -42t-42 -28t-51 -10h258 q8 0 13.5 -5.5t5.5 -13.5v-188q0 -8 -5.5 -13t-13.5 -5h-56v-207q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5v207h-56q-8 0 -13.5 5t-5.5 13zM220 619q0 -23 17 -39.5t40 -16.5h113l-73 94q-5 5 -15 11.5t-25 6.5q-23 0 -40 -16.5t-17 -39.5zM356 105 q0 -15 11 -26t27 -11h112q16 0 27 11t11 26v383h-188v-383zM509 563h114q23 0 40 16.5t17 39.5t-17 39.5t-40 16.5q-15 0 -25 -6.5t-15 -11.5z" />
+<glyph unicode="&#xf06c;" d="M3 78q9 25 25.5 41.5t33.5 30.5q14 11 24 20.5t13 20.5q1 2 0 5t-5 11q-2 6 -5 13.5t-5 16.5q-12 75 6.5 139t56.5 114.5t91 86.5t111 56q38 14 83.5 16.5t95.5 3.5q28 0 59.5 1t60.5 5.5t53.5 13.5t39.5 25q10 10 18.5 19.5t18 16.5t20.5 11.5t27 4.5q23 0 33 -21 q62 -121 32 -283q-42 -228 -272 -347q-110 -57 -220 -57q-36 0 -72.5 6t-71.5 19q-11 4 -21.5 9.5t-21.5 10.5q-13 8 -26.5 14.5t-22.5 7.5q-5 -1 -11.5 -8t-13 -16.5t-12.5 -19t-10 -15.5q-6 -11 -12 -20t-11 -16q-11 -14 -29 -14h-2q-28 2 -39 17.5t-14 23.5q-13 18 -5 37 zM188.5 253.5q1.5 -15.5 13.5 -26.5q10 -9 24 -9q18 0 28 13q42 48 85.5 82t90.5 54.5t99.5 29t114.5 6.5q15 -2 26.5 9.5t12.5 26.5q0 16 -10.5 27.5t-26.5 11.5q-69 3 -130 -7t-116 -34t-104.5 -63t-97.5 -94q-11 -11 -9.5 -26.5z" />
+<glyph unicode="&#xf06d;" horiz-adv-x="675" d="M0 214q0 58 30.5 119.5t82.5 111.5q-11 -75 0.5 -120.5t30.5 -71.5q22 -30 53 -44q-24 105 -14 204q4 42 15.5 87.5t34 90t58.5 85.5t89 74q-23 -49 -22 -90t11 -71q11 -35 34 -64q16 -19 30.5 -37.5t25 -42.5t16.5 -56.5t6 -78.5q-9 20 -27 32t-41 12q-32 0 -53.5 -22 t-21.5 -53q0 -16 5.5 -30t17 -25t30 -17t44.5 -6q44 4 77 31q13 12 25.5 29.5t20.5 43t10 60t-5 80.5h-1q52 -50 82.5 -111.5t30.5 -119.5q0 -54 -26.5 -94t-72.5 -66.5t-107 -40t-131 -13.5t-131.5 13.5t-107.5 40t-72.5 66.5t-26.5 94z" />
+<glyph unicode="&#xf06e;" d="M0 352.5q0 21.5 12 40.5q38 61 87 109.5t105.5 82t118.5 51t127 17.5q66 0 128 -17.5t118 -50.5t105 -81.5t88 -110.5q11 -19 11 -40.5t-11 -39.5q-39 -62 -88 -110.5t-105 -81.5t-118 -50.5t-128 -17.5q-65 0 -127 17.5t-118.5 51t-105.5 82t-87 109.5q-12 18 -12 39.5z M75 353q32 -51 73 -93t89 -71t101.5 -45t111.5 -16t111.5 16t101.5 45t89 71t73 93q-39 63 -91.5 110.5t-115.5 76.5q25 -29 39 -65t14 -78q0 -47 -17.5 -87.5t-48.5 -71.5t-72 -48.5t-87 -17.5q-47 0 -87.5 17.5t-71.5 48.5t-48.5 71.5t-17.5 87.5q0 38 12.5 72.5 t33.5 62.5q-57 -29 -106 -74.5t-86 -104.5zM300 397q0 -11 8 -19.5t20 -8.5t20 8.5t8 19.5q0 38 26 64t64 26q12 0 20 8.5t8 19.5q0 12 -8 20t-20 8q-30 0 -57 -11.5t-46.5 -31t-31 -46.5t-11.5 -57z" />
+<glyph unicode="&#xf070;" d="M0 374.5q0 21.5 12 40.5q38 61 87 109.5t105.5 82t118.5 51t127 17.5q26 0 51.5 -3.5t50.5 -8.5l43 77q4 7 12 9q6 3 14 -1l65 -37q7 -4 9.5 -11.5t-1.5 -14.5l-378 -675q-3 -7 -11 -9q-2 -1 -5 -1t-9 2l-66 37q-7 4 -9 11.5t2 14.5l32 56q-71 33 -131.5 87t-106.5 127 q-12 18 -12 39.5zM75 375q40 -64 93.5 -112t117.5 -77l28 51q-42 31 -67.5 78t-25.5 104q0 38 12.5 72.5t33.5 63.5q-57 -30 -106 -75t-86 -105zM300 419q0 -11 8 -19.5t20 -8.5t20 8.5t8 19.5q0 38 26 64t64 26q12 0 20 8.5t8 19.5q0 12 -8 20t-20 8q-30 0 -57 -11.5 t-46.5 -31t-31 -46.5t-11.5 -57zM453 75l43 78q102 12 186.5 70.5t142.5 151.5q-53 83 -128 138l37 67q45 -32 84 -73t71 -92q11 -19 11 -40.5t-11 -39.5q-78 -124 -191.5 -191.5t-244.5 -68.5zM528 210l139 249q2 -10 3 -19.5t1 -20.5q0 -36 -10.5 -68.5t-29.5 -59.5 t-45.5 -48t-57.5 -33z" />
+<glyph unicode="&#xf071;" horiz-adv-x="850" d="M5 23.5q-14 23.5 6 56.5l368 637q18 33 46 33q26 0 46 -33l368 -637q19 -33 5.5 -56.5t-51.5 -23.5h-736q-38 0 -52 23.5zM160 113h530l-265 459zM370 434q0 6 4 10t9 4h84q5 0 9 -4t4 -10l-7 -182q0 -12 -13 -12h-70q-13 0 -13 12zM372 189q0 13 13 13h78q13 0 13 -13 l1 -49q0 -13 -13 -13h-78q-13 0 -13 13z" />
+<glyph unicode="&#xf072;" d="M1 212l34 144q2 8 2 18t-2 18l-34 144q-2 8 2 13.5t12 5.5h45q8 0 17 -4.5t14 -10.5l85 -110q44 9 92 14t94 5h12l-61 283q-2 8 2.5 13t12.5 5h64q8 0 16 -4.5t12 -11.5l164 -285h157q29 0 58 -6.5t51.5 -17t36.5 -24t13 -27.5q1 -14 -13 -27.5t-36.5 -24t-51.5 -17 t-58 -6.5h-158l-163 -283q-4 -7 -12 -11.5t-16 -4.5h-64q-8 0 -12.5 5t-2.5 13l61 281h-12q-46 0 -94 5.5t-92 13.5l-85 -110q-12 -14 -31 -14h-45q-8 0 -12 5t-2 13z" />
+<glyph unicode="&#xf073;" horiz-adv-x="750" d="M0 56v549q0 23 16.5 39.5t39.5 16.5h36v-69q0 -28 19.5 -47.5t47.5 -19.5h15q28 0 48 19.5t20 47.5v69h58v-69q0 -28 19.5 -47.5t47.5 -19.5h16q28 0 47.5 19.5t19.5 47.5v69h58v-69q0 -28 20 -47.5t48 -19.5h15q28 0 47.5 19.5t19.5 47.5v69h36q23 0 39.5 -16.5 t16.5 -39.5v-549q0 -23 -16.5 -39.5t-39.5 -16.5h-638q-23 0 -39.5 16.5t-16.5 39.5zM75 75h600v398h-600v-398zM129 592v128q0 12 9 21t21 9h15q13 0 21.5 -9t8.5 -21v-128q0 -12 -8.5 -20.5t-21.5 -8.5h-15q-12 0 -21 8.5t-9 20.5zM177 158q0 36 20 58.5t43.5 39t43.5 32 t20 36.5q0 20 -11.5 29t-28.5 9q-11 0 -20.5 -4.5t-16.5 -11.5q-4 -4 -7 -8t-6 -9l-34 23q7 14 20 27q11 11 27.5 19t40.5 8q35 0 61 -20.5t26 -58.5q0 -21 -9 -36.5t-23 -28t-30 -22.5t-30 -20t-23.5 -21t-9.5 -25h92v34h42v-73h-185q-1 6 -1.5 12t-0.5 11zM338 592v128 q0 12 8.5 21t20.5 9h16q12 0 21 -9t9 -21v-128q0 -12 -9 -20.5t-21 -8.5h-16q-12 0 -20.5 8.5t-8.5 20.5zM397 330v71h187v-34l-117 -232h-51l107 212q3 8 6 11l3 4v1q-3 0 -5 -1h-13h-75v-32h-42zM546 592v128q0 12 8.5 21t21.5 9h15q12 0 21 -9t9 -21v-128q0 -12 -9 -20.5 t-21 -8.5h-15q-13 0 -21.5 8.5t-8.5 20.5z" />
+<glyph unicode="&#xf074;" d="M0 122v75q0 19 19 19h107q25 0 48.5 15.5t45.5 41t44 58.5t44 68q27 43 56 85.5t62 75.5t72 53.5t88 20.5h99v90q0 20 12 24t29 -10l163 -135q11 -9 11 -23q0 -13 -11 -22l-163 -136q-17 -14 -29 -10t-12 24v86h-99q-26 0 -49 -15.5t-45.5 -41t-44.5 -58.5t-44 -68 q-27 -44 -55.5 -86t-61.5 -75t-72.5 -53.5t-87.5 -20.5h-107q-8 0 -13.5 5t-5.5 13zM0 541v75q0 8 5.5 13.5t13.5 5.5h107q52 0 93.5 -23.5t76.5 -61.5q-18 -25 -34 -49.5t-31 -47.5q-25 31 -50.5 50t-54.5 19h-107q-8 0 -13.5 5.5t-5.5 13.5zM417 190q17 24 33 48.5 t31 48.5q25 -31 50.5 -50t54.5 -19h99v94q0 20 12 24t29 -10l163 -136q11 -9 11 -22q0 -14 -11 -23l-163 -135q-17 -14 -29 -10t-12 24v82h-99q-53 0 -93.5 23t-75.5 61z" />
+<glyph unicode="&#xf075;" d="M0 421q0 68 35.5 128t96.5 104.5t143 70.5t175 26t175 -26t143 -70.5t96.5 -104.5t35.5 -128t-35.5 -128t-96.5 -104.5t-143 -70.5t-175 -26q-44 0 -84 6q-42 -32 -90.5 -55t-103.5 -35l-24 -4q-12 -2 -25 -4q-16 -2 -20 14v1q-2 7 3 11l9 10q10 11 19.5 21.5t17 24.5 t14 32.5t11.5 45.5q-81 45 -129 112.5t-48 148.5z" />
+<glyph unicode="&#xf076;" horiz-adv-x="750" d="M0 311v139q0 8 5.5 13.5t13.5 5.5h187q8 0 13.5 -5.5t5.5 -13.5v-139q0 -13 11 -28t30.5 -28t47 -21.5t61.5 -8.5t61.5 8.5t47 21.5t30.5 28t11 28v139q0 8 5.5 13.5t13.5 5.5h187q8 0 13.5 -5.5t5.5 -13.5v-139q0 -65 -29.5 -121.5t-80.5 -98.5t-119 -66.5t-146 -24.5 t-146 24.5t-119 66.5t-80.5 98.5t-29.5 121.5zM0 544v187q0 19 19 19h187q19 0 19 -19v-187q0 -19 -19 -19h-187q-19 0 -19 19zM525 544v187q0 19 19 19h187q19 0 19 -19v-187q0 -19 -19 -19h-187q-19 0 -19 19z" />
+<glyph unicode="&#xf077;" horiz-adv-x="750" d="M-0.5 173.5q-0.5 18.5 13.5 32.5l329 329q14 14 33 14t33 -14l328 -329q14 -14 14 -32.5t-14 -32.5l-49 -50q-14 -14 -33 -14t-33 14l-248 249l-244 -249q-14 -14 -33 -14t-33 14l-49 50q-14 14 -14.5 32.5z" />
+<glyph unicode="&#xf078;" horiz-adv-x="750" d="M0 448.5q0 18.5 14 32.5l49 50q14 14 33 14t33 -14l248 -249l244 249q14 14 33 14t33 -14l49 -50q14 -14 14.5 -32.5t-13.5 -32.5l-329 -329q-14 -14 -33 -14t-33 14l-328 329q-14 14 -14 32.5z" />
+<glyph unicode="&#xf079;" d="M1 502.5q-6 14.5 13 34.5l181 199q12 14 30 14t30 -14l181 -199q19 -20 13 -34.5t-32 -14.5h-117v-319h81q4 -5 6.5 -9.5t7.5 -9.5l119 -131h-327q-15 0 -26 11t-11 26v432h-117q-26 0 -32 14.5zM386 731h326q16 0 27 -11t11 -26v-431h117q26 0 32 -15t-13 -35l-181 -199 q-12 -14 -30 -14t-30 14l-181 199q-19 20 -13 35t32 15h117v318h-81q-4 5 -6.5 9.5t-7.5 9.5z" />
+<glyph unicode="&#xf07a;" d="M0 694v37q0 19 19 19h113q8 0 18.5 -2t17.5 -4q3 -2 7 -7t7.5 -11.5t6 -13t3.5 -10.5l13 -61h658q17 0 28 -13t8 -29l-53 -282q-3 -12 -13 -20.5t-24 -8.5h-529l17 -82q2 -8 8.5 -13t14.5 -5h418q8 0 13.5 -5.5t5.5 -13.5v-38q0 -8 -5.5 -13t-13.5 -5h-80h-318h-51 q-8 0 -18 1.5t-17 4.5q-3 1 -7 6.5t-7.5 12t-6 13t-3.5 10.5l-105 496q-2 8 -8.5 13t-14.5 5h-83q-19 0 -19 19zM284 56q0 23 16.5 40t39.5 17q24 0 40.5 -17t16.5 -40t-16.5 -39.5t-40.5 -16.5q-23 0 -39.5 16.5t-16.5 39.5zM602 56q0 23 16.5 40t39.5 17t39.5 -17 t16.5 -40t-16.5 -39.5t-39.5 -16.5t-39.5 16.5t-16.5 39.5z" />
+<glyph unicode="&#xf07b;" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h338q23 0 39.5 -16.5t16.5 -39.5t16.5 -39.5t39.5 -16.5h338q23 0 39.5 -17t16.5 -40v-525q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5z" />
+<glyph unicode="&#xf07c;" d="M0 185v509q0 23 16.5 39.5t39.5 16.5h338q23 0 39.5 -16.5t16.5 -39.5t16.5 -39.5t39.5 -16.5h216q23 0 39.5 -17t16.5 -40v-108h-600q-18 0 -35 -6t-32 -16.5t-26 -25t-17 -31.5zM21 0l120 371q3 11 15 19t23 8h721l-127 -370q-3 -11 -15 -19.5t-23 -8.5h-714z" />
+<glyph unicode="&#xf07d;" horiz-adv-x="375" d="M0.5 187q4.5 11 27.5 11h95v354h-95q-23 0 -27.5 10.5t11.5 26.5l150 151q10 10 26 10q15 0 25 -10l150 -151q16 -15 11.5 -26t-27.5 -11h-95v-354h95q23 0 27.5 -10.5t-11.5 -26.5l-150 -151q-10 -10 -26 -10q-15 0 -25 10l-150 151q-16 15 -11.5 26z" />
+<glyph unicode="&#xf07e;" horiz-adv-x="750" d="M0 357q0 15 10 25l151 151q15 15 26 10.5t11 -26.5v-96h354v96q0 22 10.5 26.5t26.5 -11.5l151 -150q10 -10 10 -25t-10 -25l-151 -151q-15 -16 -26 -11t-11 27v96h-354v-96q0 -22 -10.5 -26.5t-26.5 11.5l-151 150q-10 10 -10 25z" />
+<glyph unicode="&#xf080;" d="M0 56v638q0 23 17 39.5t40 16.5h787q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-787q-23 0 -40 16.5t-17 39.5zM75 75h750v600h-750v-600zM150 129v177h99v-177h-99zM317 129v379h98v-379h-98zM485 129v289h99v-289h-99zM651 129v450h99v-450h-99z " />
+<glyph unicode="&#xf081;" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t36 7.5h563q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-563q-19 0 -36 7.5t-29.5 20t-20 29.5t-7.5 37zM98 273q39 -54 97 -82.5t127 -28.5q47 0 90 13t78 36t60.5 55t37.5 70q40 3 63 28 q7 7 2 16q-4 9 -15 7h-2q11 11 15 22q4 10 -4 16q-7 7 -16 1q-4 -2 -14.5 -5t-22.5 -3q-2 0 -3.5 0.5t-3.5 0.5q0 1 -0.5 2t-0.5 2q-8 30 -28 54t-46 35q2 2 3 4t3 4q3 8 0 16q-1 3 -6 8t-17 4q-1 2 -3 4q-6 6 -12 4q-12 -2 -24 -6l-1 1q-7 4 -15 -1q-29 -18 -48 -49 t-33 -66q-17 15 -28 20q-30 17 -63 31t-75 30q-7 2 -12 -2q-5 -3 -7 -10q-1 -13 4 -28.5t19 -30.5q-12 -3 -10 -16q6 -33 33 -49l-6 -6q-7 -7 -2 -16q2 -6 13 -18.5t32 -18.5q-3 -6 -3 -11t1 -7q3 -16 19 -24q-18 -12 -38.5 -16.5t-41.5 -3t-40.5 10t-34.5 22.5q-4 4 -9.5 4 t-9.5 -4q-11 -9 -2 -19z" />
+<glyph unicode="&#xf082;" horiz-adv-x="750" d="M1 94v562q0 19 7.5 36.5t20 30t29.5 20t36 7.5h563q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-237v314h84q6 0 10.5 4t4.5 10l6 82q0 7 -4 12q-5 5 -11 5h-90v36q0 20 5 26.5t26 6.5q12 0 27 -2t29 -5q3 0 6.5 0.5t5.5 2.5 q5 3 7 11l11 79q2 14 -12 17q-44 12 -92 12q-147 0 -147 -143v-41h-50q-16 0 -16 -16v-82q0 -6 4.5 -10.5t11.5 -4.5h50v-314h-192q-19 0 -36 7.5t-29.5 20t-20 29.5t-7.5 37z" />
+<glyph unicode="&#xf083;" d="M0 56v638q0 23 16.5 39.5t39.5 16.5h788q23 0 39.5 -16.5t16.5 -39.5v-638q0 -23 -16.5 -39.5t-39.5 -16.5h-788q-23 0 -39.5 16.5t-16.5 39.5zM75 78h750v56h-750v-56zM75 559h750v113h-467l-7 -45h-276v-68zM130 655h154v45h-154v-45zM272 346q0 -37 14 -69.5t38 -56.5 t56.5 -38t69.5 -14t69.5 14t56.5 38t38 56.5t14 69.5t-14 69.5t-38 56.5t-56.5 38t-69.5 14t-69.5 -14t-56.5 -38t-38 -56.5t-14 -69.5zM328 346q0 25 9.5 47.5t26 39t39 26t47.5 9.5t47.5 -9.5t39 -26t26 -39t9.5 -47.5t-9.5 -47.5t-26 -39t-39 -26t-47.5 -9.5t-47.5 9.5 t-39 26t-26 39t-9.5 47.5zM363 346q0 -8 6 -14t14 -6q9 0 15 6t6 14q0 20 13.5 33t32.5 13v1q9 0 15 6t6 14q0 9 -6 15t-15 6q-36 0 -61.5 -26t-25.5 -62z" />
+<glyph unicode="&#xf084;" d="M0.5 391.5q-2.5 52.5 14 108.5t53.5 107q36 51 83.5 85t98 48t99.5 8t90 -35q36 -26 57 -63.5t27.5 -82.5t-1.5 -93.5t-32 -95.5l195 -139l47 65l-49 35q-7 5 -8.5 13t3.5 15l23 32q5 7 13 8.5t15 -3.5l163 -116q7 -5 8 -13t-4 -15l-23 -33q-5 -7 -13 -8.5t-15 3.5 l-48 35l-47 -65l116 -83q20 -14 24.5 -39t-10.5 -45q-14 -20 -38.5 -24t-44.5 10l-376 269q-37 -38 -80.5 -61.5t-88 -31.5t-87 -0.5t-78.5 33.5q-41 29 -62.5 74t-24 97.5zM109 374.5q3 -19.5 13.5 -37t27.5 -29.5t37 -16.5t39.5 -1t37 14t29.5 27.5q17 24 18 53t-12 54 q28 -5 55 5.5t45 35.5q12 17 16.5 37t1 39.5t-14 37t-27.5 29.5t-37 16.5t-39.5 1t-37 -14t-29.5 -27.5q-17 -25 -18.5 -54t12.5 -54q-28 5 -55 -5.5t-45 -35.5q-12 -17 -16 -36.5t-1 -39z" />
+<glyph unicode="&#xf085;" d="M0 391v84q0 6 5 6q14 4 29.5 6t30.5 4q4 0 7 0.5t7 0.5q6 21 17 42q-9 14 -20 28t-23 28q-5 5 0 9q14 17 30 33.5t33 30.5q6 4 9 -1q8 -8 17 -14.5t18 -13.5l21 -15q21 11 42 17q2 21 4.5 39t6.5 35q0 5 6 5h84q7 0 7 -6q2 -14 4.5 -28.5t4.5 -29.5l2 -15q20 -6 41 -17 q8 7 19 14q10 8 19.5 15t18.5 15q6 4 9 -1q5 -4 9 -8l8 -8l22 -22q12 -12 23 -25q3 -5 0 -9q-10 -11 -20 -24.5t-23 -30.5q6 -11 10.5 -22t8.5 -22q8 -2 17.5 -3t19.5 -3l18 -2q9 -1 17 -3q6 -2 6 -7v-84q0 -5 -5 -7q-14 -3 -29.5 -5t-30.5 -4q-4 0 -14 -2q-6 -20 -17 -41 q9 -14 20 -28t23 -28q4 -5 0 -9q-14 -17 -30 -33.5t-33 -30.5q-6 -4 -9 1q-8 7 -17 14t-18 13q-5 5 -10.5 8.5t-10.5 7.5q-21 -11 -42 -17q-2 -17 -4 -36.5t-7 -37.5q-2 -5 -7 -5h-84q-6 0 -6 5q-3 14 -5 29l-4 30l-2 15q-20 6 -41 17q-5 -4 -9.5 -7t-9.5 -7 q-10 -8 -19.5 -15t-18.5 -15q-6 -4 -9 1q-5 4 -8 8l-9 8q-11 11 -22.5 22t-22.5 25q-4 4 0 8q12 14 22.5 28.5t19.5 27.5q-10 20 -18 44q-8 2 -17.5 3t-19.5 3l-18 2q-9 1 -18 3q-5 2 -5 7zM197 432q0 -35 25 -60t60 -25t60 25t25 60t-25 60t-60 25t-60 -25t-25 -60z M524 188q-2 6 4 8q11 4 21 8t21 8q1 5 1.5 9t2.5 9t3.5 8.5t3.5 8.5q-7 10 -13 19.5t-12 19.5q-3 5 2 8l62 56q4 4 9 1q9 -7 17.5 -14t17.5 -15q18 7 35 8q5 11 10.5 21t10.5 19q3 5 8 3l80 -25q5 -2 5 -8q-2 -11 -4 -21.5t-4 -21.5q8 -6 14 -13t11 -15q12 1 23 1.5t22 0.5 q5 0 7 -5l18 -83q2 -5 -4 -7q-11 -5 -21 -8.5t-21 -7.5q-1 -5 -1.5 -9t-2.5 -9t-3.5 -8.5t-3.5 -7.5q7 -10 13.5 -19.5t11.5 -19.5q2 -5 -2 -8l-62 -57q-4 -4 -9 0q-8 7 -17 14t-17 14q-20 -7 -37 -8q-5 -11 -10 -21t-10 -19q-3 -5 -8 -3l-80 25q-5 2 -5 8q2 11 3.5 22 t3.5 22q-14 12 -24 27q-12 -2 -23.5 -2.5t-22.5 0.5q-5 0 -7 5zM560 607q0 5 5 7q10 2 20 4.5t20 4.5q2 4 3 8t3 8t4.5 7t4.5 7q-5 10 -9 19.5t-8 18.5q-2 4 2 8l64 42q5 3 8 -1q8 -7 14.5 -14.5t13.5 -15.5q16 3 33 3q12 18 24 33q3 3 8 2l69 -34q5 -3 3 -8 q-2 -10 -5.5 -19t-6.5 -19q10 -13 18 -29q11 -1 21.5 -1.5t20.5 -2.5q5 -2 5 -6l5 -77q0 -4 -5 -6q-10 -2 -19.5 -4.5t-20.5 -4.5q-2 -4 -3 -7.5t-3 -7.5q-3 -7 -8 -14q5 -10 9 -19.5t8 -18.5q2 -5 -3 -8l-63 -42q-5 -3 -8 1q-13 12 -28 30q-8 -2 -16.5 -3t-17.5 0 q-6 -9 -12 -17.5t-12 -16.5q-3 -3 -8 -1l-69 34q-5 2 -3 7q3 10 6 19.5t7 19.5q-6 6 -10.5 13t-8.5 15q-11 1 -21.5 1.5t-20.5 2.5q-5 0 -5 6zM658 203q-7 -22 3.5 -42.5t33.5 -27.5q22 -8 42.5 2.5t27.5 33.5q8 22 -2.5 42.5t-33.5 28.5q-22 7 -42.5 -3.5t-28.5 -33.5z M681 564q7 -20 26 -30q20 -9 40 -2.5t29 25.5q10 20 3 40t-26 29q-19 10 -39 3t-30 -26t-3 -39z" />
+<glyph unicode="&#xf086;" d="M0 483q0 55 29 103.5t78.5 85t116 57.5t142.5 21t142.5 -21t116 -57.5t78 -85t28.5 -103.5q0 -56 -28.5 -104.5t-78 -84.5t-116 -57t-142.5 -21q-18 0 -35 1.5t-34 3.5q-34 -26 -73 -45t-84 -29q-20 -5 -40 -6q-12 -2 -16 11v1q-2 5 1.5 9t7.5 8q17 17 30 37t21 64 q-66 36 -105 91t-39 121zM305 136q8 4 12 7q13 -2 25 -2h24q93 0 173 26.5t139.5 72.5t93.5 108.5t34 134.5q0 19 -3 39q45 -36 71 -81.5t26 -98.5q0 -66 -39 -120.5t-105 -91.5q8 -44 21 -63.5t30 -36.5q4 -5 7.5 -9t1.5 -9q-1 -6 -6 -9.5t-10 -2.5q-11 2 -20.5 3.5 t-19.5 3.5q-88 19 -157 73q-17 -2 -34 -3.5t-35 -1.5q-66 0 -123.5 16t-105.5 45z" />
+<glyph unicode="&#xf087;" horiz-adv-x="783" d="M0.5 222q-1.5 56 2 112t12.5 105q45 3 94 3t90 -10q6 -38 10 -91t5.5 -110t0.5 -111t-5 -94q-18 -2 -41.5 -2.5t-49 0.5t-50 1.5t-44.5 0.5q-10 38 -16.5 89t-8 107zM91 101q0 -16 11 -27t27 -11t26.5 11t10.5 27q0 15 -10.5 26t-26.5 11t-27 -11t-11 -26zM240 412 q22 10 35.5 19.5t24.5 21t22.5 26t30.5 34.5q16 16 28.5 26.5t23 20t19 20t17.5 25.5q16 29 21 65t13 68q0 7 7 11q19 3 35 -3.5t28 -17.5t19.5 -26t10.5 -28q6 -33 -1.5 -59.5t-19 -50.5t-22 -46.5t-11.5 -47.5q21 -9 51.5 -9.5t63.5 1t64 1.5t52 -8.5t28.5 -29t-5.5 -59.5 q0 -2 -2.5 -5.5t-5 -8t-4.5 -8.5l-2 -3q11 -11 16 -23t5 -20q1 -39 -32 -68q10 -15 11 -31.5t-4 -31.5t-14.5 -26.5t-21.5 -17.5q6 -34 -6 -58t-35.5 -38.5t-56.5 -20.5t-69 -6t-72.5 5t-67.5 14q-20 6 -39 14t-38.5 15t-41 11t-45.5 0q2 39 2.5 85t-1 93.5t-4.5 92.5t-7 82 z" />
+<glyph unicode="&#xf088;" horiz-adv-x="783" d="M1 452q-1 21 7.5 37.5t24.5 30.5q-9 15 -10 31.5t3.5 31.5t14 26.5t21.5 17.5q-6 34 6 58t35.5 38.5t56.5 20.5t69 6t72.5 -5t67.5 -14q20 -6 39 -14t38.5 -15t41 -10.5t45.5 0.5q-2 -39 -2.5 -85.5t1 -94t4 -92.5t7.5 -82q-22 -10 -35.5 -19.5t-24 -21t-22.5 -26 t-31 -33.5q-15 -17 -27.5 -27.5t-23 -20t-19.5 -19.5t-18 -26q-16 -29 -20.5 -65t-13.5 -68q0 -8 -7 -11q-20 -3 -35.5 3.5t-27.5 17.5t-19.5 25.5t-10.5 28.5q-6 33 1.5 59.5t19 50.5t22 47t11.5 48q-21 9 -51.5 9t-63.5 -1.5t-63.5 -1.5t-52 8.5t-29 29t5.5 59.5 q1 1 3.5 5.5t5 8.5t3.5 8l2 3q-11 11 -16 23t-5 20zM568 630q1 54 5 94q18 2 42 2.5t49.5 0t50 -1.5t44.5 -1q10 -38 16 -89t7.5 -106.5t-2 -112t-12.5 -105.5q-45 -3 -93.5 -3t-90.5 10q-6 38 -10 91t-5.5 110t-0.5 111zM617 650q0 -16 11 -27t27 -11q15 0 26 11t11 27 q0 15 -11 26t-26 11q-16 0 -27 -11t-11 -26z" />
+<glyph unicode="&#xf089;" horiz-adv-x="393" d="M0.5 465q4.5 13 25.5 16l238 34l106 216q9 19 23 19v-633l-212 -112q-20 -10 -31 -2t-7 30l41 236l-172 168q-16 15 -11.5 28z" />
+<glyph unicode="&#xf08a;" horiz-adv-x="846" d="M0 519q0 64 20.5 108t53 71.5t73.5 39.5t82 12q30 0 59 -10t54 -25t45.5 -32.5t35.5 -32.5q15 15 36 32.5t46 32.5t53.5 25t58.5 10q42 0 83 -12t73.5 -39.5t52.5 -71.5t20 -108q0 -44 -16.5 -83.5t-36 -69.5t-37 -48t-18.5 -19l-288 -288q-13 -11 -27 -11q-15 0 -26 11 l-290 288q-1 1 -18 19t-36.5 48t-36 69.5t-16.5 83.5zM75 519q0 -32 13 -61.5t29 -53t29 -37.5l14 -14l263 -263l263 262q1 1 14 15t29 37.5t29 53t13 61.5q0 48 -14 78.5t-36.5 48t-50 23.5t-53.5 6q-25 0 -50.5 -12t-48 -29t-40 -34.5t-26.5 -28.5q-11 -14 -29 -14t-29 14 q-9 11 -26.5 28.5t-40 34.5t-48 29t-50.5 12q-26 0 -53.5 -6t-50 -23.5t-36.5 -48t-14 -78.5z" />
+<glyph unicode="&#xf08b;" horiz-adv-x="825" d="M0 150v450q0 31 12 58t32.5 47.5t47.5 32.5t58 12h225v-94h-225q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h225v-94h-225q-31 0 -58 12t-47.5 32.5t-32.5 47.5t-12 58zM248 285v180q0 16 11 26.5t27 10.5h209v143q0 20 19 28q19 7 32 -7l270 -270 q9 -9 9 -21.5t-9 -20.5l-270 -270q-9 -9 -21 -9q-5 0 -11 2q-19 8 -19 28v142h-209q-16 0 -27 11t-11 27z" />
+<glyph unicode="&#xf08c;" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t37 7.5h562q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-562q-39 0 -66.5 27.5t-27.5 66.5zM101 582q0 -28 19.5 -47.5t46.5 -19.5q28 0 47.5 19.5t19.5 47.5q0 27 -19.5 46.5t-47.5 19.5 q-27 0 -46.5 -19.5t-19.5 -46.5zM104 117q0 -5 4.5 -9.5t9.5 -4.5h98q6 0 10 4.5t4 9.5v345q0 14 -14 14h-98q-5 0 -9.5 -4t-4.5 -10v-345zM283 117q0 -5 4.5 -9.5t9.5 -4.5h98q6 0 10 4.5t4 9.5v187q0 28 8 47q15 31 55 31q32 0 42 -19q7 -11 7 -35v-211q0 -5 4 -9.5 t10 -4.5h100q6 0 10 4.5t4 9.5v233q0 72 -42 104q-40 31 -103 31q-50 0 -85 -23q-4 -3 -13 -12v12q0 14 -14 14h-95q-5 0 -9.5 -4t-4.5 -10v-345z" />
+<glyph unicode="&#xf08d;" d="M1 461q4 38 21 80.5t47 82.5t65.5 68.5t71.5 43t68.5 14t56.5 -18.5q25 -18 34.5 -49.5t5.5 -70.5l141 -105q52 29 101.5 33.5t84.5 -21.5q25 -19 37.5 -50.5t11.5 -70.5t-14.5 -83.5t-39.5 -88.5l201 -193q5 -5 6 -12t-4 -12q-5 -8 -15 -8q-3 0 -9 2l-242 138 q-35 -37 -73.5 -63t-75.5 -38t-71 -9.5t-60 22.5q-35 26 -45 74.5t4 106.5l-141 106q-36 -15 -69 -15t-58 18q-24 18 -34 49.5t-6 69.5zM80 417.5q1 -7.5 8 -12.5q8 -7 22 -7q15 0 31.5 8t33.5 22t33.5 31.5t31.5 37.5q5 6 4 13.5t-8 12.5q-6 5 -13.5 4t-12.5 -8 q-37 -49 -65.5 -67.5t-34.5 -16.5q-6 5 -13.5 4t-12.5 -8q-5 -6 -4 -13.5zM219 368l170 -127q6 -4 11 -4q10 0 15 8q5 6 4 13.5t-7 12.5l-163 121q-15 -14 -30 -24zM393 141q-10 -16 4 -27q13 -10 33 -10q19 0 41 10t44.5 27t44.5 39t41 47q5 7 4 14.5t-8 12.5 q-6 5 -13.5 3.5t-12.5 -7.5q-24 -32 -48 -54.5t-45 -35.5t-36.5 -17t-22.5 2q-6 5 -13.5 3.5t-12.5 -7.5z" />
+<glyph unicode="&#xf08e;" d="M0 150v450q0 31 12 58.5t32 47.5t47.5 32t58.5 12h284q-1 -7 -2 -13.5t-1 -14.5v-43q0 -11 3 -23h-284q-23 0 -39.5 -16.5t-16.5 -39.5v-450q0 -23 16.5 -39.5t39.5 -16.5h525q23 0 39.5 16.5t16.5 39.5v166q20 -15 44 -24t50 -10v-132q0 -31 -12 -58t-32.5 -47.5 t-47.5 -32.5t-58 -12h-525q-31 0 -58.5 12t-47.5 32.5t-32 47.5t-12 58zM338 255q0 12 8 20l376 377h-131q-12 0 -20 8t-8 20v42q-1 11 7.5 19.5t20.5 8.5h281q11 0 19.5 -8.5t8.5 -19.5v-42v-239q0 -12 -8.5 -20.5t-19.5 -7.5h-42q-12 0 -20 8t-8 20v131l-377 -376 q-8 -8 -20 -8t-20 8l-39 39q-8 8 -8 20z" />
+<glyph unicode="&#xf090;" horiz-adv-x="825" d="M0 285v180q0 16 11 26.5t27 10.5h209v143q0 20 18 28q19 7 33 -7l270 -270q8 -9 8 -21.5t-8 -20.5l-270 -270q-9 -9 -21 -9q-4 0 -12 2q-18 8 -18 28v142h-209q-16 0 -27 11t-11 27zM450 0v94h225q23 0 39.5 16.5t16.5 39.5v450q0 23 -16.5 39.5t-39.5 16.5h-225v94h225 q31 0 58 -12t47.5 -32t32.5 -47.5t12 -58.5v-450q0 -31 -12 -58t-32.5 -47.5t-47.5 -32.5t-58 -12h-225z" />
+<glyph unicode="&#xf091;" horiz-adv-x="825" d="M0 509v91q0 16 11 26.5t27 10.5h158q-1 6 -1 13v11v2q0 26 2 43t7.5 26.5t15.5 13.5t27 4h331q16 0 26.5 -4t16 -13.5t7.5 -26.5t2 -43v-13q0 -6 -1 -13h158q16 0 27 -10.5t11 -26.5v-91q0 -31 -22 -64t-59.5 -62.5t-88 -52t-108.5 -31.5q-25 -5 -44.5 -20.5t-19.5 -34.5 q0 -17 8.5 -25t19 -15t19.5 -15.5t11 -25.5q2 -11 -1 -23q-2 -7 11.5 -11.5t33 -9t40 -11t31.5 -16.5q6 -5 9.5 -19.5t4.5 -31.5q1 -16 -3 -28.5t-14 -12.5h-481q-10 0 -14 12.5t-3 28.5q1 17 4.5 31.5t9.5 19.5q11 10 31 16.5t39.5 11t33.5 9t12 11.5t-2 12v11 q1 17 10.5 25.5t20.5 15.5t19.5 15t8.5 25q0 19 -19.5 34.5t-45.5 20.5q-57 10 -107.5 32.5t-88 51.5t-59.5 62t-22 64zM75 509q0 -10 11.5 -26.5t33 -34.5t52 -35t68.5 -29q-12 39 -21.5 85.5t-16.5 92.5h-127v-53zM585 384q38 12 68.5 29t52 35t33 34.5t11.5 26.5v53h-128 q-6 -46 -15.5 -92.5t-21.5 -85.5z" />
+<glyph unicode="&#xf092;" horiz-adv-x="750" d="M0 94v562q0 19 7.5 36.5t20 30t29.5 20t37 7.5h562q39 0 66.5 -27.5t27.5 -66.5v-562q0 -20 -7.5 -37t-20 -29.5t-30 -20t-36.5 -7.5h-562q-39 0 -66.5 27.5t-27.5 66.5zM94 321q0 -44 11 -82.5t41.5 -67t85.5 -45t143 -16.5t142.5 16.5t85.5 45t42 67t11 82.5 q0 73 -46 127q4 16 5 36t-1.5 39t-7.5 36t-12 29h-14q-42 -2 -74 -22t-63 -37l-7 1q-8 0 -18.5 1t-22 1.5t-20.5 0.5q-18 0 -35 -1t-33 -3q-31 17 -63 37t-74 22h-14q-8 -12 -12.5 -29t-7 -36t-1.5 -39t5 -36q-46 -54 -46 -127zM183 289q15 60 84 67q13 2 27 1.5t30 -1.5 q7 0 25.5 -1t25.5 -1t25.5 1t25.5 1q16 1 30 1.5t26 -1.5q70 -7 85 -67q8 -33 -3 -61.5t-24 -41.5q-20 -20 -66 -32t-99 -12t-99 12t-66 32q-13 13 -24 41.5t-3 61.5zM242 265q0 -23 11 -39t27 -16t27 16t11 39t-11 38.5t-27 15.5t-27 -15.5t-11 -38.5zM432 265 q0 -23 11 -39t27 -16t27 16t11 39t-11 38.5t-27 15.5t-27 -15.5t-11 -38.5z" />
+<glyph unicode="&#xf093;" d="M0 19v300q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-169h600v169q0 8 5.5 13.5t13.5 5.5h112q8 0 13.5 -5.5t5.5 -13.5v-300q0 -19 -19 -19h-862q-19 0 -19 19zM169 473.5q-3 7.5 8 18.5l246 247q11 11 27 11t27 -11l247 -247q11 -11 7.5 -18.5t-18.5 -7.5 h-150v-244q0 -16 -11 -27t-27 -11h-150q-16 0 -26.5 11t-10.5 27v244h-150q-16 0 -19 7.5z" />
+<glyph unicode="&#xf094;" horiz-adv-x="786" d="M1 251q-1 17 0.5 33.5t3.5 36.5q2 17 3.5 35t4.5 32q7 32 15 62.5t22 57.5q10 20 22 39.5t26 38.5q5 7 10.5 12t11.5 10l22 22q11 11 24 21t28 18t32 16q16 8 33 14.5t35 13.5q34 14 76 25l1 1q22 6 41.5 8.5t38.5 2.5q29 0 55 -4.5t52 -9.5q20 -4 41.5 -7.5t45.5 -3.5h1 q14 0 30.5 2.5t32.5 2.5q12 0 22 -3t16 -12q11 -15 12.5 -35t-0.5 -37t-4 -34.5t1 -35.5q2 -11 5.5 -19t7.5 -18q4 -9 5.5 -19.5t3.5 -20.5q9 -51 7.5 -95.5t-11.5 -83t-27.5 -72.5t-39.5 -65q-18 -24 -38.5 -47.5t-45 -44.5t-54 -38t-65.5 -29q-37 -13 -77.5 -16.5 t-77.5 -5.5h-15q-51 0 -95 8t-94 8h-2q-17 0 -37.5 -5t-40.5 -6h-1q-18 0 -32 8.5t-21 20.5q-10 17 -8.5 35.5t6.5 33.5t5 32.5t-2.5 37t-6 39.5t-4.5 40z" />
+<glyph unicode="&#xf095;" horiz-adv-x="1000" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svgz b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.svgz
new file mode 100755
index 0000000000000000000000000000000000000000..2a73cd7c10f25c9ca99aa864ba1fdccce215c990
GIT binary patch
literal 21845
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
U{{;X50RR630De+Ok3Am&03Hq9T>t<8

literal 0
HcmV?d00001

diff --git a/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.ttf b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..4972eb453fcbbb87e2da55f2910ee2333f08c8a7
GIT binary patch
literal 41916
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

literal 0
HcmV?d00001

diff --git a/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.woff b/htdocs/js/lib/vendor/FontAwesome/font/fontawesome-webfont.woff
new file mode 100755
index 0000000000000000000000000000000000000000..6e4cb41f51287155de421573084c1aeeede64ecb
GIT binary patch
literal 23416
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
LFsvtGM?(59Ex;av

literal 0
HcmV?d00001

diff --git a/htdocs/js/LibraryBrowser/backbone.js b/htdocs/js/lib/vendor/backbone.js
similarity index 100%
rename from htdocs/js/LibraryBrowser/backbone.js
rename to htdocs/js/lib/vendor/backbone.js
diff --git a/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.css b/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.css
new file mode 100644
index 0000000000..7f669d573f
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.css
@@ -0,0 +1,808 @@
+/*!
+ * Bootstrap Responsive v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 28px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+@media (max-width: 767px) {
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 18px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .modal {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    left: 10px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  [class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: auto;
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 28px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 28px;
+    margin-left: 2.762430939%;
+    *margin-left: 2.709239449638298%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .span12 {
+    width: 99.999999993%;
+    *width: 99.9468085036383%;
+  }
+  .row-fluid .span11 {
+    width: 91.436464082%;
+    *width: 91.38327259263829%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817100001%;
+    *width: 82.8197366816383%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226%;
+    *width: 74.25620077063829%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585634900001%;
+    *width: 65.6926648596383%;
+  }
+  .row-fluid .span7 {
+    width: 57.182320438000005%;
+    *width: 57.129128948638304%;
+  }
+  .row-fluid .span6 {
+    width: 48.618784527%;
+    *width: 48.5655930376383%;
+  }
+  .row-fluid .span5 {
+    width: 40.055248616%;
+    *width: 40.0020571266383%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712705%;
+    *width: 31.4385212156383%;
+  }
+  .row-fluid .span3 {
+    width: 22.928176794%;
+    *width: 22.874985304638297%;
+  }
+  .row-fluid .span2 {
+    width: 14.364640883%;
+    *width: 14.311449393638298%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972%;
+    *width: 5.747913482638298%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 714px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 652px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 590px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 528px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 466px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 404px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 342px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 280px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 218px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 156px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 94px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 32px;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 28px;
+    margin-left: 2.564102564%;
+    *margin-left: 2.510911074638298%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145300001%;
+    *width: 91.3997999636383%;
+  }
+  .row-fluid .span10 {
+    width: 82.905982906%;
+    *width: 82.8527914166383%;
+  }
+  .row-fluid .span9 {
+    width: 74.358974359%;
+    *width: 74.30578286963829%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581200001%;
+    *width: 65.7587743226383%;
+  }
+  .row-fluid .span7 {
+    width: 57.264957265%;
+    *width: 57.2117657756383%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948718%;
+    *width: 48.6647572286383%;
+  }
+  .row-fluid .span5 {
+    width: 40.170940171000005%;
+    *width: 40.117748681638304%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931624%;
+    *width: 31.5707401346383%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923077%;
+    *width: 23.0237315876383%;
+  }
+  .row-fluid .span2 {
+    width: 14.529914530000001%;
+    *width: 14.4767230406383%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905983%;
+    *width: 5.929714493638298%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1160px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1060px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 960px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 860px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 760px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 660px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 560px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 460px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 360px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 260px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 160px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 60px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top {
+    position: static;
+    margin-bottom: 18px;
+  }
+  .navbar-fixed-top .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 9px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #999999;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 6px 15px;
+    font-weight: bold;
+    color: #999999;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .dropdown-menu a:hover {
+    background-color: #222222;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: block;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 9px 15px;
+    margin: 9px 0;
+    border-top: 1px solid #222222;
+    border-bottom: 1px solid #222222;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.min.css b/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.min.css
new file mode 100644
index 0000000000..dd134a1bd2
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}@media(max-width:767px){.visible-phone{display:inherit!important}.hidden-phone{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(min-width:768px) and (max-width:979px){.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:18px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.modal{position:absolute;top:10px;right:10px;left:10px;width:auto;margin:0}.modal.fade.in{top:auto}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:auto;margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.762430939%;*margin-left:2.709239449638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.999999993%;*width:99.9468085036383%}.row-fluid .span11{width:91.436464082%;*width:91.38327259263829%}.row-fluid .span10{width:82.87292817100001%;*width:82.8197366816383%}.row-fluid .span9{width:74.30939226%;*width:74.25620077063829%}.row-fluid .span8{width:65.74585634900001%;*width:65.6926648596383%}.row-fluid .span7{width:57.182320438000005%;*width:57.129128948638304%}.row-fluid .span6{width:48.618784527%;*width:48.5655930376383%}.row-fluid .span5{width:40.055248616%;*width:40.0020571266383%}.row-fluid .span4{width:31.491712705%;*width:31.4385212156383%}.row-fluid .span3{width:22.928176794%;*width:22.874985304638297%}.row-fluid .span2{width:14.364640883%;*width:14.311449393638298%}.row-fluid .span1{width:5.801104972%;*width:5.747913482638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:714px}input.span11,textarea.span11,.uneditable-input.span11{width:652px}input.span10,textarea.span10,.uneditable-input.span10{width:590px}input.span9,textarea.span9,.uneditable-input.span9{width:528px}input.span8,textarea.span8,.uneditable-input.span8{width:466px}input.span7,textarea.span7,.uneditable-input.span7{width:404px}input.span6,textarea.span6,.uneditable-input.span6{width:342px}input.span5,textarea.span5,.uneditable-input.span5{width:280px}input.span4,textarea.span4,.uneditable-input.span4{width:218px}input.span3,textarea.span3,.uneditable-input.span3{width:156px}input.span2,textarea.span2,.uneditable-input.span2{width:94px}input.span1,textarea.span1,.uneditable-input.span1{width:32px}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:30px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.564102564%;*margin-left:2.510911074638298%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145300001%;*width:91.3997999636383%}.row-fluid .span10{width:82.905982906%;*width:82.8527914166383%}.row-fluid .span9{width:74.358974359%;*width:74.30578286963829%}.row-fluid .span8{width:65.81196581200001%;*width:65.7587743226383%}.row-fluid .span7{width:57.264957265%;*width:57.2117657756383%}.row-fluid .span6{width:48.717948718%;*width:48.6647572286383%}.row-fluid .span5{width:40.170940171000005%;*width:40.117748681638304%}.row-fluid .span4{width:31.623931624%;*width:31.5707401346383%}.row-fluid .span3{width:23.076923077%;*width:23.0237315876383%}.row-fluid .span2{width:14.529914530000001%;*width:14.4767230406383%}.row-fluid .span1{width:5.982905983%;*width:5.929714493638298%}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:1160px}input.span11,textarea.span11,.uneditable-input.span11{width:1060px}input.span10,textarea.span10,.uneditable-input.span10{width:960px}input.span9,textarea.span9,.uneditable-input.span9{width:860px}input.span8,textarea.span8,.uneditable-input.span8{width:760px}input.span7,textarea.span7,.uneditable-input.span7{width:660px}input.span6,textarea.span6,.uneditable-input.span6{width:560px}input.span5,textarea.span5,.uneditable-input.span5{width:460px}input.span4,textarea.span4,.uneditable-input.span4{width:360px}input.span3,textarea.span3,.uneditable-input.span3{width:260px}input.span2,textarea.span2,.uneditable-input.span2{width:160px}input.span1,textarea.span1,.uneditable-input.span1{width:60px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top{position:static;margin-bottom:18px}.navbar-fixed-top .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 9px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#999;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#222}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:block;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/htdocs/js/lib/vendor/bootstrap/css/bootstrap.css b/htdocs/js/lib/vendor/bootstrap/css/bootstrap.css
new file mode 100644
index 0000000000..09e2833dcd
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/css/bootstrap.css
@@ -0,0 +1,4960 @@
+/*!
+ * Bootstrap v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 28px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 28px;
+  margin-left: 2.127659574%;
+  *margin-left: 2.0744680846382977%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .span12 {
+  width: 99.99999998999999%;
+  *width: 99.94680850063828%;
+}
+
+.row-fluid .span11 {
+  width: 91.489361693%;
+  *width: 91.4361702036383%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872339599999%;
+  *width: 82.92553190663828%;
+}
+
+.row-fluid .span9 {
+  width: 74.468085099%;
+  *width: 74.4148936096383%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680199999%;
+  *width: 65.90425531263828%;
+}
+
+.row-fluid .span7 {
+  width: 57.446808505%;
+  *width: 57.3936170156383%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617020799999%;
+  *width: 48.88297871863829%;
+}
+
+.row-fluid .span5 {
+  width: 40.425531911%;
+  *width: 40.3723404216383%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893614%;
+  *width: 31.8617021246383%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255317%;
+  *width: 23.3510638276383%;
+}
+
+.row-fluid .span2 {
+  width: 14.89361702%;
+  *width: 14.8404255306383%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723%;
+  *width: 6.329787233638298%;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+}
+
+p small {
+  font-size: 11px;
+  color: #999999;
+}
+
+.lead {
+  margin-bottom: 18px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 27px;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0;
+  font-family: inherit;
+  font-weight: bold;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  color: #999999;
+}
+
+h1 {
+  font-size: 30px;
+  line-height: 36px;
+}
+
+h1 small {
+  font-size: 18px;
+}
+
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+
+h2 small {
+  font-size: 18px;
+}
+
+h3 {
+  font-size: 18px;
+  line-height: 27px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4,
+h5,
+h6 {
+  line-height: 18px;
+}
+
+h4 {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 12px;
+}
+
+h5 {
+  font-size: 12px;
+}
+
+h6 {
+  font-size: 11px;
+  color: #999999;
+  text-transform: uppercase;
+}
+
+.page-header {
+  padding-bottom: 17px;
+  margin: 18px 0;
+  border-bottom: 1px solid #eeeeee;
+}
+
+.page-header h1 {
+  line-height: 1;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 9px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+ul {
+  list-style: disc;
+}
+
+ol {
+  list-style: decimal;
+}
+
+li {
+  line-height: 18px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+dl {
+  margin-bottom: 18px;
+}
+
+dt,
+dd {
+  line-height: 18px;
+}
+
+dt {
+  font-weight: bold;
+  line-height: 17px;
+}
+
+dd {
+  margin-left: 9px;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 120px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 130px;
+}
+
+hr {
+  margin: 18px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+.muted {
+  color: #999999;
+}
+
+abbr[title] {
+  cursor: help;
+  border-bottom: 1px dotted #ddd;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 22.5px;
+}
+
+blockquote small {
+  display: block;
+  line-height: 18px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 18px;
+  font-style: normal;
+  line-height: 18px;
+}
+
+small {
+  font-size: 100%;
+}
+
+cite {
+  font-style: normal;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 9px;
+  font-size: 12.025px;
+  line-height: 18px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 18px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 18px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 27px;
+  font-size: 19.5px;
+  line-height: 36px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+
+legend small {
+  font-size: 13.5px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+  color: #333333;
+}
+
+input,
+textarea,
+select,
+.uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: 18px;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #555555;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+label input,
+label textarea,
+label select {
+  display: block;
+}
+
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0;
+  /* IE7 */
+
+  line-height: normal;
+  cursor: pointer;
+  background-color: transparent;
+  border: 0 \9;
+  /* IE9 and down */
+
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+input[type="image"] {
+  border: 0;
+}
+
+input[type="file"] {
+  width: auto;
+  padding: initial;
+  line-height: initial;
+  background-color: #ffffff;
+  background-color: initial;
+  border: initial;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  width: auto;
+  height: auto;
+}
+
+select,
+input[type="file"] {
+  height: 28px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 28px;
+}
+
+input[type="file"] {
+  line-height: 18px \9;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+input[type="image"] {
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+textarea {
+  height: auto;
+}
+
+input[type="hidden"] {
+  display: none;
+}
+
+.radio,
+.checkbox {
+  min-height: 18px;
+  padding-left: 18px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+input,
+textarea {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+      -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+input:focus,
+textarea:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus,
+select:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 930px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 850px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 770px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 690px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 610px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 530px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 450px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 370px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 290px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 210px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 130px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 50px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+  border-color: #ddd;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning > label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+  border-color: #c09853;
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: 0 0 6px #dbc59e;
+     -moz-box-shadow: 0 0 6px #dbc59e;
+          box-shadow: 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error > label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+  border-color: #b94a48;
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: 0 0 6px #d59392;
+     -moz-box-shadow: 0 0 6px #d59392;
+          box-shadow: 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success > label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+  border-color: #468847;
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: 0 0 6px #7aba7b;
+     -moz-box-shadow: 0 0 6px #7aba7b;
+          box-shadow: 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:required:invalid:focus,
+textarea:focus:required:invalid:focus,
+select:focus:required:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: not-allowed;
+  background-color: #ffffff;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+:-moz-placeholder {
+  color: #999999;
+}
+
+::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.help-block,
+.help-inline {
+  color: #555555;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 9px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-prepend,
+.input-append {
+  margin-bottom: 5px;
+}
+
+.input-prepend input,
+.input-append input,
+.input-prepend select,
+.input-append select,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: middle;
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.input-prepend input:focus,
+.input-append input:focus,
+.input-prepend select:focus,
+.input-append select:focus,
+.input-prepend .uneditable-input:focus,
+.input-append .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
+  border-left-color: #ccc;
+}
+
+.input-prepend .add-on,
+.input-append .add-on {
+  display: inline-block;
+  width: auto;
+  height: 18px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-weight: normal;
+  line-height: 18px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  vertical-align: middle;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
+  margin-left: -1px;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend .active,
+.input-append .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-append .uneditable-input {
+  border-right-color: #ccc;
+  border-left-color: #eee;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 14px;
+     -moz-border-radius: 14px;
+          border-radius: 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 9px;
+}
+
+legend + .control-group {
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 18px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 140px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 160px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 160px;
+}
+
+.form-horizontal .help-block {
+  margin-top: 9px;
+  margin-bottom: 0;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 160px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 18px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 18px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapsed;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child th:first-child,
+.table-bordered tbody:first-child tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child th:last-child,
+.table-bordered tbody:first-child tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child th:first-child,
+.table-bordered tbody:last-child tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+     -moz-border-radius: 0 0 0 4px;
+          border-radius: 0 0 0 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child th:last-child,
+.table-bordered tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-striped tbody tr:nth-child(odd) td,
+.table-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+
+.table tbody tr:hover td,
+.table tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+
+table .span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+table .span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+table .span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+table .span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+table .span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+table .span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+table .span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+table .span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+table .span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+table .span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+table .span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+table .span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+table .span13 {
+  float: none;
+  width: 1004px;
+  margin-left: 0;
+}
+
+table .span14 {
+  float: none;
+  width: 1084px;
+  margin-left: 0;
+}
+
+table .span15 {
+  float: none;
+  width: 1164px;
+  margin-left: 0;
+}
+
+table .span16 {
+  float: none;
+  width: 1244px;
+  margin-left: 0;
+}
+
+table .span17 {
+  float: none;
+  width: 1324px;
+  margin-left: 0;
+}
+
+table .span18 {
+  float: none;
+  width: 1404px;
+  margin-left: 0;
+}
+
+table .span19 {
+  float: none;
+  width: 1484px;
+  margin-left: 0;
+}
+
+table .span20 {
+  float: none;
+  width: 1564px;
+  margin-left: 0;
+}
+
+table .span21 {
+  float: none;
+  width: 1644px;
+  margin-left: 0;
+}
+
+table .span22 {
+  float: none;
+  width: 1724px;
+  margin-left: 0;
+}
+
+table .span23 {
+  float: none;
+  width: 1804px;
+  margin-left: 0;
+}
+
+table .span24 {
+  float: none;
+  width: 1884px;
+  margin-left: 0;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+[class^="icon-"]:last-child,
+[class*=" icon-"]:last-child {
+  *margin-left: 0;
+}
+
+.icon-white {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown:hover .caret,
+.open .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 4px 0;
+  margin: 1px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 8px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu a {
+  display: block;
+  padding: 3px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0088cc;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open .dropdown-menu {
+  display: block;
+}
+
+.pull-right .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "\2191";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.typeahead {
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  filter: alpha(opacity=0);
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+      -ms-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+      -ms-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 10px 4px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 13px;
+  line-height: 18px;
+  *line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+  /* Buttons in IE7 don't get borders, so darken on hover */
+
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+      -ms-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-color: #e6e6e6;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 9px 14px;
+  font-size: 15px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.btn-large [class^="icon-"] {
+  margin-top: 1px;
+}
+
+.btn-small {
+  padding: 5px 9px;
+  font-size: 11px;
+  line-height: 16px;
+}
+
+.btn-small [class^="icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 14px;
+}
+
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn {
+  border-color: #ccc;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.btn-primary {
+  background-color: #0074cc;
+  *background-color: #0055cc;
+  background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0055cc);
+  background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
+  background-image: linear-gradient(top, #0088cc, #0055cc);
+  background-repeat: repeat-x;
+  border-color: #0055cc #0055cc #003580;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  background-color: #0055cc;
+  *background-color: #004ab3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #004099 \9;
+}
+
+.btn-warning {
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(top, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -ms-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(top, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(top, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  background-color: #414141;
+  *background-color: #222222;
+  background-image: -ms-linear-gradient(top, #555555, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));
+  background-image: -webkit-linear-gradient(top, #555555, #222222);
+  background-image: -o-linear-gradient(top, #555555, #222222);
+  background-image: -moz-linear-gradient(top, #555555, #222222);
+  background-image: linear-gradient(top, #555555, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-group {
+  position: relative;
+  *margin-left: .3em;
+  *zoom: 1;
+}
+
+.btn-group:before,
+.btn-group:after {
+  display: table;
+  content: "";
+}
+
+.btn-group:after {
+  clear: both;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 9px;
+  margin-bottom: 9px;
+}
+
+.btn-toolbar .btn-group {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group > .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .dropdown-toggle {
+  *padding-top: 4px;
+  padding-right: 8px;
+  *padding-bottom: 4px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini.dropdown-toggle {
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small.dropdown-toggle {
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large.dropdown-toggle {
+  padding-right: 12px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0055cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 7px;
+  margin-left: 0;
+}
+
+.btn:hover .caret,
+.open.btn-group .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.btn-mini .caret {
+  margin-top: 5px;
+}
+
+.btn-small .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.dropup .btn-large .caret {
+  border-top: 0;
+  border-bottom: 5px solid #000000;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 0.75;
+  filter: alpha(opacity=75);
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 18px;
+  color: #c09853;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert-heading {
+  color: inherit;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 18px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 18px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 8px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 18px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 5px 5px;
+     -moz-border-radius: 0 0 5px 5px;
+          border-radius: 0 0 5px 5px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.nav > .dropdown.active > a:hover {
+  color: #000000;
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 18px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+}
+
+.navbar {
+  color: #999999;
+}
+
+.navbar .brand:hover {
+  text-decoration: none;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #999999;
+}
+
+.navbar .navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+}
+
+.navbar .navbar-link {
+  color: #999999;
+}
+
+.navbar .navbar-link:hover {
+  color: #ffffff;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn {
+  margin: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 6px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #ffffff;
+  background-color: #626262;
+  border: 1px solid #151515;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+      -ms-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-search .search-query:focus,
+.navbar-search .search-query.focused {
+  padding: 5px 10px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+}
+
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 9px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar .btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  margin: 5px 5px 6px;
+  line-height: 18px;
+}
+
+.navbar .btn-group {
+  padding: 5px 5px 6px;
+  margin: 0;
+}
+
+.navbar .nav > li > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav .active > a,
+.navbar .nav .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #222222;
+}
+
+.navbar .divider-vertical {
+  width: 1px;
+  height: 40px;
+  margin: 0 9px;
+  overflow: hidden;
+  background-color: #222222;
+  border-right: 1px solid #333333;
+}
+
+.navbar .nav.pull-right {
+  margin-right: 0;
+  margin-left: 10px;
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  background-color: #2c2c2c;
+  *background-color: #222222;
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #080808 \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar .nav li.dropdown.active .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+
+.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
+  color: #ffffff;
+}
+
+.navbar .pull-right .dropdown-menu,
+.navbar .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right .dropdown-menu:before,
+.navbar .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right .dropdown-menu:after,
+.navbar .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  list-style: none;
+  background-color: #fbfbfb;
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  background-repeat: repeat-x;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.breadcrumb li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #999999;
+}
+
+.breadcrumb .active a {
+  color: #333333;
+}
+
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination li {
+  display: inline;
+}
+
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+
+.pagination a:hover,
+.pagination .active a {
+  background-color: #f5f5f5;
+}
+
+.pagination .active a {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination .disabled span,
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination li:first-child a {
+  border-left-width: 1px;
+  -webkit-border-radius: 3px 0 0 3px;
+     -moz-border-radius: 3px 0 0 3px;
+          border-radius: 3px 0 0 3px;
+}
+
+.pagination li:last-child a {
+  -webkit-border-radius: 0 3px 3px 0;
+     -moz-border-radius: 0 3px 3px 0;
+          border-radius: 0 3px 3px 0;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pager {
+  margin-bottom: 18px;
+  margin-left: 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager a {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next a {
+  float: right;
+}
+
+.pager .previous a {
+  float: left;
+}
+
+.pager .disabled a,
+.pager .disabled a:hover {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-open .dropdown-menu {
+  z-index: 2050;
+}
+
+.modal-open .dropdown.open {
+  *z-index: 2050;
+}
+
+.modal-open .popover {
+  z-index: 2060;
+}
+
+.modal-open .tooltip {
+  z-index: 2070;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  overflow: auto;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+      -ms-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 50%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-body {
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1020;
+  display: block;
+  padding: 5px;
+  font-size: 11px;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  margin-top: -2px;
+}
+
+.tooltip.right {
+  margin-left: 2px;
+}
+
+.tooltip.bottom {
+  margin-top: 2px;
+}
+
+.tooltip.left {
+  margin-left: -2px;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top: 5px solid #000000;
+  border-right: 5px solid transparent;
+  border-left: 5px solid transparent;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+  border-left: 5px solid transparent;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-right: 5px solid #000000;
+  border-bottom: 5px solid transparent;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  padding: 5px;
+}
+
+.popover.top {
+  margin-top: -5px;
+}
+
+.popover.right {
+  margin-left: 5px;
+}
+
+.popover.bottom {
+  margin-top: 5px;
+}
+
+.popover.left {
+  margin-left: -5px;
+}
+
+.popover.top .arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top: 5px solid #000000;
+  border-right: 5px solid transparent;
+  border-left: 5px solid transparent;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-right: 5px solid #000000;
+  border-bottom: 5px solid transparent;
+}
+
+.popover.bottom .arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+  border-left: 5px solid transparent;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+
+.popover .arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+
+.popover-inner {
+  width: 280px;
+  padding: 3px;
+  overflow: hidden;
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+}
+
+.popover-title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom: 1px solid #eee;
+  -webkit-border-radius: 3px 3px 0 0;
+     -moz-border-radius: 3px 3px 0 0;
+          border-radius: 3px 3px 0 0;
+}
+
+.popover-content {
+  padding: 14px;
+  background-color: #ffffff;
+  -webkit-border-radius: 0 0 3px 3px;
+     -moz-border-radius: 0 0 3px 3px;
+          border-radius: 0 0 3px 3px;
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.popover-content p,
+.popover-content ul,
+.popover-content ol {
+  margin-bottom: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 18px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+a.thumbnail:hover {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+}
+
+.label,
+.badge {
+  font-size: 10.998px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  padding: 1px 4px 2px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding: 1px 9px 2px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+a.label:hover,
+a.badge:hover {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 18px;
+  margin-bottom: 18px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  width: 0;
+  height: 18px;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(top, #149bdf, #0480be);
+  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+      -ms-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+      -ms-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 18px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 18px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+      -ms-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel .active,
+.carousel .next,
+.carousel .prev {
+  display: block;
+}
+
+.carousel .active {
+  left: 0;
+}
+
+.carousel .next,
+.carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel .next {
+  left: 100%;
+}
+
+.carousel .prev {
+  left: -100%;
+}
+
+.carousel .next.left,
+.carousel .prev.right {
+  left: 0;
+}
+
+.carousel .active.left {
+  left: -100%;
+}
+
+.carousel .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 10px 15px 5px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  color: #ffffff;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+  color: inherit;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
diff --git a/htdocs/js/lib/vendor/bootstrap/css/bootstrap.min.css b/htdocs/js/lib/vendor/bootstrap/css/bootstrap.min.css
new file mode 100644
index 0000000000..1c75d0c07a
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.0.3
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;content:""}.row:after{clear:both}[class*="span"]{float:left;margin-left:20px}.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:28px;margin-left:2.127659574%;*margin-left:2.0744680846382977%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .span12{width:99.99999998999999%;*width:99.94680850063828%}.row-fluid .span11{width:91.489361693%;*width:91.4361702036383%}.row-fluid .span10{width:82.97872339599999%;*width:82.92553190663828%}.row-fluid .span9{width:74.468085099%;*width:74.4148936096383%}.row-fluid .span8{width:65.95744680199999%;*width:65.90425531263828%}.row-fluid .span7{width:57.446808505%;*width:57.3936170156383%}.row-fluid .span6{width:48.93617020799999%;*width:48.88297871863829%}.row-fluid .span5{width:40.425531911%;*width:40.3723404216383%}.row-fluid .span4{width:31.914893614%;*width:31.8617021246383%}.row-fluid .span3{width:23.404255317%;*width:23.3510638276383%}.row-fluid .span2{width:14.89361702%;*width:14.8404255306383%}.row-fluid .span1{width:6.382978723%;*width:6.329787233638298%}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;content:""}.container-fluid:after{clear:both}p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px}p small{font-size:11px;color:#999}.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px}h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999}h1{font-size:30px;line-height:36px}h1 small{font-size:18px}h2{font-size:24px;line-height:36px}h2 small{font-size:18px}h3{font-size:18px;line-height:27px}h3 small{font-size:14px}h4,h5,h6{line-height:18px}h4{font-size:14px}h4 small{font-size:12px}h5{font-size:12px}h6{font-size:11px;color:#999;text-transform:uppercase}.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eee}.page-header h1{line-height:1}ul,ol{padding:0;margin:0 0 9px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}ul{list-style:disc}ol{list-style:decimal}li{line-height:18px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}dl{margin-bottom:18px}dt,dd{line-height:18px}dt{font-weight:bold;line-height:17px}dd{margin-left:9px}.dl-horizontal dt{float:left;width:120px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:130px}hr{margin:18px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}strong{font-weight:bold}em{font-style:italic}.muted{color:#999}abbr[title]{cursor:help;border-bottom:1px dotted #ddd}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px}blockquote small{display:block;line-height:18px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:18px;font-style:normal;line-height:18px}small{font-size:100%}cite{font-style:normal}code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:18px}pre code{padding:0;color:inherit;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 18px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333;border:0;border-bottom:1px solid #eee}legend small{font-size:13.5px;color:#999}label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px;color:#333}input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555;background-color:#fff;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.uneditable-textarea{width:auto;height:auto}label input,label textarea,label select{display:block}input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;background-color:transparent;border:0 \9;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}input[type="image"]{border:0}input[type="file"]{width:auto;padding:initial;line-height:initial;background-color:#fff;background-color:initial;border:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto}select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px}input[type="file"]{line-height:18px \9}select{width:220px;background-color:#fff}select[multiple],select[size]{height:auto}input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}textarea{height:auto}input[type="hidden"]{display:none}.radio,.checkbox{min-height:18px;padding-left:18px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-ms-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}input:focus,textarea:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}input,textarea,.uneditable-input{margin-left:0}input.span12,textarea.span12,.uneditable-input.span12{width:930px}input.span11,textarea.span11,.uneditable-input.span11{width:850px}input.span10,textarea.span10,.uneditable-input.span10{width:770px}input.span9,textarea.span9,.uneditable-input.span9{width:690px}input.span8,textarea.span8,.uneditable-input.span8{width:610px}input.span7,textarea.span7,.uneditable-input.span7{width:530px}input.span6,textarea.span6,.uneditable-input.span6{width:450px}input.span5,textarea.span5,.uneditable-input.span5{width:370px}input.span4,textarea.span4,.uneditable-input.span4{width:290px}input.span3,textarea.span3,.uneditable-input.span3{width:210px}input.span2,textarea.span2,.uneditable-input.span2{width:130px}input.span1,textarea.span1,.uneditable-input.span1{width:50px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee;border-color:#ddd}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1}.form-actions:before,.form-actions:after{display:table;content:""}.form-actions:after{clear:both}.uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#fff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}:-moz-placeholder{color:#999}::-webkit-input-placeholder{color:#999}.help-block,.help-inline{color:#555}.help-block{display:block;margin-bottom:9px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-prepend,.input-append{margin-bottom:5px}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2}.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc}.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #fff;vertical-align:middle;background-color:#eee;border:1px solid #ccc}.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-append .uneditable-input{border-right-color:#ccc;border-left-color:#eee}.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:9px}legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:18px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:160px}.form-horizontal .help-block{margin-top:9px;margin-bottom:0}.form-horizontal .form-actions{padding-left:160px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:18px}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapsed;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9}.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5}table .span1{float:none;width:44px;margin-left:0}table .span2{float:none;width:124px;margin-left:0}table .span3{float:none;width:204px;margin-left:0}table .span4{float:none;width:284px;margin-left:0}table .span5{float:none;width:364px;margin-left:0}table .span6{float:none;width:444px;margin-left:0}table .span7{float:none;width:524px;margin-left:0}table .span8{float:none;width:604px;margin-left:0}table .span9{float:none;width:684px;margin-left:0}table .span10{float:none;width:764px;margin-left:0}table .span11{float:none;width:844px;margin-left:0}table .span12{float:none;width:924px;margin-left:0}table .span13{float:none;width:1004px;margin-left:0}table .span14{float:none;width:1084px;margin-left:0}table .span15{float:none;width:1164px;margin-left:0}table .span16{float:none;width:1244px;margin-left:0}table .span17{float:none;width:1324px;margin-left:0}table .span18{float:none;width:1404px;margin-left:0}table .span19{float:none;width:1484px;margin-left:0}table .span20{float:none;width:1564px;margin-left:0}table .span21{float:none;width:1644px;margin-left:0}table .span22{float:none;width:1724px;margin-left:0}table .span23{float:none;width:1804px;margin-left:0}table .span24{float:none;width:1884px;margin-left:0}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";opacity:.3;filter:alpha(opacity=30)}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100)}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#08c}.open{*z-index:1000}.open .dropdown-menu{display:block}.pull-right .dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:"\2191"}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0,0,0,0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;filter:alpha(opacity=0);-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-ms-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1;filter:alpha(opacity=100)}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-ms-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 10px 4px;margin-bottom:0;*margin-left:.3em;font-size:13px;line-height:18px;*line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-ms-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(top,#fff,#e6e6e6);background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#e6e6e6',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-ms-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.btn-large [class^="icon-"]{margin-top:1px}.btn-small{padding:5px 9px;font-size:11px;line-height:16px}.btn-small [class^="icon-"]{margin-top:-1px}.btn-mini{padding:2px 6px;font-size:11px;line-height:14px}.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#ccc;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25)}.btn-primary{background-color:#0074cc;*background-color:#05c;background-image:-ms-linear-gradient(top,#08c,#05c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#05c));background-image:-webkit-linear-gradient(top,#08c,#05c);background-image:-o-linear-gradient(top,#08c,#05c);background-image:-moz-linear-gradient(top,#08c,#05c);background-image:linear-gradient(top,#08c,#05c);background-repeat:repeat-x;border-color:#05c #05c #003580;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc',endColorstr='#0055cc',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#05c;*background-color:#004ab3}.btn-primary:active,.btn-primary.active{background-color:#004099 \9}.btn-warning{background-color:#faa732;*background-color:#f89406;background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{background-color:#da4f49;*background-color:#bd362f;background-image:-ms-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(top,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#bd362f',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{background-color:#5bb75b;*background-color:#51a351;background-image:-ms-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(top,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#51a351',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{background-color:#49afcd;*background-color:#2f96b4;background-image:-ms-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(top,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#2f96b4',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{background-color:#414141;*background-color:#222;background-image:-ms-linear-gradient(top,#555,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#555),to(#222));background-image:-webkit-linear-gradient(top,#555,#222);background-image:-o-linear-gradient(top,#555,#222);background-image:-moz-linear-gradient(top,#555,#222);background-image:linear-gradient(top,#555,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#555555',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-group{position:relative;*margin-left:.3em;*zoom:1}.btn-group:before,.btn-group:after{display:table;content:""}.btn-group:after{clear:both}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:9px;margin-bottom:9px}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1}.btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.dropdown-toggle{*padding-top:4px;padding-right:8px;*padding-bottom:4px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini.dropdown-toggle{padding-right:5px;padding-left:5px}.btn-group>.btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px}.btn-group>.btn-large.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#05c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:7px;margin-left:0}.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100)}.btn-mini .caret{margin-top:5px}.btn-small .caret{margin-top:6px}.btn-large .caret{margin-top:6px;border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-top:0;border-bottom:5px solid #000}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:.75;filter:alpha(opacity=75)}.alert{padding:8px 35px 8px 14px;margin-bottom:18px;color:#c09853;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert-heading{color:inherit}.alert .close{position:relative;top:-2px;right:-21px;line-height:18px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:18px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>.pull-right{float:right}.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px}.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333;border-bottom-color:#333}.nav>.dropdown.active>a:hover{color:#000;cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.navbar{*position:relative;*z-index:2;margin-bottom:18px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top,#333,#222);background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1)}.navbar .container{width:auto}.nav-collapse.collapse{height:auto}.navbar{color:#999}.navbar .brand:hover{text-decoration:none}.navbar .brand{display:block;float:left;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#999}.navbar .navbar-text{margin-bottom:0;line-height:40px}.navbar .navbar-link{color:#999}.navbar .navbar-link:hover{color:#fff}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn{margin:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#fff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none}.navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-bottom{bottom:0}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right}.navbar .nav>li{display:block;float:left}.navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#999;text-decoration:none;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px}.navbar .btn-group{padding:5px 5px 6px;margin:0}.navbar .nav>li>a:hover{color:#fff;text-decoration:none;background-color:transparent}.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#fff;text-decoration:none;background-color:#222}.navbar .divider-vertical{width:1px;height:40px;margin:0 9px;overflow:hidden;background-color:#222;border-right:1px solid #333}.navbar .nav.pull-right{margin-right:0;margin-left:10px}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;background-color:#2c2c2c;*background-color:#222;background-image:-ms-linear-gradient(top,#333,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#333),to(#222));background-image:-webkit-linear-gradient(top,#333,#222);background-image:-o-linear-gradient(top,#333,#222);background-image:linear-gradient(top,#333,#222);background-image:-moz-linear-gradient(top,#333,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:dximagetransform.microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{background-color:#222;*background-color:#151515}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#080808 \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.dropdown.open .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar .nav li.dropdown.active .caret{opacity:1;filter:alpha(opacity=100)}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent}.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#fff}.navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{right:13px;left:auto}.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top,#fff,#f5f5f5);background-image:-ms-linear-gradient(top,#fff,#f5f5f5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#fff,#f5f5f5);background-image:-o-linear-gradient(top,#fff,#f5f5f5);background-image:linear-gradient(top,#fff,#f5f5f5);background-repeat:repeat-x;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff',endColorstr='#f5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.breadcrumb li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb .divider{padding:0 5px;color:#999}.breadcrumb .active a{color:#333}.pagination{height:36px;margin:18px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination li{display:inline}.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0}.pagination a:hover,.pagination .active a{background-color:#f5f5f5}.pagination .active a{color:#999;cursor:default}.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999;cursor:default;background-color:transparent}.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pager{margin-bottom:18px;margin-left:0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;content:""}.pager:after{clear:both}.pager li{display:inline}.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next a{float:right}.pager .previous a{float:left}.pager .disabled a,.pager .disabled a:hover{color:#999;cursor:default;background-color:#fff}.modal-open .dropdown-menu{z-index:2050}.modal-open .dropdown.open{*z-index:2050}.modal-open .popover{z-index:2060}.modal-open .tooltip{z-index:2070}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:50%;left:50%;z-index:1050;width:560px;margin:-250px 0 0 -280px;overflow:auto;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-ms-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:50%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-body{max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.tooltip{position:absolute;z-index:1020;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-2px}.tooltip.right{margin-left:2px}.tooltip.bottom{margin-top:2px}.tooltip.left{margin-left:-2px}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px}.popover.top{margin-top:-5px}.popover.right{margin-left:5px}.popover.bottom{margin-top:5px}.popover.left{margin-left:-5px}.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-top:5px solid #000;border-right:5px solid transparent;border-left:5px solid transparent}.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-right:5px solid #000;border-bottom:5px solid transparent}.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-right:5px solid transparent;border-bottom:5px solid #000;border-left:5px solid transparent}.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000}.popover .arrow{position:absolute;width:0;height:0}.popover-inner{width:280px;padding:3px;overflow:hidden;background:#000;background:rgba(0,0,0,0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3)}.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0}.popover-content{padding:14px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:0 1px 1px rgba(0,0,0,0.075);box-shadow:0 1px 1px rgba(0,0,0,0.075)}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px}.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:18px;margin-bottom:18px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-ms-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(top,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5',endColorstr='#f9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{width:0;height:18px;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(top,#149bdf,#0480be);background-image:-ms-linear-gradient(top,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf',endColorstr='#0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-ms-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .bar{background-color:#149bdf;background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-ms-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(top,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b',endColorstr='#c43c35',GradientType=0)}.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-ms-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(top,#62c462,#57a957);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#62c462',endColorstr='#57a957',GradientType=0)}.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-ms-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(top,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de',endColorstr='#339bb9',GradientType=0)}.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-ms-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(top,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450',endColorstr='#f89406',GradientType=0)}.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-ms-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:18px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:18px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel .item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-ms-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel .item>img{display:block;line-height:1}.carousel .active,.carousel .next,.carousel .prev{display:block}.carousel .active{left:0}.carousel .next,.carousel .prev{position:absolute;top:0;width:100%}.carousel .next{left:100%}.carousel .prev{left:-100%}.carousel .next.left,.carousel .prev.right{left:0}.carousel .active.left{left:-100%}.carousel .active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:10px 15px 5px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{color:#fff}.hero-unit{padding:60px;margin-bottom:30px;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}
diff --git a/htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings-white.png b/htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae
GIT binary patch
literal 8777
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
B7G?kd

literal 0
HcmV?d00001

diff --git a/htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings.png b/htdocs/js/lib/vendor/bootstrap/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..79bc568c21395d5a5ceab62fadb04457094b2ac7
GIT binary patch
literal 13826
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

literal 0
HcmV?d00001

diff --git a/htdocs/js/lib/vendor/bootstrap/js/bootstrap.js b/htdocs/js/lib/vendor/bootstrap/js/bootstrap.js
new file mode 100644
index 0000000000..7244954107
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/js/bootstrap.js
@@ -0,0 +1,1824 @@
+/* ===================================================
+ * bootstrap-transition.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  $(function () {
+
+    "use strict"; // jshint ;_;
+
+
+    /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+     * ======================================================= */
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd'
+            ,  'msTransition'     : 'MSTransitionEnd'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(function () {
+    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
+    })
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.options = options
+    this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , to: function (pos) {
+      var $active = this.$element.find('.active')
+        , children = $active.parent().children()
+        , activePos = children.index($active)
+        , that = this
+
+      if (pos > (children.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activePos == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e = $.Event('slide')
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      if ($next.hasClass('active')) return
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (typeof option == 'string' || (option = options.slide)) data[option]()
+      else if (options.interval) data.cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(function () {
+    $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
+      $target.carousel(options)
+      e.preventDefault()
+    })
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSIBLE PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSIBLE DATA-API
+  * ==================== */
+
+  $(function () {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+        , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $(target).collapse(option)
+    })
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , selector
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      selector = $this.attr('data-target')
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(function () {
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body')
+      .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+      .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+  })
+
+}(window.jQuery);/* =========================================================
+ * bootstrap-modal.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (content, options) {
+    this.options = options
+    this.$element = $(content)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        $('body').addClass('modal-open')
+
+        this.isShown = true
+
+        escape.call(this)
+        backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element.addClass('in')
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        $('body').removeClass('modal-open')
+
+        escape.call(this)
+
+        this.$element.removeClass('in')
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          hideWithTransition.call(this) :
+          hideModal.call(this)
+      }
+
+  }
+
+
+ /* MODAL PRIVATE METHODS
+  * ===================== */
+
+  function hideWithTransition() {
+    var that = this
+      , timeout = setTimeout(function () {
+          that.$element.off($.support.transition.end)
+          hideModal.call(that)
+        }, 500)
+
+    this.$element.one($.support.transition.end, function () {
+      clearTimeout(timeout)
+      hideModal.call(that)
+    })
+  }
+
+  function hideModal(that) {
+    this.$element
+      .hide()
+      .trigger('hidden')
+
+    backdrop.call(this)
+  }
+
+  function backdrop(callback) {
+    var that = this
+      , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(document.body)
+
+      if (this.options.backdrop != 'static') {
+        this.$backdrop.click($.proxy(this.hide, this))
+      }
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      doAnimate ?
+        this.$backdrop.one($.support.transition.end, callback) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
+        removeBackdrop.call(this)
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  function removeBackdrop() {
+    this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  function escape() {
+    var that = this
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
+      })
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
+    }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
+      e.preventDefault()
+      $target.modal(option)
+    })
+  })
+
+}(window.jQuery);/* ===========================================================
+ * bootstrap-tooltip.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger != 'manual') {
+        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , isHTML: function(text) {
+      // html string detection logic adapted from jQuery
+      return typeof text != 'string'
+        || ( text.charAt(0) === "<"
+          && text.charAt( text.length - 1 ) === ">"
+          && text.length >= 3
+        ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text)
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover'
+  , title: ''
+  , delay: 0
+  }
+
+}(window.jQuery);/* ===========================================================
+ * bootstrap-popover.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function ( element, options ) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
+      $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = $e.attr('data-content')
+        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-scrollspy.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* SCROLLSPY CLASS DEFINITION
+   * ========================== */
+
+  function ScrollSpy( element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && href.length
+              && [[ $href.position().top, href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu'))  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  $.fn.scrollspy = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function ( element ) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active a').last()[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(function () {
+    $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+      e.preventDefault()
+      $(this).tab('show')
+    })
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.$menu = $(this.options.menu).appendTo('body')
+    this.source = this.options.source
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.offset(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu.css({
+        top: pos.top + pos.height
+      , left: pos.left
+      })
+
+      this.$menu.show()
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var that = this
+        , items
+        , q
+
+      this.query = this.$element.val()
+
+      if (!this.query) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.grep(this.source, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', $.proxy(this.keypress, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , keypress: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          if (e.type != 'keydown') break
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          if (e.type != 'keydown') break
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , blur: function (e) {
+      var that = this
+      setTimeout(function () { that.hide() }, 150)
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+    }
+
+  , mouseenter: function (e) {
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(function () {
+    $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+      var $this = $(this)
+      if ($this.data('typeahead')) return
+      e.preventDefault()
+      $this.typeahead($this.data())
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/htdocs/js/lib/vendor/bootstrap/js/bootstrap.min.js b/htdocs/js/lib/vendor/bootstrap/js/bootstrap.min.js
new file mode 100644
index 0000000000..1f87730a3a
--- /dev/null
+++ b/htdocs/js/lib/vendor/bootstrap/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.hide)return c.hide();clearTimeout(this.timeout),c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/htdocs/js/LibraryBrowser/jquery-1.7.2.min.js b/htdocs/js/lib/vendor/jquery-1.7.2.min.js
similarity index 100%
rename from htdocs/js/LibraryBrowser/jquery-1.7.2.min.js
rename to htdocs/js/lib/vendor/jquery-1.7.2.min.js
diff --git a/htdocs/js/LibraryBrowser/json2.js b/htdocs/js/lib/vendor/json2.js
similarity index 100%
rename from htdocs/js/LibraryBrowser/json2.js
rename to htdocs/js/lib/vendor/json2.js
diff --git a/htdocs/js/LibraryBrowser/underscore.js b/htdocs/js/lib/vendor/underscore.js
similarity index 100%
rename from htdocs/js/LibraryBrowser/underscore.js
rename to htdocs/js/lib/vendor/underscore.js
diff --git a/htdocs/js/lib/webwork/WeBWorK.js b/htdocs/js/lib/webwork/WeBWorK.js
new file mode 100644
index 0000000000..a2ab4f6610
--- /dev/null
+++ b/htdocs/js/lib/webwork/WeBWorK.js
@@ -0,0 +1,182 @@
+/*
+    structure styled after Three.js..kind of
+
+    David Gage 2012
+
+    requires backbone.js, underscore.js, and their dependencies
+*/
+
+var webwork = webwork || { REVISION: '0' };
+
+
+webwork.USER = "user-needs-to-be-defined-in-hidden-variable-id=hidden_user";
+webwork.COURSE = "course-needs-to-be-defined-in-hidden-variable-id=hidden_courseID";
+webwork.SESSIONKEY = "session-key-needs-to-be-defined-in-hidden-variable-id=hidden_key"
+webwork.PASSWORD = "who-cares-what-the-password-is";
+// request object, I'm naming them assuming there may be different versions
+webwork.requestObject = {
+    "xml_command":"",
+    "pw":"",
+    "password":webwork.PASSWORD,
+    "session_key":webwork.SESSIONKEY,
+    "user":"user-needs-to-be-defined",
+    "library_name":"Library",
+    "courseID":webwork.COURSE,
+    "set":"set0",
+    "new_set_name":"new set",
+    "command":""
+};
+webwork.webserviceURL = "";
+webwork.alert_template = _.template('<div class="alert <%= classes %> fade in"><a class="close" data-dismiss="alert" href="#">×</a><%= message %></div>');
+webwork.alert = function(message, classes){
+    console.log('alert');
+    //developers have to add a messages div (span, whatever) to the app to see messages
+    $('#messages').html(webwork.alert_template({message: message, classes: classes}));
+    setTimeout(function(){$(".alert").alert('close')}, 2000);
+};
+
+webwork.Problem = Backbone.Model.extend({
+    defaults:function () {
+        return{
+            path:"",
+            data:false,
+            place: 0
+        };
+    },
+
+    initialize:function () {
+
+    },
+    //this is a server render, different from a view render
+    render:function () {
+        var problem = this;
+        var requestObject = {
+            set: this.get('path'),
+            problemSource: this.get('path'),
+            xml_command: "renderProblem"
+        };
+        _.defaults(requestObject, webwork.requestObject);
+
+
+        if (!problem.get('data')) {
+            //if we haven't gotten this problem yet, ask for it
+            $.post(webwork.webserviceURL, requestObject, function (data) {
+                problem.set('data', data);
+            });
+        }
+    },
+    clear: function() {
+        this.destroy();
+    }
+});
+
+webwork.ProblemList = Backbone.Collection.extend({
+    model:webwork.Problem,
+
+    initialize: function(){
+        this.defaultRequestObject = {
+
+        };
+        _.defaults(this.defaultRequestObject, webwork.requestObject);
+    },
+
+    comparator: function(problem) {
+        return problem.get("place");
+    },
+
+    //maybe move to problem list as fetch (with a set name argument)
+    fetch:function () {
+        var self = this;
+
+        //command needs to be set in the higher model since there are several versions of problem lists
+
+        var requestObject = {};
+        _.defaults(requestObject, this.defaultRequestObject);
+
+        $.post(webwork.webserviceURL, requestObject,
+            function (data) {
+                //try {//this is the wrong way to be error checking
+                var response = $.parseJSON(data);
+
+                var problems = response.result_data.split(",");
+
+                var newProblems = new Array();
+                for (var i = 0; i < problems.length; i++) {
+                    if (problems[i] != "") {
+                        newProblems.push({path:problems[i], place:i});
+                    }
+                }
+                self.reset(newProblems);
+                //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
+                /*} catch (err) {
+                 showErrorResponse(data);
+                 }*/
+            }
+        );
+    }
+});
+
+webwork.Set = Backbone.Model.extend({
+    defaults:{
+        name:"defaultSet"
+    },
+
+    initialize:function () {
+        this.set('problems', new webwork.ProblemList);
+        //this.get('problems').url = this.get('name');
+        _.extend(this.get('problems').defaultRequestObject, {
+            set: this.get('name'),
+            xml_command: "listSetProblems"
+        });
+
+
+        //this.get('problems').on('add', this.addProblem, this);
+        //this.get('problems').on('remove', this.removeProblem, this);
+        this.get('problems').fetch();
+    }
+
+});
+
+webwork.SetList = Backbone.Collection.extend({
+    model:webwork.Set,
+
+    initialize: function(){
+        this.defaultRequestObject = {};
+
+        _.defaults(this.defaultRequestObject, webwork.requestObject);
+    },
+    //think it's fetch I want to replace:
+    fetch:function () {
+        var self = this;
+
+        var requestObject = {
+            xml_command: "listSets"
+        };
+        _.defaults(requestObject, this.defaultRequestObject);
+        console.log("starting set list");
+        $.post(webwork.webserviceURL, requestObject, function (data) {
+            //try {
+            var response = $.parseJSON(data);
+            console.log("result: " + response.server_response);
+            var setNames = response.result_data.split(",");
+            setNames.sort();
+            console.log("found these sets: " + setNames);
+            var newSets = new Array();
+            for (var i = 0; i < setNames.length; i++) {
+                //workAroundSetList.renderList(workAroundSetList.setNames[i]);
+                newSets.push({name:setNames[i]})
+            }
+            self.reset(newSets);
+            /*} catch (err) {
+             showErrorResponse(data);
+             }*/
+        });
+    }
+});
+
+//set up alerts to close
+$().alert();
+//Some default ajax stuff we can keep it or not
+$(document).ajaxError(function(e, jqxhr, settings, exception) {
+    webwork.alert(exception, "alert-error");
+});
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Library.js b/htdocs/js/lib/webwork/teacher/Library.js
new file mode 100644
index 0000000000..03f67bc188
--- /dev/null
+++ b/htdocs/js/lib/webwork/teacher/Library.js
@@ -0,0 +1,76 @@
+
+webwork.Library = Backbone.Model.extend({
+    defaults:function () {
+        return{
+            name:"",
+            path: ""
+        }
+    },
+
+    initialize:function () {
+        var self = this;
+        this.set({problems:new webwork.ProblemList, children:new webwork.LibraryList});
+
+        this.get('children').url = self.get('path')
+        this.get('children').defaultRequestObject.library_name = this.get("path");
+
+        _.extend(this.get('problems').defaultRequestObject, {
+            xml_command: "listLib",
+            command: "files",
+            maxdepth: 0,
+            library_name: self.get('path') + "/"
+        });
+
+    }
+});
+
+webwork.LibraryList = Backbone.Collection.extend({
+    model:webwork.Library,
+
+    initialize: function(){
+        this.url = "";
+        this.defaultRequestObject = {
+            xml_command: "listLib",
+            command: "dirOnly",
+            maxdepth: 0
+        };
+        _.defaults(this.defaultRequestObject, webwork.requestObject);
+    },
+
+    fetch: function(){
+
+
+        var self = this;
+
+        webwork.alert("Loading libraries... may take some time");
+
+        var requestObject = {};
+
+        _.defaults(requestObject, this.defaultRequestObject);
+
+        $.post(webwork.webserviceURL, requestObject,
+            function (data) {
+                //console.log(data);
+                //try {
+                var response = $.parseJSON(data);
+                console.log(response);
+                console.log("result: " + response.server_response);
+                //need better server responses eventually
+                webwork.alert(response.server_response);
+
+                var newLibs = new Array();
+
+                //should be either an object of a comma separated list
+                var libraries = _.isObject(response.result_data)? _.keys(response.result_data):response.result_data.split(",")
+
+                libraries.forEach(function(lib) {
+                    newLibs.push({name:lib, path: self.url +"/"+lib})
+                });
+                self.reset(newLibs);
+                //callback();
+                /*} catch (err) {
+                 showErrorResponse(data);
+                 }*/
+            });//should add error checking
+    }
+});
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Problem.js b/htdocs/js/lib/webwork/teacher/Problem.js
new file mode 100644
index 0000000000..79e1920e47
--- /dev/null
+++ b/htdocs/js/lib/webwork/teacher/Problem.js
@@ -0,0 +1,97 @@
+//Problem admin functions
+webwork.ProblemList.prototype.addProblem = function (problem) {
+    this.add(problem);
+    var self = this;
+
+    var requestObject = {
+        xml_command: "addProblem",
+        problemPath: problem.get('path')
+    };
+    _.defaults(requestObject, this.defaultRequestObject);
+
+    $.post(webwork.webserviceURL, requestObject, function (data) {
+        //try {
+        var response = $.parseJSON(data);
+        console.log("result: " + response.server_response);
+        webwork.alert(response.server_response);
+        // still have to test for success..everywhere
+        if (undoing) {// might be a better way to do this later
+            redo_stack.push(function () {
+                self.removeProblem(problem);
+            });
+            undoing = false;
+        } else {
+            undo_stack.push(function () {
+                self.removeProblem(problem);
+            });
+        }
+        //hopfully I can get rid of this
+        //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
+        /*} catch (err) {
+         showErrorResponse(data);
+         }*/
+    });
+};
+
+
+webwork.ProblemList.prototype.removeProblem = function (problem) {
+
+    var self = this;
+
+    var requestObject = {
+        xml_command: "deleteProblem",
+        problemPath: problem.get("path") //notice the difference from create
+    };
+    _.defaults(requestObject, this.defaultRequestObject);
+
+    $.post(webwork.webserviceURL, requestObject, function (data) {
+        //try {
+        var response = $.parseJSON(data);
+        console.log("result: " + response.server_response);
+        webwork.alert(response.server_response);
+        // still have to test for success....
+        if (undoing) {
+            redo_stack.push(function () {
+                self.addProblem(problem);
+            });
+            undoing = false;
+        } else {
+            undo_stack.push(function () {
+                self.addProblem(problem);
+            });
+        }
+        /*workAroundSet.loadProblems($.contains(document
+         .getElementById("problems_container"), document
+         .getElementById(self.name)));*/
+        /*} catch (err) {
+         showErrorResponse(data);
+         }*/
+    });
+    problem.destroy();
+};
+
+webwork.ProblemList.prototype.reorder = function(){
+    var self = this;
+    self.sort();
+
+    var probList = self.pluck("path");
+    var probListString = probList.join(",");
+    console.log(probListString);
+    var requestObject = {
+        probList: probListString,
+        xml_command: "reorderProblems"
+    };
+
+    _.defaults(requestObject, this.defaultRequestObject);
+    console.log(requestObject.set);
+
+    $.post(webwork.webserviceURL, requestObject, function (data) {
+        //try {
+        var response = $.parseJSON(data);
+        console.log("result: " + response.server_response);
+        webwork.alert(response.server_response);
+        /*} catch (err) {
+         showErrorResponse(data);
+         }*/
+    });
+};
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Set.js b/htdocs/js/lib/webwork/teacher/Set.js
new file mode 100644
index 0000000000..a70c625e92
--- /dev/null
+++ b/htdocs/js/lib/webwork/teacher/Set.js
@@ -0,0 +1,18 @@
+//different from add I hope
+webwork.SetList.prototype.create = function (model) {
+    this.add(model);
+    var requestObject = {
+        xml_command: "createNewSet",
+        new_set_name: model.name ? model.name : model.get("name")
+    };
+    _.defaults(requestObject, this.defaultRequestObject);
+    $.post(webwork.webserviceURL, requestObject, function (data) {
+        //try {
+        var response = $.parseJSON(data);
+        console.log("result: " + response.server_response);
+        webwork.alert(response.server_response);
+        /*} catch (err) {
+         showErrorResponse(data);
+         }*/
+    });
+};
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/teacher.js b/htdocs/js/lib/webwork/teacher/teacher.js
new file mode 100644
index 0000000000..7f4f6e6979
--- /dev/null
+++ b/htdocs/js/lib/webwork/teacher/teacher.js
@@ -0,0 +1,20 @@
+/*
+ structure styled after Three.js..kind of
+
+ David Gage 2012
+ */
+
+_.extend(webwork.requestObject, {
+    "xml_command":"listLib",
+    "pw":"",
+    "password":webwork.PASSWORD,
+    "session_key":webwork.SESSIONKEY,
+    "user":"user-needs-to-be-defined",
+    "library_name":"Library",
+    "courseID":webwork.COURSE,
+    "set":"set0",
+    "new_set_name":"new set",
+    "command":"buildtree"
+});
+
+webwork.webserviceURL = "/webwork2/instructorXMLHandler";
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 0c9f8bef80..be37adbafe 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1314,9 +1314,17 @@ sub pathMacro {
 		my $name = shift @path;
 		my $url = shift @path;
 		if ($url and not $args{textonly}) {
-			push @result, CGI::a({-href=>"$url?$auth"}, $r->maketext(lc($name)));
+		    if($args{style} eq "bootstrap"){
+		        push @result, CGI::li(CGI::a({-href=>"$url?$auth"}, $r->maketext(lc($name))));
+		    } else {
+			    push @result, CGI::a({-href=>"$url?$auth"}, $r->maketext(lc($name)));
+		    }
 		} else {
-			push @result, $r->maketext($name);
+		    if($args{style} eq "bootstrap"){
+                push @result, CGI::li({-class=>"active"}, $r->maketext($name));
+            } else {
+			    push @result, $r->maketext($name);
+			}
 		}
 	}
 	
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 0b753902a2..a51a3da4a7 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -94,14 +94,22 @@ sub options {
 }
 
 sub head {
-  print '<script src="/webwork2_files/js/jquery-1.7.min.js"></script>';
+  print '<link rel="stylesheet" href="/webwork2_files/js/lib/vendor/FontAwesome/css/font-awesome.css">';
+
   print '<script src="/webwork2_files/js/jquery-ui-1.8.16.custom.min.js"></script>';
   print '<script src="/webwork2_files/js/ui.tabs.closable.min.js"></script>';
 
-  print '<script src="/webwork2_files/js/LibraryBrowser/json2.js"></script>';
-  print '<script src="/webwork2_files/js/LibraryBrowser/underscore.js"></script>';
-  print '<script src="/webwork2_files/js/LibraryBrowser/backbone.js"></script>';
-  print '<script src="/webwork2_files/js/LibraryBrowser/library_browser.js"></script>';
+  print '<script src="/webwork2_files/js/lib/vendor/json2.js"></script>';
+  print '<script src="/webwork2_files/js/lib/vendor/underscore.js"></script>';
+  print '<script src="/webwork2_files/js/lib/vendor/backbone.js"></script>';
+
+
+  print '<script src="/webwork2_files/js/lib/webwork/WeBWorK.js"></script>';
+  print '<script src="/webwork2_files/js/lib/webwork/teacher/teacher.js"></script>';
+  print '<script src="/webwork2_files/js/lib/webwork/teacher/Problem.js"></script>';
+  print '<script src="/webwork2_files/js/lib/webwork/teacher/Set.js"></script>';
+  print '<script src="/webwork2_files/js/lib/webwork/teacher/Library.js"></script>';
+  print '<script src="/webwork2_files/js/apps/LibraryBrowser/library_browser.js"></script>';
   #print '<script src="/webwork2_files/js/problem_grid.js"></script>';
   #print '<script src="/webwork2_files/js/form_builder.js"></script>';
 
@@ -128,18 +136,35 @@ sub body {
   #print '<div id="loading"></div>';
   
   #big wrapper div that will hopefully fix theme issues
-  print '<div id="app_box">';
+  print '<div id="app_box" class="container-fluid">';
     ##########  toolbar
-      print '<div class="toolbar">';
-        print '<span id="messages"></span>'; #maybe jquery alerts can go here
-      	print '<span class="actions">
-    	             <button class="button" type="button" id="undo_button">Undo</button>
-    	             <button class="button" type="button" id="redo_button">Redo</button>
-    	             <button class="button" type="button" id="delete_problem">Remove Selected</button>
-    	             <a class="button" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a>
-    	       </span>';
-      print '</div>';
-    
+     ##print '<div class="toolbar">';
+     ##
+
+     ## print '</div>';
+
+    print '<div class="navbar">',
+      '<div class="navbar-inner">',
+        '<div class="container">',
+            '<ul class="nav">',
+                '<li>
+                    <span id="CardCatalog">
+                        <!--Gonna put the lists of libraries and sub-libraries here-->
+                    </span>
+                    <button class="btn btn-small" id="load_problems">Load Problems</button>
+                </li>',
+            '</ul>',
+            '<ul class="nav pull-right">',
+                '<li><button class="btn btn-small" id="undo_button">Undo</button></li>',
+                '<li><button class="btn btn-small" id="redo_button">Redo</button></li>',
+                '<li><a class="pull-right" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a></li>',
+            '</ul>',
+
+        '</div>',
+      '</div>',
+    '</div>';
+
+
 	##########	Top part
 	#print '<button onclick="fullWindowMode();">Full Screen</button>';
 	#print '<button id="gridifyButton" onclick="gridify();">Gridify!!</button>';
@@ -158,12 +183,11 @@ sub body {
 	#				'<p><div class="ResultsWithError" style="width:16px;height:16px;border:solid 1px;"></div><span>Errors</span></p>',
 	#'</div>';
 				#'<p>In the target set you can drag problems to reorder them.<br/>The problem will be placed in front of the one you drop it on,<br/>or at the end of the list if you drop it on an empty space in the table.</p>',
-	
-	  	print '<div class="break"></div>';
-	  	print '<table>';
-		print '<tr><td><b>Library directories:</b></td><td><span id="CardCatalog"><!--Gonna put the lists of libraries and sub-libraries here--></span><button class="button" id="load_problems" type="button">Load Problems</button></td>';
-		print '<tr><td><b>Library search:</b></td><td><span id="library_search_box"><select id="subjectBox"></select><select id="chaptersBox"></select><select id="sectionsBox"></select><select  style="display:none;"  id="textbooksBox"></select><select style="display:none;" id="textChaptersBox"></select><select style="display:none;" id="textSectionsBox"></select><input type="text" id="keywordsBox"  style="display:none;"  placeholder="keywords"></input><button class="button" id="run_search" type="button">Search</button><span></td>';
-		print '</table>';
+
+	  	#print '<table>';
+		#print '<tr><td><b>Library directories:</b></td><td></td>';
+		#print '<tr><td><b>Library search:</b></td><td><span id="library_search_box"><select id="subjectBox"></select><select id="chaptersBox"></select><select id="sectionsBox"></select><select  style="display:none;"  id="textbooksBox"></select><select style="display:none;" id="textChaptersBox"></select><select style="display:none;" id="textSectionsBox"></select><input type="text" id="keywordsBox"  style="display:none;"  placeholder="keywords"></input><button class="button" id="run_search" type="button">Search</button><span></td>';
+		#print '</table>';
 		###########################################
 			      # Library repository controls
     	###########################################
@@ -171,17 +195,14 @@ sub body {
              #    '<span style="margin-left:10px;" class="js_action_span" onclick="selectNone();">none</span>';
 	  		    ###########################################
 
-	    print '<div id="problem_container">';
-	      print '<div id="dialog">',
-	      			'<input type="text" id="dialog_text" placeholder="default set"></input>',
-	      			'<button type="button" id="create_set">Create Set</button>',
-	      		'</div>';
-	      print '<div id="homework_sets_container">';
+	    print '<div id="problem_container" class="row-fluid">';
+
+	      print '<div id="homework_sets_container" class="span2">';
 	    	print '<b>Homework Sets</b>';
 			print '<!--homework sets go here-->'; #could be a problem with multiple appends (can I use a replace instead?)
 		  print '</div>';
 		  #print '<div id="size_slider"><p>||</p></div>';
-		  print '<div id="problems_container">';
+		  print '<div id="problems_container" class="span10">';
 		    #List of tabs
 		  	print '<ul>',
         			#'<li id="library_link"><a href="#library_tab"><span>Library</span></a></li>',
@@ -191,16 +212,19 @@ sub body {
 	      print '</div>';
 	        ########## Finish things off
 	   	print '</div>';
-	print '<div style="clear:both;"></div>';
+	   	print '<div>',
+            '<input type="text" id="dialog_text" placeholder="default set"></input>',
+        	'<button class="btn btn-small" id="create_set">Create Set</button>',
+        '</div>';
   print '</div>';
   print $self->hidden_authen_fields;
   print CGI::hidden({id=>'hidden_courseID',name=>'courseID',default=>$courseID });
 
 
   print '<script type="text/template", id="problem-template">',
-        '    <div class="handle">drag handle</div>',
+        '    <div class="handle" style="display:<%= remove_display %>;"><i class="icon-resize-vertical icon-large"></i></div>',
             '<button type="button" class="remove" style="display:<%= remove_display %>;">X</button>', #replace with twitter bootstrap icons? yeah font awesome :)
-        '    <div><%= data %></div>',
+        '    <div class="problem"><%= data %></div>',
         '</script>';
 
   print '<script type="text/template", id="setList-template">',
@@ -232,7 +256,7 @@ sub body {
 
        	    '</ul>',
             #<button type="button" onclick="increaseLibAcross();">+</button><span id="libAcross">4</span><button type="button" onclick="decreaseLibAcross();">-</button><span> problems across</span>
-            '<button type="button" class="next_group" style="display:<%= enough_problems %>;">Load the next <%= group_size %> problems.</button>',
+            '<span class="next_group" style="display:<%= enough_problems %>;">Load the next <%= group_size %> problems.</span>',
        '</script>';
 
 	return "";	

From b19b52f1367917c944ce9d7383789ac4680eacfb Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Wed, 30 May 2012 22:53:12 -0400
Subject: [PATCH 52/73] Fixed issue #5

---
 lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 93799d0ad1..53e8f3a0bf 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -160,7 +160,7 @@ sub body {
             '<ul class="nav pull-right">',
                 '<li><button class="btn btn-small" id="undo_button">Undo</button></li>',
                 '<li><button class="btn btn-small" id="redo_button">Redo</button></li>',
-                '<li><a class="pull-right" href="http://github.com/whytheplatypus/webwork2/issues">BUGS!</a></li>',
+                '<li><a class="pull-right" href="http://github.com/whytheplatypus/webwork2/issues" target="_blank">BUGS!</a></li>',
             '</ul>',
 
         '</div>',

From 82c5c48862d2cc8b5c49c791cc57463e24597a3d Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Wed, 30 May 2012 23:03:08 -0400
Subject: [PATCH 53/73] fix for issue #4

---
 conf/templates/dgage/lbtwo.template  | 143 +++++++++++++--------------
 conf/templates/math/lbtwo.template   | 143 +++++++++++++--------------
 conf/templates/math2/lbtwo.template  |   9 +-
 conf/templates/math3/lbtwo.template  | 143 +++++++++++++--------------
 conf/templates/moodle/lbtwo.template | 143 +++++++++++++--------------
 conf/templates/test/lbtwo.template   | 143 +++++++++++++--------------
 conf/templates/union/lbtwo.template  | 143 +++++++++++++--------------
 conf/templates/ur/lbtwo.template     | 143 +++++++++++++--------------
 8 files changed, 489 insertions(+), 521 deletions(-)

diff --git a/conf/templates/dgage/lbtwo.template b/conf/templates/dgage/lbtwo.template
index a016fa2a72..1fb3ce98e8 100755
--- a/conf/templates/dgage/lbtwo.template
+++ b/conf/templates/dgage/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/math/lbtwo.template b/conf/templates/math/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/math/lbtwo.template
+++ b/conf/templates/math/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/math2/lbtwo.template b/conf/templates/math2/lbtwo.template
index d3b0912a1b..1fb3ce98e8 100755
--- a/conf/templates/math2/lbtwo.template
+++ b/conf/templates/math2/lbtwo.template
@@ -38,6 +38,11 @@
     .breadcrumb{
         margin:0px;
     }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
 <script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
@@ -48,7 +53,7 @@
 
 
 <body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
+    <div id="messages"></div>
     <div class="navbar">
         <div class="navbar-inner">
           <div class="container">
@@ -82,8 +87,6 @@
 	<ul class="breadcrumb">
 		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
 	</ul>
-
-	<div id="messages"></div>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
diff --git a/conf/templates/math3/lbtwo.template b/conf/templates/math3/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/math3/lbtwo.template
+++ b/conf/templates/math3/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/moodle/lbtwo.template b/conf/templates/moodle/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/moodle/lbtwo.template
+++ b/conf/templates/moodle/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/test/lbtwo.template b/conf/templates/test/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/test/lbtwo.template
+++ b/conf/templates/test/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/union/lbtwo.template b/conf/templates/union/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/union/lbtwo.template
+++ b/conf/templates/union/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>
diff --git a/conf/templates/ur/lbtwo.template b/conf/templates/ur/lbtwo.template
index cefb511505..1fb3ce98e8 100755
--- a/conf/templates/ur/lbtwo.template
+++ b/conf/templates/ur/lbtwo.template
@@ -24,42 +24,69 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/css/dgage.css"/>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap.css"/>
+<style>
+    body{
+
+    }
+    input{
+        height:auto;
+    }
+    .navbar {
+        margin-bottom: 0px;
+    }
+    .breadcrumb{
+        margin:0px;
+    }
+    #messages{
+        position:absolute;
+        width:50%;
+        margin:25%;
+    }
+</style>
+<link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/jquery-1.7.2.min.js"></script>
+<script src="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/js/bootstrap.js"></script>
 <title><!--#path style="text" text=" : " textonly="1"--></title>
 <!--#head-->
 </head>
-<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
-
 
-<hr class="for-broken-browsers"/>
-<div id="big-wrapper">
-
-<div style="clear:both;"></div>
-	<div id="breadcrumbs">
-		<!--#path style="text" text=" &#x2192; "-->
-	</div>
-	<div id="content" >
-
-			<!--#if can="title"-->
-				<span style="font-size:larger; color:#00F; float:left;  width:60%;   "><!--#title--></span>
-			<!--#endif-->
-			<!--#if can="message"-->
-				<span class="Message" style=" float:right; width:40%; right:0;">
-					<!--#message-->
-				</span>
-			<!--#endif-->
 
-		    <hr style="clear:both"/>
-       		<!--#if can="info"-->
-			  <!--  styles could be different for different pages so they are not set here -->
-				<!--#info-->
-		    <!--#endif-->
-			
-		<!--#if can="nav"-->
-		<div class="Nav">
-			<!--#nav style="images" imageprefix="/webwork2_files/images/nav" imagesuffix=".gif" separator="  "-->
-		</div>
-		<!--#endif-->
+<body bgcolor="white" onload="if (typeof(initializeWWquestion) == 'function') {initializeWWquestion()}">
+    <div id="messages"></div>
+    <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <!--#if can="title"-->
+            <a class="brand" href="#"><!--#title--></a>
+            <!--#endif-->
+            <div class="nav-collapse">
+              <ul class="nav pull-right">
+                <li class="dropdown" id="webwork_navigation">
+                  <a href="#webwork_navigation" class="dropdown-toggle" data-toggle="dropdown">Main Menu <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <!--#if can="links"-->
+                        <!--#links-->
+                    <!--#endif-->
+                     <!--#if can="siblings"-->
+                        <!--#siblings-->
+                     <!--#endif-->
+                     <!--#if can="options"-->
+                        <ul>
+                     	    <h2>Display Options</h2>
+                     		<!--#options-->
+                     	</ul>
+                     <!--#endif-->
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.nav-collapse -->
+          </div>
+        </div><!-- /navbar-inner -->
+    </div>
+	<ul class="breadcrumb">
+		<!--#path style="bootstrap" text="<span class='divider'>&#x2192;</span>"-->
+	</ul>
 		
 	    <!--#if can="body"-->
 				<!--#if warnings="1"-->
@@ -77,11 +104,9 @@
 			<!--#endif-->
 		
 		<!--#if warnings="1"-->
-		
-		<hr/>
-		<div class="Warnings">
-			<!--#warnings-->
-		</div>
+		    <div class="Warnings">
+			    <!--#warnings-->
+		    </div>
 		<!--#endif-->
 		
 		<!--#if can="message"-->
@@ -89,44 +114,14 @@
 				<!--#message-->
 			</div>
 		<!--#endif-->
-		
-	
-	<hr class="for-broken-browsers"/>
-	<div id="footer">
-		<div id="site-navigation">
-
-		<!--#if can="links"-->
-			    <!--#links-->
-			    <!--#endif-->
-		      <!--#if can="siblings"-->
-			      <!--#siblings-->
-		      <!--#endif-->
-		      <!--#if can="options"-->
-		      <ul>
-		        <li>
-			        <h2>Display Options</h2>
-			        <!--#options-->
-			      </li>
-		      </ul>
-		      <!--#endif-->
-		      <div id="masthead">
-			  <!--<div id="logo">
-                <a href="http://webwork.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/webwork_rectangle.png" alt="WeBWorK" height="51" width="267" /></a>&nbsp;
-                <a href="http://www.maa.org"><img src="<!--#url type="webwork" name="htdocs"-->/images/maa_logo.png" alt="MAA" height="51" width="449" /></a>
-			  </div>-->
-	<div id="loginstatus">
-		<!--#loginstatus-->
-	</div>
-	</div>
-		      <div id="navigation-link">Navigation</div>
-	</div>
-		<p id="last-modified">Page generated at <!--#timestamp--></p>
-		<div id="copyright">
-			WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
-		</div>
-	</div>
 
-</div><!--content-->
-</div> <!-- big-wrapper -->
+	<footer class="footer">
+        <p class="pull-right"><!--#loginstatus--></p>
+        <p id="last-modified">Page generated at <!--#timestamp--></p>
+        <p>styled using twitter bootstrap</p>
+        <div id="copyright">
+            WeBWorK &#169; 2000-2007 <a href="http://openwebwork.sf.net/">The WeBWorK Project</a>
+        </div>
+    </footer>
 </body>
 </html>

From c6fbe00bc178736160f7ce19115b5add58300330 Mon Sep 17 00:00:00 2001
From: William Wheeler <wheeler@wheeler-fj.(none)>
Date: Thu, 31 May 2012 08:32:42 -0400
Subject: [PATCH 54/73] Check for and accept common misspellings of
 lis_person_sourced_id

---
 lib/WeBWorK/Authen/LTIBasic.pm | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/WeBWorK/Authen/LTIBasic.pm b/lib/WeBWorK/Authen/LTIBasic.pm
index 0376085194..9e0245fa34 100644
--- a/lib/WeBWorK/Authen/LTIBasic.pm
+++ b/lib/WeBWorK/Authen/LTIBasic.pm
@@ -84,6 +84,7 @@ sub new {
 	my $self = {
 		r => $r,
 	};
+	#initialize
 	bless $self, $class;
 	return $self;
 }
@@ -182,7 +183,8 @@ sub get_credentials {
 	if (defined $r->param("user_id")) 
 		{
 		map {$self -> {$_ -> [0]} = $r -> param($_ -> [1]);} 
-						(['user_id', 'lis_person_sourcedid'],
+						(
+						#['user_id', 'lis_person_sourcedid'],
 						['role', 'roles'],
 						['last_name' , 'lis_person_name_family'],
 						['first_name', 'lis_person_name_given'],
@@ -194,6 +196,22 @@ sub get_credentials {
 						['semester', 'custom_semester'],
 						['section', 'custom_section'],
 						);
+
+		# The following lines were substituted for the commented out line above
+		# because some LMS's misspell the lis_person_sourced_id parameter name
+		if (defined($r -> param("lis_person_sourced_id"))) {
+			$self -> {user_id} = $r -> param("lis_person_sourced_id"); 
+		} elsif (defined($r -> param("lis_person_sourcedid"))) {
+			$self -> {user_id} = $r -> param("lis_person_sourcedid"); 
+		} elsif (defined($r -> param("lis_person_source_id"))) {
+			$self -> {user_id} = $r -> param("lis_person_source_id"); 
+		} elsif (defined($r -> param("lis_person_sourceid"))) {
+			$self -> {user_id} = $r -> param("lis_person_sourceid"); 
+		} else {
+			undef($self ->{user_id});
+		}
+		
+
 		$self -> {email} = uri_unescape($r -> param("lis_person_contact_email_primary"));
 		if (!defined($self->{user_id})) {
 			$self->{user_id} = $self -> {email};
@@ -219,7 +237,7 @@ sub check_user {
 	
 	my $user_id = $self->{user_id};
 	
-	if (defined $user_id and $user_id eq "") {
+	if (!defined($user_id) or (defined $user_id and $user_id eq "")) {
 		$self->{log_error} = "no user id specified";
 		$self->{error} = $r->maketext($GENERIC_MISSING_USER_ID_ERROR_MESSAGE);
 		return 0;
@@ -228,7 +246,10 @@ sub check_user {
 	my $User = $db->getUser($user_id);
 	
 	if (!$User) {
-		if ( defined($r -> param("lis_person_sourcedid"))) {
+		if ( defined($r -> param("lis_person_sourcedid"))
+			or defined($r -> param("lis_person_sourced_id"))
+			or defined($r -> param("lis_person_source_id"))
+			or defined($r -> param("lis_person_sourceid")) ) {
 			return 1;  #This may be a new user coming in from a LMS via LTI.
 		} else {
 		$self->{log_error} .= "LOGIN FAILED $user_id - user unknonw";

From a2eace6b1aa8f247690f6dd2ef46729abecefbdb Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 31 May 2012 10:10:33 -0400
Subject: [PATCH 55/73] Add in include command for postlocal.conf

For some reason this command was omitted when I did the previous global.conf.dist merge
---
 conf/global.conf.dist | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 6aee820ae0..d167142b93 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -1152,3 +1152,5 @@ $webservices = {
 # Site wide overrides are entered into the file postlocal.conf
 ################################################################################
 
+
+include("conf/postlocal.conf");

From 3b43b43649de0456935596423c3db9b625b3b3f5 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Thu, 31 May 2012 11:55:31 -0400
Subject: [PATCH 56/73] possible solution to issue #8

---
 htdocs/js/lib/vendor/ui.tabs.closable.js      | 52 +++++++++++++++++++
 .../ContentGenerator/Instructor/SetMaker3.pm  |  6 ++-
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/js/lib/vendor/ui.tabs.closable.js

diff --git a/htdocs/js/lib/vendor/ui.tabs.closable.js b/htdocs/js/lib/vendor/ui.tabs.closable.js
new file mode 100644
index 0000000000..bac37338a6
--- /dev/null
+++ b/htdocs/js/lib/vendor/ui.tabs.closable.js
@@ -0,0 +1,52 @@
+/*!
+ * Copyright (c) 2010 Andrew Watts
+ *
+ * Dual licensed under the MIT (MIT_LICENSE.txt)
+ * and GPL (GPL_LICENSE.txt) licenses
+ * 
+ * http://github.com/andrewwatts/ui.tabs.closable
+ */
+(function() {
+    
+var ui_tabs_tabify = $.ui.tabs.prototype._tabify;
+
+$.extend($.ui.tabs.prototype, {
+
+    _tabify: function() {
+        var self = this;
+
+        ui_tabs_tabify.apply(this, arguments);
+
+        // if closable tabs are enable, add a close button
+        if (self.options.closable === true) {
+
+            var unclosable_lis = this.lis.filter(function() {
+                // return the lis that do not have a close button
+                return $('a.ui-icon-circle-close', this).length === 0;
+            });
+
+            // append the close button and associated events
+            unclosable_lis.each(function() {
+                $(this)
+                    .append('<a class="close ui-icon-circle-close" style="cursor: pointer; margin:.5em 1em; padding:0px;" href="#">&times;</a>')
+                    .find('a:last')
+                        .click(function() {
+                            var index = self.lis.index($(this).parent());
+                            if (index > -1) {
+                                // call _trigger to see if remove is allowed
+                                if (false === self._trigger("closableClick", null, self._ui( $(self.lis[index]).find( "a" )[ 0 ], self.panels[index] ))) return;
+
+                                // remove this tab
+                                self.remove(index)
+                            }
+
+                            // don't follow the link
+                            return false;
+                        })
+                    .end();
+            });
+        }
+    }
+});
+    
+})(jQuery);
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 53e8f3a0bf..c76974aa46 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -100,7 +100,7 @@ sub head {
   print qq!<link rel="stylesheet" href="$webwork_htdocs_url/js/lib/vendor/FontAwesome/css/font-awesome.css">!;
 
   print qq!<script src="$webwork_htdocs_url/js/jquery-ui-1.8.16.custom.min.js"></script>!;
-  print qq!<script src="$webwork_htdocs_url/js/ui.tabs.closable.min.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/lib/vendor/ui.tabs.closable.js"></script>!;
 
   print qq!<script src="$webwork_htdocs_url/js/lib/vendor/json2.js"></script>!;
   print qq!<script src="$webwork_htdocs_url/js/lib/vendor/underscore.js"></script>!;
@@ -122,8 +122,10 @@ sub head {
   #start a timer to save people's stuff idk if people want this
   #print "<script> setInterval('saveChanges(\"mainform\", \"".$r->uri."\")', 680000); </script>";
   #print qq!<link rel="stylesheet" type="text/css" href="$webwork_htdocs_url/css/setmaker3.css" />!;
-  print qq!<link href="$webwork_htdocs_url/css/ui-lightness/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>!;
+
   print qq!<link rel="stylesheet" type="text/css" href="$webwork_htdocs_url/css/library_browser.css" />!;
+
+  print qq!<link href="$webwork_htdocs_url/css/ui-lightness/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>!;
   #print qq!<script>window.addEventListener("load", setup, false);</script>!;
   return "";
 }

From 7c1cc937ea51a7b5361e6df2836da37235b85337 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Thu, 31 May 2012 17:32:05 -0400
Subject: [PATCH 57/73] fix for issue #7 , also fixed a type in the
 messages..and more reliable library loading and event system

---
 conf/templates/dgage/lbtwo.template           |   3 +-
 conf/templates/math/lbtwo.template            |   3 +-
 conf/templates/math2/lbtwo.template           |   3 +-
 conf/templates/math3/lbtwo.template           |   3 +-
 conf/templates/moodle/lbtwo.template          |   3 +-
 conf/templates/test/lbtwo.template            |   3 +-
 conf/templates/union/lbtwo.template           |   3 +-
 conf/templates/ur/lbtwo.template              |   3 +-
 htdocs/css/library_browser.css                |   7 +
 htdocs/images/ajax-loader-white-small.gif     | Bin 0 -> 673 bytes
 .../js/apps/LibraryBrowser/library_browser.js | 338 +++++++-----------
 htdocs/js/lib/webwork/WeBWorK.js              |  60 ++--
 htdocs/js/lib/webwork/teacher/Library.js      |  18 +-
 htdocs/js/lib/webwork/teacher/Problem.js      |  29 +-
 htdocs/js/lib/webwork/teacher/Set.js          |   6 +-
 .../ContentGenerator/Instructor/SetMaker3.pm  |   4 +-
 16 files changed, 198 insertions(+), 288 deletions(-)
 create mode 100644 htdocs/images/ajax-loader-white-small.gif

diff --git a/conf/templates/dgage/lbtwo.template b/conf/templates/dgage/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/dgage/lbtwo.template
+++ b/conf/templates/dgage/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/math/lbtwo.template b/conf/templates/math/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/math/lbtwo.template
+++ b/conf/templates/math/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/math2/lbtwo.template b/conf/templates/math2/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/math2/lbtwo.template
+++ b/conf/templates/math2/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/math3/lbtwo.template b/conf/templates/math3/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/math3/lbtwo.template
+++ b/conf/templates/math3/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/moodle/lbtwo.template b/conf/templates/moodle/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/moodle/lbtwo.template
+++ b/conf/templates/moodle/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/test/lbtwo.template b/conf/templates/test/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/test/lbtwo.template
+++ b/conf/templates/test/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/union/lbtwo.template b/conf/templates/union/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/union/lbtwo.template
+++ b/conf/templates/union/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/conf/templates/ur/lbtwo.template b/conf/templates/ur/lbtwo.template
index 1fb3ce98e8..50b30bee1e 100755
--- a/conf/templates/ur/lbtwo.template
+++ b/conf/templates/ur/lbtwo.template
@@ -41,7 +41,8 @@
     #messages{
         position:absolute;
         width:50%;
-        margin:25%;
+        margin-left:25%;
+        margin-right:25%;
     }
 </style>
 <link rel="stylesheet" type="text/css" href="<!--#url type="webwork" name="htdocs"-->/js/lib/vendor/bootstrap/css/bootstrap-responsive.css"/>
diff --git a/htdocs/css/library_browser.css b/htdocs/css/library_browser.css
index bca690891e..452d6e61e5 100644
--- a/htdocs/css/library_browser.css
+++ b/htdocs/css/library_browser.css
@@ -44,4 +44,11 @@ ul.list li{
 
 .conatains_problem{
     backbround: aliceblue;
+}
+
+.syncing:after{
+    content: url("/webwork2_files/images/ajax-loader-small.gif");
+}
+.syncing.white:after{
+    content: url("/webwork2_files/images/ajax-loader-white-small.gif");
 }
\ No newline at end of file
diff --git a/htdocs/images/ajax-loader-white-small.gif b/htdocs/images/ajax-loader-white-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d9e135c86c2333b1807f1111b39fa875f5a4960d
GIT binary patch
literal 673
zcmZ?wbhEHb6krfw_{0DL|NsBDv9Z~+XAh7uXU?3Onwp%P9L4|Key$<G&W-`DMtTO!
zj6ijY|D>FYQWHy3QxwWGOEMG^vl1(E@)J|^GV{{%85DoAaB=}v>41y`8P33L%(3gv
zKZ8@A*}};jRveOZ*!^atak_3aJhV$>=D}@x2}ceUUeJw}u)MpB-BN;w-7EXK2hbKw
zb4)<y`1L3%NVo9p-ter;rO+ubB*9QpA;HHrT53g&%+}KTZxbch8x*cfJZf{6+@z|a
zC4|i&Gmc$G%G#$KPfR#7B}|{KHCcx5i=^L2Pp8Bgs|#d4aGlw_SLWCXZKlY#;(r*M
z5Az$XOp%(up9PyyK))raYM(M{oA_o<SbS^uGR{^-9u`BF_Cy)MRc=iiF3K|}1;u{0
zl{c`^k?KFOq{z|-tKW<`b`_~>dp%DP`5^Jxr;$gk>~KO%Qpl9nmYs4LkxrWDPdNxM
z%e}ObKdc5eCukB@V}Q<4I5fdh{Bg<iJ-6l=NFJAYps44xZSJY?HH!>+*tkWC6L)Vg
z{XUhk(O?5-=kEErnqFAV0XpZ-zYm;(H|K=L&SHFbtFT~dLdV_2Id@H_wK}>TH4vGQ
zFnb##FUuhZf!T%)hpwHQh}#%o%&$&$x-v)ex*P|`VTHcqg?ucA1}jf(SQj912pC;q
Yx0W&~lqN|u&5IVCz`$S)N;qHu0DeZ*1^@s6

literal 0
HcmV?d00001

diff --git a/htdocs/js/apps/LibraryBrowser/library_browser.js b/htdocs/js/apps/LibraryBrowser/library_browser.js
index 3c712ed481..2e0041cbd3 100644
--- a/htdocs/js/apps/LibraryBrowser/library_browser.js
+++ b/htdocs/js/apps/LibraryBrowser/library_browser.js
@@ -1,40 +1,22 @@
+$(function () {
 
-/**
- * Global stuff
- */
-// undo and redo functions
-var undoing = false;
-var undo_stack = new Array();
-var redo_stack = new Array();
-
-//might be able to move this to LibraryBrowser later with event listeners
-function showErrorResponse(data) {
-    var myWindow = window.open('', '', 'width=500,height=800');
-    myWindow.document.write(data);
-    myWindow.focus();
-}
 
-$(function () {
-    // get usernames and keys from hidden variables and set up webwork object:
-    var myUser = document.getElementById("hidden_user").value;
-    var mySessionKey = document.getElementById("hidden_key").value;
-    var myCourseID = document.getElementById("hidden_courseID").value;
-    // check to make sure that our credentials are available.
-    if (myUser && mySessionKey && myCourseID) {
-        webwork.requestObject.user = myUser;
-        webwork.requestObject.session_key = mySessionKey;
-        webwork.requestObject.courseID = myCourseID;
-    } else {
-        webwork.alert("missing hidden credentials: user "
-            + myUser + " session_key " + mySessionKey
-            + " courseID" + myCourseID, "alert-error");
-    }
+    var alert_template = _.template('<div class="alert <%= classes %> fade in"><a class="close" data-dismiss="alert" href="#">×</a><%= message %></div>');
+    //set up alerts to close
+    $().alert();
+
+    var alert = function(message, classes){
+        console.log('alert');
+        console.log(message);
+        //developers have to add a messages div (span, whatever) to the app to see messages
+        $('#messages').html(alert_template({message: message, classes: classes}));
+        setTimeout(function(){$(".alert").alert('close')}, 5000);
+    };
 
 
     /*******************************************************************************
-     * The problem object
+     * The problem View
      ******************************************************************************/
-// object
 
 
 
@@ -88,170 +70,15 @@ $(function () {
 
         clear: function(){
             console.log("clear");
-            this.model.collection.removeProblem(this.model);
+            this.model.collection.remove(this.model);
             this.model.clear();
         }
     });
 
-
-
-
-
-    /*
-     this.searchButton = document.getElementById("run_search");
-
-     this.nextButton = document.getElementById("nextList");
-     this.prevButton = document.getElementById("prevList");
-     this.probsPerPage = document.getElementById("prob_per_page");
-     this.topProbIndex = 0;
-
-     var workAroundTheClosure = this;
-
-     this.buildLibraryBox(topLibraries);
-     //this.library.loadChildren(function(){workAroundTheClosure.buildSelectBox(workAroundTheClosure.library)});
-
-     this.searchButton.addEventListener('click', function() {workAroundTheClosure.searchBox.go();}, false);
-
-     document.getElementById("load_problems").addEventListener('click', function(){
-     if(workAroundTheClosure.working_library.problems > 0){
-     console.log("loaded");
-     console.log(workAroundTheClosure.working_library.problems);
-     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-     }
-     else {
-     workAroundTheClosure.working_library.loadProblems(function() {
-     console.log("callback!");
-     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-     });
-     }
-     }, false);
-
-     this.nextButton.addEventListener('click', function() {
-     console.log("Next Button was clicked");
-     // then load new problems? yes because we shouldn't
-     // even be able to click on it if we can't
-     workAroundTheClosure.topProbIndex += parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
-     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-     }, false);
-     document.getElementById("prevList").addEventListener('click', function() {
-     workAroundTheClosure.topProbIndex -= parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value);
-     if (workAroundTheClosure.topProbIndex < 0)
-     workAroundTheClosure.topProbIndex = 0;
-     workAroundTheClosure.renderProblems(workAroundTheClosure.topProbIndex, parseInt(workAroundTheClosure.probsPerPage.options[workAroundTheClosure.probsPerPage.selectedIndex].value));
-     }, false);
-     */
-
-    /*
-     CardCatolog.prototype.updateMoveButtons = function() {
-     if (this.topProbIndex + parseInt(this.probsPerPage.options[this.probsPerPage.selectedIndex].value) < this.working_library.problems.length) {
-     this.nextButton.removeAttribute("disabled");
-     } else {
-     this.nextButton.setAttribute("disabled", true);
-     }
-     if (this.topProbIndex > 0) {
-     this.prevButton.removeAttribute("disabled");
-     } else {
-     this.prevButton.setAttribute("disabled", true);
-     }
-     }
-     */
-    /*
-     CardCatolog.prototype.buildSelectBox = function(currentLibrary) {
-     var newLibList = document.createElement("select");
-     newLibList.id = "libList" + (this.displayBox.childNodes.length + 1);
-     newLibList.setAttribute("data-propName", currentLibrary.path);
-     var workAroundTheClosure = this;
-     newLibList.addEventListener("change", function(event) {
-     workAroundTheClosure.onLibSelect(event, currentLibrary);
-     }, false);
-
-     for ( var name in currentLibrary.children) {
-     if (!name.match(/\./)) {
-     var option = document.createElement("option")
-     option.value = name;
-     option.innerHTML = name;
-     newLibList.add(option, null);
-     }
-     }
-     if (newLibList.childNodes.length > 0) {
-     var emptyOption = document.createElement("option");
-     newLibList.add(emptyOption, newLibList.firstChild);
-     this.listBox.appendChild(newLibList);
-     }
-     }
-
-     // start:index to start at, limit:number of problems to list
-     CardCatolog.prototype.renderProblems = function(start, limit) {
-     $('a[href="#library_tab"] span').text("Library ("+start+" - "+ (start+limit) +" of " + this.working_library.problems.length + ") ");
-     while (this.displayBox.hasChildNodes()) {
-     this.displayBox.removeChild(this.displayBox.lastChild);
-     }
-     for(var i = start; i < start+limit && i < this.working_library.problems.length; i++){
-     this.working_library.problems[i].render(this.displayBox);
-     }
-     this.updateMoveButtons();
-     };
-
-
-     CardCatolog.prototype.onLibSelect = function(event, currentLibrary) {
-     this.topProbIndex = 0;
-     //this.library.problems.list = new Object();
-     //this.updateLibrary();
-     var changedLib = event.target;// should be the select
-     var listBox = event.target.parentNode;
-     var libChoices = listBox.childNodes;
-     //var currentObject = this.treeRoot;
-
-     var count = 0;
-     var key;
-     for ( var i = 0; i < libChoices.length; i++) {
-     if (libChoices[i].tagName == "SELECT") {
-     count = i;
-     if (libChoices[i] == changedLib)
-     break;
-     }
-     }
-     while (listBox.childNodes.length > count + 1) {
-     listBox.removeChild(listBox.lastChild);
-     }
-
-     if (currentLibrary.children.hasOwnProperty(changedLib.options[changedLib.selectedIndex].value)) {
-     var child = currentLibrary.children[changedLib.options[changedLib.selectedIndex].value];
-     this.working_library = child;
-     //right now this reloads if there are no subdirectories, can be fixed by a count on serverside.
-     if(Object.size(child.children) > 0){
-     console.log("didn't have to build");
-     this.buildSelectBox(child);
-     } else {
-     var workAroundTheClosure = this;
-     child.loadChildren(function() {
-     workAroundTheClosure.buildSelectBox(child);
-     });
-     }
-     } else {
-     this.working_library = currentLibrary;
-     }
-     };
-     */
-
     //search was here
 
-
-    /*
-     * needed functions: Both: getProblems
-     *
-     * Library: markInSet markRemovedFromSet
-     *
-     * Set: addProblem removeProblem reorderProblem view
-     *
-     * Problem: (not sure about this yet) view source view problem
-     *
-     * we're kind of following an mvc, check out pure for templating should make
-     * life easy
-     */
-
     /*******************************************************************************
-     * The library object
+     * The library View
      ******************************************************************************/
 
 
@@ -264,8 +91,21 @@ $(function () {
         },
 
         initialize: function(){
+            var self = this;
             this.group_size = 25;
             this.model.get('problems').on('reset', this.render, this);
+            this.model.get('problems').on('syncing', function(value){
+                if(value){
+                    $("[href=#"+self.model.get('name')+"]").addClass("syncing");
+                } else {
+                    $("[href=#"+self.model.get('name')+"]").removeClass("syncing");
+                }
+            }, this);
+            this.model.get('problems').on('alert', function(message){alert(message);});
+
+            if(!(this.model.get('problems').length > 0)){
+                this.model.get('problems').fetch();
+            }
         },
 
         render: function(){
@@ -281,8 +121,11 @@ $(function () {
                 $("[href=#"+this.model.get('name')+"]").html(this.model.get('name') + " (" + this.model.get('problems').length + ")");
             }
 
-            this.$el.addClass("library_tab");
+            if(self.model.get('problems').syncing){
+                $("[href=#"+self.model.get('name')+"]").addClass("syncing");
+            }
 
+            this.$el.addClass("library_tab");
             this.startIndex = 0;
 
             var jsonInfo = this.model.toJSON();
@@ -323,41 +166,70 @@ $(function () {
         template:_.template($('#LibraryList-template').html()),
 
         events: {
-            'change .list': 'lib_selected'
+            //'change .list': 'lib_selected'
         },
 
         initialize:function () {
+            var self = this;
             this.model.on("reset", this.render, this);
-            this.model.on("add", this.render, this);
+            this.model.on("add", this.addOne, this);
+            this.model.on('alert', function(message){alert(message);}, this);
+            this.model.on('syncing', function(value){
+                if(value){
+                    self.$el.addClass("syncing white");
+                } else {
+                    self.$el.removeClass("syncing white");
+                }
+            }, this);
+            //not the strongest solution but it will do
+            if(!(this.model.length > 0)){
+                this.model.fetch();
+            }
+            console.log("init "+this.options.name);
         },
 
         render:function () {
 
             var self = this;
+            console.log("trying to call render on "+this.options.name);
+            if(self.model.syncing){
+                self.$el.addClass("syncing white");
+            }
+            this.$el.html(this.template({name: this.options.name}));
+            self.$("."+this.options.name+".list").on('change', function(event){self.lib_selected(event)});
+            this.addAll();
+            return this;
+        },
 
-            if(self.model.length > 0){
-                //should show number of problems in the bar
-
-                this.$el.html(this.template(this.model.toJSON));
+        addOne: function(lib){
+            var self = this;
+            var option = document.createElement("option")
+            option.value = lib.cid;
+            option.innerHTML = lib.get('name');
+            this.$('.'+this.options.name + '.list').append(option);//what's the null?
+        },
 
-                this.model.each(function (lib) {
-                    var option = document.createElement("option")
-                    option.value = lib.cid;
-                    option.innerHTML = lib.get('name');
-                    self.$('.list').append(option);//what's the null?
-                });
+        addAll: function(){
+            var self = this;
+            if(this.model.length > 0){
+                //should show number of problems in the bar
+                this.model.each(function(lib){self.addOne(lib)});
+            } else {
+                this.$('.'+this.options.name+".list").css("display", "none");
             }
-            return this;
         },
 
         lib_selected:function (event) {
             var self = this;
+            self.$el.removeClass("syncing white");
             var selectedLib = this.model.getByCid(event.target.value);
-            console.log(selectedLib);
+            console.log(selectedLib)
             if(selectedLib){
-                selectedLib.get('children').fetch();
-                var view = new LibraryListView({model:selectedLib.get('children')});
-                this.$(".children").html(view.render().el);
+                var view = new LibraryListView({model:selectedLib.get('children'), name: selectedLib.cid});
+                this.$('.'+this.options.name+".children").html(view.render().el);
+                console.log(view.render().el);
+                console.log(this.$('.'+this.options.name+" .children"));
+                console.log("trying to render "+selectedLib.cid);
                 libToLoad = selectedLib;
             }
         }
@@ -398,6 +270,16 @@ $(function () {
             this.model.get('problems').on('all', function(){
                 $("[href=#"+self.model.get('name')+"]").html(self.model.get('name') + " (" + self.model.get('problems').length + ")");
             }, this);
+            this.model.get('problems').on('alert', function(message){alert(message);});
+
+            this.model.get('problems').on('syncing', function(value){
+                if(value){
+                    $("[href=#"+self.model.get('name')+"]").addClass("syncing");
+                } else {
+                    $("[href=#"+self.model.get('name')+"]").removeClass("syncing");
+                }
+            }, this);
+
         },
 
         render:function () {
@@ -411,6 +293,10 @@ $(function () {
 
             this.$el.html(self.template(self.model.toJSON()));
 
+            if(self.model.get('problems').syncing){
+                $("[href=#"+self.model.get('name')+"]").addClass("syncing");
+            }
+
             //this.$el.id = this.model.get('name');
             //might have to refresh
             this.$('.list').sortable({
@@ -480,6 +366,7 @@ $(function () {
             this.bigView = false;
             var self = this;
             this.model.get('problems').on('all', function(){self.render()}, this);
+            this.model.get('problems').on('alert', function(message){alert(message);});
             this.model.on('highlight', function(){self.$el.addClass("contains_problem")});
         },
 
@@ -493,8 +380,8 @@ $(function () {
                 hoverClass:'drophover',
 
                 drop:function (event, ui) {
-                    var newProblem = new webwork.Problem({path:ui.draggable.attr("data-path")});
-                    self.model.get("problems").addProblem(newProblem);
+                    //var newProblem = new webwork.Problem({path:ui.draggable.attr("data-path")});
+                    self.model.get("problems").add({path:ui.draggable.attr("data-path")});
                 }
             });
 
@@ -533,7 +420,10 @@ $(function () {
             this.model.bind('add', function(model){self.addOne(model);}, this);
             this.model.bind('reset', function(){self.addAll()}, this);
             //this.model.bind('all', this.render, this);
-            this.render();
+
+            if(!(this.model.length > 0)){
+                this.model.fetch();
+            }
         },
 
         render:function () {
@@ -579,9 +469,9 @@ $(function () {
     $("#load_problems").on("click", function(event){
         console.log(libToLoad);
         if(libToLoad){
-            libToLoad.get('problems').fetch();
             var view = new LibraryView({model: libToLoad});
             view.render();
+
         }
     });
 
@@ -597,6 +487,29 @@ $(function () {
         },
 
         initialize:function () {
+            var self = this;
+
+            //Some default ajax stuff we can keep it or not
+            $(document).ajaxError(function(e, jqxhr, settings, exception) {
+                alert(exception, "alert-error");
+            });
+
+            // get usernames and keys from hidden variables and set up webwork object:
+            var myUser = document.getElementById("hidden_user").value;
+            var mySessionKey = document.getElementById("hidden_key").value;
+            var myCourseID = document.getElementById("hidden_courseID").value;
+            // check to make sure that our credentials are available.
+            if (myUser && mySessionKey && myCourseID) {
+                webwork.requestObject.user = myUser;
+                webwork.requestObject.session_key = mySessionKey;
+                webwork.requestObject.courseID = myCourseID;
+            } else {
+                alert("missing hidden credentials: user "
+                    + myUser + " session_key " + mySessionKey
+                    + " courseID" + myCourseID, "alert-error");
+            }
+
+
             //Set up the tabbed set lists and libraries:
             $("#problems_container").tabs(
                 {
@@ -632,9 +545,6 @@ $(function () {
             this.cardCatalog = new webwork.LibraryList;
             this.cardCatalog.defaultRequestObject.xml_command = "listLibraries"
 
-            this.homeworkSets.fetch();
-            this.cardCatalog.fetch();
-
             this.render();
         },
 
@@ -668,7 +578,7 @@ $(function () {
             var homeworkSetsView = new SetListView({model: this.homeworkSets});
             this.$("#homework_sets_container").append(homeworkSetsView.render().el);
 
-            var cardCatalogView = new LibraryListView({model: this.cardCatalog});
+            var cardCatalogView = new LibraryListView({model: this.cardCatalog, name: "root"});
             this.$("#CardCatalog").append(cardCatalogView.render().el);
         },
 
diff --git a/htdocs/js/lib/webwork/WeBWorK.js b/htdocs/js/lib/webwork/WeBWorK.js
index a2ab4f6610..79df884abf 100644
--- a/htdocs/js/lib/webwork/WeBWorK.js
+++ b/htdocs/js/lib/webwork/WeBWorK.js
@@ -6,6 +6,16 @@
     requires backbone.js, underscore.js, and their dependencies
 */
 
+
+/**
+ * Global stuff
+ * should do something better with this
+ */
+// undo and redo functions
+var undoing = false;
+var undo_stack = new Array();
+var redo_stack = new Array();
+
 var webwork = webwork || { REVISION: '0' };
 
 
@@ -27,13 +37,6 @@ webwork.requestObject = {
     "command":""
 };
 webwork.webserviceURL = "";
-webwork.alert_template = _.template('<div class="alert <%= classes %> fade in"><a class="close" data-dismiss="alert" href="#">×</a><%= message %></div>');
-webwork.alert = function(message, classes){
-    console.log('alert');
-    //developers have to add a messages div (span, whatever) to the app to see messages
-    $('#messages').html(webwork.alert_template({message: message, classes: classes}));
-    setTimeout(function(){$(".alert").alert('close')}, 2000);
-};
 
 webwork.Problem = Backbone.Model.extend({
     defaults:function () {
@@ -74,10 +77,18 @@ webwork.ProblemList = Backbone.Collection.extend({
     model:webwork.Problem,
 
     initialize: function(){
+        var self = this;
         this.defaultRequestObject = {
 
         };
         _.defaults(this.defaultRequestObject, webwork.requestObject);
+
+        if(this.addProblem && this.removeProblem){
+            this.on('add', this.addProblem, this);
+            this.on('remove', this.removeProblem, this);
+        }
+        this.syncing = false;
+        this.on('syncing', function(value){self.syncing = value});
     },
 
     comparator: function(problem) {
@@ -92,10 +103,10 @@ webwork.ProblemList = Backbone.Collection.extend({
 
         var requestObject = {};
         _.defaults(requestObject, this.defaultRequestObject);
-
+        self.trigger('syncing', true);
         $.post(webwork.webserviceURL, requestObject,
             function (data) {
-                //try {//this is the wrong way to be error checking
+
                 var response = $.parseJSON(data);
 
                 var problems = response.result_data.split(",");
@@ -107,10 +118,8 @@ webwork.ProblemList = Backbone.Collection.extend({
                     }
                 }
                 self.reset(newProblems);
-                //document.getElementById(workAroundTheClosure.name + workAroundTheClosure.id).innerHTML = workAroundTheClosure.name + " (" + workAroundTheClosure.problemArray.length + ")";
-                /*} catch (err) {
-                 showErrorResponse(data);
-                 }*/
+                //self.trigger('sync');
+                self.trigger('syncing', false);
             }
         );
     }
@@ -129,9 +138,6 @@ webwork.Set = Backbone.Model.extend({
             xml_command: "listSetProblems"
         });
 
-
-        //this.get('problems').on('add', this.addProblem, this);
-        //this.get('problems').on('remove', this.removeProblem, this);
         this.get('problems').fetch();
     }
 
@@ -141,11 +147,14 @@ webwork.SetList = Backbone.Collection.extend({
     model:webwork.Set,
 
     initialize: function(){
+        var self = this;
         this.defaultRequestObject = {};
 
         _.defaults(this.defaultRequestObject, webwork.requestObject);
+        this.syncing = false;
+        this.on('syncing', function(value){self.syncing = value});
     },
-    //think it's fetch I want to replace:
+
     fetch:function () {
         var self = this;
 
@@ -153,30 +162,21 @@ webwork.SetList = Backbone.Collection.extend({
             xml_command: "listSets"
         };
         _.defaults(requestObject, this.defaultRequestObject);
-        console.log("starting set list");
+        self.trigger('syncing', true);
         $.post(webwork.webserviceURL, requestObject, function (data) {
-            //try {
             var response = $.parseJSON(data);
-            console.log("result: " + response.server_response);
+
             var setNames = response.result_data.split(",");
             setNames.sort();
-            console.log("found these sets: " + setNames);
+
             var newSets = new Array();
             for (var i = 0; i < setNames.length; i++) {
                 //workAroundSetList.renderList(workAroundSetList.setNames[i]);
                 newSets.push({name:setNames[i]})
             }
             self.reset(newSets);
-            /*} catch (err) {
-             showErrorResponse(data);
-             }*/
+            self.trigger('syncing', false);
         });
     }
 });
 
-//set up alerts to close
-$().alert();
-//Some default ajax stuff we can keep it or not
-$(document).ajaxError(function(e, jqxhr, settings, exception) {
-    webwork.alert(exception, "alert-error");
-});
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Library.js b/htdocs/js/lib/webwork/teacher/Library.js
index 03f67bc188..45b3f46655 100644
--- a/htdocs/js/lib/webwork/teacher/Library.js
+++ b/htdocs/js/lib/webwork/teacher/Library.js
@@ -28,6 +28,7 @@ webwork.LibraryList = Backbone.Collection.extend({
     model:webwork.Library,
 
     initialize: function(){
+        var self = this;
         this.url = "";
         this.defaultRequestObject = {
             xml_command: "listLib",
@@ -35,6 +36,8 @@ webwork.LibraryList = Backbone.Collection.extend({
             maxdepth: 0
         };
         _.defaults(this.defaultRequestObject, webwork.requestObject);
+        this.syncing = false;
+        this.on('syncing', function(value){self.syncing = value});
     },
 
     fetch: function(){
@@ -42,12 +45,11 @@ webwork.LibraryList = Backbone.Collection.extend({
 
         var self = this;
 
-        webwork.alert("Loading libraries... may take some time");
-
+        self.trigger("alert", "Loading libraries... may take some time");
         var requestObject = {};
 
         _.defaults(requestObject, this.defaultRequestObject);
-
+        self.trigger('syncing', true);
         $.post(webwork.webserviceURL, requestObject,
             function (data) {
                 //console.log(data);
@@ -56,7 +58,6 @@ webwork.LibraryList = Backbone.Collection.extend({
                 console.log(response);
                 console.log("result: " + response.server_response);
                 //need better server responses eventually
-                webwork.alert(response.server_response);
 
                 var newLibs = new Array();
 
@@ -67,10 +68,9 @@ webwork.LibraryList = Backbone.Collection.extend({
                     newLibs.push({name:lib, path: self.url +"/"+lib})
                 });
                 self.reset(newLibs);
-                //callback();
-                /*} catch (err) {
-                 showErrorResponse(data);
-                 }*/
-            });//should add error checking
+
+                self.trigger("alert", response.server_response);//self.trigger('alert', {message: "string", type: "error, success, warning"});
+                self.trigger('syncing', false);
+            });
     }
 });
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Problem.js b/htdocs/js/lib/webwork/teacher/Problem.js
index 79e1920e47..7c227385d8 100644
--- a/htdocs/js/lib/webwork/teacher/Problem.js
+++ b/htdocs/js/lib/webwork/teacher/Problem.js
@@ -1,6 +1,6 @@
 //Problem admin functions
 webwork.ProblemList.prototype.addProblem = function (problem) {
-    this.add(problem);
+    //this.add(problem);
     var self = this;
 
     var requestObject = {
@@ -12,8 +12,6 @@ webwork.ProblemList.prototype.addProblem = function (problem) {
     $.post(webwork.webserviceURL, requestObject, function (data) {
         //try {
         var response = $.parseJSON(data);
-        console.log("result: " + response.server_response);
-        webwork.alert(response.server_response);
         // still have to test for success..everywhere
         if (undoing) {// might be a better way to do this later
             redo_stack.push(function () {
@@ -25,11 +23,8 @@ webwork.ProblemList.prototype.addProblem = function (problem) {
                 self.removeProblem(problem);
             });
         }
-        //hopfully I can get rid of this
-        //self.loadProblems($.contains(document.getElementById("problems_container"), document.getElementById(self.name)));
-        /*} catch (err) {
-         showErrorResponse(data);
-         }*/
+        self.trigger('alert', response.server_response);
+        self.trigger('sync');
     });
 };
 
@@ -47,8 +42,6 @@ webwork.ProblemList.prototype.removeProblem = function (problem) {
     $.post(webwork.webserviceURL, requestObject, function (data) {
         //try {
         var response = $.parseJSON(data);
-        console.log("result: " + response.server_response);
-        webwork.alert(response.server_response);
         // still have to test for success....
         if (undoing) {
             redo_stack.push(function () {
@@ -60,14 +53,10 @@ webwork.ProblemList.prototype.removeProblem = function (problem) {
                 self.addProblem(problem);
             });
         }
-        /*workAroundSet.loadProblems($.contains(document
-         .getElementById("problems_container"), document
-         .getElementById(self.name)));*/
-        /*} catch (err) {
-         showErrorResponse(data);
-         }*/
+        self.trigger('alert', response.server_response);
+        self.trigger('sync');
     });
-    problem.destroy();
+    //problem.destroy();
 };
 
 webwork.ProblemList.prototype.reorder = function(){
@@ -89,9 +78,7 @@ webwork.ProblemList.prototype.reorder = function(){
         //try {
         var response = $.parseJSON(data);
         console.log("result: " + response.server_response);
-        webwork.alert(response.server_response);
-        /*} catch (err) {
-         showErrorResponse(data);
-         }*/
+        self.trigger('alert', response.server_response);
+        self.trigger('sync');
     });
 };
\ No newline at end of file
diff --git a/htdocs/js/lib/webwork/teacher/Set.js b/htdocs/js/lib/webwork/teacher/Set.js
index a70c625e92..60b5a4d3d5 100644
--- a/htdocs/js/lib/webwork/teacher/Set.js
+++ b/htdocs/js/lib/webwork/teacher/Set.js
@@ -10,9 +10,7 @@ webwork.SetList.prototype.create = function (model) {
         //try {
         var response = $.parseJSON(data);
         console.log("result: " + response.server_response);
-        webwork.alert(response.server_response);
-        /*} catch (err) {
-         showErrorResponse(data);
-         }*/
+        self.trigger('alert', response.server_response);
+        self.trigger('sync');
     });
 };
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index c76974aa46..812d8a7f53 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -248,10 +248,10 @@ sub body {
         '</script>';
 
   print '<script type="text/template", id="LibraryList-template">',
-             '<select class="list">',
+             '<select  class="<%= name %> list">',
              '<option value=null>Pick a Library</option>',
              '</select>',
-             '<span class="children"></span>',
+             '<span class="<%= name %> children"></span>',
           '</script>';
 
   print '<script type="text/template", id="Library-template">',

From df7efa7d703774bbf2b9e3a59135c622a5d65498 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 13:48:40 -0400
Subject: [PATCH 58/73] Added code to create, edit, and assign achievements to
 students

---
 conf/database.conf.dist                 |  28 +++
 conf/global.conf.dist                   | 108 ++++++++---
 lib/WeBWorK/Constants.pm                |  12 +-
 lib/WeBWorK/ContentGenerator.pm         |  62 +++----
 lib/WeBWorK/ContentGenerator/Problem.pm |  96 ++++++----
 lib/WeBWorK/DB.pm                       | 230 ++++++++++++++++++++++++
 lib/WeBWorK/DB/Schema/NewSQL.pm         |   6 +
 lib/WeBWorK/URLPath.pm                  | 142 ++++++---------
 lib/WeBWorK/Utils.pm                    |  32 +++-
 9 files changed, 531 insertions(+), 185 deletions(-)

diff --git a/conf/database.conf.dist b/conf/database.conf.dist
index 5a4d19a95c..141095fb46 100644
--- a/conf/database.conf.dist
+++ b/conf/database.conf.dist
@@ -279,6 +279,34 @@ $dbLayouts{sql_single} = {
 			tableOverride => "${courseName}_setting"
 		},
 	},
+   	achievement => {
+		record => "WeBWorK::DB::Record::Achievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_achievement"
+		},
+	},
+	achievement_user => {
+		record => "WeBWorK::DB::Record::UserAchievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_achievement_user"
+	 	},
+        },
+	global_user_achievement => {
+		record => "WeBWorK::DB::Record::GlobalUserAchievement",
+		schema => "WeBWorK::DB::Schema::NewSQL::Std",
+		driver => "WeBWorK::DB::Driver::SQL",
+		source => $database_dsn,
+		params => { %sqlParams,
+			tableOverride => "${courseName}_global_user_achievement"
+		},
+	},
+
 };
 
 
diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index d167142b93..0907767f4c 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -23,6 +23,8 @@
 # configuration file (webwork.apache-config) and is available for use here. In
 # addition, the $courseName variable holds the name of the current course.
 
+################################################################################
+# Seed variables
 ################################################################################
 
 include("conf/prelocal.conf");
@@ -31,6 +33,7 @@ include("VERSION");
 # prelocal.conf  should contain basic information about 
 # certain directories on your server
 ################################################################################
+
 # Root directory of PG.
 $pg_dir              = "/opt/webwork/pg";
 
@@ -43,6 +46,47 @@ $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
 
+################################################################################
+# Paths to external programs 
+################################################################################
+
+# system utilities
+$externalPrograms{mv}    = "/bin/mv";
+$externalPrograms{cp}    = "/bin/cp";
+$externalPrograms{rm}    = "/bin/rm";
+$externalPrograms{mkdir} = "/bin/mkdir";
+$externalPrograms{tar}   = "/bin/tar";
+$externalPrograms{gzip}  = "/bin/gzip";
+
+# equation rendering/hardcopy utiltiies
+$externalPrograms{latex}    = "/usr/bin/latex";
+$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
+$externalPrograms{dvipng}   = "/usr/bin/dvipng";
+$externalPrograms{tth}      = "/usr/bin/tth";
+
+####################################################
+# NetPBM - basic image manipulation utilities
+# Most sites only need to configure $netpbm_prefix.
+####################################################
+my $netpbm_prefix = "/usr/bin";
+$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
+$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
+$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
+$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
+$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
+
+# url checker
+$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
+
+# image conversions utiltiies
+# the source file is given on stdin, and the output expected on stdout.
+$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
+$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
+
+# mysql clients
+$externalPrograms{mysql}     = "/usr/bin/mysql";
+$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
 
 ################################################################################
 # Mail settings
@@ -158,6 +202,12 @@ $courseURLs{feedbackFormURL} = "";
 $defaultTheme = "math2";
 $defaultThemeTemplate = "system";
 
+################################################################################
+# Achievements
+################################################################################
+$achevementsEnabled = 0;
+$achievementPointsPerProblem = 5;
+
 ################################################################################
 # Language
 ################################################################################
@@ -213,9 +263,7 @@ $webworkURLs{root}          = "$webwork_url";
 $webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs";
 $webworkURLs{htdocs}        = "$webwork_htdocs_url";
 
-
 # Location of web-accessible temporary files, such as equation images.
-# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
 $webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
 $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 
@@ -287,6 +335,10 @@ $courseDirs{scoring}     = "$courseDirs{root}/scoring";
 # Location of PG templates and set definition files.
 $courseDirs{templates}   = "$courseDirs{root}/templates";
 
+# Location of course achievement files.
+$courseDirs{achievements}   = "$courseDirs{templates}/achievements";
+$courseURLs{achievements}   = "$courseURLs{html}/achievements";
+
 # Location of course-specific macro files.
 $courseDirs{macros}      = "$courseDirs{templates}/macros";
 
@@ -451,18 +503,20 @@ $default_status = "Enrolled";
 # GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
 # GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-################################################################################
-# set these variables in prelocal.conf
-#
-# $database_dsn = "dbi:mysql:webwork";
-# $database_username = "webworkWrite";
-# #$database_password = ""; #set this in prelocal.conf
-################################################################################
+$database_dsn = "dbi:mysql:webwork";
+$database_username = "webworkWrite";
+$database_password = "";
+$database_debug = 0;
 
-# $database_debug = 0;
+# Variables for sql_moodle database layout.
+$moodle_dsn = "dbi:mysql:moodle";
+$moodle_username = $database_username;
+$moodle_password = $database_password;
+$moodle_table_prefix = "mdl_";
+$moodle17 = 0;
 
-# Database schemas are defined in the file conf/database.conf and stored in the
-# hash %dbLayouts. The standard schema is called "sql_single";
+# Several database are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts.
 include "conf/database.conf";
 
 # Select the default database layout. This can be overridden in the course.conf
@@ -498,6 +552,8 @@ $problemLibrary_db = {
 # Logs
 ################################################################################
 
+# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
+# top-level hash.
 
 # Logs data about how long it takes to process problems. (Do not confuse this
 # with the /other/ timing log which can be set by WeBWorK::Timing and is used
@@ -525,7 +581,7 @@ $courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
 $courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Site defaults (Usually overridden in postlocal.conf)
+# Site defaults (FIXME: what other things could be "site defaults"?)
 ################################################################################
 
 # Set the default timezone of courses on this server. To get a list of valid
@@ -565,7 +621,7 @@ $siteDefaults{default_templates_course} ="modelCourse";
 # current database layout is found.
 # 
 $authen{user_module} = {
-	# sql_moodle => "WeBWorK::Authen::Moodle",
+	sql_moodle => "WeBWorK::Authen::Moodle",
 	# sql_ldap   => "WeBWorK::Authen::LDAP",
 	#"*" => "WeBWorK::Authen",
 	"*" => "WeBWorK::Authen::Basic_TheLastOption",
@@ -577,12 +633,15 @@ $authen{user_module} = {
 # 
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-################################################################################
 # Options for particular authentication modules
-################################################################################
 
-# If you are using ldap this next snippet should be copied and entered into postlocal.conf.
-# Make modifications there so that it works with your local LDAP protocol
+# $authen{moodle_options} = {
+# 	dsn => $moodle_dsn,
+# 	username => $moodle_username,
+# 	password => $moodle_password,
+# 	table_prefix => $moodle_table_prefix,
+# 	moodle17 => $moodle17,
+# };
 
 $authen{ldap_options} = {
 	# hosts to attempt to connect to, in order. For example:
@@ -633,7 +692,7 @@ $authen{ldap_options} = {
 };
 
 ################################################################################
-# Authorization system (Make local overrides in postlocal.conf )
+# Authorization system
 ################################################################################
 
 # this section lets you define which groups of users can perform which actions.
@@ -650,7 +709,6 @@ $authen{ldap_options} = {
 	grade_proctor => 3,
 	ta => 5,
 	professor => 10,
-	admin     => 20,
 );
 
 # this hash maps operations to the roles that are allowed to perform those
@@ -692,6 +750,8 @@ $authen{ldap_options} = {
 	modify_problem_template_files  => "professor",
 	manage_course_files            => "professor",
 	
+        edit_achievements              => "professor",
+
 	create_and_delete_courses      => "professor",
 	fix_course_databases           => "professor",
 	
@@ -1031,8 +1091,7 @@ $webworkRoot    = $webworkDirs{root};
 $webworkURLRoot = $webworkURLs{root};
 $pgRoot         = $pg{directories}{root};
 
-################################################################################
-# Temporary hack for displaying the different versions of the editors
+
 ################################################################################
 # LTI Basic parameters
 ################################################################################
@@ -1148,6 +1207,11 @@ $webservices = {
 	courseActionsAssignHomework => 0, 
 };
 
+
+################################################################################
+# Temporary hack for displaying the different versions of the editors
+################################################################################
+
 ################################################################################
 # Site wide overrides are entered into the file postlocal.conf
 ################################################################################
diff --git a/lib/WeBWorK/Constants.pm b/lib/WeBWorK/Constants.pm
index 31a64e2d31..7fe8002b14 100644
--- a/lib/WeBWorK/Constants.pm
+++ b/lib/WeBWorK/Constants.pm
@@ -134,7 +134,7 @@ $WeBWorK::ContentGenerator::Instructor::Config::ConfigValues = [
 		  type => 'text'},
 		{ var => 'defaultTheme',
 		  doc => 'Theme (refresh page after saving changes to reveal new theme.)',
-		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, math3 union.  The theme
+		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, and dgage.  The theme
 specifies a unified look and feel for the WeBWorK course web pages.',
 		  values => [qw(math math2 math3 ur dgage  union)],
 		  type => 'popuplist'},
@@ -150,7 +150,15 @@ specifies a unified look and feel for the WeBWorK course web pages.',
 		{ var => 'siteDefaults{timezone}',
 		  doc => 'Timezone for the course',
 		  doc2 => 'Some servers handle courses taking place in different timezones.  If this course is not showing the correct timezone, enter the correct value here.  The format consists of unix times, such as "America/New_York","America/Chicago", "America/Denver", "America/Phoenix" or "America/Los_Angeles". Complete list: <a href="http://en.wikipedia.org/wiki/List_of_zoneinfo_time_zones">TimeZoneFiles</a>',
-		  type => 'text'},],
+		  type => 'text'},
+    		{ var => 'achievementsEnabled',
+		  doc => 'Enable Course Achievements',
+		  doc2 => 'Activiating this will enable Mathchievements for webwork.  Mathchievements can be managed by using the Achievement Editor link.',
+		  type => 'boolean'},                
+                { var => 'achievementPointsPerProblem',
+                  doc => 'Achievement Points Per Problem',
+                  doc2 => 'This is the number of achievement points given to each user for completing a problem.',
+                  type => 'number'},],
 	['Permissions',
 		{ var => 'permissionLevels{login}',
 		  doc => 'Allowed to login to the course',
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index b659aa7eda..0abaf82bb3 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator.pm,v 1.196 2009/06/04 01:33:15 gage Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -560,9 +560,12 @@ sub links {
 	my $eUserID   = $r->param("effectiveUser");
 	my $setID     = $urlpath->arg("setID");
 	my $problemID = $urlpath->arg("problemID");
-	
+	my $achievementID = $urlpath->arg("achievementID");
+
 	my $prettySetID = $setID;
+	my $prettyAchievementID = $achievementID;
 	$prettySetID =~ s/_/ /g if defined $prettySetID;
+	$prettyAchievementID =~ s/_/ /g if defined $prettyAchievementID;
 	
 	# it's possible that the setID and the problemID are invalid, since they're just taken from the URL path info
 	if ($authen->was_verified) {
@@ -699,6 +702,10 @@ sub links {
 			
 			print CGI::li(&$makelink("${pfx}Grades", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 			
+			if ($ce->{achievementsEnabled}) {
+			    print CGI::li(&$makelink("${pfx}Achievements", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)); 
+			}
+
 			if ($authz->hasPermissions($userID, "access_instructor_tools")) {
 				$pfx .= "Instructor::";
 				
@@ -706,18 +713,10 @@ sub links {
 				print &$makelink("${pfx}Index", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				print CGI::start_ul();
 				
-				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{classlisteditor1};
-				print CGI::li(&$makelink("${pfx}UserList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{classlisteditor2};;
+				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				
 				print CGI::start_li(); # Homework Set Editor
-				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
-					if $ce->{showeditors}->{homeworkseteditor1};
-				print "<br/>";
-				print &$makelink("${pfx}ProblemSetList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
-					if $ce->{showeditors}->{homeworkseteditor2};;
-				
+				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				## only show editor link for non-versioned sets
 				if (defined $setID && $setID !~ /,v\d+$/ ) {
 					print CGI::start_ul();
@@ -726,14 +725,7 @@ sub links {
 					
 					if (defined $problemID) {
 						print CGI::start_ul();
-						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"))
-							if $ce->{showeditors}->{pgproblemeditor1};
-						print CGI::end_ul();
-					}
-					if (defined $problemID) {
-						print CGI::start_ul();
-						print CGI::li(&$makelink("${pfx}PGProblemEditor2", text=>"--$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor2"))
-							if $ce->{showeditors}->{pgproblemeditor2};;
+						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"));
 						print CGI::end_ul();
 					}
 					
@@ -742,12 +734,8 @@ sub links {
 				}
 				print CGI::end_li(); # end Homework Set Editor
 				
-				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser1};
-				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser2};
-				print CGI::li(&$makelink("${pfx}SetMaker3", text=>$r->maketext("Library Browser 3"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
-					if $ce->{showeditors}->{librarybrowser3};
+				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				print CGI::start_li(); # Stats
 				print &$makelink("${pfx}Stats", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				if ($userID ne $eUserID or defined $setID) {
@@ -788,6 +776,18 @@ sub links {
 					print CGI::li(&$makelink("${pfx}Scoring", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				}
 				
+				#Show achievement editor for instructors
+				if ($ce->{achievementsEnabled} && $authz->hasPermissions($userID, "edit_achievements")) {
+				    print CGI::li(&$makelink("${pfx}AchievementList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				    if (defined $achievementID ) {
+					print CGI::start_ul();
+					print CGI::start_li(); # $achievementID
+					print &$makelink("${pfx}AchievementEditor", text=>"$prettyAchievementID", urlpath_args=>{%args,achievementID=>$achievementID}, systemlink_args=>\%systemlink_args);
+					print CGI::end_ul();
+				    }
+				    
+				}
+
 				if ($authz->hasPermissions($userID, "send_mail")) {
 					print CGI::li(&$makelink("${pfx}SendMail", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
 				}
@@ -1242,10 +1242,8 @@ handled.
 sub if_warnings {
 	my ($self, $arg) = @_;
 	my $r = $self->r;
-
-	if ( (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) 
-	     or ($self->{pgerrors}) )  
-	{
+	
+	if (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) {
 		return $arg;
 	} else {
 		!$arg;
@@ -1631,9 +1629,7 @@ sub hidden_fields {
 # 		$html .= CGI::hidden($param, @values);  #MEG
 # 		 warn "$param ", join(" ", @values) if @values >1; #this should never happen!!!
 		my $value  = $r->param($param);
-#		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
-		$html .= CGI::hidden(-name=>$param, -default=>$value, -id=>"hidden_".$param); # (can't name these items when using real CGI) 
-
+		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
 	}
 	return $html;
 }
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index 40beab6bfb..cb363198ed 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -41,6 +41,7 @@ use WeBWorK::DB::Utils qw(global2user user2global);
 use URI::Escape;
 use WeBWorK::Localize;
 use WeBWorK::Utils::Tasks qw(fake_set fake_problem);
+use WeBWorK::AchievementEvaluator;
 
 ################################################################################
 # CGI param interface to this module (up-to-date as of v1.153)
@@ -261,9 +262,9 @@ sub attemptResults {
 		$answerMessage =~ s/\n/<BR>/g;
 		$numCorrect += $answerScore >= 1;
 		$numBlanks++ unless $studentAnswer =~/\S/ || $answerScore >= 1;   # unless student answer contains entry
-		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("Correct")) :
+		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("correct")) :
 		                   $answerScore > 0  ? $r->maketext("[_1]% correct", int($answerScore*100)) :
-                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("Incorrect"));
+                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("incorrect"));
 		$fully = $r->maketext("completely") if $answerScore >0 and $answerScore < 1;
 		
 		push @correct_ids,   $name if $answerScore == 1;
@@ -600,7 +601,7 @@ sub pre_header_initialize {
 			$problem->problem_seed($problemSeed);
 		}
 
-		my $visiblityStateClass = ($set->visible) ? $r->maketext("Visible") : $r->maketext("Hidden");
+		my $visiblityStateClass = ($set->visible) ? $r->maketext("visible") : $r->maketext("hidden");
 		my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
 		$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::font({class=>$visiblityStateClass}, $visiblityStateText))));
 
@@ -722,19 +723,6 @@ sub pre_header_initialize {
 			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
 		},
 	);
-	# sometimes, for example if the file can't be read, $pg->{pgcore} won't be defined
-	# because the PG file is never run
-	#
-	if (defined ($pg->{pgcore}) ) {
-		my $debug_msg = CGI::br().join( CGI::br(), @{ $pg->{pgcore}->get_debug_messages});
-		$self->addmessage($debug_msg ) if $debug_msg;
-		$self->{pgdebug}          = $pg->{pgcore}->get_debug_messages;
-		$self->{pgwarning}        = $pg->{pgcore}->get_warning_messages;
-		$self->{pginternalerrors} = $pg->{pgcore}->get_internal_debug_messages ;
-		$self->{pgerrors} = @{$self->{pgdebug}} || @{$self->{pgwarning}} || @{$self->{pginternalerrors}}||0;
-	} else {
-		$self->{pgerrors}=undef;  # unable to obtain errors
-	}
 
 	debug("end pg processing");
 	
@@ -781,22 +769,35 @@ sub warnings {
 	"";
 }
 
-### #FIXME  not clear this is ever used
-# sub if_errors($$) {
-# 	my ($self, $arg) = @_;
-# 	
-# 	if ($self->{isOpen}) {
-# 		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
-# 	} else {
-# 		return !$arg;
-# 	}
-# }
+sub if_errors($$) {
+	my ($self, $arg) = @_;
+	
+	if ($self->{isOpen}) {
+		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
+	} else {
+		return !$arg;
+	}
+}
 
 sub head {
 	my ($self) = @_;
+	my $ce = $self->r->ce;
 
 	return "" if ( $self->{invalidSet} );
+
+	#If we are using achievements then print the achievement css file
+	if ($ce->{achievementsEnabled}) {
+	    print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$ce->{webworkURLs}->{htdocs}/css/achievements.css\"/>";	
+	}
+
 	return $self->{pg}->{head_text} if $self->{pg}->{head_text};
+
+}
+
+sub post_header_text {
+	my ($self) = @_;
+	return "" if ( $self->{invalidSet} );
+    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
 }
 
 sub post_header_text {
@@ -1033,10 +1034,10 @@ sub output_message{
 sub output_editorLink{
 	
 	my $self = shift;
-	
-	my $set = $self->{set};
-	my $problem = $self->{problem};
-	my $pg = $self->{pg};
+
+	my $set             = $self->{set};
+	my $problem         = $self->{problem};
+	my $pg              = $self->{pg};
 	
 	my $r = $self->r;
 	my $ce = $r->ce;
@@ -1071,14 +1072,12 @@ sub output_editorLink{
 
 	if ($pg->{flags}->{error_flag}) {
 		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
-		    print "Call errorOutput</br>";
 			print $self->errorOutput($pg->{errors}, $pg->{body_text});
 			print $editorLink;
 			print $editorLink2;
 		} else {
 			print $self->errorOutput($pg->{errors}, $r->maketext("You do not have permission to view the details of this error."));
 		}
-		
 		print "";
 	}
 	else{
@@ -1132,6 +1131,8 @@ sub output_checkboxes{
 					-name    => "showHints",
 					-value   => 1,
 				}
+
+
 		),"&nbsp;";
 	}
 	if ($can{showSolutions}) {
@@ -1199,19 +1200,22 @@ sub output_submit_buttons{
 sub output_score_summary{
 	my $self = shift;
 	my $r = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
 	my $problem = $self->{problem};
 	my $set = $self->{set};
 	my $pg = $self->{pg};
 	my $scoreRecordedMessage = WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::process_and_log_answer($self) || "";
 	my $submitAnswers = $self->{submitAnswers};
-	
+
 	# score summary
+	warn "num_correct =", $problem->num_correct,"num_incorrect=",$problem->num_incorrect 
+	        unless defined($problem->num_correct) and defined($problem->num_incorrect) ;
 	my $attempts = $problem->num_correct + $problem->num_incorrect;
 	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
 	my $problem_status    = $problem->status || 0;
 	my $lastScore = sprintf("%.0f%%", $problem_status * 100); # Round to whole number
 	my $attemptsLeft = $problem->max_attempts - $attempts;
-
 	
 	my $setClosed = 0;
 	my $setClosedMessage;
@@ -1232,6 +1236,7 @@ sub output_score_summary{
 	#		$setClosedMessage .= " Additional attempts will not be recorded.";
 	#	}
 	#}
+
 	unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
 		my $notCountedMessage = ($problem->value) ? "" : $r->maketext("(This problem will not count towards your grade.)");
 		print CGI::p(join("",
@@ -1327,7 +1332,9 @@ sub output_summary{
 	my $previewAnswers = $self->{previewAnswers};
 	
 	my $r = $self->r;
-	
+	my $ce = $r->ce;
+	my $db = $r->db;
+
 	my $authz = $r->authz;
 	my $user = $r->param('user');
 	
@@ -1335,12 +1342,20 @@ sub output_summary{
 	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
 	# until after the due date
 	# do I need to check $will{showCorrectAnswers} to make preflight work??
-	if (defined($pg->{flags}->{showPartialCorrectAnswers}) and ($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
-		# print this if user submitted answers OR requested correct answers
-		
-		print $self->attemptResults($pg, 1,
+	if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
+		# print this if user submitted answers OR requested correct answers	    
+	    my $results = $self->attemptResults($pg, 1,
 			$will{showCorrectAnswers},
 			$pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
+
+           #If achievements enabled check to see if there are new ones.and print them
+	    if ($ce->{achievementsEnabled}) {
+		my $achievementMessage = WeBWorK::AchievementEvaluator::checkForAchievements($problem, $pg, $db, $ce);
+		print $achievementMessage;
+	    }
+
+	    print $results;
+
 	} elsif ($checkAnswers) {
 		# print this if user previewed answers
 		print CGI::div({class=>'ResultsWithError'},$r->maketext("ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED")), CGI::br();
@@ -1385,6 +1400,9 @@ sub output_custom_edit_message{
 	return "";
 }
 
+
+
+
 # output_past_answer_button
 
 # prints out the "Show Past Answers" button
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index c3417ce503..5e234a8197 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -534,6 +534,7 @@ sub deleteUser {
 	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
 	$self->deleteUserSet($userID, undef);
 	$self->deletePassword($userID);
+	$self->deleteGlobalUserAchievement($userID);
 	$self->deletePermissionLevel($userID);
 	$self->deleteKey($userID);
 	return $self->{user}->delete($userID);
@@ -1123,6 +1124,235 @@ sub deleteGlobalSet {
 	return $self->{set}->delete($setID);
 }
 
+####################################################################
+## achievement functions
+###############################################################
+
+BEGIN {
+	*Achievement = gen_schema_accessor("achievement");
+	*newAchievement = gen_new("achievement");
+	*countAchievementsWhere = gen_count_where("achievement");
+	*existsAchievementWhere = gen_exists_where("achievement");
+	*listAchievementsWhere = gen_list_where("achievement");
+	*getAchievementsWhere = gen_get_records_where("achievement");
+}
+
+sub countAchievements { return scalar shift->listAchievements(@_) }
+
+sub listAchievements {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{achievement}->get_fields_where(["achievement_id"]);
+	} else {
+		return $self->{achievement}->count_where;
+	}
+}
+
+sub existsAchievement {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	return $self->{achievement}->exists($achievementID);
+}
+
+sub getAchievement {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	return ( $self->getAchievements($achievementID) )[0];
+}
+
+sub getAchievements {
+	my ($self, @achievementIDs) = shift->checkArgs(\@_, qw/achievement_id*/);
+	return $self->{achievement}->gets(map { [$_] } @achievementIDs);
+}
+
+sub addAchievement {
+	my ($self, $Achievement) = shift->checkArgs(\@_, qw/REC:achievement/);
+	
+	eval {
+
+		return $self->{achievement}->add($Achievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addAchievement: achievement exists (perhaps you meant to use putAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putAchievement {
+	my ($self, $Achievement) = shift->checkArgs(\@_, qw/REC:achievement/);
+	my $rows = $self->{achievement}->put($Achievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putAchievement: achievement not found (perhaps you meant to use addAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteAchievement {
+	# achievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $achievementID) = shift->checkArgs(\@_, "achievement_id$U");
+	$self->deleteUserAchievement(undef, $achievementID);
+	return $self->{achievement}->delete($achievementID);
+}
+
+####################################################################
+## global_user_achievement functions
+###############################################################
+
+BEGIN {
+	*GlobalUserAchievement = gen_schema_accessor("global_user_achievement");
+	*newGlobalUserAchievement = gen_new("global_user_achievement");
+	*countGlobalUserAchievementsWhere = gen_count_where("global_user_achievement");
+	*existsGlobalUserAchievementWhere = gen_exists_where("global_user_achievement");
+	*listGlobalUserAchievementsWhere = gen_list_where("global_user_achievement");
+	*getGlobalUserAchievementsWhere = gen_get_records_where("global_user_achievement");
+}
+
+sub countGlobalUserAchievements { return scalar shift->listGlobalUserAchievements(@_) }
+
+sub listGlobalUserAchievements {
+	my ($self) = shift->checkArgs(\@_);
+	if (wantarray) {
+		return map { @$_ } $self->{global_user_achievement}->get_fields_where(["user_id"]);
+	} else {
+		return $self->{global_user_achievement}->count_where;
+	}
+}
+
+sub existsGlobalUserAchievement {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return $self->{global_user_achievement}->exists($userID);
+}
+
+sub getGlobalUserAchievement {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	return ( $self->getGlobalUserAchievements($userID) )[0];
+}
+
+sub getGlobalUserAchievements {
+	my ($self, @userIDs) = shift->checkArgs(\@_, qw/user_id*/);
+	return $self->{global_user_achievement}->gets(map { [$_] } @userIDs);
+}
+
+sub addGlobalUserAchievement {
+	my ($self, $globalUserAchievement) = shift->checkArgs(\@_, qw/REC:global_user_achievement/);
+	
+	eval {
+
+	    return $self->{global_user_achievement}->add($globalUserAchievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addGlobalUserAchievement: user achievement exists (perhaps you meant to use putGlobalUserAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putGlobalUserAchievement {
+	my ($self, $globalUserAchievement) = shift->checkArgs(\@_, qw/REC:global_user_achievement/);
+	my $rows = $self->{global_user_achievement}->put($globalUserAchievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putGlobalUserAchievement: user achievement not found (perhaps you meant to use addGlobalUserAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteGlobalUserAchievement {
+	# userAchievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID) = shift->checkArgs(\@_, "user_id$U");
+	return $self->{global_user_achievement}->delete($userID);
+}
+
+
+################################################################################
+# achievement_user functions
+################################################################################
+
+BEGIN {
+	*UserAchievement = gen_schema_accessor("achievement_user");
+	*newUserAchievement = gen_new("achievement_user");
+	*countUserAchievementsWhere = gen_count_where("achievement_user");
+	*existsUserAchievementWhere = gen_exists_where("achievement_user");
+	*listUserAchievementsWhere = gen_list_where("achievement_user");
+	*getUserAchievementsWhere = gen_get_records_where("achievement_user");
+}
+
+sub countAchievementUsers { return scalar shift->listAchievementUsers(@_) }
+
+sub listAchievementUsers {
+	my ($self, $achievementID) = shift->checkArgs(\@_, qw/achievement_id/);
+	my $where = [achievement_id_eq => $achievementID];
+	if (wantarray) {
+		return map { @$_ } $self->{achievement_user}->get_fields_where(["user_id"], $where);
+	} else {
+		return $self->{achievement_user}->count_where($where);
+	}
+}
+
+sub countUserAchievements { return scalar shift->listUserAchievements(@_) }
+
+sub listUserAchievements {
+	my ($self, $userID) = shift->checkArgs(\@_, qw/user_id/);
+	my $where = [user_id_eq => $userID];
+	if (wantarray) {
+		return map { @$_ } $self->{achievement_user}->get_fields_where(["achievement_id"], $where);
+	} else {
+		return $self->{achievement_user}->count_where($where);
+	}
+}
+
+sub existsUserAchievement {
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, qw/user_id achievement_id/);
+	return $self->{achievement_user}->exists($userID, $achievementID);
+}
+
+sub getUserAchievement {
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, qw/user_id achievement_id/);
+	return ( $self->getUserAchievements([$userID, $achievementID]) )[0];
+}
+
+sub getUserAchievements {
+	my ($self, @userAchievementIDs) = shift->checkArgsRefList(\@_, qw/user_id achievement_id/);
+	return $self->{achievement_user}->gets(@userAchievementIDs);
+}
+
+sub addUserAchievement {
+	my ($self, $UserAchievement) = shift->checkArgs(\@_, qw/REC:achievement_user/);
+	
+	croak "addUserAchievement: user ", $UserAchievement->user_id, " not found"
+		unless $self->{user}->exists($UserAchievement->user_id);
+	croak "addUserAchievement: achievement ", $UserAchievement->achievement_id, " not found"
+		unless $self->{achievement}->exists($UserAchievement->achievement_id);
+	
+	eval {
+		return $self->{achievement_user}->add($UserAchievement);
+	};
+	if (my $ex = caught WeBWorK::DB::Ex::RecordExists) {
+		croak "addUserAchievement: user achievement exists (perhaps you meant to use putUserAchievement?)";
+	} elsif ($@) {
+		die $@;
+	}
+}
+
+sub putUserAchievement {
+	my ($self, $UserAchievement) = shift->checkArgs(\@_, qw/REC:achievement_user/);
+	my $rows = $self->{achievement_user}->put($UserAchievement); # DBI returns 0E0 for 0.
+	if ($rows == 0) {
+		croak "putUserAchievement: user achievement not found (perhaps you meant to use addUserAchievement?)";
+	} else {
+		return $rows;
+	}
+}
+
+sub deleteUserAchievement {
+	# userID and achievementID can be undefined if being called from this package
+	my $U = caller eq __PACKAGE__ ? "!" : "";
+	my ($self, $userID, $achievementID) = shift->checkArgs(\@_, "user_id$U", "achievement_id$U");
+	return $self->{achievement_user}->delete($userID, $achievementID);
+}
+
 ################################################################################
 # set_user functions
 ################################################################################
diff --git a/lib/WeBWorK/DB/Schema/NewSQL.pm b/lib/WeBWorK/DB/Schema/NewSQL.pm
index d6a53d9774..aafb1c684e 100644
--- a/lib/WeBWorK/DB/Schema/NewSQL.pm
+++ b/lib/WeBWorK/DB/Schema/NewSQL.pm
@@ -46,6 +46,12 @@ sub where_user_id_eq {
 	return {user_id=>$user_id};
 }
 
+# can be used for achievement_user
+sub where_achievement_id_eq {
+    my ($self, $flags, $achievement_id) = @_;
+    return {achievement_id=>$achievement_id};
+}
+
 # can be used for user,password,permission,key,set_user,problem_user
 sub where_user_id_like {
 	my ($self, $flags, $user_id) = @_;
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
index fb9f5ec787..b3a75f1807 100644
--- a/lib/WeBWorK/URLPath.pm
+++ b/lib/WeBWorK/URLPath.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/lib/WeBWorK/URLPath.pm,v 1.36 2008/04/29 19:27:34 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -46,7 +46,6 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  
  course_admin                        /admin/ -> logout, options, instructor_tools
  html2xml                            /html2xml/
- instructorXMLHandler     			     /instructorXMLHandler/
  set_list                            /$courseID/
  
  equation_display                    /$courseID/equation/
@@ -68,26 +67,16 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_user_detail              /$courseID/instructor/users/$userID/
  instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
  
- instructor_user_list2                /$courseID/instructor/users2/
- instructor_user_detail2              /$courseID/instructor/users2/$userID/ #not created yet
- instructor_sets_assigned_to_user2    /$courseID/instructor/users2/$userID/sets/ #not created yet
-
- 
  instructor_set_list                 /$courseID/instructor/sets/
  instructor_set_detail               /$courseID/instructor/sets/$setID/
  instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
  
- instructor_set_list2                 /$courseID/instructor/sets2/
- instructor_set_detail2               /$courseID/instructor/sets2/$setID/ #not created yet
- instructor_users_assigned_to_set2    /$courseID/instructor/sets2/$setID/users/ #not created yet
- 
  instructor_add_users                /$courseID/instructor/add_users/
  instructor_set_assigner             /$courseID/instructor/assigner/
  instructor_file_transfer            /$courseID/instructor/files/
  instructor_file_manager             /$courseID/instructor/file_manager/
  instructor_set_maker                /$courseID/instructor/setmaker/
  instructor_set_maker2               /$courseID/instructor/setmaker2/
- instructor_set_maker3               /$courseID/instructor/setmaker3/
  instructor_get_target_set_problems  /$courseID/instructor/GetTargetSetProblems/
  instructor_get_library_set_problems /$courseID/instructor/GetLibrarySetProblems/
  instructor_config                   /$courseID/instructor/config/
@@ -97,11 +86,6 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
  instructor_problem_editor_withset_withproblem
                                      /$courseID/instructor/pgProblemEditor/$setID/$problemID/
-                                     
- instructor_problem_editor2           /$courseID/instructor/pgProblemEditor2/
- instructor_problem_editor2_withset   /$courseID/instructor/pgProblemEditor2/$setID/
- instructor_problem_editor2_withset_withproblem
-                                     /$courseID/instructor/pgProblemEditor2/$setID/$problemID/
  
  instructor_scoring                  /$courseID/instructor/scoring/
  instructor_scoring_download         /$courseID/instructor/scoringDownload/
@@ -120,6 +104,11 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  problem_list                        /$courseID/$setID/
  problem_detail                      /$courseID/$setID/$problemID/
 
+ achievements                        /$courseID/achievements
+ instructor_achievement_list         /$courseID//instructor/achievement_list
+ instructor_achievement_editor       /$courseID/instructor/achievement_list/$achievementID/editor
+ instructor_achievement_user_editor  /$courseID/instructor/achievement_list/$achievementID/users
+
 =cut
 
 ################################################################################
@@ -130,7 +119,7 @@ our %pathTypes = (
 	root => {
 		name    => 'WeBWorK',
 		parent  => '',
-		kids    => [ qw/course_admin  html2xml instructorXMLHandler set_list / ],
+		kids    => [ qw/course_admin  html2xml set_list / ],
 		match   => qr|^/|,
 		capture => [ qw// ],
 		produce => '/',
@@ -156,19 +145,11 @@ our %pathTypes = (
 		produce => 'html2xml/',
 		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
 	},
-	instructorXMLHandler => {
-		name => 'instructorXMLHandler',
-		parent => 'root',
-		kids => [ qw// ],
-		match   => qr|^instructorXMLHandler/|,
-		capture => [ qw// ],
-		produce => 'instructorXMLHandler/',
-		display => 'WeBWorK::ContentGenerator::instructorXMLHandler',
-	},
+
 	set_list => {
 		name    => '$courseID',
 		parent  => 'root',
-		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz grades hardcopy
+		kids    => [ qw/equation_display feedback gateway_quiz proctored_gateway_quiz grades hardcopy achievements
 			logout options instructor_tools problem_list
 		/ ],
 		match   => qr|^([^/]+)/|,
@@ -233,6 +214,15 @@ our %pathTypes = (
 		produce => 'grades/',
 		display => 'WeBWorK::ContentGenerator::Grades',
 	},
+        achievements  => {
+	        name    => 'Achievements',
+                parent  => 'set_list',
+                kids    => [ qw// ],
+                match   => qr|^achievements/|,
+                capture => [ qw// ],
+                produce => 'achievements/',
+                display => 'WeBWorK::ContentGenerator::Achievements',
+        },
 	hardcopy => {
 		name    => 'Hardcopy Generator',
 		parent  => 'set_list',
@@ -293,12 +283,9 @@ our %pathTypes = (
 	instructor_tools => {
 		name    => 'Instructor Tools',
 		parent  => 'set_list',
-		kids    => [ qw/instructor_user_list instructor_user_list2 instructor_set_list instructor_set_list2 
-		    instructor_add_users
+		kids    => [ qw/instructor_user_list instructor_set_list instructor_add_users instructor_achievement_list
 			instructor_set_assigner instructor_file_manager
-			instructor_problem_editor instructor_problem_editor2 
-			instructor_set_maker instructor_set_maker2 instructor_set_maker3 
-			instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
+			instructor_problem_editor instructor_set_maker instructor_set_maker2 instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
 			instructor_config
 			instructor_scoring instructor_scoring_download instructor_mail_merge
 			instructor_answer_log instructor_preflight instructor_statistics
@@ -321,15 +308,6 @@ our %pathTypes = (
 		produce => 'users/',
 		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
 	},
-	instructor_user_list2 => {
-		name    => 'Classlist Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_user_detail/ ],
-		match   => qr|^users2/|,
-		capture => [ qw// ],
-		produce => 'users2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::UserList2',
-	},
 	instructor_user_detail => {
 		name    => 'Sets assigned to $userID',
 		parent  => 'instructor_user_list',
@@ -360,15 +338,6 @@ our %pathTypes = (
 		produce => 'sets/',
 		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
 	},
-	instructor_set_list2 => {
-		name    => 'Hmwk Sets Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_set_detail/ ],
-		match   => qr|^sets2/|,
-		capture => [ qw// ],
-		produce => 'sets2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList2',
-	},
 	instructor_set_detail => {
 		name    => 'Set Detail for set $setID',
 		parent  => 'instructor_set_list',
@@ -444,15 +413,6 @@ our %pathTypes = (
 		capture => [ qw// ],
 		produce => 'setmaker2/',
 		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker2',
-	},
-		instructor_set_maker3 => {
-		name    => 'Library Browser 3',
-		parent  => 'instructor_tools',
-		kids    => [ qw// ],
-		match   => qr|^setmaker3/|,
-		capture => [ qw// ],
-		produce => 'setmaker3/',
-		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker3',
 	},
 	instructor_get_target_set_problems => {
 		name    => 'Get Target Set Problems',
@@ -490,15 +450,6 @@ our %pathTypes = (
 		produce => 'pgProblemEditor/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
-	instructor_problem_editor2 => {
-		name    => 'Problem Editor2',
-		parent  => 'instructor_tools',
-		kids    => [ qw/instructor_problem_editor2_withset/ ],
-		match   => qr|^pgProblemEditor2/|,
-		capture => [ qw// ],
-		produce => 'pgProblemEditor2/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
-	},
 	instructor_problem_editor_withset => {
 		name    => '$setID',
 		parent  => 'instructor_problem_editor',
@@ -508,15 +459,6 @@ our %pathTypes = (
 		produce => '$setID/',
 		display => undef,
 	},
-	instructor_problem_editor2_withset => {
-		name    => '$setID',
-		parent  => 'instructor_problem_editor2',
-		kids    => [ qw/instructor_problem_editor2_withset_withproblem/ ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/setID/ ],
-		produce => '$setID/',
-		display => undef,
-	},
 	instructor_problem_editor_withset_withproblem => {
 		name    => '$problemID',
 		parent  => 'instructor_problem_editor_withset',
@@ -526,15 +468,6 @@ our %pathTypes = (
 		produce => '$problemID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
-	instructor_problem_editor2_withset_withproblem => {
-		name    => '$problemID',
-		parent  => 'instructor_problem_editor2_withset',
-		kids    => [ qw// ],
-		match   => qr|^([^/]+)/|,
-		capture => [ qw/problemID/ ],
-		produce => '$problemID/',
-		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
-	},
 	instructor_scoring => {
 		name    => 'Scoring Tools',
 		parent  => 'instructor_tools',
@@ -610,7 +543,40 @@ our %pathTypes = (
 		produce => 'student/$userID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
 	},
-	
+ 	
+	################################################################################
+
+        instructor_achievement_list => {
+                name    =>  'Achievement Editor',
+                parent  =>  'instructor_tools', 
+                kids    =>  [ qw/instructor_achievement_editor instructor_achievement_user_editor/ ],
+                match   =>  qr|^achievement_list/|,
+                capture =>  [ qw// ],
+                produce =>  'achievement_list/',
+                display =>  'WeBWorK::ContentGenerator::Instructor::AchievementList',
+        },
+
+        instructor_achievement_editor => {
+	        name    => 'Achievement Evaluator Editor',
+                parent  => 'instructor_achievement_list', 
+                kids => [ qw// ],
+                match => qr|^([^/]+)/editor/|,
+		capture => [ qw/achievementID/ ],
+                produce => '$achievementID/editor/',
+		display => 'WeBWorK::ContentGenerator::Instructor::AchievementEditor',
+	},
+
+        instructor_achievement_user_editor => {
+	        name    => 'Achievement User Editor',
+                parent  => 'instructor_achievement_list', 
+                kids => [ qw// ],
+		match   => qr|^([^/]+)/users/|,
+		capture => [ qw/achievementID/ ],
+		produce => '$achievementID/users/',
+		display => 'WeBWorK::ContentGenerator::Instructor::AchievementUserEditor',
+	},
+
+
 	################################################################################
 	
 	instructor_progress => {
diff --git a/lib/WeBWorK/Utils.pm b/lib/WeBWorK/Utils.pm
index 76a55986aa..ead76e8e12 100644
--- a/lib/WeBWorK/Utils.pm
+++ b/lib/WeBWorK/Utils.pm
@@ -78,6 +78,7 @@ our @EXPORT_OK = qw(
 	ref2string
 	removeTempDirectory
 	runtime_use
+        sortAchievements
 	sortByName
 	surePathToFile
 	textDateTime
@@ -270,7 +271,7 @@ sub surePathToFile($$) {
 	}
 	# use the permissions/group on the start directory itself as a template
 	my ($perms, $groupID) = (stat $start_directory)[2,5];
-	#warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
+	# warn "&urePathToTmpFile: perms=$perms groupID=$groupID\n";
 	
 	# if the path starts with $start_directory (which is permitted but optional) remove this initial segment
 	$path =~ s|^$start_directory|| if $path =~ m|^$start_directory|;
@@ -1031,6 +1032,35 @@ sub sortByName($@) {
 	return map{$itemsByIndex{$_}} @sKeys;
 }
 
+
+################################################################################
+# Sort Achievements by category and id
+################################################################################
+
+sub sortAchievements {
+	my @Achievements = @_;
+	
+	# First sort by achievement id
+
+	@Achievements = sort {uc($a->{achievement_id}) cmp uc($b->{achievement_id})}  @Achievements;
+
+	# Next sort by categoyr, but secret comes first and level last
+
+	@Achievements = sort {
+	    if ($a->{category} eq $b->{category}) {
+		return 0; 
+	    } elsif ($a->{category} eq "secret" or $b->{category} eq "level") {
+		return -1;
+	    } elsif ($a->{category} eq "level" or $b->{category} eq "secret") {
+		return 1;
+	    } else {
+		return $a->{category} cmp $b->{category};
+	    } } @Achievements;
+
+	return @Achievements;
+       
+}
+
 ################################################################################
 # Validate strings and labels
 ################################################################################

From feee452bf5ad31171972cf9c74440231da8cfa18 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 15:40:56 -0400
Subject: [PATCH 59/73] Take 2: committing new files needed for achievements

---
 .../achievements/blankachievement.at          |   74 +
 htdocs/images/defaulticon.png                 |  Bin 0 -> 9929 bytes
 lib/WeBWorK/AchievementEvaluator.pm           |  222 +++
 lib/WeBWorK/ContentGenerator/Achievements.pm  |  226 +++
 .../Instructor/AchievementEditor.pm           |  656 ++++++++
 .../Instructor/AchievementList.pm             | 1319 +++++++++++++++++
 .../Instructor/AchievementUserEditor.pm       |  242 +++
 lib/WeBWorK/DB/Record/Achievement.pm          |   43 +
 .../DB/Record/GlobalUserAchievement.pm        |   43 +
 lib/WeBWorK/DB/Record/UserAchievement.pm      |   42 +
 10 files changed, 2867 insertions(+)
 create mode 100644 courses.dist/modelCourse/templates/achievements/blankachievement.at
 create mode 100644 htdocs/images/defaulticon.png
 create mode 100644 lib/WeBWorK/AchievementEvaluator.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Achievements.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
 create mode 100644 lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
 create mode 100644 lib/WeBWorK/DB/Record/Achievement.pm
 create mode 100644 lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
 create mode 100644 lib/WeBWorK/DB/Record/UserAchievement.pm

diff --git a/courses.dist/modelCourse/templates/achievements/blankachievement.at b/courses.dist/modelCourse/templates/achievements/blankachievement.at
new file mode 100644
index 0000000000..bbb82ab420
--- /dev/null
+++ b/courses.dist/modelCourse/templates/achievements/blankachievement.at
@@ -0,0 +1,74 @@
+# This is an "Achievement Evaluator".  Its basic job is to test, or evaluate, 
+# whether or not an achievement has been earned.  The code is run every time a
+# student submits an answer to a homework question as long as the achievement 
+# is unearned.  
+#
+# -The code should be written in perl and should return 1 if the achievement 
+#  was earned and 0 if it was not earned. 
+#
+# You have access to a variety of variables:
+#  - $problem : the problem data (changes to this variable will not be saved!)
+#      This variable contains the problem data.  It is a hash pointer with the
+#      following values (not all values shown)
+#      - $problem->status : the score of the current problem
+#      - $problem->problem_id : the id of the current problem
+#      - $problem->set_id : the id of the set containing the problem
+#      - $problem->num_correct : the number of correct attempts
+#      - $problem->num_incorrect : the number of incorrect attempts
+#      - $problem->max_attempts : the maximum number of allowed attempts
+#   
+#  - $set : the set data (changes to this variable will not be saved!)
+#      This variable contains the set data.  it is a hash pointer with the
+#      following values. (not all values shown)
+#      - $set->open_date : when the set was open
+#      - $set->due_date : when the set is due
+#    
+#  - @setProblems : the problem data for all the problems from this set.  
+#      (changes to this variable will not be saved!)
+#      This is an array of problem hashes.  Each element of the array has the
+#      save hash keys as the $problem variable above
+#
+#  - $counter : the users counter associated to this achievement
+#      (changes to this variable *will* be saved!)
+#      If this achievement has a counter associated to it 
+#      (i.e. solve 20 problems) then this is where you store 
+#      the students counter for this achievement. 
+#      This variable will initally start as ''
+#
+#  - $maxCounter : the goal for the $counter variable for this achievement
+#      (changes to this variable will not be saved!)
+#      If this achievement has a counter associated to it then this variable 
+#      contains the goal for the counter.  Your achievement should return 1 
+#      when $counter >= $maxCounter.  These two variables are used to show a 
+#      progress bar for the achievement.  
+#
+#  - $localData : this is a hash which stores data for this user and 
+#      achievement (changes to this variable *will* be saved!)
+#      This hash will persist from evaluation to evaluation.  You can 
+#      store whatever you like in here and it can be accessed next time 
+#      this evaluator is run. Two things to keep in mind. First, The data 
+#      in this hash will *not* be accessible by other achievements.  Second, 
+#      the first time a variable is accessed it will have the value ''.   
+#
+#   - $globalData : this is a hash which stores data for all achievements
+#       (changes to this variable *will* be saved!)
+#       This hash will persist from evaluation to evaluation and, like
+#       $localData, you can store whatever you like in here.  This data 
+#       will be accessable from *every* achievement and is unique to the 
+#       user.  There are two variables stored in this hash that are 
+#       maintained by the system. 
+#       - $globalData->completeSets : This is the number of sets which 
+#         the student has earned 100% on
+#       - $globalData->complete Problems : This is the number of problems 
+#         which the student has earned 100% on
+#       Warning: The achievements are always evaluated in the order they 
+#       are listed the Instructors achievement editor page.  To make matters
+#       more complicated, achievements which have already been earned are 
+#       not evaluated at all.  The up-shot of this is that when modifying 
+#       variables in $globalData you need to either write your code so it 
+#       doesnt matter which order the evaluators are run, or you need to 
+#       pay very close attention to which evaluators are run and when. 
+
+
+#the blank achievement can never be earned
+return  0;
\ No newline at end of file
diff --git a/htdocs/images/defaulticon.png b/htdocs/images/defaulticon.png
new file mode 100644
index 0000000000000000000000000000000000000000..31331d50d6aa5c41e2770bd7750ca79a2e335d25
GIT binary patch
literal 9929
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
Hu0mjf0*hPT

literal 0
HcmV?d00001

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
new file mode 100644
index 0000000000..8772ce7375
--- /dev/null
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -0,0 +1,222 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/PG.pm,v 1.76 2009/07/18 02:52:51 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::AchievementEvaluator;
+use base qw(WeBWorK);
+=head1 NAME
+
+    WeBWorK::Cheevos - Cheevo code
+
+=cut
+
+use strict;
+use warnings;
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(before after readFile sortAchievements);
+
+use Safe;
+#FreezeThaw is not part of the standard webwork installation.  It could be replaced by a more standard hash->string module (if there is one).  
+use FreezeThaw qw(freeze thaw);
+
+sub checkForAchievements {
+
+    our $problem = shift;
+    my $pg = shift;
+    my $db = shift;
+    my $ce = shift;
+
+    #set up variables and get achievements
+    my $cheevoMessage = '';
+    my $user_id = $problem->user_id;
+    my $set_id = $problem->set_id;
+    our $set = $db->getGlobalSet($problem->set_id);
+    my @allAchievementIDs = $db->listAchievements; 
+    my @achievements = $db->getAchievements(@allAchievementIDs);
+    @achievements = sortAchievements(@achievements);
+    my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
+
+    #update the problem with stuff from the pg. 
+    # this is kind of a hack.  The achievement checking happens *before* the system has
+    # updated $problem with the new results from $pg.  So we cheat and update the 
+    # important bits here.  The only thing that gets left behind is last_answer, which is
+    # still the previous last answer. 
+    # 
+    $problem->status($pg->{state}->{recorded_score});
+    $problem->sub_status($pg->{state}->{sub_recorded_score});
+    $problem->attempted(1);
+    $problem->num_correct($pg->{state}->{num_of_correct_ans});
+    $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
+
+    #These need to be "our" so that they can share to the safe container
+    our $counter;
+    our $maxCounter;
+    our $achievementPoints = $globalUserAchievement->achievement_points;
+    our $nextLevelPoints = $globalUserAchievement->next_level_points;
+    our $localData = {};
+    our $globalData = {};
+
+    my $compartment = new Safe;
+
+    #Methods alowed in the safe container
+    $compartment->permit(qw(time localtime));
+
+    #Thaw globalData hash
+    if ($globalUserAchievement->frozen_hash) {       
+	%$globalData = thaw($globalUserAchievement->frozen_hash);
+    }
+
+    #Update a couple of "standard" variables in globalData hash.
+    my $allcorrect = 0;
+    if ($problem->status == 1 && $problem->num_correct == 1) {
+	$globalUserAchievement->achievement_points(
+	    $globalUserAchievement->achievement_points + 
+	    $ce->{achievementPointsPerProblem});
+	#this variable is shared and should be considered iffy
+	$achievementPoints += $ce->{achievementPointsPerProblem};
+	$globalData->{'completeProblems'} += 1;
+	$allcorrect = 1;
+    }
+
+    our @setProblems = $db->getAllUserProblems( $user_id, $problem->set_id);
+    
+    #check and see of all problems are correct.  (also update the current
+    # problem in setProblems, since the database might be out of date)
+    my $index = 0;
+    foreach my $thisProblem (@setProblems) {
+	if ($thisProblem->problem_id eq $problem->problem_id) {
+	    $setProblems[$index] = $problem;
+	} elsif ($thisProblem->status != 1) {
+	    $allcorrect = 0;
+	}
+	$index++;
+    }
+    
+    if ($allcorrect) {
+	$globalData->{'completeSets'}++;
+    }
+
+    #These variables are shared with the safe compartment.  The achievement evaulators
+    # have access too 
+    # $problem - the problem data;
+    # @setProblems - the problem data for everything from this set;
+    # $localData - the hash that is used only for this achievement
+    # $globalData - the hash that is shared between all achievements
+    # $maxCounter - the "max counter" associated with this achievement (if there is one);
+    # $counter - the "counter" associated with this achievement (used in level bars)
+    # $nextLevelPoints - only should be used by 'level' achievements
+    # $set - the set data
+    # $achievementPoints - the number of achievmeent points
+
+    $compartment->share(qw($problem @setProblems $localData $maxCounter 
+             $globalData $counter $nextLevelPoints $set $achievementPoints));
+
+    #loop through the various achievements, see if they have been obtained, 
+    foreach my $achievement (@achievements) {
+	#skip achievements not assigned, not enabled, and that are already earned
+	next unless $achievement->enabled;
+	my $achievement_id = $achievement->achievement_id;
+	next unless ($db->existsUserAchievement($user_id,$achievement_id));
+	my $userAchievement = $db->getUserAchievement($user_id,$achievement_id);
+	next if ($userAchievement->earned);
+	
+	#thaw localData hash
+	if ($userAchievement->frozen_hash) {
+	    %$localData = thaw($userAchievement->frozen_hash);
+	}
+
+	#recover counter information (for progress bar achievements)
+	$counter = $userAchievement->counter;
+	$maxCounter = $achievement->max_counter;
+
+	#check the achievement using Safe
+	my $sourceFilePath = $ce->{courseDirs}->{achievements}.'/'.$achievement->test;
+	my $earned = $compartment->rdo($sourceFilePath);
+	warn "There were errors in achievement $achievement_id\n".$@ if $@;
+
+	#if we have a new achievement then update achievement points
+	if ($earned) {
+	    $userAchievement->earned(1);
+	
+	    if ($achievement->category eq 'level') {
+		$globalUserAchievement->level_achievement_id($achievement_id);
+		$globalUserAchievement->next_level_points($nextLevelPoints);
+	    }
+
+	    #build the cheevo message. New level messages are slightly different
+	    $cheevoMessage .=  CGI::start_div({class=>'cheevopopupouter'});
+	    $cheevoMessage .=  CGI::img({src=>"$ce->{courseURLs}->{achievements}/$achievement->{icon}", alt=>'Achievement Icon'});
+	    $cheevoMessage .= CGI::start_div({class=>'cheevopopuptext'});  
+	    if ($achievement->category eq 'level') {
+		
+		$cheevoMessage = $cheevoMessage . CGI::h1("Level Up: $achievement->{name}");
+		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!.");
+		$cheevoMessage = $cheevoMessage . CGI::end_div();
+
+	    } else {
+		
+		$cheevoMessage .=  CGI::h1("Mathchievment Unlocked: $achievement->{name}");
+		$cheevoMessage .=  CGI::div("<i>$achievement->{points} Points</i>: $achievement->{description}");
+		$cheevoMessage .= CGI::end_div();
+	    }
+	    
+	    #if facebook integration is enables then create a facebook popup
+	    if ($globalUserAchievement->facebooker) {
+		$cheevoMessage .= CGI::div({id=>'fb-root'},'');
+		$cheevoMessage .= CGI::script({src=>'http://connect.facebook.net/en_US/all.js'},'');
+		$cheevoMessage .= CGI::start_script();
+		#WCU specific appID
+		$cheevoMessage .= "FB.init({appId:'193051384078348', cookie:true,status:true, xfbml:true });\n";
+
+		my $facebookmessage;
+		if ($achievement->category eq 'level') {
+		    $facebookmessage = sprintf("I leveled up and am now a %s",$achievement->{name});
+		} else {
+		    $facebookmessage = sprintf("I earned the Mathchievement %s: %s",$achievement->{name},$achievement->{description});
+		}
+	
+		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$ce->{courseURLs}->{achievements}/$achievement->{icon}', message: '$facebookmessage'});\n";
+		$cheevoMessage .= CGI::end_script();
+
+	    }
+	        
+	    $cheevoMessage .= CGI::end_div();
+	        
+	    my $points = $achievement->points;
+	    #just in case points is an ininitialzied variable
+	    $points = 0 if (not $points);
+
+	    $globalUserAchievement->achievement_points(
+		$globalUserAchievement->achievement_points + $points);
+	    #this variable is shared and should be considered iffy
+	    $achievementPoints += $points;
+	}    
+	
+	#update counter, freeze localData and store
+	$userAchievement->counter($counter);
+	$userAchievement->frozen_hash(freeze(%$localData));	
+	$db->putUserAchievement($userAchievement);
+	
+    }
+    
+    #freeze globalData and store
+    $globalUserAchievement->frozen_hash(freeze(%$globalData));
+    $db->putGlobalUserAchievement($globalUserAchievement);
+
+    return $cheevoMessage;
+}
+
+#Perl magic
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Achievements.pm b/lib/WeBWorK/ContentGenerator/Achievements.pm
new file mode 100644
index 0000000000..11bd5dfaf9
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Achievements.pm
@@ -0,0 +1,226 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Skeleton.pm,v 1.5 2006/07/08 14:07:34 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+# This module prints out the list of achievements that a student has earned
+package WeBWorK::ContentGenerator::Achievements;
+use base qw(WeBWorK::ContentGenerator);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Achievements - Content Generator for achievements list
+This produces a list of earned achievements for each student.  
+
+=cut
+
+use strict;
+use warnings;
+
+use CGI;
+use WeBWorK::Utils qw( sortAchievements );
+
+sub head {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $ce = $r->ce;
+
+	#Print the achievement css file
+	print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$ce->{webworkURLs}->{htdocs}/css/achievements.css\"/>";	
+	return "";
+}
+
+sub initialize {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+
+	# Get user Data
+ 	my $userName = $r->param('user');
+ 	my $effectiveUserName = defined($r->param('effectiveUser') ) ? $r->param('effectiveUser') : $userName;
+	$self->{userName} = $userName;
+	$self->{studentName} = $effectiveUserName;
+
+	my $globalUserAchievement = $db->getGlobalUserAchievement($effectiveUserName);
+
+	$self->{globalData} = $globalUserAchievement;
+	
+}
+
+
+sub options {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $globalUserAchievement = $self->{globalData};
+
+	#Print the facebook sidepane.  This allows users to turn facebook integration on and off.
+
+	if (defined($globalUserAchievement)) {
+
+	    my $changeFacebooking = $r->param('changeFacebooking');
+	    
+	    if ($changeFacebooking) {
+		$globalUserAchievement->facebooker(!$globalUserAchievement->facebooker);
+		$db->putGlobalUserAchievement($globalUserAchievement);
+	    }
+
+	    print CGI::start_center();
+	    print CGI::start_div({class=>'facebookbox'});
+	    print CGI::start_form(-method=>'POST', -action=>$r->uri);
+	    print $self->hidden_authen_fields;
+	    print CGI::submit('changeFacebooking', $globalUserAchievement->facebooker 
+			      ? "Disable Facebook \n  Integration" : "Enable Facebook \n Integration");
+	    print CGI::end_form();
+	    print CGI::end_div();
+	    
+	    if ($globalUserAchievement->facebooker) {
+		#Print Facebook stuff (uses WCU specific appID)
+		print CGI::start_div({class=>'facebookbox'});
+		print CGI::div({id=>'fb-root'},'');
+		print CGI::script({src=>'http://connect.facebook.net/en_US/all.js'},"");
+		print CGI::script("FB.init({appId:'193051384078348', cookie:true, status:true, xfbml:true });");
+		print "<fb:login-button perms=\"publish_stream\">";
+		print "Login to FB";
+		print "</fb:login-button>";
+		print CGI::end_div();
+	    }
+	    print CGI::end_center();
+	}
+	
+	return "";
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $globalUserAchievements = $self->{globalData};
+	my $userID = $self->{studentName};
+	my $achievementURL = $ce->{courseURLs}->{achievements};
+
+
+	#If they dont have a globalUserAchievements record then they dont have achievements
+	if (not defined($globalUserAchievements)) {
+	    print CGI::p("You don't have any Achievement data associated to you!");
+	    return "";
+	}
+
+	print CGI::br();
+	print CGI::start_div({class=>'cheevobigbox'});
+	
+	#Print their "level achievement" if there is one and print the progress bar if there is one
+	my $achievement;
+
+	if ($globalUserAchievements->level_achievement_id) {
+	    
+	    $achievement = $db->getAchievement($globalUserAchievements->level_achievement_id);
+
+	}
+
+	if ($achievement) {
+	    
+	    print CGI::start_div({class=>'levelbox'});
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {
+		$imgSrc = $ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
+	    print CGI::img({src=>$imgSrc, alt=>'Level Icon'});
+	    print CGI::start_div({class=>'leveldatabox'});
+	    print CGI::h1($achievement->name);
+	    
+	    if ($globalUserAchievements->next_level_points) {
+		my $levelpercentage = int(100*$globalUserAchievements->achievement_points/$globalUserAchievements->next_level_points);
+		$levelpercentage = $levelpercentage <= 100 ? $levelpercentage : 100;
+
+		print CGI::start_div({class=>'levelouterbar'});
+		print CGI::div({class=>'levelinnerbar', style=>"width:$levelpercentage\%"},'');
+		print CGI::end_div();	
+		print CGI::end_div();
+	    }
+	    print CGI::end_div();
+	    print CGI::end_div();
+	}
+
+	#Get all the achievements
+	my @allAchievementIDs = $db->listAchievements; 
+	my @achievements = $db->getAchievements(@allAchievementIDs);
+
+	@achievements = sortAchievements(@achievements);
+	my $previousCategory = $achievements[0]->category;
+
+	#Loop through achievements and
+	foreach my $achievement (@achievements) {
+	    #skip the level achievements and only show achievements assigned to user
+	    last if ($achievement->category eq 'level');
+	    next unless ($db->existsUserAchievement($userID,$achievement->achievement_id));
+	    next unless $achievement->enabled;
+
+	    #separate categories with whitespace
+	    if ($previousCategory ne $achievement->category) {
+		print CGI::br();
+	    }
+	    $previousCategory = $achievement->category;
+
+	    my $userAchievement = $db->getUserAchievement($userID,$achievement->achievement_id);
+	    
+	    #dont show unearned secret achievements
+	    next if ($achievement->category eq 'secret' and not $userAchievement->earned);
+ 
+	    #print achievement and associated progress bar (if there is one)
+	    print CGI::start_div({class=>sprintf("cheevoouterbox %s", $userAchievement->earned ? 'unlocked':'locked')});
+
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {
+		$imgSrc = $ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
+	    print CGI::img({src=>$imgSrc, alt=>'Achievement Icon'});
+	    print CGI::start_div({class=>'cheevotextbox'});
+	    print CGI::h2($achievement->name);
+	    print CGI::div("<i>$achievement->{points} Points</i>: $achievement->{description}");
+	    
+	    if ($achievement->max_counter and not $userAchievement->earned) {
+		my $userCounter = $userAchievement->counter;
+		$userCounter = 0 unless ($userAchievement->counter);
+		my $percentage = int(100*$userCounter/$achievement->max_counter);
+		$percentage = $percentage <= 100 ? $percentage : 100;
+		print CGI::start_div({class=>'cheevoouterbar'});
+		print CGI::div({class=>'cheevoinnerbar', style=>sprintf("width:%i%%;", $percentage)},'');
+		print CGI::end_div();	
+	    }	
+	    print CGI::end_div();
+	    print CGI::end_div();
+	    
+	}	   
+
+	print CGI::br();
+
+	print CGI::end_div();
+
+	return "";
+	
+}
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
new file mode 100644
index 0000000000..d3cf9c6d0f
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm
@@ -0,0 +1,656 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Skeleton.pm,v 1.5 2006/07/08 14:07:34 gage Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementEditor;
+use base qw(WeBWorK);
+use base qw(WeBWorK::ContentGenerator::Instructor);
+use base qw(WeBWorK::ContentGenerator::renderViaXMLRPC);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::AchievementEditor - edit an achevement evaluator file
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Utils qw(readFile surePathToFile path_is_subdir);
+use HTML::Entities;
+use URI::Escape;
+use WeBWorK::Utils qw(has_aux_files not_blank);
+use File::Copy;
+use WeBWorK::Utils::Tasks qw(fake_user fake_set renderProblems);
+use Data::Dumper;
+use Fcntl;
+
+
+use constant ACTION_FORMS => [qw(save save_as)]; 
+use constant DEFAULT_ICON => "defaulticon.png";
+
+
+sub pre_header_initialize {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $ce             = $r->ce;
+	my $urlpath        = $r->urlpath;
+	my $authz          = $r->authz;
+	my $user           = $r->param('user');
+	$self->{courseID}   = $urlpath->arg("courseID");
+	$self->{achievementID}      = $r->urlpath->arg("achievementID") ; 
+
+	my $submit_button   = $r->param('submit');  # obtain submit command from form
+	my $actionID        = $r->param('action');
+
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "edit_achievements"));
+
+	#get the achievement
+	my $Achievement = $r->db->getAchievement($self->{achievementID});
+
+	if (not $Achievement) {
+	    $self->addbadmessage("Achievement $self->{achievementID} not found!");
+	    die;
+	}
+
+	$self->{achievement} = $Achievement;
+	$self->{sourceFilePath} = $ce->{courseDirs}->{achievements}."/".$Achievement->test;
+	$self->{r_achievementContents}= undef;
+	
+	#perform a save or save_as action
+ 	if ($actionID) {
+ 		unless (grep { $_ eq $actionID } @{ ACTION_FORMS() } ) {
+ 			die "Action $actionID not found";
+ 		}
+ 
+ 
+		my $actionHandler = "${actionID}_handler";
+		my %genericParams =();
+		my %actionParams = $self->getActionParams($actionID);
+		my %tableParams = (); 
+		$self->{action}= $actionID;
+		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+		
+ 	} else {
+	    # we just opened up this file for the first time
+ 		$self->{action}='fresh_edit';
+ 		my $actionHandler = "fresh_edit_handler";
+ 		my %genericParams;
+ 		my %actionParams = (); 
+ 		my %tableParams = (); 
+		my $achievementContents = '';
+		$self->{r_achievementContents}=\$achievementContents;
+ 		$self->$actionHandler(\%genericParams, \%actionParams, \%tableParams);
+ 	}
+ 
+	
+	##############################################################################
+	# Return 
+	#   If  file saving fails or 
+	#   if no redirects are required. No further processing takes place in this subroutine.
+	#   Redirects are required only for the following submit values
+	#        'Save'
+	#        'Save as'
+	# 
+	#########################################
+	
+	return if $self->{failure};
+	# FIXME: even with an error we still open a new page because of the target specified in the form
+	my $action = $self->{action};
+	return ;
+	
+}
+
+
+sub initialize  {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+	my $sourceFilePath = $self->{sourceFilePath};
+	
+
+	# Check permissions
+	return unless ($authz->hasPermissions($user, "edit_achievements"));
+	
+	
+	$self->addmessage($r->param('status_message') ||'');  # record status messages carried over if this is a redirect
+
+	# Check source file path
+	if ( not( -e $sourceFilePath) ) {
+	    $self->addbadmessage("The file '".$self->shortPath($sourceFilePath)."' cannot be found.");
+	}
+}
+
+sub path {
+	my ($self, $args) = @_;
+	my $r = $self->r;
+	my $urlpath = $r->urlpath;
+	my $courseName  = $urlpath->arg("courseID");
+	my $achievementName = $r->urlpath->arg("achievementID") || '';
+
+	# we need to build a path to the achievement being edited by hand, since it is not the same as the urlpath
+	# For this page the bread crum path leads back to the problem being edited, not to the Instructor tool.
+	my @path = ( 'WeBWork', $r->location,
+	          "$courseName", $r->location."/$courseName",
+		  'Achievement', $r->location."/$courseName/instructor/achievement_list",
+	          "$achievementName",    $r->location."/$courseName/instructor/achievement_list",
+	);
+	
+	#print "\n<!-- BEGIN " . __PACKAGE__ . "::path -->\n";
+	print $self->pathMacro($args, @path);
+	#print "<!-- END " . __PACKAGE__ . "::path -->\n";
+	
+	return "";
+}
+
+sub title {
+	my $self = shift;
+	my $r = $self->r;
+	my $courseName    = $r->urlpath->arg("courseID");
+	my $achievementID  = $r->urlpath->arg("achievementID");
+
+	return "Achievement Evaluator for achievement $achievementID";
+
+}
+
+sub body {
+	my ($self) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	my $ce = $r->ce;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+ 
+	# Check permissions
+	return CGI::div({class=>"ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	# Gathering info
+	my $sourceFilePath    = $self->{sourceFilePath}; # path to the permanent file to be edited
+	my $achievementID     = $self->{achievementID} ;
+	my $Achievement       = $self->{achievement};
+
+
+	#########################################################################
+	# Find the text for the achievement 
+	#########################################################################
+	
+	my $achievementContents = ${$self->{r_achievementContents}};
+
+	unless ( $achievementContents =~/\S/)   { # non-empty contents
+	    die "Path is Unsafe!" unless path_is_subdir($sourceFilePath, $ce->{courseDirs}->{achievements}, 1);
+	    
+	    eval { $achievementContents = WeBWorK::Utils::readFile($sourceFilePath) };
+	    
+	    $achievementContents = $@ if $@;
+		       
+	} else {
+	    #warn "obtaining input from r_problemContents";
+	}
+
+	my $header = CGI::i("Editing achievement in file '".$self->shortPath($sourceFilePath)."'");
+	
+	#########################################################################
+	# Format the page
+	#########################################################################
+	
+	# Define parameters for textarea
+	my $rows            = 20;
+	my $columns         = 90;
+	my $mode_list       = $ce->{pg}->{displayModes};
+	my $uri             = $r->uri;
+	
+	my $force_field = (not_blank( $self->{sourceFilePath}) ) ? # path is  a non-blank string
+		CGI::hidden(-name=>'sourceFilePath',
+		            -default=>$self->{sourceFilePath}) : '';
+
+	print CGI::p($header),
+
+		CGI::start_form({method=>"POST", id=>"editor", name=>"editor", action=>"$uri", enctype=>"application/x-www-form-urlencoded"}),
+
+		$self->hidden_authen_fields,
+		$force_field,
+
+		CGI::p(
+			CGI::textarea(
+				-name => 'achievementContents', -default => $achievementContents,
+				-rows => $rows, -cols => $columns, -override => 1,
+			),
+		);
+
+
+	
+######### print action forms
+		
+	print CGI::start_table({});
+	
+	my @formsToShow = @{ ACTION_FORMS() };
+	my $default_choice = $formsToShow[0];
+	my $i = 0;
+	foreach my $actionID (@formsToShow) {
+	    my $actionForm = "${actionID}_form";
+	    my %actionParams = $self->getActionParams($actionID);
+	    my $line_contents = $self->$actionForm(%actionParams);
+	    my $radio_params = {-type=>"radio", -name=>"action", -value=>$actionID};
+	    $radio_params->{checked}=1 if ($actionID eq $default_choice) ;
+	    $radio_params->{id} = "action$i";
+	    print CGI::Tr({-valign=>"top"},
+			  CGI::td({}, CGI::input($radio_params)),
+			  CGI::td({}, $line_contents)
+		) if $line_contents;
+	    
+	    $i++;
+	}
+	
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select above then:",
+				  CGI::submit(-name=>'submit', -value=>"Take Action!"),
+				  ));
+	
+	print CGI::end_table();	
+	
+	
+	print  CGI::end_form();
+
+	print CGI::script("updateTarget()");
+	return "";
+
+
+}
+
+#
+#  Convert long paths to [ACHEVDIR]
+#
+sub shortPath {
+  my $self = shift; my $file = shift;
+  my $ache = $self->r->ce->{courseDirs}{achievements};
+  $file =~ s|^$ache|[ACHEVDIR]|; 
+  return $file;
+}
+
+################################################################################
+# Utilities
+################################################################################
+
+sub getRelativeSourceFilePath {
+	my ($self, $sourceFilePath) = @_;
+	
+	my $achievementsDir = $self->r->ce->{courseDirs}->{achievements};
+	$sourceFilePath =~ s|^${achievementsDir}/*||; # remove templates path and any slashes that follow
+	
+	return $sourceFilePath;
+}
+
+sub saveFileChanges {
+
+################################################################################
+# saveFileChanges does most of the work. it is a separate method so that it can
+# be called from either pre_header_initialize() or initilize(), depending on
+# whether a redirect is needed or not.
+# 
+# it actually does a lot more than save changes to the file being edited, and
+# sometimes less.
+################################################################################
+
+	my ($self, $outputFilePath, $achievementContents ) = @_;
+ 	my $r             = $self->r;
+ 	my $ce            = $r->ce;
+
+	my $action          = $self->{action}||'no action';
+	
+	if (defined($achievementContents) and ref($achievementContents) ) {
+		$achievementContents = ${$achievementContents};
+	} elsif( ! not_blank($achievementContents)  ) {      # if the AchievementContents is undefined or empty
+		$achievementContents = ${$self->{r_achievementContents}};
+	}
+	
+
+	unless (not_blank($outputFilePath) ) {
+	    $self->addbadmessage("You must specify an file name in order to save a new file.");
+	    return "";
+	}
+	my $do_not_save    = 0 ;       # flag to prevent saving of file
+	my $editErrors = '';	
+	
+	##############################################################################
+	# write changes to the approriate files
+	# FIXME  make sure that the permissions are set correctly!!!
+	# Make sure that the warning is being transmitted properly.
+	##############################################################################
+   
+	my $writeFileErrors;
+	if ( not_blank($outputFilePath)  ) {   # save file
+	    
+	    # make sure any missing directories are created
+	    WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements},
+					   $outputFilePath);
+	    die "outputFilePath is unsafe!" unless path_is_subdir($outputFilePath, $ce->{courseDirs}->{achievements}, 1); # 1==path can be relative to dir
+	    
+	    eval {
+		local *OUTPUTFILE;
+		open OUTPUTFILE,  ">$outputFilePath"
+		    or die "Failed to open $outputFilePath";
+		print OUTPUTFILE $achievementContents;
+		close OUTPUTFILE;		
+		# any errors are caught in the next block
+	    };
+	    
+	    $writeFileErrors = $@ if $@;
+	} 
+	
+	###########################################################
+	# Catch errors in saving files,
+	###########################################################
+	
+	$self->{saveError} = $do_not_save;    # don't do redirects if the file was not saved.
+	                                    # don't unlink files or send success messages
+	
+	if ($writeFileErrors) {
+	    # get the current directory from the outputFilePath
+	    $outputFilePath =~ m|^(/.*?/)[^/]+$|;
+	    my $currentDirectory = $1;
+	    
+	    my $errorMessage;
+	    # check why we failed to give better error messages
+	    if ( not -w $ce->{courseDirs}->{achievements} ) {
+		$errorMessage = "Write permissions have not been enabled in the templates directory.  No changes can be made.";
+	    } elsif ( not -w $currentDirectory ) {
+		$errorMessage = "Write permissions have not been enabled in '".$self->shortPath($currentDirectory)."'.  Changes must be saved to a different directory for viewing.";
+	    } elsif ( -e $outputFilePath and not -w $outputFilePath ) {
+		$errorMessage = "Write permissions have not been enabled for '".$self->shortPath($outputFilePath)."'.  Changes must be saved to another file for viewing.";
+	    } else {
+		$errorMessage = "Unable to write to '".$self->shortPath($outputFilePath)."': $writeFileErrors";
+	    }
+	    
+	    $self->{failure} = 1;
+	    $self->addbadmessage(CGI::p($errorMessage));
+	    
+	} 
+	
+	unless( $writeFileErrors or $do_not_save) {  # everything worked!  unlink and announce success!
+
+		if ( defined($outputFilePath) and ! $self->{failure} ) {  
+		            # don't announce saving of temporary editing files
+			my $msg = "Saved to file '".$self->shortPath($outputFilePath)."'.";
+
+			$self->addgoodmessage($msg);
+		}
+
+	}
+
+
+}  # end saveFileChanges
+
+
+
+
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams=();
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub fixAchievementContents {
+		#NOT a method
+		my $AchievementContents = shift;
+		# Handle the problem of line endings.  
+		# Make sure that all of the line endings are of unix type.  
+		# Convert \r\n to \n
+		$AchievementContents =~ s/\r\n/\n/g;
+		$AchievementContents =~ s/\r/\n/g;
+		$AchievementContents;
+}
+
+sub save_form {
+	my ($self, %actionParams) = @_;
+	my $r => $self->r;
+
+	if (-w $self->{sourceFilePath}) {
+
+		return "Save ".CGI::b($self->shortPath($self->{sourceFilePath}));	
+
+	} else {
+		return ""; #"Can't save -- No write permission";
+	}
+
+}
+
+sub save_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r= $self->r;
+	my $courseName      =  $self->{courseID};
+	my $achievementName         =  $self->{achievementID};
+	
+	#################################################
+	# grab the achievementContents from the form in order to save it to the source path
+	#################################################
+	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
+	$self->{r_achievementContents} = \$achievementContents;
+	
+	#################################################
+	# Construct the output file path
+	#################################################
+	$self->saveFileChanges($self->{sourceFilePath});	
+
+	return;
+
+}
+
+
+
+sub save_as_form {  # calls the save_as_handler 
+	my ($self, %actionParams) = @_;
+	my $sourceFilePath  = $self->{sourceFilePath};
+	my $achievementsDir  =  $self->r->ce->{courseDirs}->{achievements};
+	my $achievementID    = $self->{achievementID};	
+	my $sourceFileName = getRelativeSourceFilePath($self,$sourceFilePath);
+
+	#There are three things you can do with a new achievement editor
+	#you can replace the editior in the current achievement
+	my $use_in_current_achievement  =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => "use_in_current",
+		-label     => '',
+		-checked   => 'checked',
+			 },"and use in achievement ".CGI::b("$achievementID"));
+		       
+	#Use can use it in a new achievement
+	my $create_new_achievement      =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => 'use_in_new',
+    			 -label     => '',
+		       },"and use in new achievement ",).CGI::textfield(
+		-name => "action.save_as.id",
+		-value => "",
+		-width => "50",
+			   );  
+	
+	#you can not use it at all
+	my $dont_use_in_achievement  =
+	    CGI::input({
+		-type      => 'radio',
+		-name      => "action.save_as.saveMode",
+		-value     => "dont_use",
+		-label     => '',
+		       },"and don't use in an achievement");
+	
+	my $andRelink = CGI::br(). $use_in_current_achievement.CGI::br().
+	    $create_new_achievement.CGI::br().$dont_use_in_achievement;
+	    
+	return 'Save as '.
+	    CGI::textfield(
+		-name=>'action.save_as.target_file', -size=>80, -value=>"$sourceFileName",  
+	    ).",".
+	    CGI::hidden(-name=>'action.save_as.source_file', -value=>$sourceFilePath ).
+	    $andRelink;
+}
+
+
+
+sub save_as_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r = $self->r;
+	my $db = $r->db;
+	$self->{status_message} = ''; ## DPVC -- remove bogus old messages
+	my $courseName      =  $self->{courseID};
+	my $achievementName         =  $self->{achievementID};
+	my $effectiveUserName = $self->r->param('effectiveUser');
+	
+	my $do_not_save = 0;
+	my $saveMode       = $actionParams->{'action.save_as.saveMode'}->[0] || 'no_save_mode_selected';
+	my $new_file_name  = $actionParams->{'action.save_as.target_file'}->[0] || '';
+	my $sourceFilePath = $actionParams->{'action.save_as.source_file'}->[0] || '';
+	my $targetAchievementID  =  $actionParams->{'action.save_as.id'}->[0] || '';
+
+	$self ->{sourceFilePath} = $sourceFilePath;  # store for use in saveFileChanges
+	$new_file_name =~ s/^\s*//;  #remove initial and final white space
+	$new_file_name =~ s/\s*$//;
+	if ( $new_file_name !~ /\S/) { # need a non-blank file name
+		# setting $self->{failure} stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("Please specify a file to save to."));
+	}
+	
+	#################################################
+	# grab the achievementContents from the form in order to save it to a new permanent file
+	#################################################
+	my $achievementContents = fixAchievementContents($self->r->param('achievementContents'));
+	$self->{r_achievementContents} = \$achievementContents;
+	warn "achievement contents is empty" unless $achievementContents;
+	#################################################
+	# Rescue the user in case they forgot to end the file name with .at
+	#################################################
+	
+	$new_file_name =~ s/\.at$//; # remove it if it is there
+	$new_file_name .= '.at'; # put it there
+	
+       	
+	#################################################
+	# Construct the output file path
+	#################################################
+	my $outputFilePath = $self->r->ce->{courseDirs}->{achievements} . '/' . 
+								 $new_file_name; 		
+	if (defined $outputFilePath and -e $outputFilePath) {
+		# setting $do_not_save stops saving and any redirects
+		$do_not_save = 1;
+		$self->addbadmessage(CGI::p("File '".$self->shortPath($outputFilePath)."' exists.  
+		File not saved. No changes have been made."));
+	} elsif ($saveMode eq 'use_in_new' && not $targetAchievementID) {
+	    $self->addbadmessage("No new Achievement ID specified.  No new achievement created.  File not saved.");
+	    $do_not_save = 1;
+	    
+	} elsif ($saveMode eq 'use_in_new' && $db->existsAchievement($targetAchievementID)) {
+	    $self->addbadmessage("Achievement ID exists!  No new achievement created.  File not saved.");
+	    $do_not_save = 1;
+	} else {
+	    $self->{editFilePath} = $outputFilePath;
+	    $self->{inputFilePath} = '';
+	}
+
+	return "" if $do_not_save;
+	
+
+	#Save changes
+	$self->saveFileChanges($outputFilePath);
+	
+	if ($saveMode eq 'use_in_current' and -r $outputFilePath) { 
+	    #################################################
+	    # Modify evaluator path in current achievement
+	    #################################################
+	    my $achievement = $self->r->db->getAchievement($achievementName);
+	    $achievement->test($new_file_name);
+	    if ($self->r->db->putAchievement($achievement)) {
+		$self->addgoodmessage("The evaluator for $achievementName has been renamed to '".$self->shortPath($outputFilePath)."'.") ;
+	    } else {
+		$self->addbadmessage("Unable to change the evaluator for set $achievementName. Unknown error.");
+	    }
+	    
+	} elsif ($saveMode eq 'use_in_new') {
+	    #Create a new achievement to use the evaluator in
+	    my $achievement = $self->r->db->newAchievement();
+	    $achievement->achievement_id($targetAchievementID);
+	    $achievement->test($new_file_name);
+	    $achievement->icon(DEFAULT_ICON());
+	    
+	    $self->r->db->addAchievement($achievement);
+	    $self->addgoodmessage("Achievement $targetAchievementID created with evaluator '".$self->shortPath($outputFilePath)."'.") ;			    
+	    
+	} elsif ($saveMode eq 'dont_use') {
+	    #################################################
+	    # Don't change any achievements - just report 
+	    #################################################
+	    $self->addgoodmessage("A new file has been created at '".$self->shortPath($outputFilePath)."'");
+	} else {
+	    $self->addbadmessage("Don't recognize saveMode: |$saveMode|. Unknown error.");
+	}
+	
+      
+	
+	#################################################
+	# Set up redirect
+	# The redirect gives the server time to detect that the new file exists.
+	#################################################
+	my $problemPage;
+
+	if ($saveMode eq 'dont_use' ) {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $achievementName);
+	} elsif ($saveMode eq 'use_in_current') {
+		$problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $achievementName);
+	} elsif ($saveMode eq 'use_in_new') {
+	    $problemPage = $self->r->urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",$r,
+			courseID => $courseName, achievementID => $targetAchievementID);
+	} else {
+		$self->addbadmessage(" Please use radio buttons to choose the method for saving this file. Can't recognize saveMode: |$saveMode|.");
+		# can't continue since paths have not been properly defined.
+		return "";
+	}
+	
+	#warn "save mode is $saveMode";
+
+	my $relativeOutputFilePath = $self->getRelativeSourceFilePath($outputFilePath);
+	
+	my $viewURL = $self->systemLink($problemPage, 
+					params=>{
+					    sourceFilePath     => $relativeOutputFilePath,
+					    status_message     => uri_escape($self->{status_message})}
+					
+	    );
+	
+	$self->reply_with_redirect($viewURL);
+    return "";  # no redirect needed
+}
+
+sub fresh_edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	#$self->addgoodmessage("fresh_edit_handler called");
+}
+
+
+1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
new file mode 100644
index 0000000000..2345728966
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm
@@ -0,0 +1,1319 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: 
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementList;
+use base qw(WeBWorK);
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::ProblemAchievementList - Entry point for achievement specific
+data editing/viewing
+
+=cut
+
+=for comment
+
+What do we want to be able to do here?
+
+-select achievements to edit and then edit their "basic data".  We should also be presented with 
+links to edit the evaluator and the individual user data.  
+
+-assign users to achievements "en masse"
+
+-import achievements from a file
+
+-export achievements form a file
+
+-collect achievement "scores" and output to a file
+
+-create and copy achievements
+
+-delete achievements
+
+=cut
+
+use strict;
+use warnings;
+#use CGI qw(-nosticky );
+use WeBWorK::CGI;
+use WeBWorK::Debug;
+use WeBWorK::Utils qw(timeToSec readFile listFilesRecursive cryptPassword sortAchievements);
+use DateTime;
+
+#constants for forms and the various handlers
+use constant BLANK_ACHIEVEMENT => "blankachievement.at";
+use constant DEFAULT_ENABLED_STATE => 0;
+
+use constant EDIT_FORMS => [qw(cancelEdit saveEdit)];
+use constant VIEW_FORMS => [qw(edit assign import export score create delete)];
+use constant EXPORT_FORMS => [qw(cancelExport saveExport)];
+
+use constant VIEW_FIELD_ORDER => [ qw( select enabled achievement_id category name users ) ];
+use constant EDIT_FIELD_ORDER => [ qw( icon achievement_id name category enabled points max_counter description icon_file test_file) ];
+use constant EXPORT_FIELD_ORDER => [ qw( select achievement_id name) ];
+
+use constant STATE_PARAMS => [qw(user effectiveUser key editMode exportMode)];
+
+#properites for the fields shown in the tables
+use constant  FIELD_PROPERTIES => {
+	achievement_id => {
+		type => "text",
+		size => 8,
+		access => "readonly",
+	},
+	name => {
+		type => "text",
+		size => 30,
+		access => "readwrite",
+	},
+	category => {
+		type => "text",
+		size => 30,
+		access => "readwrite",
+	},
+	icon => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+	test => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+
+	description => {
+		type => "text",
+		size => 85,
+		access => "readwrite",
+	},
+
+	enabled => {
+		type => "checked",
+		size => 8,
+		access => "readwrite",
+	},	
+
+	points => {
+		type => "text",
+		size => 8,
+		access => "readwrite",
+	},	
+
+	max_counter => {
+	        type => "text",
+		size => 8,
+		access => "readwrite",
+	},
+};
+
+sub initialize {
+
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $achievementID= $urlpath->arg("achievementID");       
+	my $user         = $r->param('user');
+	
+
+	my $root = $ce->{webworkURLs}->{root};
+
+	#check permissions
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	########## set initial values for state fields
+	my @allAchievementIDs = $db->listAchievements;
+	# DBFIXME count would suffice here :P
+	my @users = $db->listUsers;
+	$self->{allAchievementIDs} = \@allAchievementIDs;
+	$self->{totalUsers} = scalar @users;
+	
+	if (defined $r->param("selected_achievements")) {
+		$self->{selectedAchievementIDs} = [ $r->param("selected_achievements") ];
+	} else {
+		$self->{selectedAchievementIDs} = [];
+	}
+	
+	$self->{editMode} = $r->param("editMode") || 0;
+	
+	#########################################
+	#  call action handler  
+	#########################################
+	
+	my $actionID = $r->param("action");
+	$self->{actionID} = $actionID;
+	if ($actionID) {
+		unless (grep { $_ eq $actionID } @{ VIEW_FORMS() }, @{ EDIT_FORMS() }, @{ EXPORT_FORMS() }) {
+			die "Action $actionID not found";
+		}
+
+		my $actionHandler = "${actionID}_handler";
+		my %genericParams;
+		foreach my $param (qw(selected_achievements)) {
+		    $genericParams{$param} = [ $r->param($param) ];
+		}
+		my %actionParams = $self->getActionParams($actionID);
+		my %tableParams = $self->getTableParams();
+		$self->addmessage( CGI::div({class=>"Message"}, "Results of last action performed: "));
+		$self->addmessage(
+		       $self->$actionHandler(\%genericParams, \%actionParams, \%tableParams), 
+			       CGI::hr()
+		    );
+		
+	} else {
+	    
+	    $self->addgoodmessage("Please select action to be performed.");
+	}
+		
+	
+}
+
+sub info {
+	my ($self) = @_;
+	my $r            = $self->r;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $urlpath      = $r->urlpath;
+	my $courseName   = $urlpath->arg("courseID");
+	
+	my $evalpath = $ce->{courseDirs}{achievements};
+	$evalpath =~ s/$ce->{courseDirs}{root}/$courseName/;
+	my $iconpath = $ce->{courseURLs}{achievements};
+	$iconpath =~ s/$ce->{courseURLs}{html}/$ce->{courseDirs}{html}/;
+	$iconpath =~ s/$ce->{courseDirs}{root}/$courseName/;
+
+	print CGI::div("This is the Achievent Editor.  It is used to edit the achievements available to students.  Please keep in mind the following facts:");
+	print CGI::start_ul();
+	print CGI::li("The achievements are always sorted by category and then by name.");
+	print CGI::li("Achievments are displayed, and evaluated, in the order they are listed.");
+	print CGI::li('The "secret" category always comes first and creates achievements which are not visible to students until they are earned.');
+	print CGI::li('The "level" category is used for the achievements associated to a users level.');
+	print CGI::li("The evaluator files are stored in $evalpath");
+	print CGI::li("The icons are stored in $iconpath");
+	print CGI::end_ul();
+	
+	return "";
+}
+
+
+sub body {
+	my ($self)       = @_;
+	my $r            = $self->r;
+	my $urlpath      = $r->urlpath;
+	my $db           = $r->db;
+	my $ce           = $r->ce;
+	my $authz        = $r->authz;	
+	my $courseName   = $urlpath->arg("courseID");
+	my $achievementID= $urlpath->arg("achievementID");       
+	my $user         = $r->param('user');
+	
+	my $root = $ce->{webworkURLs}->{root};
+
+	return CGI::div({class => "ResultsWithError"}, "You are not authorized to edit achievements.")
+		unless $authz->hasPermissions($user, "edit_achievements");
+	
+	my $actionID = $self->{actionID};
+	
+	########## retrieve possibly changed values for member fields
+	
+	my @allAchievementIDs = @{ $self->{allAchievementIDs} }; # do we need this one? YES, deleting or importing a achievement will change this.
+	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
+	my $editMode = $self->{editMode};
+	my $exportMode = $self->{exportMode};
+	
+	########## get achievements
+	
+	# DBFIXME use an iterator
+	my @Achievements = $db->getAchievements(@allAchievementIDs);
+	
+	# sort Achievments.  Achievements are always sorted by in the order they are evaluated
+	if (@Achievements) {
+	    @Achievements = sortAchievements(@Achievements);
+	}
+
+
+	########## print beginning of form
+
+	print CGI::start_form({method=>"post", action=>$self->systemLink($urlpath,authen=>0), name=>"achievementlist"});
+	print $self->hidden_authen_fields();
+	
+	########## print state data
+	
+	print "\n<!-- state data here -->\n";
+	
+	print CGI::hidden(-name=>"editMode", -value=>$editMode);
+	print CGI::hidden(-name=>"exportMode", -value=>$exportMode);
+	
+	print "\n<!-- state data here -->\n";
+	
+	########## print action forms
+	
+	print CGI::p(CGI::b("Any changes made below will be reflected in the achievement for ALL students.")) if $editMode;
+
+	print CGI::start_table({});
+	print CGI::Tr({}, CGI::td({-colspan=>2}, "Select an action to perform:"));
+
+	my @formsToShow;
+	if ($editMode) {
+		@formsToShow = @{ EDIT_FORMS() };
+	} else {
+		@formsToShow = @{ VIEW_FORMS() };
+	}
+	
+	if ($exportMode) {
+		@formsToShow = @{ EXPORT_FORMS() };
+	}
+	
+	my $i = 0;
+	foreach my $actionID (@formsToShow) {
+
+		my $actionForm = "${actionID}_form";
+		my $onChange = "document.achievementlist.action[$i].checked=true";
+		my %actionParams = $self->getActionParams($actionID);
+		
+		print CGI::Tr({-valign=>"top"},
+			CGI::td({}, CGI::input({-type=>"radio", -name=>"action", -value=>$actionID})),
+			CGI::td({}, $self->$actionForm($onChange, %actionParams))
+		);
+		
+		$i++;
+	}
+	
+	my $selectAll =CGI::input({-type=>'button', -name=>'check_all', -value=>'Select all',
+	       onClick => "for (i in document.achievementlist.elements)  { 
+	                       if (document.achievementlist.elements[i].name =='selected_achievements') { 
+	                           document.achievementlist.elements[i].checked = true
+	                       }
+	                    }" });
+   	my $selectNone =CGI::input({-type=>'button', -name=>'check_none', -value=>'Unselect all',
+	       onClick => "for (i in document.achievementlist.elements)  { 
+	                       if (document.achievementlist.elements[i].name =='selected_achievements') { 
+	                          document.achievementlist.elements[i].checked = false
+	                       }
+	                    }" });
+	unless ($editMode or $exportMode) {
+		print CGI::Tr({}, CGI::td({ colspan=>2, -align=>"center"},
+			$selectAll." ". $selectNone
+			)
+		);
+	}
+	print CGI::Tr({}, CGI::td({-colspan=>2, -align=>"center"},
+		CGI::submit(-value=>"Take Action!"))
+	);
+	print CGI::end_table();
+	
+	########## print table
+
+	$self->printTableHTML(\@Achievements,
+		editMode => $editMode,
+		exportMode => $exportMode,
+		selectedAchievementIDs => \@selectedAchievementIDs,
+	);
+	
+	
+	########## print end of form
+	
+ 	print CGI::end_form();
+
+	return "";
+}
+
+################################################################################
+# extract particular params and put them in a hash (values are ARRAYREFs!)
+################################################################################
+
+sub getActionParams {
+	my ($self, $actionID) = @_;
+	my $r = $self->{r};
+	
+	my %actionParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^action\.$actionID\./;
+		$actionParams{$param} = [ $r->param($param) ];
+	}
+	return %actionParams;
+}
+
+sub getTableParams {
+	my ($self) = @_;
+	my $r = $self->{r};
+	
+	my %tableParams;
+	foreach my $param ($r->param) {
+		next unless $param =~ m/^(?:achievement)\./;
+		$tableParams{$param} = [ $r->param($param) ];
+	}
+	return %tableParams;
+}
+
+################################################################################
+# actions and action triggers
+################################################################################
+
+# edit, cancelEdit, and saveEdit should stay with the display module and
+# not be real "actions". that way, all actions are shown in view mode and no
+# actions are shown in edit mode.
+
+
+#form for edition achievements
+sub edit_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Edit ",
+		CGI::popup_menu(
+			-name => "action.edit.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.edit.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+#handler for editing achievements.  Just changes the view mode
+sub edit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.edit.scope"}->[0];
+	if ($scope eq "all") {
+	        $self->{selectedAchievementIDs} = $self->{allAchievementIDs};
+		$result = "editing all achievements";
+	} elsif ($scope eq "selected") {
+		$result = "editing selected achievements";
+	}
+	$self->{editMode} = 1;
+	
+	return $result;
+}
+
+#form for assigning achievemetns to users
+sub assign_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Assign ",
+		CGI::popup_menu(
+			-name => "action.assign.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.assign.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+		" to all users, create global data, and ",
+   		CGI::popup_menu(
+			-name => "action.assign.overwrite",
+			-values => [qw(everything new_only)],
+			-default => $actionParams{"action.assign.overwrite"}->[0] || "new_only",
+			-labels => {
+				everything => "overwrite all data",
+				new_only => "preserve existing data",
+			},
+			-onchange => $onChange,
+		),
+
+	);
+}
+
+#handler for assigning achievements to users
+sub assign_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+
+	my $scope = $actionParams->{"action.assign.scope"}->[0];
+	my $overwrite = (($actionParams->{"action.assign.overwrite"}->[0] eq 'everything') ? 1 : 0);
+	
+	my @achievementIDs;
+	my @users = $db->listUsers;
+
+
+	if ($scope eq "all") {
+	        @achievementIDs = @{$self->{allAchievementIDs}};
+	} else {
+	    	@achievementIDs = @{$self->{selectedAchievementIDs}};
+	}
+	
+	#Enable all achievements
+	my @achievements = $db->getAchievements(@achievementIDs);
+	
+	foreach my $achievement (@achievements) {
+	    $achievement->enabled(1);
+	    $db->putAchievement($achievement);
+	}
+
+	#Assign globalUserAchievement data, overwriting if necc
+
+	foreach my $user (@users) {
+	    if (not $db->existsGlobalUserAchievement($user)) {
+		my $globalUserAchievement = $db->newGlobalUserAchievement();
+		$globalUserAchievement->user_id($user);
+		$db->addGlobalUserAchievement($globalUserAchievement);
+	    } elsif ($overwrite) {
+		my $globalUserAchievement = $db->newGlobalUserAchievement();
+		$globalUserAchievement->user_id($user);
+		$db->putGlobalUserAchievement($globalUserAchievement);
+	    }
+	}
+		
+
+	#Assign userAchievement data, overwriting if necc
+
+	foreach my $achievementID (@achievementIDs) {
+	    foreach my $user (@users) {
+		if (not $db->existsUserAchievement($user,$achievementID)) {
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievementID);
+		    $db->addUserAchievement($userAchievement);
+		} elsif ($overwrite) {
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievementID);
+		    $db->putUserAchievement($userAchievement);
+		}
+	    }
+	}
+     
+
+	return "Assigned $scope achievements to users";
+}
+
+#form for scoring
+sub score_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join ("",
+		"Score ",
+		CGI::popup_menu(
+			-name => "action.score.scope",
+			-values => [qw(none all selected)],
+			-default => $actionParams{"action.score.scope"}->[0] || "none",
+			-labels => {
+				none => "no achievements.",
+				all => "all achievements.",
+				selected => "selected achievements.",
+			},
+			-onchange => $onChange,
+		),
+	);
+	
+}
+
+#handler for scoring
+sub score_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $ce = $r->ce;
+	my $db = $r->db;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+
+	my $scope = $actionParams->{"action.score.scope"}->[0];	
+	my @achievementsToScore;
+	
+	if ($scope eq "none") { 
+		@achievementsToScore = ();
+		return "No achievements selected for scoring.";
+	} elsif ($scope eq "all") {
+		@achievementsToScore = @{ $self->{allAchievementIDs} };
+	} elsif ($scope eq "selected") {
+		@achievementsToScore = @{ $genericParams->{selected_achievements} };
+	}
+
+	#define file name
+	my $scoreFileName = $courseName."_achievement_scores.csv";
+	my $scoreFilePath = $ce->{courseDirs}->{scoring}.'/'.$scoreFileName;
+	
+	# back up existing file
+	if(-e $scoreFilePath) {
+	    rename($scoreFilePath, "$scoreFilePath.bak") or 
+		warn "Existing file $scoreFilePath could not be backed up and was lost.";
+	}
+
+	# check path and open the file
+	$scoreFilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{scoring}, $scoreFilePath);
+
+	local *SCORE;
+	open SCORE, ">$scoreFilePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $scoreFilePath");
+
+	#print out header info
+	print SCORE "username, last name, first name, section, achievement level, achievement score, ";
+	
+	my @achievementIDs = $db->listAchievements;
+	my @achievements = $db->getAchievements(@achievementIDs);
+	@achievements = sortAchievements(@achievements);
+
+	foreach my $achievement (@achievements) {
+	    print SCORE $achievement->achievement_id.", ";
+	}
+	print SCORE "\n";
+
+	my @users = $db->listUsers;
+	
+	# get user records
+	my @userRecords  = ();
+	foreach my $currentUser ( @users) {
+		my $userObj = $db->getUser($currentUser); #checked
+		die "Unable to find user object for $currentUser. " unless $userObj;
+		push (@userRecords, $userObj );
+	}
+	
+	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
+	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+
+	
+	#print out achievement information for each user
+	foreach my $userRecord (@userRecords) {
+	    my $user_id = $userRecord->user_id;
+	    next unless $db->existsGlobalUserAchievement($user_id);
+	    print SCORE "$user_id, $userRecord->{last_name}, $userRecord->{first_name}, $userRecord->{section}, ";
+	    my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
+	    my $level_id = $globalUserAchievement->level_achievement_id;
+	    $level_id = ' ' unless $level_id;
+	    my $points = $globalUserAchievement->achievement_points;
+	    $points = 0 unless $points;
+	    print SCORE "$level_id, $points, ";
+
+	    foreach my $achievement (@achievements) {
+		my $achievement_id = $achievement->achievement_id;
+		if ($db->existsUserAchievement($user_id,$achievement_id)) {
+		    my $userAchievement = $db->getUserAchievement($user_id,$achievement_id);
+		    print SCORE $userAchievement->earned ? "1, ": "0, ";
+		} else {
+		    print SCORE ", ";
+		}
+	    }
+
+	    print SCORE "\n";
+	}
+	
+	close SCORE;
+		    
+	return CGI::div({class=>"ResultsWithoutError"},  "Achievement scores saved to $scoreFileName")
+}
+
+
+#form for delete action
+sub delete_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		CGI::div({class=>"ResultsWithError"}, 
+			"Delete ",
+			CGI::popup_menu(
+				-name => "action.delete.scope",
+				-values => [qw(none selected)],
+				-default => "none", #  don't make it easy to delete # $actionParams{"action.delete.scope"}->[0] || "none",
+				-labels => {
+					none => "no achievements.",
+					selected => "selected achievements.",
+				},
+				-onchange => $onChange,
+			),
+			CGI::em(" Deletion destroys all achievement-related data and is not undoable!"),
+		)
+	);
+}
+
+#handler for delete action
+sub delete_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $r      = $self->r;
+	my $db     = $r->db;
+
+	my $scope = $actionParams->{"action.delete.scope"}->[0];
+
+	
+	my @achievementIDsToDelete = ();
+
+	if ($scope eq "selected") {
+		@achievementIDsToDelete = @{ $self->{selectedAchievementIDs} };
+	}
+	
+	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
+	my %selectedAchievementIDs = map { $_ => 1 } @{ $self->{selectedAchievementIDs} };
+	
+	#run through selected achievements and delete
+	foreach my $achievementID (@achievementIDsToDelete) {
+		delete $allAchievementIDs{$achievementID};
+		delete $selectedAchievementIDs{$achievementID};
+		
+		$db->deleteAchievement($achievementID);
+	}
+	
+	#update local fields
+	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
+	$self->{selectedAchievementIDs} = [ keys %selectedAchievementIDs ];
+	
+	my $num = @achievementIDsToDelete;
+	 return CGI::div({class=>"ResultsWithoutError"},  "deleted $num achievement" .
+	                                           ($num == 1 ? "" : "s")
+	);
+}
+
+#form for creating achievement
+sub create_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	my $r      = $self->r;
+	
+	return "Create a new achievement with ID: ", 
+		CGI::textfield(
+			-name => "action.create.id",
+			-value => $actionParams{"action.create.name"}->[0] || "",
+			-width => "60",
+			-onchange => $onChange,
+		),
+		" as ",
+		CGI::popup_menu(
+			-name => "action.create.type",
+			-values => [qw(empty copy)],
+			-default => $actionParams{"action.create.type"}->[0] || "empty",
+			-labels => {
+				empty => "a new empty achievement.",
+				copy => "a duplicate of the first selected achievement.",
+			},
+			-onchange => $onChange,
+		);
+			
+}
+
+#handler for creating an ahcievement
+sub create_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+     
+	my $r      = $self->r;
+	my $db     = $r->db;
+	my $ce     = $r->ce;
+	
+	#create achievement
+	my $newAchievementID = $actionParams->{"action.create.id"}->[0];
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new achievement: no achievement ID specified!") unless $newAchievementID =~ /\S/;
+	return CGI::div({class => "ResultsWithError"}, "Achievement $newAchievementID exists.  No achievement created") if $db->existsAchievement($newAchievementID);
+	my $newAchievementRecord = $db->newAchievement;
+	my $oldAchievementID = $self->{selectedAchievementIDs}->[0];
+
+	my $type = $actionParams->{"action.create.type"}->[0];
+
+	#either assign empty data or copy over existing data
+	if ($type eq "empty") {
+		$newAchievementRecord->achievement_id($newAchievementID);
+		$newAchievementRecord->enabled(0);
+		$newAchievementRecord->test(BLANK_ACHIEVEMENT());
+		$db->addAchievement($newAchievementRecord);
+	} elsif ($type eq "copy") {
+		return CGI::div({class => "ResultsWithError"}, "Failed to duplicate achievement: no achievement selected for duplication!") unless $oldAchievementID =~ /\S/;
+		$newAchievementRecord = $db->getAchievement($oldAchievementID);
+		$newAchievementRecord->achievement_id($newAchievementID);
+		$db->addAchievement($newAchievementRecord);
+
+	}
+
+	#add to local list of achievements
+	push @{ $self->{allAchievementIDs} }, $newAchievementID;
+	
+	return CGI::div({class => "ResultsWithError"}, "Failed to create new achievement: $@") if $@;
+	
+	return CGI::div({class=>"ResultsWithoutError"},"Successfully created new achievement $newAchievementID" );
+	
+}
+
+#form for importing achievements
+sub import_form {
+	my ($self, $onChange, %actionParams) = @_;
+	
+	my $r = $self->r;
+	my $authz = $r->authz;
+	my $user = $r->param('user');
+
+	return join(" ",
+		"Import achievements from ",
+		CGI::popup_menu(
+			-name => "action.import.source",
+			-values => [ "", $self->getAxpList() ],
+			-labels => { "" => "the following file" },
+			-default => $actionParams{"action.import.source"}->[0] || "",
+		        -onchange => $onChange,
+		),
+		    "assigning the achievements to " .
+		    CGI::popup_menu(
+			-name => "action.import.assign",
+			-value => [qw(none all)],
+			-default => $actionParams{"action.import.assign"}->[0] || "none",
+			-labels => {
+			    all => "all current users.",
+			    none => "no users.",
+			},
+			-onchange => $onChange,
+		   ) );
+}
+
+# handler for importing achievements
+sub import_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $ce          = $r->ce;
+	my $db          = $r->db;
+
+	my $fileName = $actionParams->{"action.import.source"}->[0];
+	my $assign = $actionParams->{"action.import.assign"}->[0];
+	my @users = $db->listUsers;
+	my %allAchievementIDs = map { $_ => 1 } @{ $self->{allAchievementIDs} };
+	my $filePath = $ce->{courseDirs}->{achievements}.'/'.$fileName;
+	
+	#open file name
+	local *IMPORT;
+	open EXPORT, "$filePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $filePath");
+
+	#read in lines from file
+	my $count = 0;
+	while (my $line = <EXPORT>) {
+	    chomp $line;
+	    my @data = split(', ',$line);
+	    my $achievement_id = $data[0];
+	    #skip achievements that already exist
+	    next if $db->existsAchievement($achievement_id);
+
+	    #write achievement data.  The "format" for this isn't written down anywhere (!)
+	    my $achievement = $db->newAchievement();
+	    $achievement->achievement_id($achievement_id);
+	    $achievement->name($data[1]);
+	    $achievement->category($data[2]);
+	    $data[3] =~ s/\;/,/;
+	    $achievement->description($data[3]);
+	    $achievement->points($data[4]);
+	    $achievement->max_counter($data[5]);
+	    $achievement->test($data[6]);
+	    $achievement->icon($data[7]);
+	    $achievement->enabled($assign eq "all"?1:0);
+	    
+	    #add achievement
+	    $db->addAchievement($achievement);
+	    $count++;
+	    $allAchievementIDs{$achievement_id} = 1;
+	    
+	    #assign to usesrs if necc
+	    if ($assign eq "all") {
+		foreach my $user (@users) {
+		    if (not $db->existsGlobalUserAchievement($user)) {
+			my $globalUserAchievement = $db->newGlobalUserAchievement();
+			$globalUserAchievement->user_id($user);
+			$db->addGlobalUserAchievement($globalUserAchievement);
+		    }
+		    my $userAchievement = $db->newUserAchievement();
+		    $userAchievement->user_id($user);
+		    $userAchievement->achievement_id($achievement_id);
+		    $db->addUserAchievement($userAchievement);
+		}
+	    }
+	}
+
+	$self->{allAchievementIDs} = [ keys %allAchievementIDs ];
+		    
+	return CGI::div(
+	    {class=>"ResultsWithoutError"}, "Imported $count achievement".(($count >1 || $count == 0)?"s":""));
+}
+
+#form for exporting 
+sub export_form {
+	my ($self, $onChange, %actionParams) = @_;
+
+	return join("",
+		"Export ",
+		CGI::popup_menu(
+			-name => "action.export.scope",
+			-values => [qw(all selected)],
+			-default => $actionParams{"action.export.scope"}->[0] || "selected",
+			-labels => {
+				all => "all achievements",
+				selected => "selected achievements",
+			},
+			-onchange => $onChange,
+		),
+	);
+}
+
+# export handler
+# this does not actually export any files, rather it sends us to a new page in order to export the files
+sub export_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+
+	my $result;
+	
+	my $scope = $actionParams->{"action.export.scope"}->[0];
+	if ($scope eq "all") {
+		$result = "exporting all achievements";
+		$self->{selectedAchievementIDs} = $self->{allAchievementIDs};
+	} elsif ($scope eq "selected") {
+		$result = "exporting selected achievements";
+		$self->{selectedAchievementIDs} = $genericParams->{selected_achievements}; # an arrayref
+	}
+	$self->{exportMode} = 1;
+	
+	return   CGI::div({class=>"ResultsWithoutError"},  $result);
+}
+
+
+#form and hanlder for leaving the export page
+sub cancelExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon export";
+}
+
+sub cancelExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
+	
+	$self->{exportMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"},  "export abandoned");
+}
+
+#handler and form for actually exporting
+sub saveExport_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Export selected achievements.";
+}
+
+sub saveExport_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $ce          = $r->ce;
+	my $db          = $r->db;
+	my $urlpath = $r->urlpath;
+	my $courseName = $urlpath->arg("courseID");
+
+	my @achievementIDsToExport = @{ $self->{selectedAchievementIDs} };
+
+	#get file path
+	my $FileName = $courseName."_achievements.axp";
+	my $FilePath = $ce->{courseDirs}->{achievements}.'/'.$FileName;
+	
+	# back up existing file
+	if(-e $FilePath) {
+	    rename($FilePath, "$FilePath.bak") or 
+		warn "Existing file $FilePath could not be backed up and was lost.";
+	}
+
+	$FilePath = WeBWorK::Utils::surePathToFile($ce->{courseDirs}->{achievements}, $FilePath);
+	#open file
+	local *EXPORT;
+	open EXPORT, ">$FilePath" or return CGI::div({class=>"ResultsWithError"}, "Failed to open $FilePath");
+
+	my @achievements = $db->getAchievements(@achievementIDsToExport);
+	#run through achievements outputing data as csv list.  This format is not documented anywhere
+	foreach my $achievement (@achievements) {
+	    print EXPORT $achievement->achievement_id.", ";
+	    print EXPORT $achievement->name.", ";
+	    print EXPORT $achievement->category.", ";
+	    my $description = $achievement->description;
+	    $description =~ s/,/\;/;
+	    print EXPORT $description.", ";
+	    print EXPORT $achievement->points.", ";
+	    print EXPORT $achievement->max_counter.", ";
+	    print EXPORT $achievement->test.", ";
+	    print EXPORT $achievement->icon.", ";
+	    print EXPORT "\n";
+	}
+
+	close EXPORT;
+	
+	$self->{exportMode} = 0;
+	
+	return 	CGI::div( {class=>"resultsWithoutError"}, "Exported achievements to $FileName");
+
+}
+
+#form and handler for cancelling edits
+sub cancelEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Abandon changes";
+}
+
+sub cancelEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r      = $self->r;
+	
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes abandoned");
+}
+
+#form and handler for saving edits
+sub saveEdit_form {
+	my ($self, $onChange, %actionParams) = @_;
+	return "Save changes";
+}
+
+sub saveEdit_handler {
+	my ($self, $genericParams, $actionParams, $tableParams) = @_;
+	my $r           = $self->r;
+	my $db          = $r->db;
+	
+	my @selectedAchievementIDs = @{ $self->{selectedAchievementIDs} };
+	
+	#run through selected achievements
+	foreach my $achievementID (@selectedAchievementIDs) {
+		my $Achievement = $db->getAchievement($achievementID); # checked
+		# FIXME: we may not want to die on bad sets, they're not as bad as bad users
+		die "record for achievement $achievementID not found" unless $Achievement;
+
+		#update fields
+		foreach my $field ($Achievement->NONKEYFIELDS()) {
+			my $param = "achievement.${achievementID}.${field}";
+			if (defined $tableParams->{$param}->[0]) {
+			    $Achievement->$field($tableParams->{$param}->[0]);
+			}
+		}
+		
+		$db->putAchievement($Achievement);
+	}
+	
+	$self->{editMode} = 0;
+	
+	return CGI::div({class=>"ResultsWithError"}, "changes saved" );
+}
+
+################################################################################
+# "display" methods
+################################################################################
+
+#write out a particular field
+sub fieldEditHTML {
+	my ($self, $fieldName, $value, $properties) = @_;
+	my $size = $properties->{size};
+	my $type = $properties->{type};
+	my $access = $properties->{access};
+	my $items = $properties->{items};
+	my $synonyms = $properties->{synonyms};
+	my $headerFiles = $self->{headerFiles};
+	
+	if ($access eq "readonly") {
+		return $value;
+	}
+	
+	if ($type eq "number" or $type eq "text") {
+		return CGI::input({type=>"text", name=>$fieldName, value=>$value, size=>$size});
+	}
+	
+	if ($type eq "checked") {
+		
+		# FIXME: kludge (R)
+		# if the checkbox is checked it returns a 1, if it is unchecked it returns nothing
+		# in which case the hidden field overrides the parameter with a 0
+		return CGI::checkbox(
+			-name => $fieldName,
+			-checked => $value,
+			-label => "",
+			-value => 1
+		) . CGI::hidden(
+			-name => $fieldName,
+			-value => 0
+		);
+	}
+}
+
+#write out a row of the table
+sub recordEditHTML {
+	my ($self, $Achievement, %options) = @_;
+	my $r           = $self->r;
+	my $urlpath     = $r->urlpath;
+	my $ce          = $r->ce;
+	my $db		= $r->db;
+	my $authz	= $r->authz;
+	my $user	= $r->param('user');
+	my $root        = $ce->{webworkURLs}->{root};
+	my $courseName  = $urlpath->arg("courseID");
+	
+	my $editMode = $options{editMode};
+	my $exportMode = $options{exportMode};
+	my $achievementSelected = $options{achievementSelected};
+
+	my $users = $db->countAchievementUsers($Achievement->achievement_id);
+	my $totalUsers = $self->{totalUsers};
+
+	my @tableCells;
+	my $achievement_id = $Achievement->achievement_id;
+	my $editorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementEditor",  $r, courseID => $courseName, achievementID => $achievement_id);
+	my $editorURL = $self->systemLink($editorPage, params => {
+	    sourceFilePath => $ce->{courseDirs}->{achievements}."/".$Achievement->test});
+
+	my $userEditorPage = $urlpath->newFromModule("WeBWorK::ContentGenerator::Instructor::AchievementUserEditor", $r, courseID=>$courseName, achievementID =>$achievement_id);
+	my $userEditorURL = $self->systemLink($userEditorPage, params => {});
+
+	# the formats are "hard coded" below.  Making them more modular would be good
+	#format for export row
+	if ($exportMode) {
+	    # selection checkbox
+	    push @tableCells, CGI::checkbox(
+		-type => "checkbox",
+		-name => "selected_achievements",
+		-value => $achievement_id,
+		-label => "",
+		-checked => $achievementSelected,
+					    );
+	
+    
+	    my @fields = ("achievement_id", "name");
+	    
+	    foreach my $field (@fields) {
+		
+		my $fieldName = "achievement.".$achievement_id .".". $field;
+		my $fieldValue = $Achievement->$field;
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
+		$properties{access} = "readonly";
+		$fieldValue =~ s/ /&nbsp;/g;
+		push @tableCells, CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+	    }
+	    
+	    #format for edit mode
+	} elsif ($editMode) {
+
+	    return unless $achievementSelected;
+
+	    my $tableCell;
+
+	    if ($Achievement->{icon}) {
+		$tableCell = CGI::img({-src=>$ce->{courseURLs}->{achievements}."/".$Achievement->{icon},-alt=>"Achievement Icon",-height=>60,-vspace=>10});
+	    } else {
+		$tableCell = CGI::img({-src=>$ce->{webworkURLs}->{htdocs}."/images/defaulticon.png"
+					   ,-alt=>"Achievement Icon",-height=>60,-vspace=>10});
+	    }
+	    $tableCell = $tableCell.CGI::br().CGI::center(CGI::a({href=>$editorURL},"Edit"));
+
+	    push @tableCells, $tableCell;
+
+	    my $fieldName;
+	    my $fieldValue;
+	    my %properties;
+	    my $field;
+
+	    $tableCell = CGI::hidden(
+		-name => "selected_achievements",
+		-value => $achievement_id,
+		);
+	    
+	    $field = "achievement_id";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "name";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "category";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    $field = "enabled";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "points";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "max_counter";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    $field = "description";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "test";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties)).CGI::br();
+
+	    $field = "icon";
+	    $fieldName = "achievement.".$achievement_id.".".$field;
+	    $fieldValue = $Achievement->$field;
+	    %properties = %{ FIELD_PROPERTIES()->{$field} };
+	    $tableCell=$tableCell.CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+
+	    push @tableCells, $tableCell;
+
+	    #format for regular viewing mode
+	} else {
+	 
+	    # selection checkbox
+	    push @tableCells, CGI::checkbox({
+		name => "selected_achievements",
+		value => $achievement_id,
+		checked => $achievementSelected,
+		label => "",
+		});
+	    
+	    my @fields = ("enabled", "achievement_id", "category", "name");
+	    my $AchievementEditURL = $self->systemLink($urlpath->new(type=>'instructor_achievement_list', args=>{courseID => $courseName})) . "&editMode=1&selected_achievements=" . $achievement_id;
+	    my $imageURL = $ce->{webworkURLs}->{htdocs}."/images/edit.gif";
+	    my $imageLink = CGI::a({href => $AchievementEditURL}, CGI::img({src=>$imageURL, border=>0}));
+
+
+	    foreach my $field (@fields) {
+		
+		my $fieldName = "achievement.".$achievement_id.".".$field;
+		my $fieldValue = $Achievement->$field;
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
+		$properties{access} = "readonly";
+		$fieldValue =~ s/ /&nbsp;/g;
+		$fieldValue = ($fieldValue) ? "Yes" : "No" if $field =~ /enabled/;
+		if ($field =~ /achievement_id/) {
+		    $fieldValue .= " ".$imageLink;
+		}
+		push @tableCells, CGI::font( $self->fieldEditHTML($fieldName, $fieldValue, \%properties));
+	    }
+
+	    push @tableCells, CGI::a({href=>$userEditorURL}, "$users/$totalUsers");
+
+	    push @tableCells, CGI::a({href=>$editorURL}, "Edit Evaluator");
+
+	}
+
+	return CGI::Tr({}, CGI::td({}, \@tableCells));
+}
+
+#this prints out the whole table
+sub printTableHTML {
+	my ($self, $AchievementsRef, %options) = @_;
+	my $r                       = $self->r;
+	my $authz                   = $r->authz;
+	my $user                    = $r->param('user');
+	my @Achievements                    = @$AchievementsRef;
+  
+	
+	my $editMode                = $options{editMode};
+	my $exportMode              = $options{exportMode};
+	my %selectedAchievementIDs          = map { $_ => 1 } @{ $options{selectedAchievementIDs} };
+	
+	# names of headings:
+
+	if ($editMode and not %selectedAchievementIDs) {
+	    print CGI::p(
+		CGI::i("No achievements shown.  Select an achievement to edit!"));
+	    return;
+	}
+	    
+
+	my @tableHeadings; 
+	    
+	#hardcoded headings.  making htis more modular would be good
+	if ($exportMode) {
+	    @tableHeadings = ("Select",
+			      "Achievement ID",
+			      "Name");
+	} elsif ($editMode) {
+	    @tableHeadings = ("Icon",
+			      "Achievement ID <br> Name <br> Category",
+			      "Enabled <br> Points <br> Counter",
+			      "Description <br> Evaluator File <br> Icon File"
+		);
+	} else {
+	    @tableHeadings = ("Select",
+			      "Enabled",
+			      "Achievement ID",
+			      "Category",
+			      "Name",
+			      "Edit <br> Users",
+			      "Edit <br> Evaluator"
+		);
+	}
+	
+	# print the table
+	if ($exportMode) {
+	    print CGI::start_table({});
+	} else {
+	    print CGI::start_table({-border=>1, -cellpadding=>5});
+	}
+	
+	print CGI::Tr({}, CGI::th({}, \@tableHeadings));
+
+	for (my $i = 0; $i < @Achievements; $i++) {
+		my $Achievement = $Achievements[$i];
+
+		print $self->recordEditHTML($Achievement,
+			editMode => $editMode,
+			exportMode => $exportMode,
+			achievementSelected => exists $selectedAchievementIDs{
+			    $Achievement->achievement_id}
+		);
+	}
+	
+	print CGI::end_table();
+	#########################################
+	# if there are no users shown print message
+	# 
+	##########################################
+	
+	print CGI::p(
+                      CGI::i("No achievements shown.  Create an achievement!")
+	    ) unless @Achievements;
+}
+
+#get list of files that can be imported.  
+sub getAxpList {
+	my ($self) = @_;
+	my $ce = $self->{ce};
+	my $dir = $ce->{courseDirs}->{achievements};
+	return $self->read_dir($dir, qr/.*\.axp/);
+}
+
+1;
+
+=head1 AUTHOR
+
+Written by Robert Van Dam, toenail (at) cif.rochester.edu
+
+=cut
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
new file mode 100644
index 0000000000..f30788596d
--- /dev/null
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementUserEditor.pm
@@ -0,0 +1,242 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm,v 1.23 2006/09/25 22:14:53 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::ContentGenerator::Instructor::AchievementUserEditor;
+use base qw(WeBWorK::ContentGenerator::Instructor);
+
+=head1 NAME
+
+WeBWorK::ContentGenerator::Instructor::AchievementUserEditor - List and edit the
+users assigned to an achievement.
+
+=cut
+
+use strict;
+use warnings;
+use CGI qw(-nosticky );
+use WeBWorK::Debug;
+
+sub initialize {
+	my ($self)     = @_;
+	my $r          = $self->r;
+	my $urlpath    = $r->urlpath;
+	my $authz      = $r->authz;
+	my $db         = $r->db;	
+	my $achievementID = $urlpath->arg("achievementID");
+	my $user       = $r->param('user');
+	
+	# Check permissions
+	return unless $authz->hasPermissions($user, "edit_achievements");	
+
+	my @users = $db->listUsers;
+	my %selectedUsers = map {$_ => 1} $r->param('selected');
+	
+	my $doAssignToSelected = 0;
+	
+	#Check and see if we need to assign or unassign things
+	if (defined $r->param('assignToAll')) {
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been assigned to all users."));
+		%selectedUsers = map {$_ => 1} @users;
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param('unassignFromAll') and defined($r->param('unassignFromAllSafety')) and $r->param('unassignFromAllSafety')==1) {
+		%selectedUsers = ( );
+		$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been unassigned to all students."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param('assignToSelected')) {
+	   	$self->addmessage(CGI::div({class=>'ResultsWithoutError'}, "Achievement has been assigned to selected users."));
+		$doAssignToSelected = 1;
+	} elsif (defined $r->param("unassignFromAll")) {
+	   # no action taken
+	   $self->addmessage(CGI::div({class=>'ResultsWithError'}, "No action taken"));
+	}
+	
+	#do actual assignment and unassignment
+	if ($doAssignToSelected) {
+		
+		my %achievementUsers = map { $_ => 1 } $db->listAchievementUsers($achievementID);
+		foreach my $selectedUser (@users) {
+			if (exists $selectedUsers{$selectedUser} && $achievementUsers{$selectedUser}) {
+			    # update existing user data (in case fields were changed)
+			    my $userAchievement = $db->getUserAchievement($selectedUser,$achievementID); 
+
+			    my $updatedEarned = $r->param("$selectedUser.earned") ? 1:0;
+			    my $earned = $userAchievement->earned ? 1:0;
+			    if ($updatedEarned != $earned) {
+				
+				$userAchievement->earned($updatedEarned);
+				my $globalUserAchievement = $db->getGlobalUserAchievement($selectedUser);
+				my $achievement = $db->getAchievement($achievementID);
+				#add the correct number of points if we 
+				# are saying that the user now earned the
+				# achievement, or remove them otherwise
+				if ($updatedEarned) {
+				    $globalUserAchievement->achievement_points(
+					$globalUserAchievement->achievement_points +
+					$achievement->points);
+				} else {
+				    $globalUserAchievement->achievement_points(
+					$globalUserAchievement->achievement_points -
+					$achievement->points);
+				}
+
+				$db->putGlobalUserAchievement($globalUserAchievement);
+			    }
+				    
+
+			    $userAchievement->counter($r->param("$selectedUser.counter"));
+			    $db->putUserAchievement($userAchievement);
+			
+			} elsif (exists $selectedUsers{$selectedUser}) {
+			    # add users that dont exist
+			    my $userAchievement = $db->newUserAchievement();
+			    $userAchievement->user_id($selectedUser);
+			    $userAchievement->achievement_id($achievementID);
+			    $db->addUserAchievement($userAchievement);
+
+			    #If they dont have global achievement data, then add that too
+			    if (not $db->existsGlobalUserAchievement($selectedUser)) {
+				my $globalUserAchievement = $db->newGlobalUserAchievement();
+				$globalUserAchievement->user_id($selectedUser);
+				$db->addGlobalUserAchievement($globalUserAchievement);
+			    }
+
+			} else {
+			    # delete users who are not selected
+			    # but dont delete users who dont exist
+			    next unless $achievementUsers{$selectedUser};
+			    $db->deleteUserAchievement($selectedUser, $achievementID);
+			}
+		}
+	}
+}
+
+sub body {
+	my ($self)         = @_;
+	my $r              = $self->r;
+	my $urlpath        = $r->urlpath;
+	my $db             = $r->db;
+	my $ce             = $r->ce;
+	my $authz          = $r->authz;
+	my $webworkRoot    = $ce->{webworkURLs}->{root};
+	my $courseName     = $urlpath->arg("courseID");
+	my $achievementID  = $urlpath->arg("achievementID");
+	my $user           = $r->param('user');
+
+	return CGI::div({class=>"ResultsWithError"}, CGI::p("You are not authorized to edit achievements."))
+		unless $authz->hasPermissions($user, "edit_achievements");
+		
+	# DBFIXME duplicate call
+	my @users = $db->listUsers;
+	print CGI::start_form({method=>"post", action => $self->systemLink( $urlpath, authen=>0) });
+	 
+	# Assign to everyone message
+	print CGI::p(
+		    CGI::submit({name=>"assignToAll", value => "Assign to All Current Users"}), CGI::i("This action will not overwrite existing users.")
+		  ),
+		  CGI::div({-style=>"color:red"}, "Do not uncheck students, unless you know what you are doing.",CGI::br(),
+	           "There is NO undo for unassigning students. "),
+	      CGI::p("When you unassign
+				        by unchecking a student's name, you destroy all
+				        of the data for achievement ".CGI::b($achievementID)." for this student. You will then need to
+				        reassign the set to these students and they will receive new versions of the problems.
+				        Make sure this is what you want to do before unchecking students."
+	);
+				    
+	# Print table
+	print CGI::start_table({});
+	print CGI::Tr({-valign=>"top"}, CGI::th(["Assigned","Login Name","&nbsp;","Student Name","&nbsp;","Section","&nbsp;","Earned","&nbsp;","Counter"]));
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"&nbsp;"]));
+
+	# get user records
+	my @userRecords  = ();
+	foreach my $currentUser ( @users) {
+		my $userObj = $db->getUser($currentUser); #checked
+		die "Unable to find user object for $currentUser. " unless $userObj;
+		push (@userRecords, $userObj );
+	}
+	@userRecords = sort { ( lc($a->section) cmp lc($b->section) ) || 
+	                     ( lc($a->last_name) cmp lc($b->last_name )) } @userRecords;
+	
+	#print row for user
+	foreach my $userRecord (@userRecords) {
+
+		my $statusClass = $ce->status_abbrev_to_name($userRecord->status) || "";
+
+		my $user = $userRecord->user_id;
+		my $userAchievement = $db->getUserAchievement($user, $achievementID); 
+		my $prettyName = $userRecord->last_name
+			. ", "
+			. $userRecord->first_name;
+		my $earned  = $userAchievement->earned if ref($userAchievement);
+		my $counter = $userAchievement->counter if ref($userAchievement);
+
+		print CGI::Tr({}, 
+			CGI::td({-align=>"center"},
+				CGI::checkbox({
+						type=>"checkbox",
+						name=>"selected",
+						checked=>(
+							defined($userAchievement)
+							? "on" : ""
+						    ), value=>$user,
+						label=>"",
+					      })
+			      ),CGI::td({},[
+				CGI::div($user),
+				"",
+				"($prettyName)", " ", $userRecord->section, " ",
+				(
+					defined $userAchievement
+					? (
+					    CGI::checkbox({type=>"checkbox",
+							name=>"$user.earned",
+							value=>"1",
+							checked=>($earned ? "on" : ""),
+							label=>"",}), " ",
+					    CGI::input({type=>"text",
+							name=>"$user.counter",
+							value=>$counter,
+							size=>6,})
+					)
+				      : ()
+				),
+			])
+		);
+	}
+	print CGI::Tr(CGI::td([CGI::hr(),CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr(),"",CGI::hr()]));
+	print CGI::end_table();
+	print $self->hidden_authen_fields;
+	print CGI::submit({name=>"assignToSelected", value=>"Save"});
+
+	#Print unassign from everyone stuff
+	print CGI::p( CGI::hr(),
+				  CGI::div( {class=>'ResultsWithError'},
+						"There is NO undo for this function.  
+				        Do not use it unless you know what you are doing!  When you unassign
+				        a student using this button, or by unchecking their name, you destroy all
+				        of the data for achievement $achievementID for this student.",
+						CGI::br(),
+						CGI::submit({name=>"unassignFromAll", value=>"Unassign from All Users"}),
+						CGI::radio_group(-name=>"unassignFromAllSafety", -values=>[0,1], -default=>0, -labels=>{0=>'Read only', 1=>'Allow unassign'}),
+				  ),
+				  CGI::hr(),
+	);
+	print CGI::end_form();
+	
+	return "";
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/Achievement.pm b/lib/WeBWorK/DB/Record/Achievement.pm
new file mode 100644
index 0000000000..d2814a2bcd
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/Achievement.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::Achievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::Achievement - represent a record from the achievement
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		achievement_id            => { type=>"TINYBLOB NOT NULL", key=>1 },
+		name                      => { type=>"TEXT" },
+		description               => { type=>"TEXT" },
+		points                    => { type=>"INT"  },
+		test                      => { type=>"TEXT" },
+		icon                      => { type=>"TEXT" },
+		category                  => { type=>"TEXT" },
+  	        enabled                   => { type=>"INT"  },
+	        max_counter               => { type=>"INT"  },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
new file mode 100644
index 0000000000..f5a92b3963
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/GlobalUserAchievement.pm
@@ -0,0 +1,43 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::GlobalUserAchievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::GlobalUserAchievement - represent a record from the achievement table
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id             => { type=>"TINYBLOB NOT NULL", key=>1 },
+		achievement_points  => { type=>"INT" },
+                next_level_points   => { type=>"INT" },
+	        level_achievement_id => { type=>"VARCHAR(100)" },
+	    # VARCHAR(1024) is only supported by MySQL version 5.0.3 and 
+	    # later, but it makes freezing and thawing safer to have 
+	    # more available characters
+  	        frozen_hash         => { type=>"VARCHAR(1024)" },
+                facebooker          => { type=>"INT" },
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/DB/Record/UserAchievement.pm b/lib/WeBWorK/DB/Record/UserAchievement.pm
new file mode 100644
index 0000000000..fe554e6b3e
--- /dev/null
+++ b/lib/WeBWorK/DB/Record/UserAchievement.pm
@@ -0,0 +1,42 @@
+################################################################################
+# WeBWorK Online Homework Delivery System
+# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# $CVSHeader: webwork2/lib/WeBWorK/DB/Record/Set.pm,v 1.22 2007/08/13 22:59:57 sh002i Exp $
+# 
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of either: (a) the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any later
+# version, or (b) the "Artistic License" which comes with this package.
+# 
+# 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 either the GNU General Public License or the
+# Artistic License for more details.
+################################################################################
+
+package WeBWorK::DB::Record::UserAchievement;
+use base WeBWorK::DB::Record;
+
+=head1 NAME
+
+WeBWorK::DB::Record::UserAchievement - represent a record from the achievement table
+
+=cut
+
+use strict;
+use warnings;
+
+BEGIN {
+	__PACKAGE__->_fields(
+		user_id                   => { type=>"TINYBLOB NOT NULL", key=>1 },
+		achievement_id            => { type=>"TINYBLOB NOT NULL", key=>1 },
+		earned                    => { type=>"INT" },
+		counter                   => { type=>"INT" },
+	    # VARCHAR(1024) is only supported by MySQL version 5.0.3 and 
+	    # later, but it makes freezing and thawing safer to have 
+	    # more available characters
+  	        frozen_hash               => { type=>"VARCHAR(1024)" },
+	);
+}
+
+1;

From cdbb7cf3f7b634313fe9356e18cebf6d86523c6e Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Thu, 24 May 2012 16:31:20 -0400
Subject: [PATCH 60/73] Take 3: One last file

---
 htdocs/css/achievements.css | 123 ++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 htdocs/css/achievements.css

diff --git a/htdocs/css/achievements.css b/htdocs/css/achievements.css
new file mode 100644
index 0000000000..4e9c9d4095
--- /dev/null
+++ b/htdocs/css/achievements.css
@@ -0,0 +1,123 @@
+.facebookbox {
+    margin-top:7px;
+}
+
+.facebookbox form {
+    margin-bottom:0px;
+}
+
+.cheevobigbox {
+    width:700px;
+}
+
+.levelbox {
+    height:100px;
+    margin-bottom:30px;
+}
+
+.levelbox img {
+    float:left;
+    height:100px;
+    width:100px;
+}
+
+.leveldatabox {
+    margin-left:20px;
+    float:left;
+}
+
+.leveldatabox h1 {
+    font-size:35px;
+    font-weight:bold;
+}
+
+.levelouterbar {
+    height:20px;
+    border-style:solid;
+    border-width:2px;
+    width:400px;
+}
+
+.levelinnerbar {
+    height:20px;
+    background-color:#88D;
+}
+
+.cheevoouterbox {
+    height:50px;
+    margin-bottom:15px;
+}
+
+.cheevoouterbox img {
+    float:left;
+    height:50px;
+    width:50px;
+    
+}
+
+.unlocked {
+    color:black;
+}
+
+.locked { 
+    color:grey;
+}
+
+.locked img {
+    opacity:0.4;
+    filter:alpha(opacity=40);
+}
+
+.locked h2 {
+    color:grey;
+}
+
+.cheevotextbox {
+    margin-left:15px;
+    float:left;
+}
+
+.cheevotextbox h2 {
+    line-height:15px;
+    font-size:15px;
+    margin-bottom:5px;
+    margin-top:2px;
+    font-weight:bold;
+}
+
+/*width of cheevo progress bar controlled by perl code*/
+.cheevoouterbar {
+    height:10px;
+    border-style:solid;
+    border-width:2px;
+    width:200px;
+}
+
+.cheevoinnerbar {
+    height:10px;
+    background-color:#88D;
+}
+
+.cheevopopupouter {
+    height:75px;
+    margin-bottom:10px;
+    margin-left:15px;
+}
+
+.cheevopopupouter img {
+    float:left;
+    height:75px;
+    width:75px;
+}
+
+.cheevopopuptext {
+    margin-left:15px;
+    float:left;
+}
+
+.cheevopopuptext h1 {
+    margin-top:0px;
+    margin-bottom:5px;
+    font-size:20px;
+    font-weight:bold;
+}
\ No newline at end of file

From bf0e24cdffa99d8616ee088bc765198269547e4e Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Fri, 25 May 2012 10:02:47 -0400
Subject: [PATCH 61/73] Fixed Facebook Integration

---
 lib/WeBWorK/AchievementEvaluator.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 8772ce7375..5855ec6af1 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -156,13 +156,20 @@ sub checkForAchievements {
 	    }
 
 	    #build the cheevo message. New level messages are slightly different
+	    my $imgSrc;
+	    if ($achievement->{icon}) {
+		$imgSrc = $ce->{server_root_url}.$ce->{courseURLs}->{achievements}."/".$achievement->{icon};
+	    } else {           
+		$imgSrc = $ce->{server_root_url}.$ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";
+	    }
+
 	    $cheevoMessage .=  CGI::start_div({class=>'cheevopopupouter'});
-	    $cheevoMessage .=  CGI::img({src=>"$ce->{courseURLs}->{achievements}/$achievement->{icon}", alt=>'Achievement Icon'});
+	    $cheevoMessage .=  CGI::img({src=>$imgSrc, alt=>'Achievement Icon'});
 	    $cheevoMessage .= CGI::start_div({class=>'cheevopopuptext'});  
 	    if ($achievement->category eq 'level') {
 		
 		$cheevoMessage = $cheevoMessage . CGI::h1("Level Up: $achievement->{name}");
-		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!.");
+		$cheevoMessage = $cheevoMessage . CGI::div("Congratulations, you earned a new level!");
 		$cheevoMessage = $cheevoMessage . CGI::end_div();
 
 	    } else {
@@ -184,10 +191,10 @@ sub checkForAchievements {
 		if ($achievement->category eq 'level') {
 		    $facebookmessage = sprintf("I leveled up and am now a %s",$achievement->{name});
 		} else {
-		    $facebookmessage = sprintf("I earned the Mathchievement %s: %s",$achievement->{name},$achievement->{description});
+		    $facebookmessage = sprintf("%s: %s",$achievement->{name},$achievement->{description});
 		}
 	
-		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$ce->{courseURLs}->{achievements}/$achievement->{icon}', message: '$facebookmessage'});\n";
+		$cheevoMessage .= "FB.ui({ method: 'feed', display: 'popup', picture: '$imgSrc', description: '$facebookmessage'});\n";
 		$cheevoMessage .= CGI::end_script();
 
 	    }

From e0dace979ae28a1a090d8a33d77856d717c0b6c4 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Sun, 27 May 2012 15:07:28 -0400
Subject: [PATCH 62/73] Removed dependency of code on Freeze Thaw.  Now uses
 Storable.

---
 htdocs/css/achievements.css         |  1 +
 lib/WeBWorK/AchievementEvaluator.pm | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/css/achievements.css b/htdocs/css/achievements.css
index 4e9c9d4095..0f4ff428f8 100644
--- a/htdocs/css/achievements.css
+++ b/htdocs/css/achievements.css
@@ -52,6 +52,7 @@
     float:left;
     height:50px;
     width:50px;
+    margin-top:5px;
     
 }
 
diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 5855ec6af1..7f06c40973 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -28,8 +28,7 @@ use WeBWorK::CGI;
 use WeBWorK::Utils qw(before after readFile sortAchievements);
 
 use Safe;
-#FreezeThaw is not part of the standard webwork installation.  It could be replaced by a more standard hash->string module (if there is one).  
-use FreezeThaw qw(freeze thaw);
+use Storable qw(freeze thaw);
 
 sub checkForAchievements {
 
@@ -75,7 +74,7 @@ sub checkForAchievements {
 
     #Thaw globalData hash
     if ($globalUserAchievement->frozen_hash) {       
-	%$globalData = thaw($globalUserAchievement->frozen_hash);
+	$globalData = thaw($globalUserAchievement->frozen_hash);
     }
 
     #Update a couple of "standard" variables in globalData hash.
@@ -134,7 +133,7 @@ sub checkForAchievements {
 	
 	#thaw localData hash
 	if ($userAchievement->frozen_hash) {
-	    %$localData = thaw($userAchievement->frozen_hash);
+	    $localData = thaw($userAchievement->frozen_hash);
 	}
 
 	#recover counter information (for progress bar achievements)
@@ -213,13 +212,13 @@ sub checkForAchievements {
 	
 	#update counter, freeze localData and store
 	$userAchievement->counter($counter);
-	$userAchievement->frozen_hash(freeze(%$localData));	
+	$userAchievement->frozen_hash(freeze($localData));	
 	$db->putUserAchievement($userAchievement);
 	
     }
     
     #freeze globalData and store
-    $globalUserAchievement->frozen_hash(freeze(%$globalData));
+    $globalUserAchievement->frozen_hash(freeze($globalData));
     $db->putGlobalUserAchievement($globalUserAchievement);
 
     return $cheevoMessage;

From 960d675a1221dedf42d35c3ad0bbbb3fca3530fa Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 31 May 2012 13:04:13 -0400
Subject: [PATCH 63/73] Add changes to global.conf.dist which are compatible
 with up-coming merge with goehle's code

---
 conf/global.conf.dist    | 19 +++++++++++++++++++
 conf/postlocal.conf.dist | 28 +++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 0907767f4c..59df445150 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -1212,6 +1212,25 @@ $webservices = {
 # Temporary hack for displaying the different versions of the editors
 ################################################################################
 
+# These configurations can be overridden
+# in course.conf file to tune the behavior for individual courses
+# The items below can be placed in postlocal.conf override the settings in this file
+# One can also use $showeditors{classlisteditor1}=0; to override a setting.
+%showeditors = (
+	classlisteditor1   => 1,
+	classlisteditor2   => 0,
+	
+	homeworkseteditor1 => 1,
+	homeworkseteditor2 => 0,
+	
+	librarybrowser1    => 1,
+	librarybrowser2    => 0,
+	librarybrowser3    => 0,
+	
+	pgproblemeditor1   => 1,
+	pgproblemeditor2   => 0,
+);
+
 ################################################################################
 # Site wide overrides are entered into the file postlocal.conf
 ################################################################################
diff --git a/conf/postlocal.conf.dist b/conf/postlocal.conf.dist
index 2a8b6e814f..d704eed365 100755
--- a/conf/postlocal.conf.dist
+++ b/conf/postlocal.conf.dist
@@ -197,8 +197,8 @@ $pg{displayModes} = [
 	"LaTeXMathML",   # render TeX math expressions on the client side using LaTeXMathML
 ];
 
-+# Default display mode. Should be an uncommented item listed above.
-+$pg{options}{displayMode}        = "images";
+# Default display mode. Should be an uncommented item listed above.
+$pg{options}{displayMode}        = "images";
  
 ################################################################################
 #  The macro file search path. (Check with entries in global.conf before overriding)
@@ -264,7 +264,7 @@ $problemDefaults{max_attempts} = -1;
 ################################################################################
 # Temporary hack for displaying the different versions of the editors
 ################################################################################
-# These configurations can be placed in CourseConfig to tune the behavior for individual courses
+# These configurations can be placed in course.conf file to tune the behavior for individual courses
 # The items below can be used to override the settings in global.conf.dist
 # One can also use $showeditors{classlisteditor1}=0; to override
 # %showeditors = (
@@ -282,6 +282,28 @@ $problemDefaults{max_attempts} = -1;
 # 	pgproblemeditor2   => 1,
 # );
 
+################################################################################
+# Authorization system   LTI:  LMS Roles Mapped to WeBWorK Roles
+################################################################################
+
+## Each institution will need to customize these correspondences
+## to take into account the roles that are used in its
+## Learning Management System.
+
+# %LMSrolesToWeBWorKroles = (
+# 	"AI/TA" => "ta",
+# 	"assistant" => "empowered_AI",
+# 	"instructor" => "professor",
+# 	"librarian" => "guest",
+# 	"librarian+" => "empoweredAI",
+# 	"observer" => "guest",
+#     "student" => "student",
+# 	"visitor" => "guest",
+# 	"Instructor" => "professor",
+#     "Student" => "student",
+#     "Learner" => "student",
+# 	"Teaching Assistant" => "ta",
+# );
 ################################################################################
 # Directory for temporary files
 ################################################################################ 

From 5188ce7d9cf906de9abde42b89ae4a8b45a282aa Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 31 May 2012 20:56:03 -0400
Subject: [PATCH 64/73] Correct errors that crept in while merging goehle
 software with master.

---
 lib/WeBWorK/Constants.pm                |  2 +-
 lib/WeBWorK/ContentGenerator.pm         | 41 ++++++++---
 lib/WeBWorK/ContentGenerator/Problem.pm | 54 +++++++-------
 lib/WeBWorK/URLPath.pm                  | 93 +++++++++++++++++++++++--
 4 files changed, 149 insertions(+), 41 deletions(-)

diff --git a/lib/WeBWorK/Constants.pm b/lib/WeBWorK/Constants.pm
index 7fe8002b14..66f5a50e64 100644
--- a/lib/WeBWorK/Constants.pm
+++ b/lib/WeBWorK/Constants.pm
@@ -134,7 +134,7 @@ $WeBWorK::ContentGenerator::Instructor::Config::ConfigValues = [
 		  type => 'text'},
 		{ var => 'defaultTheme',
 		  doc => 'Theme (refresh page after saving changes to reveal new theme.)',
-		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, and dgage.  The theme
+		  doc2 => 'There are currently five themes (or skins) to choose from: ur, math, math2, math3 union.  The theme
 specifies a unified look and feel for the WeBWorK course web pages.',
 		  values => [qw(math math2 math3 ur dgage  union)],
 		  type => 'popuplist'},
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 0abaf82bb3..07e862c359 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2012 The WeBWorK Project, http://github.com/openwebwork
 # $CVSHeader: webwork2/lib/WeBWorK/ContentGenerator.pm,v 1.196 2009/06/04 01:33:15 gage Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -713,10 +713,18 @@ sub links {
 				print &$makelink("${pfx}Index", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				print CGI::start_ul();
 				
-				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::li(&$makelink("${pfx}UserList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
+					if $ce->{showeditors}->{classlisteditor1};
+				print CGI::li(&$makelink("${pfx}UserList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
+					if $ce->{showeditors}->{classlisteditor2};;
 				
 				print CGI::start_li(); # Homework Set Editor
-				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
+				print &$makelink("${pfx}ProblemSetList", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
+					if $ce->{showeditors}->{homeworkseteditor1};
+				print "<br/>";
+				print &$makelink("${pfx}ProblemSetList2", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args)
+					if $ce->{showeditors}->{homeworkseteditor2};;
+				
 				## only show editor link for non-versioned sets
 				if (defined $setID && $setID !~ /,v\d+$/ ) {
 					print CGI::start_ul();
@@ -725,7 +733,14 @@ sub links {
 					
 					if (defined $problemID) {
 						print CGI::start_ul();
-						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"));
+						print CGI::li(&$makelink("${pfx}PGProblemEditor", text=>"$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor"))
+							if $ce->{showeditors}->{pgproblemeditor1};
+						print CGI::end_ul();
+					}
+					if (defined $problemID) {
+						print CGI::start_ul();
+						print CGI::li(&$makelink("${pfx}PGProblemEditor2", text=>"--$problemID", urlpath_args=>{%args,setID=>$setID,problemID=>$problemID}, systemlink_args=>\%systemlink_args, target=>"WW_Editor2"))
+							if $ce->{showeditors}->{pgproblemeditor2};;
 						print CGI::end_ul();
 					}
 					
@@ -734,8 +749,12 @@ sub links {
 				}
 				print CGI::end_li(); # end Homework Set Editor
 				
-				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
-				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args));
+				print CGI::li(&$makelink("${pfx}SetMaker", text=>$r->maketext("Library Browser"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
+					if $ce->{showeditors}->{librarybrowser1};
+				print CGI::li(&$makelink("${pfx}SetMaker2", text=>$r->maketext("Library Browser 2"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
+					if $ce->{showeditors}->{librarybrowser2};
+				print CGI::li(&$makelink("${pfx}SetMaker3", text=>$r->maketext("Library Browser 3"), urlpath_args=>{%args}, systemlink_args=>\%systemlink_args))
+					if $ce->{showeditors}->{librarybrowser3};
 				print CGI::start_li(); # Stats
 				print &$makelink("${pfx}Stats", urlpath_args=>{%args}, systemlink_args=>\%systemlink_args);
 				if ($userID ne $eUserID or defined $setID) {
@@ -1242,8 +1261,10 @@ handled.
 sub if_warnings {
 	my ($self, $arg) = @_;
 	my $r = $self->r;
-	
-	if (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) {
+
+	if ( (MP2 ? $r->notes->get("warnings") : $r->notes("warnings")) 
+	     or ($self->{pgerrors}) )  
+	{
 		return $arg;
 	} else {
 		!$arg;
@@ -1629,7 +1650,9 @@ sub hidden_fields {
 # 		$html .= CGI::hidden($param, @values);  #MEG
 # 		 warn "$param ", join(" ", @values) if @values >1; #this should never happen!!!
 		my $value  = $r->param($param);
-		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
+#		$html .= CGI::hidden($param, $value); # (can't name these items when using real CGI) 
+		$html .= CGI::hidden(-name=>$param, -default=>$value, -id=>"hidden_".$param); # (can't name these items when using real CGI) 
+
 	}
 	return $html;
 }
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index cb363198ed..2ad2e68eb5 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -262,9 +262,9 @@ sub attemptResults {
 		$answerMessage =~ s/\n/<BR>/g;
 		$numCorrect += $answerScore >= 1;
 		$numBlanks++ unless $studentAnswer =~/\S/ || $answerScore >= 1;   # unless student answer contains entry
-		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("correct")) :
+		my $resultString = $answerScore >= 1 ? CGI::span({class=>"ResultsWithoutError"}, $r->maketext("Correct")) :
 		                   $answerScore > 0  ? $r->maketext("[_1]% correct", int($answerScore*100)) :
-                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("incorrect"));
+                                                       CGI::span({class=>"ResultsWithError"}, $r->maketext("Incorrect"));
 		$fully = $r->maketext("completely") if $answerScore >0 and $answerScore < 1;
 		
 		push @correct_ids,   $name if $answerScore == 1;
@@ -601,7 +601,7 @@ sub pre_header_initialize {
 			$problem->problem_seed($problemSeed);
 		}
 
-		my $visiblityStateClass = ($set->visible) ? $r->maketext("visible") : $r->maketext("hidden");
+		my $visiblityStateClass = ($set->visible) ? $r->maketext("Visible") : $r->maketext("Hidden");
 		my $visiblityStateText = ($set->visible) ? $r->maketext("visible to students")."." : $r->maketext("hidden from students").".";
 		$self->addmessage(CGI::span($r->maketext("This set is [_1]", CGI::font({class=>$visiblityStateClass}, $visiblityStateText))));
 
@@ -723,6 +723,19 @@ sub pre_header_initialize {
 			effectivePermissionLevel => $db->getPermissionLevel($effectiveUserName)->permission,
 		},
 	);
+	# sometimes, for example if the file can't be read, $pg->{pgcore} won't be defined
+	# because the PG file is never run
+	#
+	if (defined ($pg->{pgcore}) ) {
+		my $debug_msg = CGI::br().join( CGI::br(), @{ $pg->{pgcore}->get_debug_messages});
+		$self->addmessage($debug_msg ) if $debug_msg;
+		$self->{pgdebug}          = $pg->{pgcore}->get_debug_messages;
+		$self->{pgwarning}        = $pg->{pgcore}->get_warning_messages;
+		$self->{pginternalerrors} = $pg->{pgcore}->get_internal_debug_messages ;
+		$self->{pgerrors} = @{$self->{pgdebug}} || @{$self->{pgwarning}} || @{$self->{pginternalerrors}}||0;
+	} else {
+		$self->{pgerrors}=undef;  # unable to obtain errors
+	}
 
 	debug("end pg processing");
 	
@@ -769,15 +782,16 @@ sub warnings {
 	"";
 }
 
-sub if_errors($$) {
-	my ($self, $arg) = @_;
-	
-	if ($self->{isOpen}) {
-		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
-	} else {
-		return !$arg;
-	}
-}
+### #FIXME  not clear this is ever used
+# sub if_errors($$) {
+# 	my ($self, $arg) = @_;
+# 	
+# 	if ($self->{isOpen}) {
+# 		return $self->{pg}->{flags}->{error_flag} ? $arg : !$arg;
+# 	} else {
+# 		return !$arg;
+# 	}
+# }
 
 sub head {
 	my ($self) = @_;
@@ -800,12 +814,6 @@ sub post_header_text {
     return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
 }
 
-sub post_header_text {
-	my ($self) = @_;
-	return "" if ( $self->{invalidSet} );
-    return $self->{pg}->{post_header_text} if $self->{pg}->{post_header_text};
-}
-
 sub options {
 	my ($self) = @_;
 	#warn "doing options in Problem";
@@ -1072,6 +1080,7 @@ sub output_editorLink{
 
 	if ($pg->{flags}->{error_flag}) {
 		if ($authz->hasPermissions($user, "view_problem_debugging_info")) {
+		    print "Call errorOutput</br>";
 			print $self->errorOutput($pg->{errors}, $pg->{body_text});
 			print $editorLink;
 			print $editorLink2;
@@ -1209,8 +1218,6 @@ sub output_score_summary{
 	my $submitAnswers = $self->{submitAnswers};
 
 	# score summary
-	warn "num_correct =", $problem->num_correct,"num_incorrect=",$problem->num_incorrect 
-	        unless defined($problem->num_correct) and defined($problem->num_incorrect) ;
 	my $attempts = $problem->num_correct + $problem->num_incorrect;
 	#my $attemptsNoun = $attempts != 1 ? $r->maketext("times") : $r->maketext("time");
 	my $problem_status    = $problem->status || 0;
@@ -1236,7 +1243,6 @@ sub output_score_summary{
 	#		$setClosedMessage .= " Additional attempts will not be recorded.";
 	#	}
 	#}
-
 	unless (defined( $pg->{state}->{state_summary_msg}) and $pg->{state}->{state_summary_msg}=~/\S/) {
 		my $notCountedMessage = ($problem->value) ? "" : $r->maketext("(This problem will not count towards your grade.)");
 		print CGI::p(join("",
@@ -1342,7 +1348,8 @@ sub output_summary{
 	#FIXME -- the following is a kludge:  if showPartialCorrectAnswers is negative don't show anything.
 	# until after the due date
 	# do I need to check $will{showCorrectAnswers} to make preflight work??
-	if (($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
+
+	if (defined($pg->{flags}->{showPartialCorrectAnswers}) and ($pg->{flags}->{showPartialCorrectAnswers} >= 0 and $submitAnswers) ) {
 		# print this if user submitted answers OR requested correct answers	    
 	    my $results = $self->attemptResults($pg, 1,
 			$will{showCorrectAnswers},
@@ -1400,9 +1407,6 @@ sub output_custom_edit_message{
 	return "";
 }
 
-
-
-
 # output_past_answer_button
 
 # prints out the "Show Past Answers" button
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
index b3a75f1807..dfd23fc18c 100644
--- a/lib/WeBWorK/URLPath.pm
+++ b/lib/WeBWorK/URLPath.pm
@@ -1,6 +1,6 @@
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright © 2000-2007 The WeBWorK Project, http://github.com/openwebwork
 # $CVSHeader: webwork2/lib/WeBWorK/URLPath.pm,v 1.36 2008/04/29 19:27:34 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under
@@ -46,6 +46,7 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  
  course_admin                        /admin/ -> logout, options, instructor_tools
  html2xml                            /html2xml/
+ instructorXMLHandler     			     /instructorXMLHandler/
  set_list                            /$courseID/
  
  equation_display                    /$courseID/equation/
@@ -67,16 +68,26 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_user_detail              /$courseID/instructor/users/$userID/
  instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
  
+ instructor_user_list2                /$courseID/instructor/users2/
+ instructor_user_detail2              /$courseID/instructor/users2/$userID/ #not created yet
+ instructor_sets_assigned_to_user2    /$courseID/instructor/users2/$userID/sets/ #not created yet
+
+ 
  instructor_set_list                 /$courseID/instructor/sets/
  instructor_set_detail               /$courseID/instructor/sets/$setID/
  instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
  
+ instructor_set_list2                 /$courseID/instructor/sets2/
+ instructor_set_detail2               /$courseID/instructor/sets2/$setID/ #not created yet
+ instructor_users_assigned_to_set2    /$courseID/instructor/sets2/$setID/users/ #not created yet
+ 
  instructor_add_users                /$courseID/instructor/add_users/
  instructor_set_assigner             /$courseID/instructor/assigner/
  instructor_file_transfer            /$courseID/instructor/files/
  instructor_file_manager             /$courseID/instructor/file_manager/
  instructor_set_maker                /$courseID/instructor/setmaker/
  instructor_set_maker2               /$courseID/instructor/setmaker2/
+ instructor_set_maker3               /$courseID/instructor/setmaker3/
  instructor_get_target_set_problems  /$courseID/instructor/GetTargetSetProblems/
  instructor_get_library_set_problems /$courseID/instructor/GetLibrarySetProblems/
  instructor_config                   /$courseID/instructor/config/
@@ -86,6 +97,11 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
  instructor_problem_editor_withset_withproblem
                                      /$courseID/instructor/pgProblemEditor/$setID/$problemID/
+                                     
+ instructor_problem_editor2           /$courseID/instructor/pgProblemEditor2/
+ instructor_problem_editor2_withset   /$courseID/instructor/pgProblemEditor2/$setID/
+ instructor_problem_editor2_withset_withproblem
+                                     /$courseID/instructor/pgProblemEditor2/$setID/$problemID/
  
  instructor_scoring                  /$courseID/instructor/scoring/
  instructor_scoring_download         /$courseID/instructor/scoringDownload/
@@ -119,7 +135,7 @@ our %pathTypes = (
 	root => {
 		name    => 'WeBWorK',
 		parent  => '',
-		kids    => [ qw/course_admin  html2xml set_list / ],
+		kids    => [ qw/course_admin  html2xml instructorXMLHandler set_list / ],
 		match   => qr|^/|,
 		capture => [ qw// ],
 		produce => '/',
@@ -145,7 +161,15 @@ our %pathTypes = (
 		produce => 'html2xml/',
 		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
 	},
-
+	instructorXMLHandler => {
+		name => 'instructorXMLHandler',
+		parent => 'root',
+		kids => [ qw// ],
+		match   => qr|^instructorXMLHandler/|,
+		capture => [ qw// ],
+		produce => 'instructorXMLHandler/',
+		display => 'WeBWorK::ContentGenerator::instructorXMLHandler',
+	},
 	set_list => {
 		name    => '$courseID',
 		parent  => 'root',
@@ -283,9 +307,12 @@ our %pathTypes = (
 	instructor_tools => {
 		name    => 'Instructor Tools',
 		parent  => 'set_list',
-		kids    => [ qw/instructor_user_list instructor_set_list instructor_add_users instructor_achievement_list
+		kids    => [ qw/instructor_user_list instructor_user_list2 instructor_set_list instructor_set_list2 
+		    instructor_add_users instructor_achievement_list
 			instructor_set_assigner instructor_file_manager
-			instructor_problem_editor instructor_set_maker instructor_set_maker2 instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
+			instructor_problem_editor instructor_problem_editor2 
+			instructor_set_maker instructor_set_maker2 instructor_set_maker3 
+			instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
 			instructor_config
 			instructor_scoring instructor_scoring_download instructor_mail_merge
 			instructor_answer_log instructor_preflight instructor_statistics
@@ -308,6 +335,15 @@ our %pathTypes = (
 		produce => 'users/',
 		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
 	},
+	instructor_user_list2 => {
+		name    => 'Classlist Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_user_detail/ ],
+		match   => qr|^users2/|,
+		capture => [ qw// ],
+		produce => 'users2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::UserList2',
+	},
 	instructor_user_detail => {
 		name    => 'Sets assigned to $userID',
 		parent  => 'instructor_user_list',
@@ -338,6 +374,15 @@ our %pathTypes = (
 		produce => 'sets/',
 		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
 	},
+	instructor_set_list2 => {
+		name    => 'Hmwk Sets Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_set_detail/ ],
+		match   => qr|^sets2/|,
+		capture => [ qw// ],
+		produce => 'sets2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList2',
+	},
 	instructor_set_detail => {
 		name    => 'Set Detail for set $setID',
 		parent  => 'instructor_set_list',
@@ -413,6 +458,15 @@ our %pathTypes = (
 		capture => [ qw// ],
 		produce => 'setmaker2/',
 		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker2',
+	},
+		instructor_set_maker3 => {
+		name    => 'Library Browser 3',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^setmaker3/|,
+		capture => [ qw// ],
+		produce => 'setmaker3/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker3',
 	},
 	instructor_get_target_set_problems => {
 		name    => 'Get Target Set Problems',
@@ -450,6 +504,15 @@ our %pathTypes = (
 		produce => 'pgProblemEditor/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
+	instructor_problem_editor2 => {
+		name    => 'Problem Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_problem_editor2_withset/ ],
+		match   => qr|^pgProblemEditor2/|,
+		capture => [ qw// ],
+		produce => 'pgProblemEditor2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
+	},
 	instructor_problem_editor_withset => {
 		name    => '$setID',
 		parent  => 'instructor_problem_editor',
@@ -459,6 +522,15 @@ our %pathTypes = (
 		produce => '$setID/',
 		display => undef,
 	},
+	instructor_problem_editor2_withset => {
+		name    => '$setID',
+		parent  => 'instructor_problem_editor2',
+		kids    => [ qw/instructor_problem_editor2_withset_withproblem/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => undef,
+	},
 	instructor_problem_editor_withset_withproblem => {
 		name    => '$problemID',
 		parent  => 'instructor_problem_editor_withset',
@@ -468,6 +540,15 @@ our %pathTypes = (
 		produce => '$problemID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
+	instructor_problem_editor2_withset_withproblem => {
+		name    => '$problemID',
+		parent  => 'instructor_problem_editor2_withset',
+		kids    => [ qw// ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/problemID/ ],
+		produce => '$problemID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
+	},
 	instructor_scoring => {
 		name    => 'Scoring Tools',
 		parent  => 'instructor_tools',
@@ -543,7 +624,7 @@ our %pathTypes = (
 		produce => 'student/$userID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
 	},
- 	
+
 	################################################################################
 
         instructor_achievement_list => {

From c289abaf27fa2b99e74dc56183370325bb26d3ca Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 31 May 2012 22:26:59 -0400
Subject: [PATCH 65/73] Add more things that were lost while merging the
 various versions of global.conf.dist

---
 conf/global.conf.dist | 201 +++++++++++++++++++++++++++---------------
 1 file changed, 131 insertions(+), 70 deletions(-)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 59df445150..b8db17c550 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -23,9 +23,6 @@
 # configuration file (webwork.apache-config) and is available for use here. In
 # addition, the $courseName variable holds the name of the current course.
 
-################################################################################
-# Seed variables
-################################################################################
 
 include("conf/prelocal.conf");
 include("VERSION");
@@ -46,47 +43,6 @@ $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
 
-################################################################################
-# Paths to external programs 
-################################################################################
-
-# system utilities
-$externalPrograms{mv}    = "/bin/mv";
-$externalPrograms{cp}    = "/bin/cp";
-$externalPrograms{rm}    = "/bin/rm";
-$externalPrograms{mkdir} = "/bin/mkdir";
-$externalPrograms{tar}   = "/bin/tar";
-$externalPrograms{gzip}  = "/bin/gzip";
-
-# equation rendering/hardcopy utiltiies
-$externalPrograms{latex}    = "/usr/bin/latex";
-$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
-$externalPrograms{dvipng}   = "/usr/bin/dvipng";
-$externalPrograms{tth}      = "/usr/bin/tth";
-
-####################################################
-# NetPBM - basic image manipulation utilities
-# Most sites only need to configure $netpbm_prefix.
-####################################################
-my $netpbm_prefix = "/usr/bin";
-$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
-$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
-$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
-$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
-$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
-
-# url checker
-$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
-
-# image conversions utiltiies
-# the source file is given on stdin, and the output expected on stdout.
-$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
-$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
-$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
-
-# mysql clients
-$externalPrograms{mysql}     = "/usr/bin/mysql";
-$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
 
 ################################################################################
 # Mail settings
@@ -168,7 +124,7 @@ $mail{editor_window_columns} = 100;
 # Customizing the action of the "Email your instructor" button
 ###################################################
 
-# Customizing the behavior fo this button is best done by copying the lines below, entering them
+# Customizing the behavior for this button is best done by copying the lines below, entering them
 # in the postlocal.conf file and making the desired modifications. 
 # Then you will not need to update these modifications
 # when you download a new version of WeBWorK.
@@ -264,6 +220,7 @@ $webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdoc
 $webworkURLs{htdocs}        = "$webwork_htdocs_url";
 
 # Location of web-accessible temporary files, such as equation images.
+# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
 $webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
 $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 
@@ -503,20 +460,21 @@ $default_status = "Enrolled";
 # GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
 # GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-$database_dsn = "dbi:mysql:webwork";
-$database_username = "webworkWrite";
-$database_password = "";
-$database_debug = 0;
 
-# Variables for sql_moodle database layout.
-$moodle_dsn = "dbi:mysql:moodle";
-$moodle_username = $database_username;
-$moodle_password = $database_password;
-$moodle_table_prefix = "mdl_";
-$moodle17 = 0;
+################################################################################
+# set these variables in prelocal.conf
+#
+# $database_dsn = "dbi:mysql:webwork";
+# $database_username = "webworkWrite";
+# $database_password = ""; #set this in prelocal.conf
+# $database_debug = 0;
+################################################################################
+
+
+
+# Database schemas are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts. The standard schema is called "sql_single";
 
-# Several database are defined in the file conf/database.conf and stored in the
-# hash %dbLayouts.
 include "conf/database.conf";
 
 # Select the default database layout. This can be overridden in the course.conf
@@ -552,8 +510,6 @@ $problemLibrary_db = {
 # Logs
 ################################################################################
 
-# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
-# top-level hash.
 
 # Logs data about how long it takes to process problems. (Do not confuse this
 # with the /other/ timing log which can be set by WeBWorK::Timing and is used
@@ -581,7 +537,7 @@ $courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
 $courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Site defaults (FIXME: what other things could be "site defaults"?)
+# Site defaults (Usually overridden in postlocal.conf)
 ################################################################################
 
 # Set the default timezone of courses on this server. To get a list of valid
@@ -621,7 +577,7 @@ $siteDefaults{default_templates_course} ="modelCourse";
 # current database layout is found.
 # 
 $authen{user_module} = {
-	sql_moodle => "WeBWorK::Authen::Moodle",
+	# sql_moodle => "WeBWorK::Authen::Moodle",
 	# sql_ldap   => "WeBWorK::Authen::LDAP",
 	#"*" => "WeBWorK::Authen",
 	"*" => "WeBWorK::Authen::Basic_TheLastOption",
@@ -633,15 +589,11 @@ $authen{user_module} = {
 # 
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-# Options for particular authentication modules
 
-# $authen{moodle_options} = {
-# 	dsn => $moodle_dsn,
-# 	username => $moodle_username,
-# 	password => $moodle_password,
-# 	table_prefix => $moodle_table_prefix,
-# 	moodle17 => $moodle17,
-# };
+
+
+# If you are using ldap this next snippet should be copied and entered into postlocal.conf.
+# Make modifications there so that it works with your local LDAP protocol
 
 $authen{ldap_options} = {
 	# hosts to attempt to connect to, in order. For example:
@@ -692,7 +644,7 @@ $authen{ldap_options} = {
 };
 
 ################################################################################
-# Authorization system
+# Authorization system (Make local overrides in postlocal.conf )
 ################################################################################
 
 # this section lets you define which groups of users can perform which actions.
@@ -709,6 +661,7 @@ $authen{ldap_options} = {
 	grade_proctor => 3,
 	ta => 5,
 	professor => 10,
+	admin     => 20,
 );
 
 # this hash maps operations to the roles that are allowed to perform those
@@ -1082,6 +1035,113 @@ $pg{ansEvalDefaults} = {
 	reducedScoringValue			  => 1,	# A number in [0,1]. Students will be informed of the value as a percentage
 };
 
+################################################################################
+# Authorization system (Make local overrides in postlocal.conf )
+################################################################################
+
+# this section lets you define which groups of users can perform which actions.
+
+# this hash maps a numeric permission level to the name of a role. the number
+# assigned to a role is significant -- roles with higher numbers are considered
+# "more privileged", and are included when that role is listed for a privilege
+# below.
+# 
+%userRoles = (
+	guest => -5,
+	student => 0,
+	login_proctor => 2,
+	grade_proctor => 3,
+	ta => 5,
+	professor => 10,
+	admin     => 20,
+);
+
+# this hash maps operations to the roles that are allowed to perform those
+# operations. the role listed and any role with a higher permission level (in
+# the %userRoles hash) will be allowed to perform the operation. If the role
+# is undefined, no users will be allowed to perform the operation.
+# 
+%permissionLevels = (
+	login                          => "guest",
+	report_bugs                    => "ta",
+	submit_feedback                => "student",
+	change_password                => "student",
+	change_email_address           => "student",
+	
+	proctor_quiz_login             => "login_proctor",
+	proctor_quiz_grade             => "grade_proctor",
+	view_proctored_tests           => "student",
+	view_hidden_work               => "ta",
+	
+	view_multiple_sets             => "ta",
+	view_unopened_sets             => "ta",
+	view_hidden_sets               => "ta",
+	view_answers                   => "ta",
+	view_ip_restricted_sets        => "ta",
+	
+	become_student                 => "professor",
+	access_instructor_tools        => "ta",
+	score_sets                     => "professor",
+	send_mail                      => "professor",
+	receive_feedback               => "ta",
+	
+	create_and_delete_problem_sets => "professor",
+	assign_problem_sets            => "professor",
+	modify_problem_sets            => "professor",
+	modify_student_data            => "professor",
+	modify_classlist_files         => "professor",
+	modify_set_def_files           => "professor",
+	modify_scoring_files           => "professor",
+	modify_problem_template_files  => "professor",
+	manage_course_files            => "professor",
+	
+	create_and_delete_courses      => "professor",
+	fix_course_databases           => "professor",
+	
+	##### Behavior of the interactive problem processor #####
+	
+	show_correct_answers_before_answer_date         => "ta",
+	show_solutions_before_answer_date               => "ta",
+	avoid_recording_answers                         => "ta",
+	# Below this level, old answers are never initially shown
+	can_show_old_answers_by_default                 => "student",
+	# at this level, we look at showOldAnswers for default value
+	# even after the due date
+	can_always_use_show_old_answers_default         => "professor",
+	check_answers_before_open_date                  => "ta",
+	check_answers_after_open_date_with_attempts     => "ta",
+	check_answers_after_open_date_without_attempts  => "guest",
+	check_answers_after_due_date                    => "guest",
+	check_answers_after_answer_date                 => "guest",
+	create_new_set_version_when_acting_as_student   => undef,
+	print_path_to_problem                           => "professor", # see "Special" PG environment variables
+	record_set_version_answers_when_acting_as_student => undef,
+	record_answers_when_acting_as_student           => undef,
+	# "record_answers_when_acting_as_student" takes precedence
+	# over the following for professors acting as students:
+	record_answers_before_open_date                 => undef,
+	record_answers_after_open_date_with_attempts    => "student",
+	record_answers_after_open_date_without_attempts => undef,
+	record_answers_after_due_date                   => undef,
+	record_answers_after_answer_date                => undef,
+	dont_log_past_answers                           => "professor",
+	# does the user get to see a dump of the problem?
+	view_problem_debugging_info                     => "ta",
+	
+	##### Behavior of the Hardcopy Processor #####
+	
+	download_hardcopy_multiuser  => "ta",
+	download_hardcopy_multiset   => "ta",
+	download_hardcopy_view_errors =>"professor",
+	download_hardcopy_format_pdf => "guest",
+	download_hardcopy_format_tex => "ta",
+);
+
+# This is the default permission level given to new students and students with
+# invalid or missing permission levels.
+$default_permission_level = $userRoles{student};
+
+
 ################################################################################
 # Compatibility
 ################################################################################
@@ -1237,3 +1297,4 @@ $webservices = {
 
 
 include("conf/postlocal.conf");
+1; #final line of the file to reassure perl that it was read properly.

From 8b1344faffa8d855c449ec781e743fa0cae086d0 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Thu, 31 May 2012 22:26:59 -0400
Subject: [PATCH 66/73] Add more things that were lost while merging the
 various versions of global.conf.dist

---
 conf/global.conf.dist | 99 ++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 73 deletions(-)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 59df445150..777f37f05d 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -23,9 +23,6 @@
 # configuration file (webwork.apache-config) and is available for use here. In
 # addition, the $courseName variable holds the name of the current course.
 
-################################################################################
-# Seed variables
-################################################################################
 
 include("conf/prelocal.conf");
 include("VERSION");
@@ -46,47 +43,6 @@ $webwork_htdocs_dir  = "$webwork_dir/htdocs";
 $webwork_courses_url = "/webwork2_course_files";
 $webwork_courses_dir = "/opt/webwork/courses"; #(a typical place to put the course directory
 
-################################################################################
-# Paths to external programs 
-################################################################################
-
-# system utilities
-$externalPrograms{mv}    = "/bin/mv";
-$externalPrograms{cp}    = "/bin/cp";
-$externalPrograms{rm}    = "/bin/rm";
-$externalPrograms{mkdir} = "/bin/mkdir";
-$externalPrograms{tar}   = "/bin/tar";
-$externalPrograms{gzip}  = "/bin/gzip";
-
-# equation rendering/hardcopy utiltiies
-$externalPrograms{latex}    = "/usr/bin/latex";
-$externalPrograms{pdflatex} = "/usr/bin/pdflatex --shell-escape";
-$externalPrograms{dvipng}   = "/usr/bin/dvipng";
-$externalPrograms{tth}      = "/usr/bin/tth";
-
-####################################################
-# NetPBM - basic image manipulation utilities
-# Most sites only need to configure $netpbm_prefix.
-####################################################
-my $netpbm_prefix = "/usr/bin";
-$externalPrograms{giftopnm} = "$netpbm_prefix/giftopnm";
-$externalPrograms{ppmtopgm} = "$netpbm_prefix/ppmtopgm";
-$externalPrograms{pnmtops}  = "$netpbm_prefix/pnmtops";
-$externalPrograms{pnmtopng} = "$netpbm_prefix/pnmtopng";
-$externalPrograms{pngtopnm} = "$netpbm_prefix/pngtopnm";
-
-# url checker
-$externalPrograms{checkurl} = "/usr/bin/lwp-request -d -mHEAD "; # or "/usr/local/bin/w3c -head "
-
-# image conversions utiltiies
-# the source file is given on stdin, and the output expected on stdout.
-$externalPrograms{gif2eps} = "$externalPrograms{giftopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
-$externalPrograms{png2eps} = "$externalPrograms{pngtopnm} | $externalPrograms{ppmtopgm} | $externalPrograms{pnmtops} -noturn 2>/dev/null";
-$externalPrograms{gif2png} = "$externalPrograms{giftopnm} | $externalPrograms{pnmtopng}";
-
-# mysql clients
-$externalPrograms{mysql}     = "/usr/bin/mysql";
-$externalPrograms{mysqldump} = "/usr/bin/mysqldump";
 
 ################################################################################
 # Mail settings
@@ -168,7 +124,7 @@ $mail{editor_window_columns} = 100;
 # Customizing the action of the "Email your instructor" button
 ###################################################
 
-# Customizing the behavior fo this button is best done by copying the lines below, entering them
+# Customizing the behavior for this button is best done by copying the lines below, entering them
 # in the postlocal.conf file and making the desired modifications. 
 # Then you will not need to update these modifications
 # when you download a new version of WeBWorK.
@@ -264,6 +220,7 @@ $webworkDirs{htdocs}        = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdoc
 $webworkURLs{htdocs}        = "$webwork_htdocs_url";
 
 # Location of web-accessible temporary files, such as equation images.
+# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
 $webworkDirs{htdocs_temp}   = "$webworkDirs{htdocs}/tmp";
 $webworkURLs{htdocs_temp}   = "$webworkURLs{htdocs}/tmp";
 
@@ -503,20 +460,21 @@ $default_status = "Enrolled";
 # GRANT SELECT ON webwork.* TO webworkRead@localhost IDENTIFIED BY 'passwordRO';
 # GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX, LOCK TABLES ON webwork.* TO webworkWrite@localhost IDENTIFIED BY 'passwordRW';
 
-$database_dsn = "dbi:mysql:webwork";
-$database_username = "webworkWrite";
-$database_password = "";
-$database_debug = 0;
 
-# Variables for sql_moodle database layout.
-$moodle_dsn = "dbi:mysql:moodle";
-$moodle_username = $database_username;
-$moodle_password = $database_password;
-$moodle_table_prefix = "mdl_";
-$moodle17 = 0;
+################################################################################
+# set these variables in prelocal.conf
+#
+# $database_dsn = "dbi:mysql:webwork";
+# $database_username = "webworkWrite";
+# $database_password = ""; #set this in prelocal.conf
+# $database_debug = 0;
+################################################################################
+
+
+
+# Database schemas are defined in the file conf/database.conf and stored in the
+# hash %dbLayouts. The standard schema is called "sql_single";
 
-# Several database are defined in the file conf/database.conf and stored in the
-# hash %dbLayouts.
 include "conf/database.conf";
 
 # Select the default database layout. This can be overridden in the course.conf
@@ -552,8 +510,6 @@ $problemLibrary_db = {
 # Logs
 ################################################################################
 
-# FIXME: take logs out of %webworkFiles/%courseFiles and give them their own
-# top-level hash.
 
 # Logs data about how long it takes to process problems. (Do not confuse this
 # with the /other/ timing log which can be set by WeBWorK::Timing and is used
@@ -581,7 +537,7 @@ $courseFiles{logs}{login_log}       = "$courseDirs{logs}/login.log";
 $courseFiles{logs}{activity_log} = '';
 
 ################################################################################
-# Site defaults (FIXME: what other things could be "site defaults"?)
+# Site defaults (Usually overridden in postlocal.conf)
 ################################################################################
 
 # Set the default timezone of courses on this server. To get a list of valid
@@ -621,7 +577,7 @@ $siteDefaults{default_templates_course} ="modelCourse";
 # current database layout is found.
 # 
 $authen{user_module} = {
-	sql_moodle => "WeBWorK::Authen::Moodle",
+	# sql_moodle => "WeBWorK::Authen::Moodle",
 	# sql_ldap   => "WeBWorK::Authen::LDAP",
 	#"*" => "WeBWorK::Authen",
 	"*" => "WeBWorK::Authen::Basic_TheLastOption",
@@ -633,15 +589,11 @@ $authen{user_module} = {
 # 
 $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 
-# Options for particular authentication modules
 
-# $authen{moodle_options} = {
-# 	dsn => $moodle_dsn,
-# 	username => $moodle_username,
-# 	password => $moodle_password,
-# 	table_prefix => $moodle_table_prefix,
-# 	moodle17 => $moodle17,
-# };
+
+
+# If you are using ldap this next snippet should be copied and entered into postlocal.conf.
+# Make modifications there so that it works with your local LDAP protocol
 
 $authen{ldap_options} = {
 	# hosts to attempt to connect to, in order. For example:
@@ -692,7 +644,7 @@ $authen{ldap_options} = {
 };
 
 ################################################################################
-# Authorization system
+# Authorization system (Make local overrides in postlocal.conf )
 ################################################################################
 
 # this section lets you define which groups of users can perform which actions.
@@ -709,6 +661,7 @@ $authen{ldap_options} = {
 	grade_proctor => 3,
 	ta => 5,
 	professor => 10,
+	admin     => 20,
 );
 
 # this hash maps operations to the roles that are allowed to perform those
@@ -749,9 +702,7 @@ $authen{ldap_options} = {
 	modify_scoring_files           => "professor",
 	modify_problem_template_files  => "professor",
 	manage_course_files            => "professor",
-	
-        edit_achievements              => "professor",
-
+	edit_achievements			   => "professor",
 	create_and_delete_courses      => "professor",
 	fix_course_databases           => "professor",
 	
@@ -1082,6 +1033,7 @@ $pg{ansEvalDefaults} = {
 	reducedScoringValue			  => 1,	# A number in [0,1]. Students will be informed of the value as a percentage
 };
 
+
 ################################################################################
 # Compatibility
 ################################################################################
@@ -1237,3 +1189,4 @@ $webservices = {
 
 
 include("conf/postlocal.conf");
+1; #final line of the file to reassure perl that it was read properly.

From 6e76cb0b342c93f35c8c74535a82acf210aace72 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Fri, 1 Jun 2012 11:07:39 -0400
Subject: [PATCH 67/73] Remove duplicate entries for permissionLevel in
 global.conf.dist

This was preventing permission for editing achievements from being granted.
---
 conf/global.conf.dist | 106 ------------------------------------------
 1 file changed, 106 deletions(-)

diff --git a/conf/global.conf.dist b/conf/global.conf.dist
index 46b5b410b3..21e70258d0 100644
--- a/conf/global.conf.dist
+++ b/conf/global.conf.dist
@@ -1034,112 +1034,6 @@ $pg{ansEvalDefaults} = {
 };
 
 
-################################################################################
-# Authorization system (Make local overrides in postlocal.conf )
-################################################################################
-
-# this section lets you define which groups of users can perform which actions.
-
-# this hash maps a numeric permission level to the name of a role. the number
-# assigned to a role is significant -- roles with higher numbers are considered
-# "more privileged", and are included when that role is listed for a privilege
-# below.
-# 
-%userRoles = (
-	guest => -5,
-	student => 0,
-	login_proctor => 2,
-	grade_proctor => 3,
-	ta => 5,
-	professor => 10,
-	admin     => 20,
-);
-
-# this hash maps operations to the roles that are allowed to perform those
-# operations. the role listed and any role with a higher permission level (in
-# the %userRoles hash) will be allowed to perform the operation. If the role
-# is undefined, no users will be allowed to perform the operation.
-# 
-%permissionLevels = (
-	login                          => "guest",
-	report_bugs                    => "ta",
-	submit_feedback                => "student",
-	change_password                => "student",
-	change_email_address           => "student",
-	
-	proctor_quiz_login             => "login_proctor",
-	proctor_quiz_grade             => "grade_proctor",
-	view_proctored_tests           => "student",
-	view_hidden_work               => "ta",
-	
-	view_multiple_sets             => "ta",
-	view_unopened_sets             => "ta",
-	view_hidden_sets               => "ta",
-	view_answers                   => "ta",
-	view_ip_restricted_sets        => "ta",
-	
-	become_student                 => "professor",
-	access_instructor_tools        => "ta",
-	score_sets                     => "professor",
-	send_mail                      => "professor",
-	receive_feedback               => "ta",
-	
-	create_and_delete_problem_sets => "professor",
-	assign_problem_sets            => "professor",
-	modify_problem_sets            => "professor",
-	modify_student_data            => "professor",
-	modify_classlist_files         => "professor",
-	modify_set_def_files           => "professor",
-	modify_scoring_files           => "professor",
-	modify_problem_template_files  => "professor",
-	manage_course_files            => "professor",
-	
-	create_and_delete_courses      => "professor",
-	fix_course_databases           => "professor",
-	
-	##### Behavior of the interactive problem processor #####
-	
-	show_correct_answers_before_answer_date         => "ta",
-	show_solutions_before_answer_date               => "ta",
-	avoid_recording_answers                         => "ta",
-	# Below this level, old answers are never initially shown
-	can_show_old_answers_by_default                 => "student",
-	# at this level, we look at showOldAnswers for default value
-	# even after the due date
-	can_always_use_show_old_answers_default         => "professor",
-	check_answers_before_open_date                  => "ta",
-	check_answers_after_open_date_with_attempts     => "ta",
-	check_answers_after_open_date_without_attempts  => "guest",
-	check_answers_after_due_date                    => "guest",
-	check_answers_after_answer_date                 => "guest",
-	create_new_set_version_when_acting_as_student   => undef,
-	print_path_to_problem                           => "professor", # see "Special" PG environment variables
-	record_set_version_answers_when_acting_as_student => undef,
-	record_answers_when_acting_as_student           => undef,
-	# "record_answers_when_acting_as_student" takes precedence
-	# over the following for professors acting as students:
-	record_answers_before_open_date                 => undef,
-	record_answers_after_open_date_with_attempts    => "student",
-	record_answers_after_open_date_without_attempts => undef,
-	record_answers_after_due_date                   => undef,
-	record_answers_after_answer_date                => undef,
-	dont_log_past_answers                           => "professor",
-	# does the user get to see a dump of the problem?
-	view_problem_debugging_info                     => "ta",
-	
-	##### Behavior of the Hardcopy Processor #####
-	
-	download_hardcopy_multiuser  => "ta",
-	download_hardcopy_multiset   => "ta",
-	download_hardcopy_view_errors =>"professor",
-	download_hardcopy_format_pdf => "guest",
-	download_hardcopy_format_tex => "ta",
-);
-
-# This is the default permission level given to new students and students with
-# invalid or missing permission levels.
-$default_permission_level = $userRoles{student};
-
 
 ################################################################################
 # Compatibility

From aaa6903a3ce93f52cbca0cc59b4eab77d7c59491 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Fri, 1 Jun 2012 15:57:38 -0400
Subject: [PATCH 68/73] making touch events work for the iPad

---
 htdocs/js/lib/vendor/jquery.ui.touch-punch.js | 160 ++++++++++++++++++
 .../ContentGenerator/Instructor/SetMaker3.pm  |   1 +
 2 files changed, 161 insertions(+)
 create mode 100644 htdocs/js/lib/vendor/jquery.ui.touch-punch.js

diff --git a/htdocs/js/lib/vendor/jquery.ui.touch-punch.js b/htdocs/js/lib/vendor/jquery.ui.touch-punch.js
new file mode 100644
index 0000000000..2766f4184d
--- /dev/null
+++ b/htdocs/js/lib/vendor/jquery.ui.touch-punch.js
@@ -0,0 +1,160 @@
+/*!
+ * jQuery UI Touch Punch 0.2.2
+ *
+ * Copyright 2011, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+(function ($) {
+
+  // Detect touch support
+  $.support.touch = 'ontouchend' in document;
+
+  // Ignore browsers without touch support
+  if (!$.support.touch) {
+    return;
+  }
+
+  var mouseProto = $.ui.mouse.prototype,
+      _mouseInit = mouseProto._mouseInit,
+      touchHandled;
+
+  /**
+   * Simulate a mouse event based on a corresponding touch event
+   * @param {Object} event A touch event
+   * @param {String} simulatedType The corresponding mouse event
+   */
+  function simulateMouseEvent (event, simulatedType) {
+
+    // Ignore multi-touch events
+    if (event.originalEvent.touches.length > 1) {
+      return;
+    }
+
+    event.preventDefault();
+
+    var touch = event.originalEvent.changedTouches[0],
+        simulatedEvent = document.createEvent('MouseEvents');
+    
+    // Initialize the simulated mouse event using the touch event's coordinates
+    simulatedEvent.initMouseEvent(
+      simulatedType,    // type
+      true,             // bubbles                    
+      true,             // cancelable                 
+      window,           // view                       
+      1,                // detail                     
+      touch.screenX,    // screenX                    
+      touch.screenY,    // screenY                    
+      touch.clientX,    // clientX                    
+      touch.clientY,    // clientY                    
+      false,            // ctrlKey                    
+      false,            // altKey                     
+      false,            // shiftKey                   
+      false,            // metaKey                    
+      0,                // button                     
+      null              // relatedTarget              
+    );
+
+    // Dispatch the simulated event to the target element
+    event.target.dispatchEvent(simulatedEvent);
+  }
+
+  /**
+   * Handle the jQuery UI widget's touchstart events
+   * @param {Object} event The widget element's touchstart event
+   */
+  mouseProto._touchStart = function (event) {
+
+    var self = this;
+
+    // Ignore the event if another widget is already being handled
+    if (touchHandled || !self._mouseCapture(event.originalEvent.changedTouches[0])) {
+      return;
+    }
+
+    // Set the flag to prevent other widgets from inheriting the touch event
+    touchHandled = true;
+
+    // Track movement to determine if interaction was a click
+    self._touchMoved = false;
+
+    // Simulate the mouseover event
+    simulateMouseEvent(event, 'mouseover');
+
+    // Simulate the mousemove event
+    simulateMouseEvent(event, 'mousemove');
+
+    // Simulate the mousedown event
+    simulateMouseEvent(event, 'mousedown');
+  };
+
+  /**
+   * Handle the jQuery UI widget's touchmove events
+   * @param {Object} event The document's touchmove event
+   */
+  mouseProto._touchMove = function (event) {
+
+    // Ignore event if not handled
+    if (!touchHandled) {
+      return;
+    }
+
+    // Interaction was not a click
+    this._touchMoved = true;
+
+    // Simulate the mousemove event
+    simulateMouseEvent(event, 'mousemove');
+  };
+
+  /**
+   * Handle the jQuery UI widget's touchend events
+   * @param {Object} event The document's touchend event
+   */
+  mouseProto._touchEnd = function (event) {
+
+    // Ignore event if not handled
+    if (!touchHandled) {
+      return;
+    }
+
+    // Simulate the mouseup event
+    simulateMouseEvent(event, 'mouseup');
+
+    // Simulate the mouseout event
+    simulateMouseEvent(event, 'mouseout');
+
+    // If the touch interaction did not move, it should trigger a click
+    if (!this._touchMoved) {
+
+      // Simulate the click event
+      simulateMouseEvent(event, 'click');
+    }
+
+    // Unset the flag to allow other widgets to inherit the touch event
+    touchHandled = false;
+  };
+
+  /**
+   * A duck punch of the $.ui.mouse _mouseInit method to support touch events.
+   * This method extends the widget with bound touch event handlers that
+   * translate touch events to mouse events and pass them to the widget's
+   * original mouse event handling methods.
+   */
+  mouseProto._mouseInit = function () {
+    
+    var self = this;
+
+    // Delegate the touch handlers to the widget's element
+    self.element
+      .bind('touchstart', $.proxy(self, '_touchStart'))
+      .bind('touchmove', $.proxy(self, '_touchMove'))
+      .bind('touchend', $.proxy(self, '_touchEnd'));
+
+    // Call the original $.ui.mouse init method
+    _mouseInit.call(self);
+  };
+
+})(jQuery);
\ No newline at end of file
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
index 812d8a7f53..29f2d0e288 100755
--- a/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/SetMaker3.pm
@@ -100,6 +100,7 @@ sub head {
   print qq!<link rel="stylesheet" href="$webwork_htdocs_url/js/lib/vendor/FontAwesome/css/font-awesome.css">!;
 
   print qq!<script src="$webwork_htdocs_url/js/jquery-ui-1.8.16.custom.min.js"></script>!;
+  print qq!<script src="$webwork_htdocs_url/js/lib/vendor/jquery.ui.touch-punch.js"></script>!;
   print qq!<script src="$webwork_htdocs_url/js/lib/vendor/ui.tabs.closable.js"></script>!;
 
   print qq!<script src="$webwork_htdocs_url/js/lib/vendor/json2.js"></script>!;

From 1888c197d34afd14cc714d9d5f5704af53800a89 Mon Sep 17 00:00:00 2001
From: whytheplatypus <whytheplatypus@gmail.com>
Date: Fri, 1 Jun 2012 22:58:06 -0400
Subject: [PATCH 69/73] better scrolling on iOS

---
 htdocs/css/library_browser.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/css/library_browser.css b/htdocs/css/library_browser.css
index 452d6e61e5..75b3d561fc 100644
--- a/htdocs/css/library_browser.css
+++ b/htdocs/css/library_browser.css
@@ -9,11 +9,13 @@ select{
 #problems_container{
     overflow:auto;
     height:100%;
+    -webkit-overflow-scrolling: touch;
 }
 
 #homework_sets_container{
     overflow:auto;
     height:100%;
+    -webkit-overflow-scrolling: touch;
 }
 
 #homework_sets_container ul li{

From 5a82b3924180d92a7f85b33c013471342cf4abf2 Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 3 Jun 2012 09:34:20 -0400
Subject: [PATCH 70/73] Add ipad keyboard components to javascript and css

---
 htdocs/css/keys.css |  42 ++++++++++++++
 htdocs/js/keys.js   | 136 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 178 insertions(+)
 create mode 100644 htdocs/css/keys.css
 create mode 100644 htdocs/js/keys.js

diff --git a/htdocs/css/keys.css b/htdocs/css/keys.css
new file mode 100644
index 0000000000..e14176f3d6
--- /dev/null
+++ b/htdocs/css/keys.css
@@ -0,0 +1,42 @@
+
+div#keyboard{
+    position:fixed;
+    top:-60px;
+    height:60px;
+    width:100%;
+    z-index: 2000;
+    overflow-x:scroll;
+    -webkit-transition: top 0.25s ease-in-out;
+    -moz-transition: top 0.25s ease-in-out;
+    -o-transition: top 0.25s ease-in-out;
+}
+
+div#keyboard.visible{
+    position:absolute;
+    top:0px;
+}
+
+div#keyboard .key {
+    top: 18px;
+    position: relative;
+    opacity: 0.97;
+    background: #ffffff;
+    padding: 18px 27px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    color: #000000;
+    font-size: 13px;
+    font-family: Georgia, serif;
+    text-decoration: none;
+    vertical-align: middle;
+    cursor:pointer;
+}
+/*screws up iOS
+div#keyboard .key:hover {
+    background: #1fa5ff;
+    color: #ffffff;
+}*/
+div#keyboard .key:active {
+    background: #1f1dff;
+}
\ No newline at end of file
diff --git a/htdocs/js/keys.js b/htdocs/js/keys.js
new file mode 100644
index 0000000000..38c02e88f5
--- /dev/null
+++ b/htdocs/js/keys.js
@@ -0,0 +1,136 @@
+
+(function(){
+  "use strict";
+
+    /**
+    * Creates an instance of keys, an extra row of buttons for the iOS virtual keyboard in webapps.
+    *
+    * @constructor
+    * @this {keys}
+    * @param {Array} syms An array of characters that you want the new keyboard to containt (this can be added to later).
+    * @param {Object} options An object containing options for the new keys, this is optional
+    */
+    var Keys = function(syms, opt){
+        this.symbols = syms;
+        this.options = opt;
+        //we haven't rendered anything yet
+        this.board = false;
+        this.input = false; //the currently focused input
+    };
+
+    Keys.prototype.hasClass = function(cls) {
+        return this.board.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
+    }
+
+    Keys.prototype.addClass = function(cls) {
+        if (!this.hasClass(cls)) this.board.className += " "+cls;
+    }
+
+    Keys.prototype.removeClass = function(cls) {
+        if (this.hasClass(cls)) {
+            var reg = new RegExp('(\\s|^)'+cls+'(\\s|$)');
+            this.board.className=this.board.className.replace(reg,' ');
+        }
+    }
+
+    /**
+     * Updates the orientation of keys display, we define how it handles the orientation in the css
+     *
+     * @this {keys}
+     * @return {keys} just in case.
+     */
+    Keys.prototype.setOrientation = function(){
+        if(window.orientation == 0 || 180){
+            this.removeClass("landscape");
+            this.addClass("portrait");
+        } else {
+            this.removeClass("portrait");
+            this.addClass("landscape");
+        }
+        return this;
+    }
+
+    /**
+     * Creates and or renders the board and respective keys,
+     * including listeners, orientation etc.
+     *
+     * @self {keys}
+     * @return {keys} just in case.
+     */
+    Keys.prototype.build = function(){
+        var self = this;
+        //make sure we're on iOS (just iPad for now)
+        if (this.options.debug || (navigator.userAgent.indexOf('iPhone') != -1) || (navigator.userAgent.indexOf('iPod') != -1) || (navigator.userAgent.indexOf('iPad') != -1)) {
+            if(!self.board){
+                self.board = document.createElement('div');
+                self.board.id = "keyboard";
+            }
+            if(!document.getElementById(self.board.id)){
+                document.body.appendChild(self.board);
+            }
+
+            self.symbols.forEach(function(key){
+                var button = document.createElement('a');
+                button.value = key;
+                button.innerHTML = key;
+                button.className = "key";
+                button.hidefocus = "true";
+
+                button.addEventListener('touchstart', function(event){
+                    event.preventDefault();
+                }, false);
+                
+                /*button.addEventListener('mouseup', function(event){
+                    event.preventDefault();
+                }, false);*/
+                
+                
+                button.addEventListener('touchend', function(event){
+
+                    //event.preventDefault();
+                    //self.input.focus();
+                    //have to check for normal input vs just content editable at some point
+                    self.input.value += button.value;
+
+                }, false);
+                self.board.appendChild(button);
+            });
+
+            //get orientation
+            self.setOrientation();
+            document.body.addEventListener('orientationchange', function(event){
+                self.setOrientation();
+            }, false);
+
+            var inputs = document.getElementsByTagName('input');
+            for(var i = 0; i < inputs.length; i++){
+               inputs[i].addEventListener('focus', function(){
+                    self.input = this;
+                    self.show();
+               }, false);
+               inputs[i].addEventListener('blur', function(){self.hide()}, false);
+            }
+            window.addEventListener('scroll', function(){
+                if(self.input){
+                    self.board.style.top = window.pageYOffset+"px";
+                }
+            }, false);
+        }
+
+        return this;
+    };
+
+    Keys.prototype.hide = function(){
+        this.removeClass('visible');
+        this.input = false;
+        this.board.style.top = "-60px";
+    }
+
+    Keys.prototype.show = function(){
+        var self = this;
+        this.addClass('visible');
+        self.board.style.top = (window.pageYOffset)+"px";
+    }
+    
+    window.Keys = Keys;
+})();
\ No newline at end of file

From c8e17e6859e5de8e403eff1593cf11bbee4d88da Mon Sep 17 00:00:00 2001
From: Michael Gage <gage@math.rochester.edu>
Date: Sun, 3 Jun 2012 12:56:07 -0400
Subject: [PATCH 71/73] Add bug fixes from whytheplaytpus

Fixes scrolling
Fixes cursor entry
---
 htdocs/js/keys.js | 161 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 115 insertions(+), 46 deletions(-)

diff --git a/htdocs/js/keys.js b/htdocs/js/keys.js
index 38c02e88f5..f3d95ac5f1 100644
--- a/htdocs/js/keys.js
+++ b/htdocs/js/keys.js
@@ -1,35 +1,34 @@
-
-(function(){
-  "use strict";
+(function () {
+    "use strict";
 
     /**
-    * Creates an instance of keys, an extra row of buttons for the iOS virtual keyboard in webapps.
-    *
-    * @constructor
-    * @this {keys}
-    * @param {Array} syms An array of characters that you want the new keyboard to containt (this can be added to later).
-    * @param {Object} options An object containing options for the new keys, this is optional
-    */
-    var Keys = function(syms, opt){
+     * Creates an instance of keys, an extra row of buttons for the iOS virtual keyboard in webapps.
+     *
+     * @constructor
+     * @this {keys}
+     * @param {Array} syms An array of characters that you want the new keyboard to containt (this can be added to later).
+     * @param {Object} options An object containing options for the new keys, this is optional
+     */
+    var Keys = function (syms, opt) {
         this.symbols = syms;
-        this.options = opt;
+        this.options = opt ? opt : {};
         //we haven't rendered anything yet
         this.board = false;
         this.input = false; //the currently focused input
     };
 
-    Keys.prototype.hasClass = function(cls) {
-        return this.board.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
+    Keys.prototype.hasClass = function (cls) {
+        return this.board.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'));
     }
 
-    Keys.prototype.addClass = function(cls) {
-        if (!this.hasClass(cls)) this.board.className += " "+cls;
+    Keys.prototype.addClass = function (cls) {
+        if (!this.hasClass(cls)) this.board.className += " " + cls;
     }
 
-    Keys.prototype.removeClass = function(cls) {
+    Keys.prototype.removeClass = function (cls) {
         if (this.hasClass(cls)) {
-            var reg = new RegExp('(\\s|^)'+cls+'(\\s|$)');
-            this.board.className=this.board.className.replace(reg,' ');
+            var reg = new RegExp('(\\s|^)' + cls + '(\\s|$)');
+            this.board.className = this.board.className.replace(reg, ' ');
         }
     }
 
@@ -39,8 +38,8 @@
      * @this {keys}
      * @return {keys} just in case.
      */
-    Keys.prototype.setOrientation = function(){
-        if(window.orientation == 0 || 180){
+    Keys.prototype.setOrientation = function () {
+        if (window.orientation == 0 || 180) {
             this.removeClass("landscape");
             this.addClass("portrait");
         } else {
@@ -57,62 +56,131 @@
      * @self {keys}
      * @return {keys} just in case.
      */
-    Keys.prototype.build = function(){
+    Keys.prototype.build = function () {
         var self = this;
         //make sure we're on iOS (just iPad for now)
         if (this.options.debug || (navigator.userAgent.indexOf('iPhone') != -1) || (navigator.userAgent.indexOf('iPod') != -1) || (navigator.userAgent.indexOf('iPad') != -1)) {
-            if(!self.board){
+            if (!self.board) {
                 self.board = document.createElement('div');
                 self.board.id = "keyboard";
             }
-            if(!document.getElementById(self.board.id)){
+            if (!document.getElementById(self.board.id)) {
                 document.body.appendChild(self.board);
             }
 
-            self.symbols.forEach(function(key){
+            self.symbols.forEach(function (key) {
                 var button = document.createElement('a');
                 button.value = key;
                 button.innerHTML = key;
                 button.className = "key";
                 button.hidefocus = "true";
 
-                button.addEventListener('touchstart', function(event){
-                    event.preventDefault();
-                }, false);
-                
+                /*button.addEventListener('touchstart', function(event){
+                 event.preventDefault();
+                 }, false);*/
+
                 /*button.addEventListener('mouseup', function(event){
-                    event.preventDefault();
-                }, false);*/
+                 event.preventDefault();
+                 }, false);*/
                 
-                
-                button.addEventListener('touchend', function(event){
+                 var insertAtCaret = function(el,text) {
+    var txtarea = el;
+    var scrollPos = txtarea.scrollTop;
+    var strPos = 0;
+strPos = txtarea.selectionStart;
+
+    var front = (txtarea.value).substring(0,strPos);  
+    var back = (txtarea.value).substring(strPos,txtarea.value.length); 
+    txtarea.value=front+text+back;
+    strPos = strPos + text.length;
+                    txtarea.selectionStart = strPos;
+        txtarea.selectionEnd = strPos;
+        txtarea.focus();
+    txtarea.scrollTop = scrollPos;
+}
+
+                button.hitButton = function (event) {
 
                     //event.preventDefault();
                     //self.input.focus();
                     //have to check for normal input vs just content editable at some point
-                    self.input.value += button.value;
 
+                    if (self.input.replaceRange) {
+                        var cursor_temp = self.input.getCursor();
+                        self.input.replaceRange(button.value, cursor_temp);
+                        /*var cursor_temp = self.input.getCursor();
+                        self.input.setValue(self.input.getValue() + button.value);
+                        cursor_temp.ch += 1;
+                        self.input.setCursor(cursor_temp);*/
+                    } else {
+                        insertAtCaret(self.input, button.value);
+                    }
+                    event.preventDefault();
+                    button.removeEventListener('touchend', button.hitButton, false);
+
+                };
+
+                button.addEventListener('touchstart',function(){
+                    //event.preventDefault();
+                    button.addEventListener('touchend', button.hitButton, false);
                 }, false);
+                button.addEventListener('touchmove', function(){
+                    //event.preventDefault();
+                    button.removeEventListener('touchend', button.hitButton, false);
+                }, false);
+
+                if (self.options.debug) {
+                    button.addEventListener('mousedown', function (event) {
+                        event.preventDefault();
+                    }, false);
+                    button.addEventListener('mouseup', function (event) {
+                        event.preventDefault();
+                    }, false);
+                    button.addEventListener('click', button.hitButton, false);
+                }
+
                 self.board.appendChild(button);
             });
 
+
             //get orientation
             self.setOrientation();
-            document.body.addEventListener('orientationchange', function(event){
+            document.body.addEventListener('orientationchange', function (event) {
                 self.setOrientation();
             }, false);
 
             var inputs = document.getElementsByTagName('input');
-            for(var i = 0; i < inputs.length; i++){
-               inputs[i].addEventListener('focus', function(){
+            for (var i = 0; i < inputs.length; i++) {
+                inputs[i].addEventListener('focus', function () {
                     self.input = this;
                     self.show();
-               }, false);
-               inputs[i].addEventListener('blur', function(){self.hide()}, false);
+                }, false);
+                inputs[i].addEventListener('blur', function () {
+                    self.hide()
+                }, false);
+            }
+            if (this.options.codemirrors) {
+                for (var i = 0; i < this.options.codemirrors.length; i++) {
+                    var currentMirror = this.options.codemirrors[i];
+                    currentMirror.setOption('onFocus', function () {
+                        self.input = currentMirror;
+                        self.show();
+                    });
+                    currentMirror.setOption('onBlur', function () {
+                        self.hide();
+                    });
+                }
             }
-            window.addEventListener('scroll', function(){
-                if(self.input){
-                    self.board.style.top = window.pageYOffset+"px";
+
+            window.addEventListener('scroll', function () {
+                if (self.input) {
+                    self.board.style.top = window.pageYOffset + "px";
+                }
+            }, false);
+            window.addEventListener('resize', function () {
+                if (self.input) {
+                    self.board.style.top = window.pageYOffset + "px";
+                    self.board.style.width = window.innerWidth + "px";
                 }
             }, false);
         }
@@ -120,17 +188,18 @@
         return this;
     };
 
-    Keys.prototype.hide = function(){
+    Keys.prototype.hide = function () {
         this.removeClass('visible');
         this.input = false;
         this.board.style.top = "-60px";
     }
 
-    Keys.prototype.show = function(){
+    Keys.prototype.show = function () {
         var self = this;
         this.addClass('visible');
-        self.board.style.top = (window.pageYOffset)+"px";
+        self.board.style.top = (window.pageYOffset) + "px";
+        self.board.style.width = window.innerWidth + "px";
     }
-    
+
     window.Keys = Keys;
 })();
\ No newline at end of file

From 3f55c60bd1ed770ae942f2e5f795b0c22b51856d Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Mon, 4 Jun 2012 17:22:05 -0400
Subject: [PATCH 72/73] Fixed borked URLPaths merge

---
 conf/postlocal.conf.dist |  0
 conf/prelocal.conf.dist  |  0
 lib/WeBWorK/URLPath.pm   | 87 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 83 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 conf/postlocal.conf.dist
 mode change 100755 => 100644 conf/prelocal.conf.dist

diff --git a/conf/postlocal.conf.dist b/conf/postlocal.conf.dist
old mode 100755
new mode 100644
diff --git a/conf/prelocal.conf.dist b/conf/prelocal.conf.dist
old mode 100755
new mode 100644
diff --git a/lib/WeBWorK/URLPath.pm b/lib/WeBWorK/URLPath.pm
index 6e114d2eee..dfd23fc18c 100644
--- a/lib/WeBWorK/URLPath.pm
+++ b/lib/WeBWorK/URLPath.pm
@@ -46,6 +46,7 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  
  course_admin                        /admin/ -> logout, options, instructor_tools
  html2xml                            /html2xml/
+ instructorXMLHandler     			     /instructorXMLHandler/
  set_list                            /$courseID/
  
  equation_display                    /$courseID/equation/
@@ -67,16 +68,26 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_user_detail              /$courseID/instructor/users/$userID/
  instructor_sets_assigned_to_user    /$courseID/instructor/users/$userID/sets/
  
+ instructor_user_list2                /$courseID/instructor/users2/
+ instructor_user_detail2              /$courseID/instructor/users2/$userID/ #not created yet
+ instructor_sets_assigned_to_user2    /$courseID/instructor/users2/$userID/sets/ #not created yet
+
+ 
  instructor_set_list                 /$courseID/instructor/sets/
  instructor_set_detail               /$courseID/instructor/sets/$setID/
  instructor_users_assigned_to_set    /$courseID/instructor/sets/$setID/users/
  
+ instructor_set_list2                 /$courseID/instructor/sets2/
+ instructor_set_detail2               /$courseID/instructor/sets2/$setID/ #not created yet
+ instructor_users_assigned_to_set2    /$courseID/instructor/sets2/$setID/users/ #not created yet
+ 
  instructor_add_users                /$courseID/instructor/add_users/
  instructor_set_assigner             /$courseID/instructor/assigner/
  instructor_file_transfer            /$courseID/instructor/files/
  instructor_file_manager             /$courseID/instructor/file_manager/
  instructor_set_maker                /$courseID/instructor/setmaker/
  instructor_set_maker2               /$courseID/instructor/setmaker2/
+ instructor_set_maker3               /$courseID/instructor/setmaker3/
  instructor_get_target_set_problems  /$courseID/instructor/GetTargetSetProblems/
  instructor_get_library_set_problems /$courseID/instructor/GetLibrarySetProblems/
  instructor_config                   /$courseID/instructor/config/
@@ -86,6 +97,11 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE HEIRARCHY BELOW!!!
  instructor_problem_editor_withset   /$courseID/instructor/pgProblemEditor/$setID/
  instructor_problem_editor_withset_withproblem
                                      /$courseID/instructor/pgProblemEditor/$setID/$problemID/
+                                     
+ instructor_problem_editor2           /$courseID/instructor/pgProblemEditor2/
+ instructor_problem_editor2_withset   /$courseID/instructor/pgProblemEditor2/$setID/
+ instructor_problem_editor2_withset_withproblem
+                                     /$courseID/instructor/pgProblemEditor2/$setID/$problemID/
  
  instructor_scoring                  /$courseID/instructor/scoring/
  instructor_scoring_download         /$courseID/instructor/scoringDownload/
@@ -119,7 +135,7 @@ our %pathTypes = (
 	root => {
 		name    => 'WeBWorK',
 		parent  => '',
-		kids    => [ qw/course_admin  html2xml set_list / ],
+		kids    => [ qw/course_admin  html2xml instructorXMLHandler set_list / ],
 		match   => qr|^/|,
 		capture => [ qw// ],
 		produce => '/',
@@ -145,7 +161,15 @@ our %pathTypes = (
 		produce => 'html2xml/',
 		display => 'WeBWorK::ContentGenerator::renderViaXMLRPC',
 	},
-
+	instructorXMLHandler => {
+		name => 'instructorXMLHandler',
+		parent => 'root',
+		kids => [ qw// ],
+		match   => qr|^instructorXMLHandler/|,
+		capture => [ qw// ],
+		produce => 'instructorXMLHandler/',
+		display => 'WeBWorK::ContentGenerator::instructorXMLHandler',
+	},
 	set_list => {
 		name    => '$courseID',
 		parent  => 'root',
@@ -286,7 +310,9 @@ our %pathTypes = (
 		kids    => [ qw/instructor_user_list instructor_user_list2 instructor_set_list instructor_set_list2 
 		    instructor_add_users instructor_achievement_list
 			instructor_set_assigner instructor_file_manager
-			instructor_problem_editor instructor_set_maker instructor_set_maker2 instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
+			instructor_problem_editor instructor_problem_editor2 
+			instructor_set_maker instructor_set_maker2 instructor_set_maker3 
+			instructor_get_target_set_problems instructor_get_library_set_problems instructor_compare
 			instructor_config
 			instructor_scoring instructor_scoring_download instructor_mail_merge
 			instructor_answer_log instructor_preflight instructor_statistics
@@ -309,6 +335,15 @@ our %pathTypes = (
 		produce => 'users/',
 		display => 'WeBWorK::ContentGenerator::Instructor::UserList',
 	},
+	instructor_user_list2 => {
+		name    => 'Classlist Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_user_detail/ ],
+		match   => qr|^users2/|,
+		capture => [ qw// ],
+		produce => 'users2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::UserList2',
+	},
 	instructor_user_detail => {
 		name    => 'Sets assigned to $userID',
 		parent  => 'instructor_user_list',
@@ -339,6 +374,15 @@ our %pathTypes = (
 		produce => 'sets/',
 		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList',
 	},
+	instructor_set_list2 => {
+		name    => 'Hmwk Sets Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_set_detail/ ],
+		match   => qr|^sets2/|,
+		capture => [ qw// ],
+		produce => 'sets2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::ProblemSetList2',
+	},
 	instructor_set_detail => {
 		name    => 'Set Detail for set $setID',
 		parent  => 'instructor_set_list',
@@ -414,6 +458,15 @@ our %pathTypes = (
 		capture => [ qw// ],
 		produce => 'setmaker2/',
 		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker2',
+	},
+		instructor_set_maker3 => {
+		name    => 'Library Browser 3',
+		parent  => 'instructor_tools',
+		kids    => [ qw// ],
+		match   => qr|^setmaker3/|,
+		capture => [ qw// ],
+		produce => 'setmaker3/',
+		display => 'WeBWorK::ContentGenerator::Instructor::SetMaker3',
 	},
 	instructor_get_target_set_problems => {
 		name    => 'Get Target Set Problems',
@@ -451,6 +504,15 @@ our %pathTypes = (
 		produce => 'pgProblemEditor/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
+	instructor_problem_editor2 => {
+		name    => 'Problem Editor2',
+		parent  => 'instructor_tools',
+		kids    => [ qw/instructor_problem_editor2_withset/ ],
+		match   => qr|^pgProblemEditor2/|,
+		capture => [ qw// ],
+		produce => 'pgProblemEditor2/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
+	},
 	instructor_problem_editor_withset => {
 		name    => '$setID',
 		parent  => 'instructor_problem_editor',
@@ -460,6 +522,15 @@ our %pathTypes = (
 		produce => '$setID/',
 		display => undef,
 	},
+	instructor_problem_editor2_withset => {
+		name    => '$setID',
+		parent  => 'instructor_problem_editor2',
+		kids    => [ qw/instructor_problem_editor2_withset_withproblem/ ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/setID/ ],
+		produce => '$setID/',
+		display => undef,
+	},
 	instructor_problem_editor_withset_withproblem => {
 		name    => '$problemID',
 		parent  => 'instructor_problem_editor_withset',
@@ -469,6 +540,15 @@ our %pathTypes = (
 		produce => '$problemID/',
 		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor',
 	},
+	instructor_problem_editor2_withset_withproblem => {
+		name    => '$problemID',
+		parent  => 'instructor_problem_editor2_withset',
+		kids    => [ qw// ],
+		match   => qr|^([^/]+)/|,
+		capture => [ qw/problemID/ ],
+		produce => '$problemID/',
+		display => 'WeBWorK::ContentGenerator::Instructor::PGProblemEditor2',
+	},
 	instructor_scoring => {
 		name    => 'Scoring Tools',
 		parent  => 'instructor_tools',
@@ -545,7 +625,6 @@ our %pathTypes = (
 		display => 'WeBWorK::ContentGenerator::Instructor::Stats',
 	},
 
-
 	################################################################################
 
         instructor_achievement_list => {

From a0f8ab6caefb8f00423d82777fb520b00eafc138 Mon Sep 17 00:00:00 2001
From: Geoff Goehle <goehle@gmail.com>
Date: Mon, 4 Jun 2012 17:36:56 -0400
Subject: [PATCH 73/73] Fixed bug where students cant solve problems if they
 have no achievement data

---
 lib/WeBWorK/AchievementEvaluator.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 7f06c40973..f6d042f9a0 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -47,6 +47,13 @@ sub checkForAchievements {
     @achievements = sortAchievements(@achievements);
     my $globalUserAchievement = $db->getGlobalUserAchievement($user_id);
 
+    # If no global data then initialize
+    if (not $globalUserAchievement) {
+	$globalUserAchievement = $db->newGlobalUserAchievement();
+	$globalUserAchievement->user_id($user_id);
+	$db->addGlobalUserAchievement($globalUserAchievement);
+    }
+
     #update the problem with stuff from the pg. 
     # this is kind of a hack.  The achievement checking happens *before* the system has
     # updated $problem with the new results from $pg.  So we cheat and update the